diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c9341fb3e0..0b0c78df87 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-03 00:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/qtgui/hbqt_init.cpp
+    ! Fixed missing HB_EXTERN_BEGIN/END from around a new internal function.
+
+  * contrib/hbqt/utils/hbqtgen.prg
+    ! Fixed to not spit HB_TR_ALWAYS msgs while running.
+    % Deleted unnecessary HB_SYMBOL_UNUSED in generated code.
+    % Minor optimization in generate code.
+    ; TODO: Optimize code generated for GC desctructor.
+
+  * contrib/hbqt/*/g/*
+    * Regenerated.
+
+  * utils/hbmk2/hbmk2.prg
+    + Will now accepts macros in Harbour options.
+      (lightly tested)
+
 2010-11-02 18:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/utils/hbqtgen.prg
     % Optimized generated source code to be more compact.
diff --git a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
index ab28488a90..4c72e94259 100644
--- a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQsciScintilla )
 {
-   HBQsciScintilla  * ph = NULL;
    HBQT_GC_T_HBQsciScintilla * p = ( HBQT_GC_T_HBQsciScintilla * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQsciScintilla * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
index 668440781a..e56001cc4d 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciAPIs )
 {
-   QsciAPIs  * ph = NULL;
    HBQT_GC_T_QsciAPIs * p = ( HBQT_GC_T_QsciAPIs * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QsciAPIs * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp
index 14cf4ec536..0e90440366 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciAbstractAPIs )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp
index 7f7569e708..47fd9f6615 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciCommand )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp
index 1e93cf8cce..4497de925a 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciCommandSet )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp
index b83a2c8ca9..2176f53408 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp
@@ -49,7 +49,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciLexer )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
index 78043c69ac..5a14c66aaa 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciLexerCPP )
 {
-   QsciLexerCPP  * ph = NULL;
    HBQT_GC_T_QsciLexerCPP * p = ( HBQT_GC_T_QsciLexerCPP * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QsciLexerCPP * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
index dee535601a..22e31831a4 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciLexerFlagship )
 {
-   QsciLexerFlagship  * ph = NULL;
    HBQT_GC_T_QsciLexerFlagship * p = ( HBQT_GC_T_QsciLexerFlagship * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QsciLexerFlagship * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
index 98567b2946..835cecf71e 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
@@ -89,12 +89,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciScintilla )
 {
-   QsciScintilla  * ph = NULL;
    HBQT_GC_T_QsciScintilla * p = ( HBQT_GC_T_QsciScintilla * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QsciScintilla * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
index fa2a85e9d4..cd603138f9 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QsciStyle )
 {
-   QsciStyle  * ph = NULL;
    HBQT_GC_T_QsciStyle * p = ( HBQT_GC_T_QsciStyle * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QsciStyle * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
index 1ea7f4d6cb..ee4d171907 100644
--- a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQEvents )
 {
-   HBQEvents  * ph = NULL;
    HBQT_GC_T_HBQEvents * p = ( HBQT_GC_T_HBQEvents * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQEvents * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
index 614199b2cf..89d45918f7 100644
--- a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQSlots )
 {
-   HBQSlots  * ph = NULL;
    HBQT_GC_T_HBQSlots * p = ( HBQT_GC_T_HBQSlots * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQSlots * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
index 6b93087080..1337fc57e6 100644
--- a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
@@ -60,7 +60,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractItemModel )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
index b0c0aa15f8..c5b40a9b3e 100644
--- a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractListModel )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
index 4babc17b9e..f6199d40ec 100644
--- a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractTableModel )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
index f8caadd6b3..066c3f7cf2 100644
--- a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QBuffer )
 {
-   QBuffer  * ph = NULL;
    HBQT_GC_T_QBuffer * p = ( HBQT_GC_T_QBuffer * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QBuffer * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QChar.cpp b/harbour/contrib/hbqt/qtcore/g/QChar.cpp
index 10f10e33c4..f06c2fa27a 100644
--- a/harbour/contrib/hbqt/qtcore/g/QChar.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QChar.cpp
@@ -72,7 +72,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QChar )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
index 464ffa2282..ce8db7f9b3 100644
--- a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
@@ -57,7 +57,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCoreApplication )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
index dc14ce6313..531a457e92 100644
--- a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QEventLoop )
 {
-   QEventLoop  * ph = NULL;
    HBQT_GC_T_QEventLoop * p = ( HBQT_GC_T_QEventLoop * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QEventLoop * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QFile.cpp b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
index 10837a91b2..26e7bd31b6 100644
--- a/harbour/contrib/hbqt/qtcore/g/QFile.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
@@ -65,12 +65,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFile )
 {
-   QFile  * ph = NULL;
    HBQT_GC_T_QFile * p = ( HBQT_GC_T_QFile * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFile * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
index 2c4ee98852..5bdf3d1e30 100644
--- a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
@@ -53,7 +53,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QIODevice )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaClassInfo.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaClassInfo.cpp
index 4cacf10f52..5f9cf61d98 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaClassInfo.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaClassInfo.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMetaClassInfo )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaEnum.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaEnum.cpp
index 197a617237..2d204d1815 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaEnum.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaEnum.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMetaEnum )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaObject.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaObject.cpp
index 8325bdcedb..562ac0749d 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaObject.cpp
@@ -55,7 +55,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMetaObject )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaProperty.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaProperty.cpp
index 84fc23cd36..d0b0427d19 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaProperty.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaProperty.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMetaProperty )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaType.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaType.cpp
index 04f6ed32b1..794a7b0d23 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaType.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaType.cpp
@@ -58,7 +58,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMetaType )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
index 317d166a45..8a6e903095 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMimeData )
 {
-   QMimeData  * ph = NULL;
    HBQT_GC_T_QMimeData * p = ( HBQT_GC_T_QMimeData * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMimeData * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
index 0998ed644f..78c657a317 100644
--- a/harbour/contrib/hbqt/qtcore/g/QObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
@@ -63,12 +63,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QObject )
 {
-   QObject  * ph = NULL;
    HBQT_GC_T_QObject * p = ( HBQT_GC_T_QObject * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QObject * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
index ffadb91374..63f90ca583 100644
--- a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
@@ -62,12 +62,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QProcess )
 {
-   QProcess  * ph = NULL;
    HBQT_GC_T_QProcess * p = ( HBQT_GC_T_QProcess * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QProcess * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
index 8ac7a32d4b..626bf344d1 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSettings )
 {
-   QSettings  * ph = NULL;
    HBQT_GC_T_QSettings * p = ( HBQT_GC_T_QSettings * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSettings * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
index 9017e6b133..acfffeba70 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSignalMapper )
 {
-   QSignalMapper  * ph = NULL;
    HBQT_GC_T_QSignalMapper * p = ( HBQT_GC_T_QSignalMapper * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSignalMapper * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
index 9edaec224a..1c891aa998 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
@@ -57,7 +57,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextCodec )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QThread.cpp b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
index 526864ba5b..be274e5835 100644
--- a/harbour/contrib/hbqt/qtcore/g/QThread.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QThread )
 {
-   QThread  * ph = NULL;
    HBQT_GC_T_QThread * p = ( HBQT_GC_T_QThread * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QThread * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
index cbcf0ebd04..2b0de85c15 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTimeLine )
 {
-   QTimeLine  * ph = NULL;
    HBQT_GC_T_QTimeLine * p = ( HBQT_GC_T_QTimeLine * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTimeLine * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
index 2694acb018..33f84ae909 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
@@ -47,12 +47,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTimer )
 {
-   QTimer  * ph = NULL;
    HBQT_GC_T_QTimer * p = ( HBQT_GC_T_QTimer * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTimer * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
index 6c33218b7d..c690d98966 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTranslator )
 {
-   QTranslator  * ph = NULL;
    HBQT_GC_T_QTranslator * p = ( HBQT_GC_T_QTranslator * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTranslator * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp
index 34337b5f9e..1b152f91af 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerActionEditorInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
index 23a64095f6..4272eb2060 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
@@ -55,12 +55,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface )
 {
-   QDesignerFormEditorInterface  * ph = NULL;
    HBQT_GC_T_QDesignerFormEditorInterface * p = ( HBQT_GC_T_QDesignerFormEditorInterface * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDesignerFormEditorInterface * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp
index efeb36dd81..fb9be40504 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp
@@ -55,7 +55,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormWindowCursorInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp
index c09284ebc3..13f7df58d5 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp
@@ -62,7 +62,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormWindowInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp
index 1e51465d02..ec4d70c0eb 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormWindowManagerInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp
index bf1fe0af56..c137ea320a 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerObjectInspectorInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp
index 80f2cfc034..9e27235af0 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerPropertyEditorInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp
index 3cb2baa476..91213981cf 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesignerWidgetBoxInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
index 8a7e282c4b..e100d032df 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQAbstractItemModel )
 {
-   HBQAbstractItemModel  * ph = NULL;
    HBQT_GC_T_HBQAbstractItemModel * p = ( HBQT_GC_T_HBQAbstractItemModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQAbstractItemModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
index 02842ba1f5..ebdc9dfc95 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQGraphicsScene )
 {
-   HBQGraphicsScene  * ph = NULL;
    HBQT_GC_T_HBQGraphicsScene * p = ( HBQT_GC_T_HBQGraphicsScene * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQGraphicsScene * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
index 9138291582..3dda4f4db1 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQPlainTextEdit )
 {
-   HBQPlainTextEdit  * ph = NULL;
    HBQT_GC_T_HBQPlainTextEdit * p = ( HBQT_GC_T_HBQPlainTextEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQPlainTextEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
index 775ec5da43..1b1704c623 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQSyntaxHighlighter )
 {
-   HBQSyntaxHighlighter  * ph = NULL;
    HBQT_GC_T_HBQSyntaxHighlighter * p = ( HBQT_GC_T_HBQSyntaxHighlighter * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQSyntaxHighlighter * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
index b53681d784..e3e80f2a1b 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_HBQTableView )
 {
-   HBQTableView  * ph = NULL;
    HBQT_GC_T_HBQTableView * p = ( HBQT_GC_T_HBQTableView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      HBQTableView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
index 1a1844ce5f..405783355b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractButton )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp
index c2c0158942..886c337734 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractGraphicsShapeItem )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
index cd5652fd99..b77c030322 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
@@ -55,7 +55,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractItemDelegate )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
index 622c6d8134..902ea92bd0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
@@ -58,7 +58,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractItemView )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
index d1e2495a70..00c445929a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
@@ -56,7 +56,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractPrintDialog )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
index 5c3decfc8c..a9acb882e9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractProxyModel )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
index 0d3b4389ad..e82b282db1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractScrollArea )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
index 213b4d0fd4..1ab8914597 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractSlider )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
index 43f2545e41..795e249888 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
@@ -60,7 +60,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractSpinBox )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
index 82b51307b1..8fe0852ce6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAbstractTextDocumentLayout )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
index 67bfda21c4..cbba151c22 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
@@ -62,12 +62,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QAction )
 {
-   QAction  * ph = NULL;
    HBQT_GC_T_QAction * p = ( HBQT_GC_T_QAction * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QAction * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
index 1d36801dbb..5b51374282 100644
--- a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
@@ -47,12 +47,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QActionGroup )
 {
-   QActionGroup  * ph = NULL;
    HBQT_GC_T_QActionGroup * p = ( HBQT_GC_T_QActionGroup * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QActionGroup * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
index 31738597e7..f8d30ec32a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
@@ -99,7 +99,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QApplication )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
index f917799faa..bfcd47cc61 100644
--- a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QBoxLayout )
 {
-   QBoxLayout  * ph = NULL;
    HBQT_GC_T_QBoxLayout * p = ( HBQT_GC_T_QBoxLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QBoxLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
index 55713628ef..a64d526414 100644
--- a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QButtonGroup )
 {
-   QButtonGroup  * ph = NULL;
    HBQT_GC_T_QButtonGroup * p = ( HBQT_GC_T_QButtonGroup * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QButtonGroup * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
index f535245150..c91442fa38 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCalendarWidget )
 {
-   QCalendarWidget  * ph = NULL;
    HBQT_GC_T_QCalendarWidget * p = ( HBQT_GC_T_QCalendarWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QCalendarWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
index 576b604cd8..5ce5a29c4e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCheckBox )
 {
-   QCheckBox  * ph = NULL;
    HBQT_GC_T_QCheckBox * p = ( HBQT_GC_T_QCheckBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QCheckBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
index 0e8ece3671..de1e7db5a7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
@@ -59,7 +59,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QClipboard )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
index 5743816263..d4ed8645a4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QColorDialog )
 {
-   QColorDialog  * ph = NULL;
    HBQT_GC_T_QColorDialog * p = ( HBQT_GC_T_QColorDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QColorDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
index 5cd541fc2e..130bfa228b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QComboBox )
 {
-   QComboBox  * ph = NULL;
    HBQT_GC_T_QComboBox * p = ( HBQT_GC_T_QComboBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QComboBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
index a20a96f604..eb672fb605 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCommandLinkButton )
 {
-   QCommandLinkButton  * ph = NULL;
    HBQT_GC_T_QCommandLinkButton * p = ( HBQT_GC_T_QCommandLinkButton * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QCommandLinkButton * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
index d25e8b06c2..1735b95bee 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
@@ -47,12 +47,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCommonStyle )
 {
-   QCommonStyle  * ph = NULL;
    HBQT_GC_T_QCommonStyle * p = ( HBQT_GC_T_QCommonStyle * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QCommonStyle * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
index 63527cc44d..c5426448b2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QCompleter )
 {
-   QCompleter  * ph = NULL;
    HBQT_GC_T_QCompleter * p = ( HBQT_GC_T_QCompleter * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QCompleter * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
index c7e1bd2ad5..5507016130 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDateEdit )
 {
-   QDateEdit  * ph = NULL;
    HBQT_GC_T_QDateEdit * p = ( HBQT_GC_T_QDateEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDateEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
index 442c9db8e9..9ad743859a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
@@ -55,12 +55,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDateTimeEdit )
 {
-   QDateTimeEdit  * ph = NULL;
    HBQT_GC_T_QDateTimeEdit * p = ( HBQT_GC_T_QDateTimeEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDateTimeEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp
index 76bb18cf4f..a17f9c03a6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesktopServices )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
index e7879aa5cd..960c794d62 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDesktopWidget )
 {
-   QDesktopWidget  * ph = NULL;
    HBQT_GC_T_QDesktopWidget * p = ( HBQT_GC_T_QDesktopWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDesktopWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDial.cpp b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
index 96283141fc..4162958001 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDial.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDial )
 {
-   QDial  * ph = NULL;
    HBQT_GC_T_QDial * p = ( HBQT_GC_T_QDial * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDial * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
index 8e1f9b8282..c2928d1e81 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDialog )
 {
-   QDialog  * ph = NULL;
    HBQT_GC_T_QDialog * p = ( HBQT_GC_T_QDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
index 1366f1a1bb..82f7d97eab 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDirModel )
 {
-   QDirModel  * ph = NULL;
    HBQT_GC_T_QDirModel * p = ( HBQT_GC_T_QDirModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDirModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
index fdfdf40def..97abede1c0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDockWidget )
 {
-   QDockWidget  * ph = NULL;
    HBQT_GC_T_QDockWidget * p = ( HBQT_GC_T_QDockWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDockWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
index 381e067cc1..934def4a01 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDoubleSpinBox )
 {
-   QDoubleSpinBox  * ph = NULL;
    HBQT_GC_T_QDoubleSpinBox * p = ( HBQT_GC_T_QDoubleSpinBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDoubleSpinBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
index 84949e7f7e..d49adee744 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDoubleValidator )
 {
-   QDoubleValidator  * ph = NULL;
    HBQT_GC_T_QDoubleValidator * p = ( HBQT_GC_T_QDoubleValidator * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDoubleValidator * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
index 3e08a7cdb8..6d5b30004e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDrag )
 {
-   QDrag  * ph = NULL;
    HBQT_GC_T_QDrag * p = ( HBQT_GC_T_QDrag * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QDrag * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
index 1ff964a4ad..77ca0b17d3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDragEnterEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
index 6ea000a70a..4974c3f29c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDragLeaveEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
index 20a7550935..6c5797f9b3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDragMoveEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
index a09d604cee..d942b1f954 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QDropEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
index 3eb57ddd05..bd41270d91 100644
--- a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QErrorMessage )
 {
-   QErrorMessage  * ph = NULL;
    HBQT_GC_T_QErrorMessage * p = ( HBQT_GC_T_QErrorMessage * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QErrorMessage * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
index bd3f0134ca..d6ededbfd4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
@@ -68,12 +68,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFileDialog )
 {
-   QFileDialog  * ph = NULL;
    HBQT_GC_T_QFileDialog * p = ( HBQT_GC_T_QFileDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFileDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
index b30f643be1..23f2025cc9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
@@ -58,12 +58,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFileSystemModel )
 {
-   QFileSystemModel  * ph = NULL;
    HBQT_GC_T_QFileSystemModel * p = ( HBQT_GC_T_QFileSystemModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFileSystemModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
index 7431313ee3..7eaefe96d9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFocusEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
index 5a8d2ec73f..07e1eedb75 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFocusFrame )
 {
-   QFocusFrame  * ph = NULL;
    HBQT_GC_T_QFocusFrame * p = ( HBQT_GC_T_QFocusFrame * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFocusFrame * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
index d7d57d68a4..05a00c52ef 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFontComboBox )
 {
-   QFontComboBox  * ph = NULL;
    HBQT_GC_T_QFontComboBox * p = ( HBQT_GC_T_QFontComboBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFontComboBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
index 34605b4281..09fac016e0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
@@ -58,12 +58,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFontDialog )
 {
-   QFontDialog  * ph = NULL;
    HBQT_GC_T_QFontDialog * p = ( HBQT_GC_T_QFontDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFontDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
index ec45c0e0ee..455fbdd02b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
@@ -60,12 +60,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFormLayout )
 {
-   QFormLayout  * ph = NULL;
    HBQT_GC_T_QFormLayout * p = ( HBQT_GC_T_QFormLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFormLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
index 57c6ff933a..558622dfae 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFrame )
 {
-   QFrame  * ph = NULL;
    HBQT_GC_T_QFrame * p = ( HBQT_GC_T_QFrame * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFrame * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp
index 52d22b93cb..f7d3a13a62 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp
@@ -58,7 +58,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGradient )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp
index 465999a8be..b69ff74898 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp
@@ -56,7 +56,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsItem )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
index d6af98b72e..8a10f6e7d4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsItemAnimation )
 {
-   QGraphicsItemAnimation  * ph = NULL;
    HBQT_GC_T_QGraphicsItemAnimation * p = ( HBQT_GC_T_QGraphicsItemAnimation * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsItemAnimation * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp
index 346936b6f2..2c3337059f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsLayout )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp
index 504cef52b7..c439953ec7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsLayoutItem )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
index f3abb9a2d9..6a4b969e95 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsProxyWidget )
 {
-   QGraphicsProxyWidget  * ph = NULL;
    HBQT_GC_T_QGraphicsProxyWidget * p = ( HBQT_GC_T_QGraphicsProxyWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsProxyWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
index bd022c9774..92a3effcb0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
@@ -63,12 +63,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsScene )
 {
-   QGraphicsScene  * ph = NULL;
    HBQT_GC_T_QGraphicsScene * p = ( HBQT_GC_T_QGraphicsScene * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsScene * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp
index 749817a334..5fd92fe1c5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp
@@ -54,7 +54,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneContextMenuEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp
index 974126c88c..398cdfb890 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneDragDropEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp
index f6d773bb12..053678b154 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp
index 456beb7af0..79a9582040 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneHelpEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp
index 6c90a1d579..6eabcc91eb 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneHoverEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp
index 2b13864a48..567574174a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneMouseEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp
index a2c8fa4013..1ced175bf5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneMoveEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp
index f6ffc5a8ab..f3f8976557 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp
@@ -49,7 +49,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneResizeEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp
index 8a5f139350..08dbf74ed2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp
@@ -49,7 +49,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSceneWheelEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
index e68ebee308..79e5b7038b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsTextItem )
 {
-   QGraphicsTextItem  * ph = NULL;
    HBQT_GC_T_QGraphicsTextItem * p = ( HBQT_GC_T_QGraphicsTextItem * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsTextItem * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
index 3874842284..d1a8ef97ef 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
@@ -62,12 +62,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsView )
 {
-   QGraphicsView  * ph = NULL;
    HBQT_GC_T_QGraphicsView * p = ( HBQT_GC_T_QGraphicsView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
index 7eab855fdb..45002f1cdf 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsWidget )
 {
-   QGraphicsWidget  * ph = NULL;
    HBQT_GC_T_QGraphicsWidget * p = ( HBQT_GC_T_QGraphicsWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGraphicsWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
index 66a8998998..2fafe282e3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGridLayout )
 {
-   QGridLayout  * ph = NULL;
    HBQT_GC_T_QGridLayout * p = ( HBQT_GC_T_QGridLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGridLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
index 4f47534200..e9b3d42ebe 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QGroupBox )
 {
-   QGroupBox  * ph = NULL;
    HBQT_GC_T_QGroupBox * p = ( HBQT_GC_T_QGroupBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QGroupBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
index a275b594c7..233f1f50d6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHBoxLayout )
 {
-   QHBoxLayout  * ph = NULL;
    HBQT_GC_T_QHBoxLayout * p = ( HBQT_GC_T_QHBoxLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QHBoxLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
index 4942c5315b..3b40c98c45 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHeaderView )
 {
-   QHeaderView  * ph = NULL;
    HBQT_GC_T_QHeaderView * p = ( HBQT_GC_T_QHeaderView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QHeaderView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
index 5860f2e637..f82d40dae7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHelpEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
index 645d5ff469..202a6f1376 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHideEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
index 7fe2c994bb..aecfee0531 100644
--- a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QInputDialog )
 {
-   QInputDialog  * ph = NULL;
    HBQT_GC_T_QInputDialog * p = ( HBQT_GC_T_QInputDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QInputDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
index 5de948079a..9851734377 100644
--- a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QIntValidator )
 {
-   QIntValidator  * ph = NULL;
    HBQT_GC_T_QIntValidator * p = ( HBQT_GC_T_QIntValidator * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QIntValidator * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
index eda4b34940..92b1ec67ac 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QItemDelegate )
 {
-   QItemDelegate  * ph = NULL;
    HBQT_GC_T_QItemDelegate * p = ( HBQT_GC_T_QItemDelegate * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QItemDelegate * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
index fe32d264c5..98ad76b7bb 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
@@ -49,7 +49,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QItemEditorCreatorBase )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
index e6dc395c76..b45e113016 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
@@ -59,12 +59,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QItemSelectionModel )
 {
-   QItemSelectionModel  * ph = NULL;
    HBQT_GC_T_QItemSelectionModel * p = ( HBQT_GC_T_QItemSelectionModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QItemSelectionModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
index 3727b54d25..a8f66a60c2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QKeyEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
index 40421037a3..94ed36f7e2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QLCDNumber )
 {
-   QLCDNumber  * ph = NULL;
    HBQT_GC_T_QLCDNumber * p = ( HBQT_GC_T_QLCDNumber * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QLCDNumber * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
index 2c8d396047..833f10f119 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QLabel )
 {
-   QLabel  * ph = NULL;
    HBQT_GC_T_QLabel * p = ( HBQT_GC_T_QLabel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QLabel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp
index 37a4559b65..20e16b20be 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QLayout )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
index a521c6e8dc..df2d2bff7c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QLayoutItem )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
index c096398415..6cdaee5fd1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QLineEdit )
 {
-   QLineEdit  * ph = NULL;
    HBQT_GC_T_QLineEdit * p = ( HBQT_GC_T_QLineEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QLineEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QListView.cpp b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
index 0199e249c0..7b77cfab24 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QListView )
 {
-   QListView  * ph = NULL;
    HBQT_GC_T_QListView * p = ( HBQT_GC_T_QListView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QListView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
index 859c5c8f98..d2ebbbf2ba 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QListWidget )
 {
-   QListWidget  * ph = NULL;
    HBQT_GC_T_QListWidget * p = ( HBQT_GC_T_QListWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QListWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
index ba6ee43661..3684b6a892 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
@@ -68,12 +68,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMainWindow )
 {
-   QMainWindow  * ph = NULL;
    HBQT_GC_T_QMainWindow * p = ( HBQT_GC_T_QMainWindow * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMainWindow * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
index 18aa6dbb49..691e40b5a3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMdiArea )
 {
-   QMdiArea  * ph = NULL;
    HBQT_GC_T_QMdiArea * p = ( HBQT_GC_T_QMdiArea * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMdiArea * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
index 98f389061f..62d8fa7fc7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMdiSubWindow )
 {
-   QMdiSubWindow  * ph = NULL;
    HBQT_GC_T_QMdiSubWindow * p = ( HBQT_GC_T_QMdiSubWindow * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMdiSubWindow * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
index ef958c1954..37fa0d3d34 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMenu )
 {
-   QMenu  * ph = NULL;
    HBQT_GC_T_QMenu * p = ( HBQT_GC_T_QMenu * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMenu * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
index 796323c718..003a7ed5b9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMenuBar )
 {
-   QMenuBar  * ph = NULL;
    HBQT_GC_T_QMenuBar * p = ( HBQT_GC_T_QMenuBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMenuBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
index 358358a2a1..3b48d77b0c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMessageBox )
 {
-   QMessageBox  * ph = NULL;
    HBQT_GC_T_QMessageBox * p = ( HBQT_GC_T_QMessageBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMessageBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
index 2c10bc492d..3dc07968f8 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMoveEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
index e6d1cb848f..70acc204cc 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QMovie )
 {
-   QMovie  * ph = NULL;
    HBQT_GC_T_QMovie * p = ( HBQT_GC_T_QMovie * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QMovie * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
index cbb6fd97b7..8fd768287b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPageSetupDialog )
 {
-   QPageSetupDialog  * ph = NULL;
    HBQT_GC_T_QPageSetupDialog * p = ( HBQT_GC_T_QPageSetupDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPageSetupDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
index dd10814cc2..5544a1462c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPaintDevice )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
index f628b1964c..96748d0d5d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
@@ -61,7 +61,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPaintEngine )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
index 252fec7b44..899ed80cce 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPlainTextDocumentLayout )
 {
-   QPlainTextDocumentLayout  * ph = NULL;
    HBQT_GC_T_QPlainTextDocumentLayout * p = ( HBQT_GC_T_QPlainTextDocumentLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPlainTextDocumentLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
index 18f5df08ae..4cd3fe6701 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
@@ -57,12 +57,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPlainTextEdit )
 {
-   QPlainTextEdit  * ph = NULL;
    HBQT_GC_T_QPlainTextEdit * p = ( HBQT_GC_T_QPlainTextEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPlainTextEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
index 2d67708479..531b4c4389 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
@@ -60,12 +60,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPrintDialog )
 {
-   QPrintDialog  * ph = NULL;
    HBQT_GC_T_QPrintDialog * p = ( HBQT_GC_T_QPrintDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPrintDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
index b48bc7b789..44d1bbfcd6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
@@ -52,7 +52,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPrintEngine )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
index 0793a37204..5390dae0dd 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPrintPreviewDialog )
 {
-   QPrintPreviewDialog  * ph = NULL;
    HBQT_GC_T_QPrintPreviewDialog * p = ( HBQT_GC_T_QPrintPreviewDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPrintPreviewDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
index bdbeb4b517..e210487d54 100644
--- a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QProgressBar )
 {
-   QProgressBar  * ph = NULL;
    HBQT_GC_T_QProgressBar * p = ( HBQT_GC_T_QProgressBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QProgressBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
index 98b5dc9fc2..62ae31f2db 100644
--- a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QProgressDialog )
 {
-   QProgressDialog  * ph = NULL;
    HBQT_GC_T_QProgressDialog * p = ( HBQT_GC_T_QProgressDialog * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QProgressDialog * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
index 3b73ab3426..b06f65fca5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
@@ -50,12 +50,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QPushButton )
 {
-   QPushButton  * ph = NULL;
    HBQT_GC_T_QPushButton * p = ( HBQT_GC_T_QPushButton * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QPushButton * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
index e5b9685f35..901a8afb51 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QRadioButton )
 {
-   QRadioButton  * ph = NULL;
    HBQT_GC_T_QRadioButton * p = ( HBQT_GC_T_QRadioButton * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QRadioButton * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
index 1c567df74a..f3e4edd086 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QRegExpValidator )
 {
-   QRegExpValidator  * ph = NULL;
    HBQT_GC_T_QRegExpValidator * p = ( HBQT_GC_T_QRegExpValidator * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QRegExpValidator * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
index 12121b897a..71513e9c36 100644
--- a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QResizeEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
index 2f2e5c08fc..1089a86688 100644
--- a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QScrollArea )
 {
-   QScrollArea  * ph = NULL;
    HBQT_GC_T_QScrollArea * p = ( HBQT_GC_T_QScrollArea * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QScrollArea * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
index 46c85efd79..d72541d090 100644
--- a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QScrollBar )
 {
-   QScrollBar  * ph = NULL;
    HBQT_GC_T_QScrollBar * p = ( HBQT_GC_T_QScrollBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QScrollBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
index caf2196956..7014670773 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
@@ -51,7 +51,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSessionManager )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
index 8958222439..a6985be5ef 100644
--- a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QShowEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
index 9cdb2da1a3..5659ce6994 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSizeGrip )
 {
-   QSizeGrip  * ph = NULL;
    HBQT_GC_T_QSizeGrip * p = ( HBQT_GC_T_QSizeGrip * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSizeGrip * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
index ec138dc500..9e375e4a16 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSlider )
 {
-   QSlider  * ph = NULL;
    HBQT_GC_T_QSlider * p = ( HBQT_GC_T_QSlider * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSlider * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
index d863312c3a..8d28ecba31 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSortFilterProxyModel )
 {
-   QSortFilterProxyModel  * ph = NULL;
    HBQT_GC_T_QSortFilterProxyModel * p = ( HBQT_GC_T_QSortFilterProxyModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSortFilterProxyModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSound.cpp b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
index 5fbfd7fcf2..676a6baaf1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSound.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSound )
 {
-   QSound  * ph = NULL;
    HBQT_GC_T_QSound * p = ( HBQT_GC_T_QSound * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSound * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
index b7ee0fbb5c..c55625a490 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
@@ -47,12 +47,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSpinBox )
 {
-   QSpinBox  * ph = NULL;
    HBQT_GC_T_QSpinBox * p = ( HBQT_GC_T_QSpinBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSpinBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
index be61a800da..5d173a296c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSplashScreen )
 {
-   QSplashScreen  * ph = NULL;
    HBQT_GC_T_QSplashScreen * p = ( HBQT_GC_T_QSplashScreen * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSplashScreen * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
index 1608c36963..14c8df3c1c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
@@ -56,12 +56,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSplitter )
 {
-   QSplitter  * ph = NULL;
    HBQT_GC_T_QSplitter * p = ( HBQT_GC_T_QSplitter * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSplitter * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
index c9c36cc164..7f5f8d6d24 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStackedWidget )
 {
-   QStackedWidget  * ph = NULL;
    HBQT_GC_T_QStackedWidget * p = ( HBQT_GC_T_QStackedWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QStackedWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
index 6b8efe8a9e..7e22afc16a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
@@ -59,12 +59,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStandardItemModel )
 {
-   QStandardItemModel  * ph = NULL;
    HBQT_GC_T_QStandardItemModel * p = ( HBQT_GC_T_QStandardItemModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QStandardItemModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
index 811afba26d..125cc09f9d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStatusBar )
 {
-   QStatusBar  * ph = NULL;
    HBQT_GC_T_QStatusBar * p = ( HBQT_GC_T_QStatusBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QStatusBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
index 7da8beae87..d5cb2fd81c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStringListModel )
 {
-   QStringListModel  * ph = NULL;
    HBQT_GC_T_QStringListModel * p = ( HBQT_GC_T_QStringListModel * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QStringListModel * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp
index 778eda4ec1..b5579167fd 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp
@@ -63,7 +63,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStyle )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
index 92e5480d57..16f8b4ba63 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
@@ -57,7 +57,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStyleHintReturn )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
index 4256785254..b9f7dcab54 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
@@ -55,7 +55,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStyleHintReturnMask )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
index 632ce2d222..fe0dddca7d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
@@ -56,7 +56,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStyleHintReturnVariant )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
index 85511ae56b..a7b1054835 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QStyledItemDelegate )
 {
-   QStyledItemDelegate  * ph = NULL;
    HBQT_GC_T_QStyledItemDelegate * p = ( HBQT_GC_T_QStyledItemDelegate * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QStyledItemDelegate * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
index 12112c3771..ce0a7f0a27 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
@@ -50,7 +50,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSyntaxHighlighter )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
index dfb15e5d98..bbf45344e2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QSystemTrayIcon )
 {
-   QSystemTrayIcon  * ph = NULL;
    HBQT_GC_T_QSystemTrayIcon * p = ( HBQT_GC_T_QSystemTrayIcon * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QSystemTrayIcon * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
index f2ee46ddf1..ed9d60c65e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTabBar )
 {
-   QTabBar  * ph = NULL;
    HBQT_GC_T_QTabBar * p = ( HBQT_GC_T_QTabBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTabBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
index dacf4149c1..81561d3876 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
@@ -53,12 +53,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTabWidget )
 {
-   QTabWidget  * ph = NULL;
    HBQT_GC_T_QTabWidget * p = ( HBQT_GC_T_QTabWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTabWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
index c1ec5795e6..0770012eec 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTableView )
 {
-   QTableView  * ph = NULL;
    HBQT_GC_T_QTableView * p = ( HBQT_GC_T_QTableView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTableView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
index 329f52b7b2..73c1dd4387 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTableWidget )
 {
-   QTableWidget  * ph = NULL;
    HBQT_GC_T_QTableWidget * p = ( HBQT_GC_T_QTableWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTableWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
index 0748c8fc6c..f1152aa605 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
@@ -54,7 +54,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextBlockGroup )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
index 20b4f7e20c..5f49b9f98a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
@@ -47,12 +47,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextBrowser )
 {
-   QTextBrowser  * ph = NULL;
    HBQT_GC_T_QTextBrowser * p = ( HBQT_GC_T_QTextBrowser * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTextBrowser * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
index b3beec81e2..7004f9fd20 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextDocument )
 {
-   QTextDocument  * ph = NULL;
    HBQT_GC_T_QTextDocument * p = ( HBQT_GC_T_QTextDocument * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTextDocument * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
index b3343c0221..098e87177f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
@@ -61,12 +61,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextEdit )
 {
-   QTextEdit  * ph = NULL;
    HBQT_GC_T_QTextEdit * p = ( HBQT_GC_T_QTextEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTextEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
index 9470d145c5..ecb5ff4a80 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
@@ -54,12 +54,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextFrame )
 {
-   QTextFrame  * ph = NULL;
    HBQT_GC_T_QTextFrame * p = ( HBQT_GC_T_QTextFrame * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTextFrame * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
index 85b84c4c39..b70b6a5c2d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextInlineObject )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp
index 973fd1643e..e734f9d7fd 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextList )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
index d497dde1dc..64f9e13513 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTextObject )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
index ca1a9c7bca..2d1e7f52ce 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTimeEdit )
 {
-   QTimeEdit  * ph = NULL;
    HBQT_GC_T_QTimeEdit * p = ( HBQT_GC_T_QTimeEdit * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTimeEdit * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
index ddffe30af9..ca752b83ea 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QToolBar )
 {
-   QToolBar  * ph = NULL;
    HBQT_GC_T_QToolBar * p = ( HBQT_GC_T_QToolBar * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QToolBar * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
index fcd19517d8..f7b38ec9b0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QToolBox )
 {
-   QToolBox  * ph = NULL;
    HBQT_GC_T_QToolBox * p = ( HBQT_GC_T_QToolBox * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QToolBox * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
index 8f0eb27532..ea97957d3b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QToolButton )
 {
-   QToolButton  * ph = NULL;
    HBQT_GC_T_QToolButton * p = ( HBQT_GC_T_QToolButton * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QToolButton * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
index a88d15adb8..8b4379e780 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
@@ -60,12 +60,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTreeView )
 {
-   QTreeView  * ph = NULL;
    HBQT_GC_T_QTreeView * p = ( HBQT_GC_T_QTreeView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTreeView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
index 97f7d38f03..08a17fe0c5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
@@ -52,12 +52,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QTreeWidget )
 {
-   QTreeWidget  * ph = NULL;
    HBQT_GC_T_QTreeWidget * p = ( HBQT_GC_T_QTreeWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QTreeWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
index 892326688f..21f57ec450 100644
--- a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QVBoxLayout )
 {
-   QVBoxLayout  * ph = NULL;
    HBQT_GC_T_QVBoxLayout * p = ( HBQT_GC_T_QVBoxLayout * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QVBoxLayout * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp
index 1ab178317a..c3a550b80a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp
@@ -56,7 +56,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QValidator )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
index bc3a9cfb75..4cdbd78c74 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWheelEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
index 849b195847..caba810a06 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
@@ -85,12 +85,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWidget )
 {
-   QWidget  * ph = NULL;
    HBQT_GC_T_QWidget * p = ( HBQT_GC_T_QWidget * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWidget * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
index d03b67798c..92b2e26353 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
@@ -48,12 +48,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWidgetAction )
 {
-   QWidgetAction  * ph = NULL;
    HBQT_GC_T_QWidgetAction * p = ( HBQT_GC_T_QWidgetAction * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWidgetAction * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
index d64a14b5e3..f25ba81f77 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWindowStateChangeEvent )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
index ad337f139e..358a74176f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
@@ -49,12 +49,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWindowsStyle )
 {
-   QWindowsStyle  * ph = NULL;
    HBQT_GC_T_QWindowsStyle * p = ( HBQT_GC_T_QWindowsStyle * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWindowsStyle * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
index 6db6960b4f..668b89022e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
@@ -60,12 +60,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWizard )
 {
-   QWizard  * ph = NULL;
    HBQT_GC_T_QWizard * p = ( HBQT_GC_T_QWizard * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWizard * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
index 2cfdd1a4c0..6e36fa3acc 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
@@ -46,12 +46,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWizardPage )
 {
-   QWizardPage  * ph = NULL;
    HBQT_GC_T_QWizardPage * p = ( HBQT_GC_T_QWizardPage * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWizardPage * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp
index 9ffcb94e90..fa22d7f662 100644
--- a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp
+++ b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp
@@ -148,7 +148,9 @@ HB_FUNC( __HBQTGUI )
    HB_FUNC_EXEC( __HBQTCORE );
 }
 
+HB_EXTERN_BEGIN
 extern HB_EXPORT QApplication * __hbqtgui_app( void );
+HB_EXTERN_END
 
 QApplication * __hbqtgui_app( void )
 {
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
index 33add4c8d8..bd935b0c1e 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
@@ -75,12 +75,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QFtp )
 {
-   QFtp  * ph = NULL;
    HBQT_GC_T_QFtp * p = ( HBQT_GC_T_QFtp * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QFtp * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
index 487db9bad4..e890c49ffb 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
@@ -78,12 +78,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHttp )
 {
-   QHttp  * ph = NULL;
    HBQT_GC_T_QHttp * p = ( HBQT_GC_T_QHttp * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QHttp * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
index 7c01b3b478..8a86f739f7 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
@@ -53,7 +53,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QHttpHeader )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp b/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
index 22683a4018..3653b2937d 100644
--- a/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
+++ b/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
@@ -51,12 +51,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QUiLoader )
 {
-   QUiLoader  * ph = NULL;
    HBQT_GC_T_QUiLoader * p = ( HBQT_GC_T_QUiLoader * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QUiLoader * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp
index 3c4b75380c..3f4fa3f52e 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp
@@ -56,7 +56,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp
index 9db6a393d7..fe5ee9aaca 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp
@@ -47,7 +47,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp
index 43b15de870..81a4d783ac 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp
@@ -48,7 +48,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
index 4ee6e9a1bf..7cfa73fc43 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
@@ -68,12 +68,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebPage )
 {
-   QWebPage  * ph = NULL;
    HBQT_GC_T_QWebPage * p = ( HBQT_GC_T_QWebPage * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWebPage * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp
index 54feb08b81..ee139514b2 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp
@@ -60,7 +60,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebPluginFactory )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp
index e2c4f44f35..01474ddb49 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp
@@ -57,7 +57,6 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebSettings )
 {
-   HB_SYMBOL_UNUSED( Cargo );
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
    if( p && p->bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
index f173f5f303..7863cc65d9 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
@@ -51,12 +51,11 @@ typedef struct
 
 HBQT_GC_FUNC( hbqt_gcRelease_QWebView )
 {
-   QWebView  * ph = NULL;
    HBQT_GC_T_QWebView * p = ( HBQT_GC_T_QWebView * ) Cargo;
 
    if( p && p->bNew && p->ph )
    {
-      ph = p->ph;
+      QWebView * ph = p->ph;
       if( ph )
       {
          const QMetaObject * m = ( ph )->metaObject();
diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg
index 3a3abfaaae..7d7c14a077 100644
--- a/harbour/contrib/hbqt/utils/hbqtgen.prg
+++ b/harbour/contrib/hbqt/utils/hbqtgen.prg
@@ -599,7 +599,7 @@ METHOD HbQtSource:new( oGen, cFileQth, cPathOut, cPathDoc, cProject )
    ::enums_:= PullOutSection( @cQth, "ENUMS"  )
    ::enum_:= {}
    FOR EACH s IN ::enums_
-      IF ( "enum " $ s .or. "flags " $ s )
+      IF "enum " $ s .or. "flags " $ s
          b_:= hb_ATokens( alltrim( s ), " " )
          aadd( ::enum_, b_[ 2 ] )
       ENDIF
@@ -769,14 +769,13 @@ METHOD HbQtSource:build()
 
    aadd( ::cpp_, "HBQT_GC_FUNC( hbqt_gcRelease_" + ::cWidget + " )"  )
    aadd( ::cpp_, "{"                                     )
-   IF ( ::isDestructor ) .AND. ( ::isConstructor )
+   IF ::isDestructor .AND. ::isConstructor
       IF ::isObject
-         aadd( ::cpp_, "   " + ::cWidget + " " + iif( ::isList, "< void * >", "" )+" * ph = NULL;" )
          aadd( ::cpp_, "   HBQT_GC_T_" + ::cWidget + " * p = ( HBQT_GC_T_" + ::cWidget + " * ) Cargo; " )
          aadd( ::cpp_, "   " )
          aadd( ::cpp_, "   if( p && p->bNew && p->ph )" )
          aadd( ::cpp_, "   {" )
-         aadd( ::cpp_, "      ph = p->ph; " )
+         aadd( ::cpp_, "      " + ::cWidget + " " + iif( ::isList, "< void * >", "" ) + "* ph = p->ph;" )
          aadd( ::cpp_, "      if( ph )" )
          aadd( ::cpp_, "      {" )
          aadd( ::cpp_, "         const QMetaObject * m = ( ph )->metaObject();" )
@@ -857,7 +856,6 @@ METHOD HbQtSource:build()
          #endif
       ENDIF
    ELSE
-      aadd( ::cpp_, "   HB_SYMBOL_UNUSED( Cargo );" )
       aadd( ::cpp_, "   HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;" )
       aadd( ::cpp_, "   " )
       aadd( ::cpp_, "   if( p && p->bNew )" )
@@ -1316,7 +1314,7 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed
 
       cFun := cRetCast + "FromPointer( " + "Qt_" + cWidget + "_" + oM:cHBFunc + "( ::pPtr, ... )" + " )"
 
-   ELSEIF ( "<" $ cRetCast )
+   ELSEIF "<" $ cRetCast
       cFun := "QList" + "FromPointer( " + "Qt_" + cWidget + "_" + oM:cHBFunc + "( ::pPtr, ... )" + " )"
 
    ELSE
@@ -1325,11 +1323,11 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed
    ENDIF
 
    IF nTySame > 0 .AND. lInIf
-      HB_TRACE( HB_TR_ALWAYS, oM:nArgQCast, oM:nArgs )
+      HB_TRACE( HB_TR_DEBUG, oM:nArgQCast, oM:nArgs )
 
       IF oM:nArgQCast == 0
          aadd( txt_, sp + "// " + "RETURN " + cFun + cPostFix )
-         HB_TRACE( HB_TR_ALWAYS, "// RETURN " + cFun + cPostFix )  /* needed to refine the engine further */
+         HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix )  /* needed to refine the engine further */
          IF nTySame > 1 .AND. nCount == nTySame
             aadd( txt_, sp + "ENDSWITCH" )
          ENDIF
