diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9eade1508..6dcbf4b6e3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-17 08:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/qtgui/qth/QIcon.qth
+    ! An important change in constructor.
+
+      TO-REMEMBER: whenever any parameter has to be tested with 
+        HB_ISCHAR() and HB_ISPOINTER(),  HB_ISCHAR() must ever be 
+        checked first then HB_ISPOINTER(), at least for hbQT.
+
+  * contrib/hbqt/utils/hbqtgen.prg
+    ! Fixed: how a QIcon() is passed to another methods.
+
+  * contrib/hbqt/qt*/g/*.prg
+  * contrib/hbqt/qt*/doc/en/*.txt
+    * Auto generated.
+ 
 2010-09-17 07:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbwin/win_rpc.c
     * casting to pacify MinGW warnings
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt
index 094f08db01..5ca88b8aa4 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt
@@ -42,7 +42,7 @@
  *     :setAutoRepeatInterval( nInt )                      -> NIL
  *     :setCheckable( lBool )                              -> NIL
  *     :setDown( lBool )                                   -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setShortcut( pKey )                                -> NIL
  *     :setText( cText )                                   -> NIL
  *     :shortcut()                                         -> pQKeySequence
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt
index 9e84f6d15a..cbeb2d0cd3 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt
@@ -48,7 +48,7 @@
  *     :setCheckable( lBool )                              -> NIL
  *     :setData( pUserData )                               -> NIL
  *     :setFont( pFont )                                   -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setIconText( cText )                               -> NIL
  *     :setIconVisibleInMenu( lVisible )                   -> NIL
  *     :setMenu( pMenu )                                   -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt
index 6f9f2395ca..9f77b34aa7 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt
@@ -29,7 +29,7 @@
  *     :actions()                                          -> pQList<QAction *>
  *     :addAction( pAction )                               -> pQAction
  *     :addAction_1( cText )                               -> pQAction
- *     :addAction_2( cIcon, cText )                        -> pQAction
+ *     :addAction_2( pIcon, cText )                        -> pQAction
  *     :checkedAction()                                    -> pQAction
  *     :isEnabled()                                        -> lBool
  *     :isExclusive()                                      -> lBool
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt
index 9b31ffc154..6f64229a0c 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt
@@ -85,7 +85,7 @@
  *     :setStyle( pStyle )                                 -> NIL
  *     :setStyle_1( cStyle )                               -> pQStyle
  *     :setWheelScrollLines( nInt )                        -> NIL
- *     :setWindowIcon( cIcon )                             -> NIL
+ *     :setWindowIcon( pIcon )                             -> NIL
  *     :startDragDistance()                                -> nInt
  *     :startDragTime()                                    -> nInt
  *     :style()                                            -> pQStyle
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt
index f23381f880..e1eb897d9b 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt
@@ -27,7 +27,7 @@
  *     An instance of the object of type QComboBox
  *  $METHODS$
  *     :addItem( cText, pUserData )                        -> NIL
- *     :addItem_1( cIcon, cText, pUserData )               -> NIL
+ *     :addItem_1( pIcon, cText, pUserData )               -> NIL
  *     :addItems( pTexts )                                 -> NIL
  *     :completer()                                        -> pQCompleter
  *     :count()                                            -> nInt
@@ -40,7 +40,7 @@
  *     :hidePopup()                                        -> NIL
  *     :iconSize()                                         -> pQSize
  *     :insertItem( nIndex, cText, pUserData )             -> NIL
- *     :insertItem_1( nIndex, cIcon, cText, pUserData )    -> NIL
+ *     :insertItem_1( nIndex, pIcon, cText, pUserData )    -> NIL
  *     :insertItems( nIndex, pList )                       -> NIL
  *     :insertPolicy()                                     -> nInsertPolicy
  *     :insertSeparator( nIndex )                          -> NIL
@@ -65,7 +65,7 @@
  *     :setInsertPolicy( nPolicy )                         -> NIL
  *     :setItemData( nIndex, pValue, nRole )               -> NIL
  *     :setItemDelegate( pDelegate )                       -> NIL
- *     :setItemIcon( nIndex, cIcon )                       -> NIL
+ *     :setItemIcon( nIndex, pIcon )                       -> NIL
  *     :setItemText( nIndex, cText )                       -> NIL
  *     :setLineEdit( pEdit )                               -> NIL
  *     :setMaxCount( nMax )                                -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt
index 6ed0f31495..e2a55245f9 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt
@@ -44,7 +44,7 @@
  *     :setFont( pFont )                                   -> NIL
  *     :setForeground( pBrush )                            -> NIL
  *     :setHidden( lHide )                                 -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setSelected( lSelect )                             -> NIL
  *     :setSizeHint( pSize )                               -> NIL
  *     :setStatusTip( cStatusTip )                         -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt
index 883355c3ed..3b8c6f0efe 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt
@@ -30,9 +30,9 @@
  *     :actionGeometry( pAct )                             -> pQRect
  *     :activeAction()                                     -> pQAction
  *     :addAction( cText )                                 -> pQAction
- *     :addAction_1( cIcon, cText )                        -> pQAction
+ *     :addAction_1( pIcon, cText )                        -> pQAction
  *     :addAction_2( cText, pReceiver, pMember, pShortcut )  -> pQAction
- *     :addAction_3( cIcon, cText, pReceiver, pMember, pShortcut )  -> pQAction
+ *     :addAction_3( pIcon, cText, pReceiver, pMember, pShortcut )  -> pQAction
  *     :addAction_4( pAction )                             -> NIL
  *     :addMenu( pMenu )                                   -> pQAction
  *     :addSeparator()                                     -> pQAction
@@ -52,7 +52,7 @@
  *     :separatorsCollapsible()                            -> lBool
  *     :setActiveAction( pAct )                            -> NIL
  *     :setDefaultAction( pAct )                           -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setSeparatorsCollapsible( lCollapse )              -> NIL
  *     :setTearOffEnabled( lBool )                         -> NIL
  *     :setTitle( cTitle )                                 -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt
index 69fe9b5bb4..617df07f43 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt
@@ -32,7 +32,7 @@
  *     :addAction_2( pAction )                             -> NIL
  *     :addMenu( pMenu )                                   -> pQAction
  *     :addMenu_1( cTitle )                                -> pQMenu
- *     :addMenu_2( cIcon, cTitle )                         -> pQMenu
+ *     :addMenu_2( pIcon, cTitle )                         -> pQMenu
  *     :addSeparator()                                     -> pQAction
  *     :clear()                                            -> NIL
  *     :insertMenu( pBefore, pMenu )                       -> pQAction
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt
index 8b5fbfb3d5..2e58f17229 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt
@@ -74,7 +74,7 @@
  *     :setFlags( nFlags )                                 -> NIL
  *     :setFont( pFont )                                   -> NIL
  *     :setForeground( pBrush )                            -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setRowCount( nRows )                               -> NIL
  *     :setSelectable( lSelectable )                       -> NIL
  *     :setSizeHint( pSize )                               -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt
index 611393d6e1..a449f06077 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt
@@ -31,7 +31,7 @@
  *     :icon()                                             -> pQIcon
  *     :isVisible()                                        -> lBool
  *     :setContextMenu( pMenu )                            -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setToolTip( cTip )                                 -> NIL
  *     :showMessage( cTitle, cMessage, nIcon, nMillisecondsTimeoutHint )  -> NIL
  *     :toolTip()                                          -> cQString
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt
index 3306398fd0..352db94b4b 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt
@@ -43,7 +43,7 @@
  *     :setFlags( nFlags )                                 -> NIL
  *     :setFont( pFont )                                   -> NIL
  *     :setForeground( pBrush )                            -> NIL
- *     :setIcon( cIcon )                                   -> NIL
+ *     :setIcon( pIcon )                                   -> NIL
  *     :setSelected( lSelect )                             -> NIL
  *     :setSizeHint( pSize )                               -> NIL
  *     :setStatusTip( cStatusTip )                         -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt
index e81ebe32fd..165d64e999 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt
@@ -27,7 +27,7 @@
  *     An instance of the object of type QTabWidget
  *  $METHODS$
  *     :addTab( pPage, cLabel )                            -> nInt
- *     :addTab_1( pPage, cIcon, cLabel )                   -> nInt
+ *     :addTab_1( pPage, pIcon, cLabel )                   -> nInt
  *     :clear()                                            -> NIL
  *     :cornerWidget( nCorner )                            -> pQWidget
  *     :count()                                            -> nInt
@@ -38,7 +38,7 @@
  *     :iconSize()                                         -> pQSize
  *     :indexOf( pW )                                      -> nInt
  *     :insertTab( nIndex, pPage, cLabel )                 -> nInt
- *     :insertTab_1( nIndex, pPage, cIcon, cLabel )        -> nInt
+ *     :insertTab_1( nIndex, pPage, pIcon, cLabel )        -> nInt
  *     :isMovable()                                        -> lBool
  *     :isTabEnabled( nIndex )                             -> lBool
  *     :removeTab( nIndex )                                -> NIL
@@ -48,7 +48,7 @@
  *     :setIconSize( pSize )                               -> NIL
  *     :setMovable( lMovable )                             -> NIL
  *     :setTabEnabled( nIndex, lEnable )                   -> NIL
- *     :setTabIcon( nIndex, cIcon )                        -> NIL
+ *     :setTabIcon( nIndex, pIcon )                        -> NIL
  *     :setTabPosition( nTabPosition )                     -> NIL
  *     :setTabShape( nS )                                  -> NIL
  *     :setTabText( nIndex, cLabel )                       -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt
index dd37d6e049..ff14bd98b1 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt
@@ -30,9 +30,9 @@
  *     :actionAt_1( nX, nY )                               -> pQAction
  *     :addAction( pAction )                               -> NIL
  *     :addAction_1( cText )                               -> pQAction
- *     :addAction_2( cIcon, cText )                        -> pQAction
+ *     :addAction_2( pIcon, cText )                        -> pQAction
  *     :addAction_3( cText, pReceiver, pMember )           -> pQAction
- *     :addAction_4( cIcon, cText, pReceiver, pMember )    -> pQAction
+ *     :addAction_4( pIcon, cText, pReceiver, pMember )    -> pQAction
  *     :addSeparator()                                     -> pQAction
  *     :addWidget( pWidget )                               -> pQAction
  *     :allowedAreas()                                     -> nQt::ToolBarAreas
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt
index ec1fda151a..1c926adfcf 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt
@@ -26,13 +26,13 @@
  *  $RETURNS$
  *     An instance of the object of type QToolBox
  *  $METHODS$
- *     :addItem( pWidget, cIconSet, cText )                -> nInt
+ *     :addItem( pWidget, pIconSet, cText )                -> nInt
  *     :addItem_1( pW, cText )                             -> nInt
  *     :count()                                            -> nInt
  *     :currentIndex()                                     -> nInt
  *     :currentWidget()                                    -> pQWidget
  *     :indexOf( pWidget )                                 -> nInt
- *     :insertItem( nIndex, pWidget, cIcon, cText )        -> nInt
+ *     :insertItem( nIndex, pWidget, pIcon, cText )        -> nInt
  *     :insertItem_1( nIndex, pWidget, cText )             -> nInt
  *     :isItemEnabled( nIndex )                            -> lBool
  *     :itemIcon( nIndex )                                 -> pQIcon
@@ -40,7 +40,7 @@
  *     :itemToolTip( nIndex )                              -> cQString
  *     :removeItem( nIndex )                               -> NIL
  *     :setItemEnabled( nIndex, lEnabled )                 -> NIL
- *     :setItemIcon( nIndex, cIcon )                       -> NIL
+ *     :setItemIcon( nIndex, pIcon )                       -> NIL
  *     :setItemText( nIndex, cText )                       -> NIL
  *     :setItemToolTip( nIndex, cToolTip )                 -> NIL
  *     :widget( nIndex )                                   -> pQWidget
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt
index 0b462bc43d..432558d6bb 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt
@@ -57,7 +57,7 @@
  *     :setFont( nColumn, pFont )                          -> NIL
  *     :setForeground( nColumn, pBrush )                   -> NIL
  *     :setHidden( lHide )                                 -> NIL
- *     :setIcon( nColumn, cIcon )                          -> NIL
+ *     :setIcon( nColumn, pIcon )                          -> NIL
  *     :setSelected( lSelect )                             -> NIL
  *     :setSizeHint( nColumn, pSize )                      -> NIL
  *     :setStatusTip( nColumn, cStatusTip )                -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt
index d962aad566..dd17edbd79 100644
--- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt
+++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt
@@ -162,7 +162,7 @@
  *     :setWhatsThis( cQString )                           -> NIL
  *     :setWindowFilePath( cFilePath )                     -> NIL
  *     :setWindowFlags( nType )                            -> NIL
- *     :setWindowIcon( cIcon )                             -> NIL
+ *     :setWindowIcon( pIcon )                             -> NIL
  *     :setWindowIconText( cQString )                      -> NIL
  *     :setWindowModality( nWindowModality )               -> NIL
  *     :setWindowOpacity( nLevel )                         -> NIL
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
index bf8585d3d6..7ad0aa3f88 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
@@ -320,7 +320,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETICON )
    QAbstractButton * p = hbqt_par_QAbstractButton( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
index 399983e6f9..c481f8fbc4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
@@ -447,7 +447,7 @@ HB_FUNC( QT_QACTION_SETICON )
    QAction * p = hbqt_par_QAction( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
index d6a1c6dc1a..3d62c07012 100644
--- a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
@@ -199,7 +199,7 @@ HB_FUNC( QT_QACTIONGROUP_ADDACTION_2 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
       hb_strfree( pText );
    }
 }
diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
index a2f81d4302..b8061c0db7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
@@ -918,7 +918,7 @@ HB_FUNC( QT_QAPPLICATION_SETWINDOWICON )
    QApplication * p = hbqt_par_QApplication( 1 );
    if( p )
    {
-      ( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setWindowIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
index 675012a6ac..27c61930fb 100644
--- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
@@ -178,7 +178,7 @@ HB_FUNC( QT_QCOMBOBOX_ADDITEM_1 )
    if( p )
    {
       void * pText;
-      ( p )->addItem( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
+      ( p )->addItem( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
       hb_strfree( pText );
    }
 }
@@ -340,7 +340,7 @@ HB_FUNC( QT_QCOMBOBOX_INSERTITEM_1 )
    if( p )
    {
       void * pText;
-      ( p )->insertItem( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), hb_parstr_utf8( 4, &pText, NULL ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
+      ( p )->insertItem( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
       hb_strfree( pText );
    }
 }
@@ -641,7 +641,7 @@ HB_FUNC( QT_QCOMBOBOX_SETITEMICON )
    QComboBox * p = hbqt_par_QComboBox( 1 );
    if( p )
    {
-      ( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
+      ( p )->setItemIcon( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
index 8220cfce8a..796a336300 100644
--- a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
@@ -148,7 +148,7 @@ HB_FUNC( QT_QICON )
    {
       pObj =  new QIcon( hbqt_par_QString( 1 ) ) ;
    }
-   if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
+   else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
    {
       pObj =  new QIcon( *hbqt_par_QPixmap( 1 ) ) ;
    }
diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
index b870eb147f..5c2bcbafff 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
@@ -382,7 +382,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_SETICON )
    QListWidgetItem * p = hbqt_par_QListWidgetItem( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
index 25e800987d..d5cb713f02 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
@@ -231,7 +231,7 @@ HB_FUNC( QT_QMENU_ADDACTION_1 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
       hb_strfree( pText );
    }
 }
@@ -259,7 +259,7 @@ HB_FUNC( QT_QMENU_ADDACTION_3 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) );
       hb_strfree( pText );
    }
 }
@@ -316,7 +316,7 @@ HB_FUNC( QT_QMENU_ADDMENU_2 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
       hb_strfree( pText );
    }
 }
@@ -533,7 +533,7 @@ HB_FUNC( QT_QMENU_SETICON )
    QMenu * p = hbqt_par_QMenu( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
index 3887d81253..359c1a8a09 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
@@ -237,7 +237,7 @@ HB_FUNC( QT_QMENUBAR_ADDMENU_2 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
       hb_strfree( pText );
    }
 }
diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
index 9d71e81f15..c4463543e6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
@@ -784,7 +784,7 @@ HB_FUNC( QT_QSTANDARDITEM_SETICON )
    QStandardItem * p = hbqt_par_QStandardItem( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
index 3f7afe641d..eeeb93fcaf 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
@@ -224,7 +224,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_SETICON )
    QSystemTrayIcon * p = hbqt_par_QSystemTrayIcon( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
index a35c6f47b1..9609c00b7c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
@@ -192,7 +192,7 @@ HB_FUNC( QT_QTABWIDGET_ADDTAB_1 )
    if( p )
    {
       void * pText;
-      hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), hb_parstr_utf8( 4, &pText, NULL ) ) );
+      hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ) ) );
       hb_strfree( pText );
    }
 }
@@ -328,7 +328,7 @@ HB_FUNC( QT_QTABWIDGET_INSERTTAB_1 )
    if( p )
    {
       void * pText;
-      hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), hb_parstr_utf8( 5, &pText, NULL ) ) );
+      hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISCHAR( 4 ) ? QIcon( hbqt_par_QString( 4 ) ) : *hbqt_par_QIcon( 4 )), hb_parstr_utf8( 5, &pText, NULL ) ) );
       hb_strfree( pText );
    }
 }
@@ -449,7 +449,7 @@ HB_FUNC( QT_QTABWIDGET_SETTABICON )
    QTabWidget * p = hbqt_par_QTabWidget( 1 );
    if( p )
    {
-      ( p )->setTabIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
+      ( p )->setTabIcon( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
index e81b95987d..3e110e061a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
@@ -385,7 +385,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_SETICON )
    QTableWidgetItem * p = hbqt_par_QTableWidgetItem( 1 );
    if( p )
    {
-      ( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
index 2cd8bc10f3..0f69cef62c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
@@ -228,7 +228,7 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_2 )
    if( p )
    {
       void * pText;
-      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
+      hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) );
       hb_strfree( pText );
    }
 }
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
index cf6804fc87..d346dd05a2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
@@ -159,7 +159,7 @@ HB_FUNC( QT_QTOOLBOX_ADDITEM )
    if( p )
    {
       void * pText;
-      hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), hb_parstr_utf8( 4, &pText, NULL ) ) );
+      hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ) ) );
       hb_strfree( pText );
    }
 }
@@ -235,7 +235,7 @@ HB_FUNC( QT_QTOOLBOX_INSERTITEM )
    if( p )
    {
       void * pText;
-      hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), hb_parstr_utf8( 5, &pText, NULL ) ) );
+      hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISCHAR( 4 ) ? QIcon( hbqt_par_QString( 4 ) ) : *hbqt_par_QIcon( 4 )), hb_parstr_utf8( 5, &pText, NULL ) ) );
       hb_strfree( pText );
    }
 }
@@ -334,7 +334,7 @@ HB_FUNC( QT_QTOOLBOX_SETITEMICON )
    QToolBox * p = hbqt_par_QToolBox( 1 );
    if( p )
    {
-      ( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
+      ( p )->setItemIcon( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
index 686104e21b..41c7bdde1a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
@@ -591,7 +591,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_SETICON )
    QTreeWidgetItem * p = hbqt_par_QTreeWidgetItem( 1 );
    if( p )
    {
-      ( p )->setIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
+      ( p )->setIcon( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
index 01c0524bb0..4635708238 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
@@ -1948,7 +1948,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWICON )
    QWidget * p = hbqt_par_QWidget( 1 );
    if( p )
    {
-      ( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
+      ( p )->setWindowIcon( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )) );
    }
 }
 
diff --git a/harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg
index cd14babb12..837bcb019e 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg
@@ -87,7 +87,7 @@ CREATE CLASS QAbstractButton INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_Q
    METHOD  setAutoRepeatInterval( nInt )
    METHOD  setCheckable( lBool )
    METHOD  setDown( lBool )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setShortcut( pKey )
    METHOD  setText( cText )
    METHOD  shortcut()
@@ -174,8 +174,8 @@ METHOD QAbstractButton:setDown( lBool )
    RETURN Qt_QAbstractButton_setDown( ::pPtr, lBool )
 
 
-METHOD QAbstractButton:setIcon( cIcon )
-   RETURN Qt_QAbstractButton_setIcon( ::pPtr, cIcon )
+METHOD QAbstractButton:setIcon( pIcon )
+   RETURN Qt_QAbstractButton_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QAbstractButton:setShortcut( pKey )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQAction.prg b/harbour/contrib/hbqt/qtgui/g/TQAction.prg
index f859a15bf8..74edda3ec7 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQAction.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQAction.prg
@@ -93,7 +93,7 @@ CREATE CLASS QAction INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QAction
    METHOD  setCheckable( lBool )
    METHOD  setData( pUserData )
    METHOD  setFont( pFont )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setIconText( cText )
    METHOD  setIconVisibleInMenu( lVisible )
    METHOD  setMenu( pMenu )
@@ -222,8 +222,8 @@ METHOD QAction:setFont( pFont )
    RETURN Qt_QAction_setFont( ::pPtr, hbqt_ptr( pFont ) )
 
 
-METHOD QAction:setIcon( cIcon )
-   RETURN Qt_QAction_setIcon( ::pPtr, cIcon )
+METHOD QAction:setIcon( pIcon )
+   RETURN Qt_QAction_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QAction:setIconText( cText )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg
index 9d60c7e6dc..6d09dce147 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg
@@ -74,7 +74,7 @@ CREATE CLASS QActionGroup INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QAct
    METHOD  actions()
    METHOD  addAction( pAction )
    METHOD  addAction_1( cText )
-   METHOD  addAction_2( cIcon, cText )
+   METHOD  addAction_2( pIcon, cText )
    METHOD  checkedAction()
    METHOD  isEnabled()
    METHOD  isExclusive()
@@ -109,8 +109,8 @@ METHOD QActionGroup:addAction_1( cText )
    RETURN Qt_QActionGroup_addAction_1( ::pPtr, cText )
 
 
-METHOD QActionGroup:addAction_2( cIcon, cText )
-   RETURN Qt_QActionGroup_addAction_2( ::pPtr, cIcon, cText )
+METHOD QActionGroup:addAction_2( pIcon, cText )
+   RETURN Qt_QActionGroup_addAction_2( ::pPtr, hbqt_ptr( pIcon ), cText )
 
 
 METHOD QActionGroup:checkedAction()
diff --git a/harbour/contrib/hbqt/qtgui/g/TQApplication.prg b/harbour/contrib/hbqt/qtgui/g/TQApplication.prg
index 9314457fc7..cf1100c559 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQApplication.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQApplication.prg
@@ -130,7 +130,7 @@ CREATE CLASS QApplication INHERIT HbQtObjectHandler, HB_QCoreApplication FUNCTIO
    METHOD  setStyle( pStyle )
    METHOD  setStyle_1( cStyle )
    METHOD  setWheelScrollLines( nInt )
-   METHOD  setWindowIcon( cIcon )
+   METHOD  setWindowIcon( pIcon )
    METHOD  startDragDistance()
    METHOD  startDragTime()
    METHOD  style()
@@ -394,8 +394,8 @@ METHOD QApplication:setWheelScrollLines( nInt )
    RETURN Qt_QApplication_setWheelScrollLines( ::pPtr, nInt )
 
 
-METHOD QApplication:setWindowIcon( cIcon )
-   RETURN Qt_QApplication_setWindowIcon( ::pPtr, cIcon )
+METHOD QApplication:setWindowIcon( pIcon )
+   RETURN Qt_QApplication_setWindowIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QApplication:startDragDistance()
diff --git a/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg b/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg
index fb8cc1c490..df364a2911 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg
@@ -72,7 +72,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QComboB
    METHOD  new( ... )
 
    METHOD  addItem( cText, pUserData )
-   METHOD  addItem_1( cIcon, cText, pUserData )
+   METHOD  addItem_1( pIcon, cText, pUserData )
    METHOD  addItems( pTexts )
    METHOD  completer()
    METHOD  count()
@@ -85,7 +85,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QComboB
    METHOD  hidePopup()
    METHOD  iconSize()
    METHOD  insertItem( nIndex, cText, pUserData )
-   METHOD  insertItem_1( nIndex, cIcon, cText, pUserData )
+   METHOD  insertItem_1( nIndex, pIcon, cText, pUserData )
    METHOD  insertItems( nIndex, pList )
    METHOD  insertPolicy()
    METHOD  insertSeparator( nIndex )
@@ -110,7 +110,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QComboB
    METHOD  setInsertPolicy( nPolicy )
    METHOD  setItemData( nIndex, pValue, nRole )
    METHOD  setItemDelegate( pDelegate )
-   METHOD  setItemIcon( nIndex, cIcon )
+   METHOD  setItemIcon( nIndex, pIcon )
    METHOD  setItemText( nIndex, cText )
    METHOD  setLineEdit( pEdit )
    METHOD  setMaxCount( nMax )
@@ -147,8 +147,8 @@ METHOD QComboBox:addItem( cText, pUserData )
    RETURN Qt_QComboBox_addItem( ::pPtr, cText, hbqt_ptr( pUserData ) )
 
 
-METHOD QComboBox:addItem_1( cIcon, cText, pUserData )
-   RETURN Qt_QComboBox_addItem_1( ::pPtr, cIcon, cText, hbqt_ptr( pUserData ) )
+METHOD QComboBox:addItem_1( pIcon, cText, pUserData )
+   RETURN Qt_QComboBox_addItem_1( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pUserData ) )
 
 
 METHOD QComboBox:addItems( pTexts )
@@ -199,8 +199,8 @@ METHOD QComboBox:insertItem( nIndex, cText, pUserData )
    RETURN Qt_QComboBox_insertItem( ::pPtr, nIndex, cText, hbqt_ptr( pUserData ) )
 
 
-METHOD QComboBox:insertItem_1( nIndex, cIcon, cText, pUserData )
-   RETURN Qt_QComboBox_insertItem_1( ::pPtr, nIndex, cIcon, cText, hbqt_ptr( pUserData ) )
+METHOD QComboBox:insertItem_1( nIndex, pIcon, cText, pUserData )
+   RETURN Qt_QComboBox_insertItem_1( ::pPtr, nIndex, hbqt_ptr( pIcon ), cText, hbqt_ptr( pUserData ) )
 
 
 METHOD QComboBox:insertItems( nIndex, pList )
@@ -299,8 +299,8 @@ METHOD QComboBox:setItemDelegate( pDelegate )
    RETURN Qt_QComboBox_setItemDelegate( ::pPtr, hbqt_ptr( pDelegate ) )
 
 
-METHOD QComboBox:setItemIcon( nIndex, cIcon )
-   RETURN Qt_QComboBox_setItemIcon( ::pPtr, nIndex, cIcon )
+METHOD QComboBox:setItemIcon( nIndex, pIcon )
+   RETURN Qt_QComboBox_setItemIcon( ::pPtr, nIndex, hbqt_ptr( pIcon ) )
 
 
 METHOD QComboBox:setItemText( nIndex, cText )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg
index 3e2ec21d46..ffd2c67054 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg
@@ -90,7 +90,7 @@ CREATE CLASS QListWidgetItem INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_Q
    METHOD  setFont( pFont )
    METHOD  setForeground( pBrush )
    METHOD  setHidden( lHide )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setSelected( lSelect )
    METHOD  setSizeHint( pSize )
    METHOD  setStatusTip( cStatusTip )
@@ -195,8 +195,8 @@ METHOD QListWidgetItem:setHidden( lHide )
    RETURN Qt_QListWidgetItem_setHidden( ::pPtr, lHide )
 
 
-METHOD QListWidgetItem:setIcon( cIcon )
-   RETURN Qt_QListWidgetItem_setIcon( ::pPtr, cIcon )
+METHOD QListWidgetItem:setIcon( pIcon )
+   RETURN Qt_QListWidgetItem_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QListWidgetItem:setSelected( lSelect )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg
index b5e5296674..f8f51c3f09 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg
@@ -75,13 +75,13 @@ CREATE CLASS QMenu INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMenu
    METHOD  actionGeometry( pAct )
    METHOD  activeAction()
    METHOD  addAction( cText )
-   METHOD  addAction_1( cIcon, cText )
+   METHOD  addAction_1( pIcon, cText )
    METHOD  addAction_2( cText, pReceiver, pMember, pShortcut )
-   METHOD  addAction_3( cIcon, cText, pReceiver, pMember, pShortcut )
+   METHOD  addAction_3( pIcon, cText, pReceiver, pMember, pShortcut )
    METHOD  addAction_4( pAction )
    METHOD  addMenu( pMenu )
    METHOD  addMenu_1( cTitle )
-   METHOD  addMenu_2( cIcon, cTitle )
+   METHOD  addMenu_2( pIcon, cTitle )
    METHOD  addSeparator()
    METHOD  clear()
    METHOD  defaultAction()
@@ -99,7 +99,7 @@ CREATE CLASS QMenu INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMenu
    METHOD  separatorsCollapsible()
    METHOD  setActiveAction( pAct )
    METHOD  setDefaultAction( pAct )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setSeparatorsCollapsible( lCollapse )
    METHOD  setTearOffEnabled( lBool )
    METHOD  setTitle( cTitle )
@@ -133,16 +133,16 @@ METHOD QMenu:addAction( cText )
    RETURN Qt_QMenu_addAction( ::pPtr, cText )
 
 
-METHOD QMenu:addAction_1( cIcon, cText )
-   RETURN Qt_QMenu_addAction_1( ::pPtr, cIcon, cText )
+METHOD QMenu:addAction_1( pIcon, cText )
+   RETURN Qt_QMenu_addAction_1( ::pPtr, hbqt_ptr( pIcon ), cText )
 
 
 METHOD QMenu:addAction_2( cText, pReceiver, pMember, pShortcut )
    RETURN Qt_QMenu_addAction_2( ::pPtr, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ), hbqt_ptr( pShortcut ) )
 
 
-METHOD QMenu:addAction_3( cIcon, cText, pReceiver, pMember, pShortcut )
-   RETURN Qt_QMenu_addAction_3( ::pPtr, cIcon, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ), hbqt_ptr( pShortcut ) )
+METHOD QMenu:addAction_3( pIcon, cText, pReceiver, pMember, pShortcut )
+   RETURN Qt_QMenu_addAction_3( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ), hbqt_ptr( pShortcut ) )
 
 
 METHOD QMenu:addAction_4( pAction )
@@ -157,8 +157,8 @@ METHOD QMenu:addMenu_1( cTitle )
    RETURN Qt_QMenu_addMenu_1( ::pPtr, cTitle )
 
 
-METHOD QMenu:addMenu_2( cIcon, cTitle )
-   RETURN Qt_QMenu_addMenu_2( ::pPtr, cIcon, cTitle )
+METHOD QMenu:addMenu_2( pIcon, cTitle )
+   RETURN Qt_QMenu_addMenu_2( ::pPtr, hbqt_ptr( pIcon ), cTitle )
 
 
 METHOD QMenu:addSeparator()
@@ -229,8 +229,8 @@ METHOD QMenu:setDefaultAction( pAct )
    RETURN Qt_QMenu_setDefaultAction( ::pPtr, hbqt_ptr( pAct ) )
 
 
-METHOD QMenu:setIcon( cIcon )
-   RETURN Qt_QMenu_setIcon( ::pPtr, cIcon )
+METHOD QMenu:setIcon( pIcon )
+   RETURN Qt_QMenu_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QMenu:setSeparatorsCollapsible( lCollapse )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg b/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg
index 5f4f3974a4..1f117f957e 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg
@@ -77,7 +77,7 @@ CREATE CLASS QMenuBar INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMenuBar
    METHOD  addAction_2( pAction )
    METHOD  addMenu( pMenu )
    METHOD  addMenu_1( cTitle )
-   METHOD  addMenu_2( cIcon, cTitle )
+   METHOD  addMenu_2( pIcon, cTitle )
    METHOD  addSeparator()
    METHOD  clear()
    METHOD  insertMenu( pBefore, pMenu )
@@ -122,8 +122,8 @@ METHOD QMenuBar:addMenu_1( cTitle )
    RETURN Qt_QMenuBar_addMenu_1( ::pPtr, cTitle )
 
 
-METHOD QMenuBar:addMenu_2( cIcon, cTitle )
-   RETURN Qt_QMenuBar_addMenu_2( ::pPtr, cIcon, cTitle )
+METHOD QMenuBar:addMenu_2( pIcon, cTitle )
+   RETURN Qt_QMenuBar_addMenu_2( ::pPtr, hbqt_ptr( pIcon ), cTitle )
 
 
 METHOD QMenuBar:addSeparator()
diff --git a/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg b/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg
index 3de1e155f4..5de8878d43 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg
@@ -122,7 +122,7 @@ CREATE CLASS QStandardItem INHERIT HbQtObjectHandler FUNCTION HB_QStandardItem
    METHOD  setFlags( nFlags )
    METHOD  setFont( pFont )
    METHOD  setForeground( pBrush )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setRowCount( nRows )
    METHOD  setSelectable( lSelectable )
    METHOD  setSizeHint( pSize )
@@ -361,8 +361,8 @@ METHOD QStandardItem:setForeground( pBrush )
    RETURN Qt_QStandardItem_setForeground( ::pPtr, hbqt_ptr( pBrush ) )
 
 
-METHOD QStandardItem:setIcon( cIcon )
-   RETURN Qt_QStandardItem_setIcon( ::pPtr, cIcon )
+METHOD QStandardItem:setIcon( pIcon )
+   RETURN Qt_QStandardItem_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QStandardItem:setRowCount( nRows )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg b/harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg
index 8dbadd9c2e..ad4851a503 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg
@@ -76,7 +76,7 @@ CREATE CLASS QSystemTrayIcon INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_Q
    METHOD  icon()
    METHOD  isVisible()
    METHOD  setContextMenu( pMenu )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setToolTip( cTip )
    METHOD  showMessage( cTitle, cMessage, nIcon, nMillisecondsTimeoutHint )
    METHOD  toolTip()
@@ -118,8 +118,8 @@ METHOD QSystemTrayIcon:setContextMenu( pMenu )
    RETURN Qt_QSystemTrayIcon_setContextMenu( ::pPtr, hbqt_ptr( pMenu ) )
 
 
-METHOD QSystemTrayIcon:setIcon( cIcon )
-   RETURN Qt_QSystemTrayIcon_setIcon( ::pPtr, cIcon )
+METHOD QSystemTrayIcon:setIcon( pIcon )
+   RETURN Qt_QSystemTrayIcon_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QSystemTrayIcon:setToolTip( cTip )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg
index 545251726a..4399519dcc 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg
@@ -72,7 +72,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QTabWi
    METHOD  new( ... )
 
    METHOD  addTab( pPage, cLabel )
-   METHOD  addTab_1( pPage, cIcon, cLabel )
+   METHOD  addTab_1( pPage, pIcon, cLabel )
    METHOD  clear()
    METHOD  cornerWidget( nCorner )
    METHOD  count()
@@ -83,7 +83,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QTabWi
    METHOD  iconSize()
    METHOD  indexOf( pW )
    METHOD  insertTab( nIndex, pPage, cLabel )
-   METHOD  insertTab_1( nIndex, pPage, cIcon, cLabel )
+   METHOD  insertTab_1( nIndex, pPage, pIcon, cLabel )
    METHOD  isMovable()
    METHOD  isTabEnabled( nIndex )
    METHOD  removeTab( nIndex )
@@ -93,7 +93,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QTabWi
    METHOD  setIconSize( pSize )
    METHOD  setMovable( lMovable )
    METHOD  setTabEnabled( nIndex, lEnable )
-   METHOD  setTabIcon( nIndex, cIcon )
+   METHOD  setTabIcon( nIndex, pIcon )
    METHOD  setTabPosition( nTabPosition )
    METHOD  setTabShape( nS )
    METHOD  setTabText( nIndex, cLabel )
@@ -129,8 +129,8 @@ METHOD QTabWidget:addTab( pPage, cLabel )
    RETURN Qt_QTabWidget_addTab( ::pPtr, hbqt_ptr( pPage ), cLabel )
 
 
-METHOD QTabWidget:addTab_1( pPage, cIcon, cLabel )
-   RETURN Qt_QTabWidget_addTab_1( ::pPtr, hbqt_ptr( pPage ), cIcon, cLabel )
+METHOD QTabWidget:addTab_1( pPage, pIcon, cLabel )
+   RETURN Qt_QTabWidget_addTab_1( ::pPtr, hbqt_ptr( pPage ), hbqt_ptr( pIcon ), cLabel )
 
 
 METHOD QTabWidget:clear()
@@ -173,8 +173,8 @@ METHOD QTabWidget:insertTab( nIndex, pPage, cLabel )
    RETURN Qt_QTabWidget_insertTab( ::pPtr, nIndex, hbqt_ptr( pPage ), cLabel )
 
 
-METHOD QTabWidget:insertTab_1( nIndex, pPage, cIcon, cLabel )
-   RETURN Qt_QTabWidget_insertTab_1( ::pPtr, nIndex, hbqt_ptr( pPage ), cIcon, cLabel )
+METHOD QTabWidget:insertTab_1( nIndex, pPage, pIcon, cLabel )
+   RETURN Qt_QTabWidget_insertTab_1( ::pPtr, nIndex, hbqt_ptr( pPage ), hbqt_ptr( pIcon ), cLabel )
 
 
 METHOD QTabWidget:isMovable()
@@ -213,8 +213,8 @@ METHOD QTabWidget:setTabEnabled( nIndex, lEnable )
    RETURN Qt_QTabWidget_setTabEnabled( ::pPtr, nIndex, lEnable )
 
 
-METHOD QTabWidget:setTabIcon( nIndex, cIcon )
-   RETURN Qt_QTabWidget_setTabIcon( ::pPtr, nIndex, cIcon )
+METHOD QTabWidget:setTabIcon( nIndex, pIcon )
+   RETURN Qt_QTabWidget_setTabIcon( ::pPtr, nIndex, hbqt_ptr( pIcon ) )
 
 
 METHOD QTabWidget:setTabPosition( nTabPosition )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg
index 1fb5a57ce4..8a55f8417d 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg
@@ -89,7 +89,7 @@ CREATE CLASS QTableWidgetItem INHERIT HbQtObjectHandler FUNCTION HB_QTableWidget
    METHOD  setFlags( nFlags )
    METHOD  setFont( pFont )
    METHOD  setForeground( pBrush )
-   METHOD  setIcon( cIcon )
+   METHOD  setIcon( pIcon )
    METHOD  setSelected( lSelect )
    METHOD  setSizeHint( pSize )
    METHOD  setStatusTip( cStatusTip )
@@ -191,8 +191,8 @@ METHOD QTableWidgetItem:setForeground( pBrush )
    RETURN Qt_QTableWidgetItem_setForeground( ::pPtr, hbqt_ptr( pBrush ) )
 
 
-METHOD QTableWidgetItem:setIcon( cIcon )
-   RETURN Qt_QTableWidgetItem_setIcon( ::pPtr, cIcon )
+METHOD QTableWidgetItem:setIcon( pIcon )
+   RETURN Qt_QTableWidgetItem_setIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QTableWidgetItem:setSelected( lSelect )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg
index 25a0b476fc..cd937d485b 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg
@@ -75,9 +75,9 @@ CREATE CLASS QToolBar INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QToolBar
    METHOD  actionAt_1( nX, nY )
    METHOD  addAction( pAction )
    METHOD  addAction_1( cText )
-   METHOD  addAction_2( cIcon, cText )
+   METHOD  addAction_2( pIcon, cText )
    METHOD  addAction_3( cText, pReceiver, pMember )
-   METHOD  addAction_4( cIcon, cText, pReceiver, pMember )
+   METHOD  addAction_4( pIcon, cText, pReceiver, pMember )
    METHOD  addSeparator()
    METHOD  addWidget( pWidget )
    METHOD  allowedAreas()
@@ -128,16 +128,16 @@ METHOD QToolBar:addAction_1( cText )
    RETURN Qt_QToolBar_addAction_1( ::pPtr, cText )
 
 
-METHOD QToolBar:addAction_2( cIcon, cText )
-   RETURN Qt_QToolBar_addAction_2( ::pPtr, cIcon, cText )
+METHOD QToolBar:addAction_2( pIcon, cText )
+   RETURN Qt_QToolBar_addAction_2( ::pPtr, hbqt_ptr( pIcon ), cText )
 
 
 METHOD QToolBar:addAction_3( cText, pReceiver, pMember )
    RETURN Qt_QToolBar_addAction_3( ::pPtr, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) )
 
 
-METHOD QToolBar:addAction_4( cIcon, cText, pReceiver, pMember )
-   RETURN Qt_QToolBar_addAction_4( ::pPtr, cIcon, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) )
+METHOD QToolBar:addAction_4( pIcon, cText, pReceiver, pMember )
+   RETURN Qt_QToolBar_addAction_4( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) )
 
 
 METHOD QToolBar:addSeparator()
diff --git a/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg
index 47be9133ca..489f47820e 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg
@@ -71,13 +71,13 @@ CREATE CLASS QToolBox INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QToolBox
 
    METHOD  new( ... )
 
-   METHOD  addItem( pWidget, cIconSet, cText )
+   METHOD  addItem( pWidget, pIconSet, cText )
    METHOD  addItem_1( pW, cText )
    METHOD  count()
    METHOD  currentIndex()
    METHOD  currentWidget()
    METHOD  indexOf( pWidget )
-   METHOD  insertItem( nIndex, pWidget, cIcon, cText )
+   METHOD  insertItem( nIndex, pWidget, pIcon, cText )
    METHOD  insertItem_1( nIndex, pWidget, cText )
    METHOD  isItemEnabled( nIndex )
    METHOD  itemIcon( nIndex )
@@ -85,7 +85,7 @@ CREATE CLASS QToolBox INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QToolBox
    METHOD  itemToolTip( nIndex )
    METHOD  removeItem( nIndex )
    METHOD  setItemEnabled( nIndex, lEnabled )
-   METHOD  setItemIcon( nIndex, cIcon )
+   METHOD  setItemIcon( nIndex, pIcon )
    METHOD  setItemText( nIndex, cText )
    METHOD  setItemToolTip( nIndex, cToolTip )
    METHOD  widget( nIndex )
@@ -104,8 +104,8 @@ METHOD QToolBox:new( ... )
    RETURN Self
 
 
-METHOD QToolBox:addItem( pWidget, cIconSet, cText )
-   RETURN Qt_QToolBox_addItem( ::pPtr, hbqt_ptr( pWidget ), cIconSet, cText )
+METHOD QToolBox:addItem( pWidget, pIconSet, cText )
+   RETURN Qt_QToolBox_addItem( ::pPtr, hbqt_ptr( pWidget ), hbqt_ptr( pIconSet ), cText )
 
 
 METHOD QToolBox:addItem_1( pW, cText )
@@ -128,8 +128,8 @@ METHOD QToolBox:indexOf( pWidget )
    RETURN Qt_QToolBox_indexOf( ::pPtr, hbqt_ptr( pWidget ) )
 
 
-METHOD QToolBox:insertItem( nIndex, pWidget, cIcon, cText )
-   RETURN Qt_QToolBox_insertItem( ::pPtr, nIndex, hbqt_ptr( pWidget ), cIcon, cText )
+METHOD QToolBox:insertItem( nIndex, pWidget, pIcon, cText )
+   RETURN Qt_QToolBox_insertItem( ::pPtr, nIndex, hbqt_ptr( pWidget ), hbqt_ptr( pIcon ), cText )
 
 
 METHOD QToolBox:insertItem_1( nIndex, pWidget, cText )
@@ -160,8 +160,8 @@ METHOD QToolBox:setItemEnabled( nIndex, lEnabled )
    RETURN Qt_QToolBox_setItemEnabled( ::pPtr, nIndex, lEnabled )
 
 
-METHOD QToolBox:setItemIcon( nIndex, cIcon )
-   RETURN Qt_QToolBox_setItemIcon( ::pPtr, nIndex, cIcon )
+METHOD QToolBox:setItemIcon( nIndex, pIcon )
+   RETURN Qt_QToolBox_setItemIcon( ::pPtr, nIndex, hbqt_ptr( pIcon ) )
 
 
 METHOD QToolBox:setItemText( nIndex, cText )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg
index c332dfbfdf..a80d6fe586 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg
@@ -105,7 +105,7 @@ CREATE CLASS QTreeWidgetItem INHERIT HbQtObjectHandler FUNCTION HB_QTreeWidgetIt
    METHOD  setFont( nColumn, pFont )
    METHOD  setForeground( nColumn, pBrush )
    METHOD  setHidden( lHide )
-   METHOD  setIcon( nColumn, cIcon )
+   METHOD  setIcon( nColumn, pIcon )
    METHOD  setSelected( lSelect )
    METHOD  setSizeHint( nColumn, pSize )
    METHOD  setStatusTip( nColumn, cStatusTip )
@@ -273,8 +273,8 @@ METHOD QTreeWidgetItem:setHidden( lHide )
    RETURN Qt_QTreeWidgetItem_setHidden( ::pPtr, lHide )
 
 
-METHOD QTreeWidgetItem:setIcon( nColumn, cIcon )
-   RETURN Qt_QTreeWidgetItem_setIcon( ::pPtr, nColumn, cIcon )
+METHOD QTreeWidgetItem:setIcon( nColumn, pIcon )
+   RETURN Qt_QTreeWidgetItem_setIcon( ::pPtr, nColumn, hbqt_ptr( pIcon ) )
 
 
 METHOD QTreeWidgetItem:setSelected( lSelect )
diff --git a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg
index 0d13b179e9..7bc3dfbe00 100644
--- a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg
@@ -214,7 +214,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QPaintDevice FUNC
    METHOD  setWhatsThis( cQString )
    METHOD  setWindowFilePath( cFilePath )
    METHOD  setWindowFlags( nType )
-   METHOD  setWindowIcon( cIcon )
+   METHOD  setWindowIcon( pIcon )
    METHOD  setWindowIconText( cQString )
    METHOD  setWindowModality( nWindowModality )
    METHOD  setWindowOpacity( nLevel )
@@ -862,8 +862,8 @@ METHOD QWidget:setWindowFlags( nType )
    RETURN Qt_QWidget_setWindowFlags( ::pPtr, nType )
 
 
-METHOD QWidget:setWindowIcon( cIcon )
-   RETURN Qt_QWidget_setWindowIcon( ::pPtr, cIcon )
+METHOD QWidget:setWindowIcon( pIcon )
+   RETURN Qt_QWidget_setWindowIcon( ::pPtr, hbqt_ptr( pIcon ) )
 
 
 METHOD QWidget:setWindowIconText( cQString )
diff --git a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth
index 2d4bff16b0..2bffbdf7bf 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth
@@ -85,7 +85,7 @@ HB_FUNC( QT_QICON )
    {
       hb_retptr( ( QIcon* ) new QIcon( hbqt_par_QString( 1 ) ) );
    }
-   if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
+   else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
    {
       hb_retptr( ( QIcon* ) new QIcon( *hbqt_par_QPixmap( 1 ) ) );
    }
diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg
index 2c15fe339e..4caa52fdf3 100644
--- a/harbour/contrib/hbqt/utils/hbqtgen.prg
+++ b/harbour/contrib/hbqt/utils/hbqtgen.prg
@@ -1027,8 +1027,9 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, lList, fB
 
             CASE aA[ PRT_CAST ] == "QIcon"
                s := "*hbqt_par_QIcon( " + cHBIdx + " )"
-               aA[ PRT_BODY ] := "( HB_ISPOINTER( " + cHBIdx + " ) ? " + s + " : " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) ) )"
-               aA[ PRT_DOC  ] := "c" + cDocNM
+//               aA[ PRT_BODY ] := "( HB_ISPOINTER( " + cHBIdx + " ) ? " + s + " : " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) ) )"
+               aA[ PRT_BODY ] := "( HB_ISCHAR( " + cHBIdx + " ) ? " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) )" + " : " + s + ")"
+               aA[ PRT_DOC  ] := "p" + cDocNM
 
             CASE aA[ PRT_L_FAR ]
                aA[ PRT_BODY ] := "hbqt_par_" + aA[ PRT_CAST ] + "( " + cHBIdx + " )"