@@ -1353,7 +1351,7 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed
    ELSE
       IF nCount > 1
          aadd( txt_, sp + "// " + "RETURN " + cFun + cPostFix )
-         HB_TRACE( HB_TR_ALWAYS, "// RETURN " + cFun + cPostFix )  /* needed to refine the engine further */
+         HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix )  /* needed to refine the engine further */
       ELSE
          IF "..." $ cFun
             aadd( txt_, sp + cPrefix + "RETURN " + cFun + cPostFix )
@@ -1732,18 +1730,18 @@ METHOD HbQtSource:parseProto( cProto, fBody_ )
             oArg:cDoc    := "n" + oMtd:cDocNM
             oArg:cTypeHB := "N"
 
-         CASE oArg:cCast == "uchar" .and. oArg:lFar .and. !( oArg:lConst )
+         CASE oArg:cCast == "uchar" .and. oArg:lFar .and. ! oArg:lConst
             /* TOFIX: Such code is not valid and should never be generated (const->non-const) [vszakats] */
             oArg:cBody   := "( uchar * ) hb_parc( " + cHBIdx + " )"
             oArg:cDoc    := "c" + oMtd:cDocNM
             oArg:cTypeHB := "C"
 
-         CASE oArg:cCast == "uchar" .and. !( oArg:lFar ) .and. !( oArg:lConst )
+         CASE oArg:cCast == "uchar" .and. ! oArg:lFar .and. ! oArg:lConst
             oArg:cBody   := "( uchar ) hb_parni( " + cHBIdx + " )"
             oArg:cDoc    := "n" + oMtd:cDocNM
             oArg:cTypeHB := "N"
 
-         CASE oArg:cCast == "char" .and. oArg:lFar .and. !( oArg:lConst )
+         CASE oArg:cCast == "char" .and. oArg:lFar .and. ! oArg:lConst
             /* TOFIX: Such code is not valid and should never be generated (const->non-const) [vszakats] */
             oArg:cBody   := "( char * ) hb_parc( " + cHBIdx + " )"
             oArg:cDoc    := "c" + oMtd:cDocNM
@@ -1754,7 +1752,7 @@ METHOD HbQtSource:parseProto( cProto, fBody_ )
             oArg:cDoc    := "c" + oMtd:cDocNM
             oArg:cTypeHB := "C"
 
-         CASE oArg:cCast == "char" .and. !( oArg:lFar ) .and. !( oArg:lConst )
+         CASE oArg:cCast == "char" .and. ! oArg:lFar .and. ! oArg:lConst
             oArg:cBody   := "( char ) hb_parni( " + cHBIdx + " )"
             oArg:cDoc    := "n" + oMtd:cDocNM
             oArg:cTypeHB := "N"
@@ -1960,8 +1958,8 @@ METHOD HbQtSource:buildCppCode( oMtd )
       oMtd:cCmd := "hb_retc( ( const char * ) " + oMtd:cCmn + " )"
       oMtd:cPrgRet := "c" + oMtd:cDocNMRet //p
 
-   CASE oRet:lFar .AND. !( oRet:lConst )
-      IF ( isAqtObject( oRet:cCast ) )
+   CASE oRet:lFar .AND. ! oRet:lConst
+      IF isAqtObject( oRet:cCast )
          oMtd:cCmd := Get_Command( oRet:cCast, oMtd:cCmn, .F. )
       ELSE
          /* TOFIX: Such code is not valid and should never be generated [vszakats] */
@@ -2004,7 +2002,7 @@ METHOD HbQtSource:buildCppCode( oMtd )
 
    OTHERWISE
       /* No attribute is attached to return value */
-      IF ( isAqtObject( oRet:cCast ) )
+      IF isAqtObject( oRet:cCast )
          oMtd:cCmd := Get_Command( oRet:cCast, oMtd:cCmn )
          oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d6dc604f93..65d0ef18d5 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2621,7 +2621,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             IF nHarbourPPO >= 2
                hbmk[ _HBMK_lCreatePPO ] := .T.
             ENDIF
-            AAddNewNotEmpty( hbmk[ _HBMK_aOPTPRG ], PathSepToSelf( cParam, 2 ) )
+            AAddNewNotEmpty( hbmk[ _HBMK_aOPTPRG ], PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ), 2 ) )
          ENDCASE
 
       CASE hbmk[ _HBMK_lCreateImpLib ]