diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0b0c78df87..60dfacabdf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-03 00:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/utils/hbqtgen.prg
+    % Simplified GC release code.
+    ! Fixed potential GPF in GC release code.
+      (p->ph might have been assigned NULL even if p was NULL)
+    ; Please review and test.
+
+  * contrib/hbqt/*/g/*.cpp
+    * Regenerated.
+
 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.
diff --git a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
index 4c72e94259..4310701015 100644
--- a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQsciScintilla )
 {
    HBQT_GC_T_HBQsciScintilla * p = ( HBQT_GC_T_HBQsciScintilla * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQsciScintilla * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQsciScintilla * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQsciScintilla( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
index e56001cc4d..c476c48f41 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciAPIs )
 {
    HBQT_GC_T_QsciAPIs * p = ( HBQT_GC_T_QsciAPIs * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QsciAPIs * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QsciAPIs * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciAPIs( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp
index 4bc32c8d85..e8686aa455 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciDocument )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QsciDocument * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciDocument( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
index 5a14c66aaa..8fdfe706e1 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciLexerCPP )
 {
    HBQT_GC_T_QsciLexerCPP * p = ( HBQT_GC_T_QsciLexerCPP * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QsciLexerCPP * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QsciLexerCPP * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciLexerCPP( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
index 22e31831a4..791de11fbe 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciLexerFlagship )
 {
    HBQT_GC_T_QsciLexerFlagship * p = ( HBQT_GC_T_QsciLexerFlagship * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QsciLexerFlagship * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QsciLexerFlagship * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciLexerFlagship( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
index 835cecf71e..5c12c07425 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
@@ -91,25 +91,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciScintilla )
 {
    HBQT_GC_T_QsciScintilla * p = ( HBQT_GC_T_QsciScintilla * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QsciScintilla * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QsciScintilla * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciScintilla( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
index cd603138f9..e2c8bd286a 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciStyle )
 {
    HBQT_GC_T_QsciStyle * p = ( HBQT_GC_T_QsciStyle * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QsciStyle * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QsciStyle * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciStyle( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp
index 435c8ff7b3..9ad9ca96a0 100644
--- a/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp
+++ b/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QsciStyledText )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QsciStyledText * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QsciStyledText( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
index ee4d171907..2252228b3e 100644
--- a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQEvents )
 {
    HBQT_GC_T_HBQEvents * p = ( HBQT_GC_T_HBQEvents * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQEvents * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQEvents * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQEvents( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
index 89d45918f7..155fd87ad0 100644
--- a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQSlots )
 {
    HBQT_GC_T_HBQSlots * p = ( HBQT_GC_T_HBQSlots * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQSlots * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQSlots * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQSlots( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp
index 8c74cee997..69bc07c26e 100644
--- a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp
@@ -100,18 +100,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQString )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( HBQString * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQString( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
index 0f0eee9731..3b6bc90e88 100644
--- a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
@@ -49,18 +49,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QBitArray )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QBitArray * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QBitArray( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
index 066c3f7cf2..f9a8c94781 100644
--- a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QBuffer )
 {
    HBQT_GC_T_QBuffer * p = ( HBQT_GC_T_QBuffer * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QBuffer * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QBuffer * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QBuffer( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
index 008f1f0cdb..8f7d05fd5b 100644
--- a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QByteArray )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QByteArray * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QByteArray( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
index d1ecfa6642..bbcc15e1fb 100644
--- a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
@@ -62,18 +62,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDataStream )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QDataStream * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDataStream( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QDate.cpp b/harbour/contrib/hbqt/qtcore/g/QDate.cpp
index aaab30eb12..279433f85e 100644
--- a/harbour/contrib/hbqt/qtcore/g/QDate.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDate.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDate )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QDate * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDate( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
index 5f287c3aa1..9ddf50f150 100644
--- a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDateTime )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QDateTime * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QDir.cpp b/harbour/contrib/hbqt/qtcore/g/QDir.cpp
index 4d46e053ad..79816f1078 100644
--- a/harbour/contrib/hbqt/qtcore/g/QDir.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDir.cpp
@@ -64,18 +64,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDir )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QDir * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDir( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp
index 1233f5f81f..db6c250844 100644
--- a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
index 531a457e92..3f9e37d681 100644
--- a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QEventLoop )
 {
    HBQT_GC_T_QEventLoop * p = ( HBQT_GC_T_QEventLoop * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QEventLoop * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QEventLoop * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QFile.cpp b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
index 26e7bd31b6..06544cac77 100644
--- a/harbour/contrib/hbqt/qtcore/g/QFile.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
@@ -67,25 +67,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFile )
 {
    HBQT_GC_T_QFile * p = ( HBQT_GC_T_QFile * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFile * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFile * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFile( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
index 6a05b2264c..f06894639f 100644
--- a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFileInfo )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFileInfo * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QGenericArgument.cpp b/harbour/contrib/hbqt/qtcore/g/QGenericArgument.cpp
index 01f03eea3a..d0e2717e81 100644
--- a/harbour/contrib/hbqt/qtcore/g/QGenericArgument.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QGenericArgument.cpp
@@ -49,18 +49,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGenericArgument )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGenericArgument * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGenericArgument( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QGenericReturnArgument.cpp b/harbour/contrib/hbqt/qtcore/g/QGenericReturnArgument.cpp
index 0e0bc458ae..45ac691af8 100644
--- a/harbour/contrib/hbqt/qtcore/g/QGenericReturnArgument.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QGenericReturnArgument.cpp
@@ -49,18 +49,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGenericReturnArgument )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGenericReturnArgument * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGenericReturnArgument( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
index f6a8cf1210..0427b8cc1f 100644
--- a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
@@ -48,18 +48,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLatin1Char )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLatin1Char * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
index e360bc857f..4a316a62c1 100644
--- a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
@@ -48,18 +48,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLatin1String )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLatin1String * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QLine.cpp b/harbour/contrib/hbqt/qtcore/g/QLine.cpp
index 13a9c73c3a..0b7caeddcc 100644
--- a/harbour/contrib/hbqt/qtcore/g/QLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLine.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLine )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLine * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLine( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp
index b95c798053..0a5eccc368 100644
--- a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLineF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLineF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QList.cpp b/harbour/contrib/hbqt/qtcore/g/QList.cpp
index d6e3e9c92b..9789c098cb 100644
--- a/harbour/contrib/hbqt/qtcore/g/QList.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QList.cpp
@@ -74,18 +74,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QList )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QList< void * > * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QList( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp
index 13db050b05..414e8419cd 100644
--- a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp
@@ -63,18 +63,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLocale )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLocale * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMetaMethod.cpp b/harbour/contrib/hbqt/qtcore/g/QMetaMethod.cpp
index c2a7357a28..b680c86d99 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMetaMethod.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMetaMethod.cpp
@@ -61,18 +61,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMetaMethod )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QMetaMethod * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMetaMethod( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
index 8a6e903095..f579308557 100644
--- a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMimeData )
 {
    HBQT_GC_T_QMimeData * p = ( HBQT_GC_T_QMimeData * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMimeData * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMimeData * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
index a13db46396..694d5ca63d 100644
--- a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QModelIndex )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QModelIndex * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
index 78c657a317..e1cee68247 100644
--- a/harbour/contrib/hbqt/qtcore/g/QObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
@@ -65,25 +65,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QObject )
 {
    HBQT_GC_T_QObject * p = ( HBQT_GC_T_QObject * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QObject * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QObject * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QObject( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp
index 06364d0410..155746599c 100644
--- a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPoint )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPoint * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp
index 2536c436bc..9227044e75 100644
--- a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPointF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPointF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPointF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
index 63f90ca583..dc5b8739a3 100644
--- a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
@@ -64,25 +64,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QProcess )
 {
    HBQT_GC_T_QProcess * p = ( HBQT_GC_T_QProcess * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QProcess * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QProcess * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QProcess( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QRect.cpp b/harbour/contrib/hbqt/qtcore/g/QRect.cpp
index b4df881644..c8fd14495b 100644
--- a/harbour/contrib/hbqt/qtcore/g/QRect.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRect.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRect )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QRect * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRect( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp
index 0c3d67be0f..108ffa8a2e 100644
--- a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRectF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QRectF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRectF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
index 1bf01aa750..44a507dcff 100644
--- a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRegExp )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QRegExp * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRegExp( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QResource.cpp b/harbour/contrib/hbqt/qtcore/g/QResource.cpp
index 67c8925d42..abfeecf635 100644
--- a/harbour/contrib/hbqt/qtcore/g/QResource.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QResource.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QResource )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QResource * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QResource( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
index 626bf344d1..4d1b729c74 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSettings )
 {
    HBQT_GC_T_QSettings * p = ( HBQT_GC_T_QSettings * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSettings * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSettings * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSettings( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
index acfffeba70..1729628beb 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSignalMapper )
 {
    HBQT_GC_T_QSignalMapper * p = ( HBQT_GC_T_QSignalMapper * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSignalMapper * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSignalMapper * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSignalMapper( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QSize.cpp b/harbour/contrib/hbqt/qtcore/g/QSize.cpp
index d557e2119f..f18c838d26 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSize.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSize.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSize )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QSize * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSize( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
index 230d600974..efdb7e1043 100644
--- a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSizeF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QSizeF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp
index 11648745c9..c47dd2f7cc 100644
--- a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp
@@ -65,18 +65,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStringList )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStringList * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp b/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp
index ee145f8b2c..bbd61b7a4d 100644
--- a/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp
@@ -60,18 +60,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStringRef )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStringRef * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStringRef( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
index e10f495adf..3943ba8cb7 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextBoundaryFinder )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextBoundaryFinder * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
index 4b538c022a..dac73d65a2 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextDecoder )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextDecoder * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextDecoder( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
index b0e3591926..13b9901b54 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextEncoder )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextEncoder * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextEncoder( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
index fb8cd9a99b..b29cea11de 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
@@ -67,18 +67,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextStream )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextStream * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextStream( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QThread.cpp b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
index be274e5835..fd34a8047d 100644
--- a/harbour/contrib/hbqt/qtcore/g/QThread.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QThread )
 {
    HBQT_GC_T_QThread * p = ( HBQT_GC_T_QThread * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QThread * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QThread * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QThread( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTime.cpp b/harbour/contrib/hbqt/qtcore/g/QTime.cpp
index 5759345e8a..1325774f5d 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTime.cpp
@@ -48,18 +48,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTime )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTime * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTime( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
index 2b0de85c15..f0bb05d2ad 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTimeLine )
 {
    HBQT_GC_T_QTimeLine * p = ( HBQT_GC_T_QTimeLine * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTimeLine * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTimeLine * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTimeLine( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
index 33f84ae909..02bdeab083 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
@@ -49,25 +49,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTimer )
 {
    HBQT_GC_T_QTimer * p = ( HBQT_GC_T_QTimer * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTimer * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTimer * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTimer( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
index c690d98966..b949a37c71 100644
--- a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTranslator )
 {
    HBQT_GC_T_QTranslator * p = ( HBQT_GC_T_QTranslator * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTranslator * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTranslator * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp
index fa152af6c1..320b2da0ba 100644
--- a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp
@@ -76,18 +76,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QUrl )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QUrl * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp
index fb6c386aa7..84afb485eb 100644
--- a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp
@@ -104,18 +104,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QVariant )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QVariant * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
index 4272eb2060..c583225fc2 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
+++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp
@@ -57,25 +57,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface )
 {
    HBQT_GC_T_QDesignerFormEditorInterface * p = ( HBQT_GC_T_QDesignerFormEditorInterface * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDesignerFormEditorInterface * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDesignerFormEditorInterface * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDesignerFormEditorInterface( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
index e100d032df..00599b6931 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQAbstractItemModel )
 {
    HBQT_GC_T_HBQAbstractItemModel * p = ( HBQT_GC_T_HBQAbstractItemModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQAbstractItemModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQAbstractItemModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQAbstractItemModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp
index 444933f175..722e0ec696 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQGraphicsItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( HBQGraphicsItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQGraphicsItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
index ebdc9dfc95..a70f624d1c 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQGraphicsScene )
 {
    HBQT_GC_T_HBQGraphicsScene * p = ( HBQT_GC_T_HBQGraphicsScene * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQGraphicsScene * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQGraphicsScene * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQGraphicsScene( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
index 3dda4f4db1..0174f5e401 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQPlainTextEdit )
 {
    HBQT_GC_T_HBQPlainTextEdit * p = ( HBQT_GC_T_HBQPlainTextEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQPlainTextEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQPlainTextEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQPlainTextEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
index 1b1704c623..c4088aa887 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQSyntaxHighlighter )
 {
    HBQT_GC_T_HBQSyntaxHighlighter * p = ( HBQT_GC_T_HBQSyntaxHighlighter * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQSyntaxHighlighter * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQSyntaxHighlighter * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
index e3e80f2a1b..62e3709c8f 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQTableView )
 {
    HBQT_GC_T_HBQTableView * p = ( HBQT_GC_T_HBQTableView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      HBQTableView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         HBQTableView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
index 55a5843952..9972713db5 100644
--- a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBQTextBlockUserData )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( HBQTextBlockUserData * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
index cbba151c22..01f178989d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
@@ -64,25 +64,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QAction )
 {
    HBQT_GC_T_QAction * p = ( HBQT_GC_T_QAction * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QAction * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QAction * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QAction( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
index 5b51374282..4f9f526e02 100644
--- a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
@@ -49,25 +49,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QActionGroup )
 {
    HBQT_GC_T_QActionGroup * p = ( HBQT_GC_T_QActionGroup * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QActionGroup * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QActionGroup * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QActionGroup( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
index 43df81e428..8c3b36837d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QBitmap )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QBitmap * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QBitmap( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
index bfcd47cc61..cda682ba0a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QBoxLayout )
 {
    HBQT_GC_T_QBoxLayout * p = ( HBQT_GC_T_QBoxLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QBoxLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QBoxLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QBoxLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp
index 9267bfada3..54353e4610 100644
--- a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QBrush )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QBrush * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QBrush( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
index a64d526414..ab9f2dbbe2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QButtonGroup )
 {
    HBQT_GC_T_QButtonGroup * p = ( HBQT_GC_T_QButtonGroup * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QButtonGroup * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QButtonGroup * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QButtonGroup( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
index c91442fa38..e6e4bfee15 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCalendarWidget )
 {
    HBQT_GC_T_QCalendarWidget * p = ( HBQT_GC_T_QCalendarWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QCalendarWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QCalendarWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCalendarWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
index 5ce5a29c4e..2dd0422241 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCheckBox )
 {
    HBQT_GC_T_QCheckBox * p = ( HBQT_GC_T_QCheckBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QCheckBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QCheckBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCheckBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QColor.cpp b/harbour/contrib/hbqt/qtgui/g/QColor.cpp
index d97679187e..e85865ec74 100644
--- a/harbour/contrib/hbqt/qtgui/g/QColor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QColor.cpp
@@ -65,18 +65,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QColor )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QColor * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QColor( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
index d4ed8645a4..b8aa8f43da 100644
--- a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QColorDialog )
 {
    HBQT_GC_T_QColorDialog * p = ( HBQT_GC_T_QColorDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QColorDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QColorDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QColorDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
index 130bfa228b..58fb561bc1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QComboBox )
 {
    HBQT_GC_T_QComboBox * p = ( HBQT_GC_T_QComboBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QComboBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QComboBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QComboBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
index eb672fb605..2e8dd2d99a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCommandLinkButton )
 {
    HBQT_GC_T_QCommandLinkButton * p = ( HBQT_GC_T_QCommandLinkButton * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QCommandLinkButton * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QCommandLinkButton * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCommandLinkButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
index 1735b95bee..d2bf40ac6d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
@@ -49,25 +49,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCommonStyle )
 {
    HBQT_GC_T_QCommonStyle * p = ( HBQT_GC_T_QCommonStyle * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QCommonStyle * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QCommonStyle * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCommonStyle( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
index c5426448b2..ddc550e612 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCompleter )
 {
    HBQT_GC_T_QCompleter * p = ( HBQT_GC_T_QCompleter * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QCompleter * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QCompleter * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCompleter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
index c1101c600a..2df3223b4c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QConicalGradient )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QConicalGradient * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QConicalGradient( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
index e9ef738383..fa9be5ab44 100644
--- a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QContextMenuEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QContextMenuEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QContextMenuEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp
index f585848202..6af53db4d5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp
@@ -61,18 +61,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QCursor )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QCursor * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QCursor( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
index 5507016130..d402223fae 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDateEdit )
 {
    HBQT_GC_T_QDateEdit * p = ( HBQT_GC_T_QDateEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDateEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDateEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDateEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
index 9ad743859a..4fd82d6c0e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
@@ -57,25 +57,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDateTimeEdit )
 {
    HBQT_GC_T_QDateTimeEdit * p = ( HBQT_GC_T_QDateTimeEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDateTimeEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDateTimeEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDateTimeEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
index 960c794d62..f43a34399e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDesktopWidget )
 {
    HBQT_GC_T_QDesktopWidget * p = ( HBQT_GC_T_QDesktopWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDesktopWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDesktopWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDesktopWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDial.cpp b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
index 4162958001..a53b68b3e1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDial.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDial )
 {
    HBQT_GC_T_QDial * p = ( HBQT_GC_T_QDial * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDial * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDial * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDial( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
index c2928d1e81..bcb9b5ca82 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDialog )
 {
    HBQT_GC_T_QDialog * p = ( HBQT_GC_T_QDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
index 82f7d97eab..bdd9e18712 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDirModel )
 {
    HBQT_GC_T_QDirModel * p = ( HBQT_GC_T_QDirModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDirModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDirModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDirModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
index 97abede1c0..10ae745f88 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDockWidget )
 {
    HBQT_GC_T_QDockWidget * p = ( HBQT_GC_T_QDockWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDockWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDockWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDockWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
index 934def4a01..5f28ebcc07 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDoubleSpinBox )
 {
    HBQT_GC_T_QDoubleSpinBox * p = ( HBQT_GC_T_QDoubleSpinBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDoubleSpinBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDoubleSpinBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
index d49adee744..10c885306a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDoubleValidator )
 {
    HBQT_GC_T_QDoubleValidator * p = ( HBQT_GC_T_QDoubleValidator * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDoubleValidator * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDoubleValidator * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDoubleValidator( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
index 6d5b30004e..a527b98b4f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QDrag )
 {
    HBQT_GC_T_QDrag * p = ( HBQT_GC_T_QDrag * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QDrag * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QDrag * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QDrag( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
index bd41270d91..a97db26156 100644
--- a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QErrorMessage )
 {
    HBQT_GC_T_QErrorMessage * p = ( HBQT_GC_T_QErrorMessage * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QErrorMessage * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QErrorMessage * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QErrorMessage( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
index d6ededbfd4..6508b150d7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
@@ -70,25 +70,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFileDialog )
 {
    HBQT_GC_T_QFileDialog * p = ( HBQT_GC_T_QFileDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFileDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFileDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFileDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
index 963f3dec37..04bec85462 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFileIconProvider )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFileIconProvider * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFileIconProvider( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
index 23f2025cc9..e59a248d9e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
@@ -60,25 +60,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFileSystemModel )
 {
    HBQT_GC_T_QFileSystemModel * p = ( HBQT_GC_T_QFileSystemModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFileSystemModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFileSystemModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFileSystemModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
index 07e1eedb75..a2bf7f5b12 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFocusFrame )
 {
    HBQT_GC_T_QFocusFrame * p = ( HBQT_GC_T_QFocusFrame * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFocusFrame * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFocusFrame * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFocusFrame( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFont.cpp b/harbour/contrib/hbqt/qtgui/g/QFont.cpp
index a1d2ef1f86..9bdd78b575 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFont.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFont.cpp
@@ -71,18 +71,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFont )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFont * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFont( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
index 05a00c52ef..e5f334345f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontComboBox )
 {
    HBQT_GC_T_QFontComboBox * p = ( HBQT_GC_T_QFontComboBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFontComboBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFontComboBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontComboBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
index 3b95dfca5a..0282c43bd3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontDatabase )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFontDatabase * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontDatabase( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
index 09fac016e0..9fa02c8afe 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
@@ -60,25 +60,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontDialog )
 {
    HBQT_GC_T_QFontDialog * p = ( HBQT_GC_T_QFontDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFontDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFontDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
index d894bc812c..2179cdf3ad 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontInfo )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFontInfo * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontInfo( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
index 1dd7304371..3aca0303d1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontMetrics )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFontMetrics * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontMetrics( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
index 0ff930ab43..29ffa6c2fc 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFontMetricsF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QFontMetricsF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFontMetricsF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
index 455fbdd02b..d6c5f68133 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
@@ -62,25 +62,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFormLayout )
 {
    HBQT_GC_T_QFormLayout * p = ( HBQT_GC_T_QFormLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFormLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFormLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFormLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
index 558622dfae..e6ac11cea9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFrame )
 {
    HBQT_GC_T_QFrame * p = ( HBQT_GC_T_QFrame * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFrame * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFrame * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFrame( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp
index 4363183c76..dcd892aa7f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsEllipseItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsEllipseItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsEllipseItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp
index 36a16d25e5..24f2c11dbf 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsGridLayout )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsGridLayout * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsGridLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
index 8a10f6e7d4..c28d2ff418 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsItemAnimation )
 {
    HBQT_GC_T_QGraphicsItemAnimation * p = ( HBQT_GC_T_QGraphicsItemAnimation * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsItemAnimation * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsItemAnimation * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsItemAnimation( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp
index 3a1ddb523a..0b522f641b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsItemGroup )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsItemGroup * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsItemGroup( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp
index 18e399ed61..b66ce4c9a8 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsLineItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsLineItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsLineItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp
index 6bd6ed4bba..82dcde80fb 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsLinearLayout )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsLinearLayout * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsLinearLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp
index 92e8399626..faaf4c40f6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsPathItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsPathItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsPathItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp
index ecbf84a220..b95e70eeee 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsPixmapItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsPixmapItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsPixmapItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp
index d59af41f7b..11b30ac82f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsPolygonItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsPolygonItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsPolygonItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
index 6a4b969e95..0a09592d80 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsProxyWidget )
 {
    HBQT_GC_T_QGraphicsProxyWidget * p = ( HBQT_GC_T_QGraphicsProxyWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsProxyWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsProxyWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsProxyWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp
index 99c030f0b0..8bff331c46 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsRectItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsRectItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsRectItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
index 92a3effcb0..8e05299775 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp
@@ -65,25 +65,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsScene )
 {
    HBQT_GC_T_QGraphicsScene * p = ( HBQT_GC_T_QGraphicsScene * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsScene * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsScene * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsScene( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp
index 0a375b8932..132ca5eaf0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsSimpleTextItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QGraphicsSimpleTextItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsSimpleTextItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
index 79e5b7038b..3ae0a561b6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsTextItem )
 {
    HBQT_GC_T_QGraphicsTextItem * p = ( HBQT_GC_T_QGraphicsTextItem * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsTextItem * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsTextItem * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsTextItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
index d1a8ef97ef..778d55f415 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp
@@ -64,25 +64,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsView )
 {
    HBQT_GC_T_QGraphicsView * p = ( HBQT_GC_T_QGraphicsView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
index 45002f1cdf..2c23f0fdfb 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGraphicsWidget )
 {
    HBQT_GC_T_QGraphicsWidget * p = ( HBQT_GC_T_QGraphicsWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGraphicsWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGraphicsWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGraphicsWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
index 2fafe282e3..ef4cbca55c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGridLayout )
 {
    HBQT_GC_T_QGridLayout * p = ( HBQT_GC_T_QGridLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGridLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGridLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGridLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
index e9b3d42ebe..e073337be7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QGroupBox )
 {
    HBQT_GC_T_QGroupBox * p = ( HBQT_GC_T_QGroupBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QGroupBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QGroupBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QGroupBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
index 233f1f50d6..8d422520a4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QHBoxLayout )
 {
    HBQT_GC_T_QHBoxLayout * p = ( HBQT_GC_T_QHBoxLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QHBoxLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QHBoxLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QHBoxLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
index 3b40c98c45..20490aa3cd 100644
--- a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QHeaderView )
 {
    HBQT_GC_T_QHeaderView * p = ( HBQT_GC_T_QHeaderView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QHeaderView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QHeaderView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QHeaderView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
index 04e23adca0..520d2a9529 100644
--- a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
@@ -64,18 +64,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QIcon )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QIcon * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QIcon( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QImage.cpp b/harbour/contrib/hbqt/qtgui/g/QImage.cpp
index 22968744c8..0414becf63 100644
--- a/harbour/contrib/hbqt/qtgui/g/QImage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImage.cpp
@@ -77,18 +77,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QImage )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QImage * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QImage( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
index 1e2a633b18..efc7dd1711 100644
--- a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QImageReader )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QImageReader * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QImageReader( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
index cd398b7e41..1e5c2f42bf 100644
--- a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
@@ -56,18 +56,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QImageWriter )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QImageWriter * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QImageWriter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
index aecfee0531..3476dd6a29 100644
--- a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QInputDialog )
 {
    HBQT_GC_T_QInputDialog * p = ( HBQT_GC_T_QInputDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QInputDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QInputDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QInputDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
index a3e7e81bed..c1b58f1912 100644
--- a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QInputEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QInputEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QInputEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
index 78ceea39b2..96ee1fb7ac 100644
--- a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QInputMethodEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QInputMethodEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QInputMethodEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
index 9851734377..881147215f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QIntValidator )
 {
    HBQT_GC_T_QIntValidator * p = ( HBQT_GC_T_QIntValidator * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QIntValidator * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QIntValidator * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QIntValidator( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
index 92b1ec67ac..42cf63191a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QItemDelegate )
 {
    HBQT_GC_T_QItemDelegate * p = ( HBQT_GC_T_QItemDelegate * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QItemDelegate * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QItemDelegate * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QItemDelegate( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
index 65ba4a0218..ac12fd8efe 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QItemEditorFactory )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QItemEditorFactory * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QItemEditorFactory( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
index a7749a5e2d..f02f2b3833 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QItemSelection )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QItemSelection * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QItemSelection( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
index b45e113016..ab5c07bb70 100644
--- a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
@@ -61,25 +61,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QItemSelectionModel )
 {
    HBQT_GC_T_QItemSelectionModel * p = ( HBQT_GC_T_QItemSelectionModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QItemSelectionModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QItemSelectionModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QItemSelectionModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
index e733ed8156..cebe7a5928 100644
--- a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
@@ -60,18 +60,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QKeySequence )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QKeySequence * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QKeySequence( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
index 94ed36f7e2..1b13da257b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLCDNumber )
 {
    HBQT_GC_T_QLCDNumber * p = ( HBQT_GC_T_QLCDNumber * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QLCDNumber * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QLCDNumber * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLCDNumber( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
index 833f10f119..ddf4f391e0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLabel )
 {
    HBQT_GC_T_QLabel * p = ( HBQT_GC_T_QLabel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QLabel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QLabel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLabel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
index 6cdaee5fd1..064ca9e63f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLineEdit )
 {
    HBQT_GC_T_QLineEdit * p = ( HBQT_GC_T_QLineEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QLineEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QLineEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLineEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
index eb5d0579cb..a00cee1a7d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QLinearGradient )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QLinearGradient * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QLinearGradient( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QListView.cpp b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
index 7b77cfab24..a3eec8702e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QListView )
 {
    HBQT_GC_T_QListView * p = ( HBQT_GC_T_QListView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QListView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QListView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QListView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
index d2ebbbf2ba..630b4950a0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QListWidget )
 {
    HBQT_GC_T_QListWidget * p = ( HBQT_GC_T_QListWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QListWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QListWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QListWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
index b1aecb9610..94b7d3f459 100644
--- a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QListWidgetItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QListWidgetItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QListWidgetItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
index 3684b6a892..efb5fba968 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
@@ -70,25 +70,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMainWindow )
 {
    HBQT_GC_T_QMainWindow * p = ( HBQT_GC_T_QMainWindow * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMainWindow * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMainWindow * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMainWindow( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
index afb61437cd..02c1770908 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMatrix )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QMatrix * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMatrix( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
index 691e40b5a3..73e56deff4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMdiArea )
 {
    HBQT_GC_T_QMdiArea * p = ( HBQT_GC_T_QMdiArea * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMdiArea * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMdiArea * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMdiArea( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
index 62d8fa7fc7..2f081f978e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMdiSubWindow )
 {
    HBQT_GC_T_QMdiSubWindow * p = ( HBQT_GC_T_QMdiSubWindow * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMdiSubWindow * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMdiSubWindow * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMdiSubWindow( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
index 37fa0d3d34..de529e7809 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMenu )
 {
    HBQT_GC_T_QMenu * p = ( HBQT_GC_T_QMenu * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMenu * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMenu * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMenu( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
index 003a7ed5b9..65727dd392 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMenuBar )
 {
    HBQT_GC_T_QMenuBar * p = ( HBQT_GC_T_QMenuBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMenuBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMenuBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMenuBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
index 3b48d77b0c..6165c0c283 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMessageBox )
 {
    HBQT_GC_T_QMessageBox * p = ( HBQT_GC_T_QMessageBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMessageBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMessageBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMessageBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
index bb8983105a..5e2bd7fa95 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMouseEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QMouseEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMouseEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
index 70acc204cc..964f9b5252 100644
--- a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QMovie )
 {
    HBQT_GC_T_QMovie * p = ( HBQT_GC_T_QMovie * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QMovie * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QMovie * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QMovie( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
index 8fd768287b..bd27b65779 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPageSetupDialog )
 {
    HBQT_GC_T_QPageSetupDialog * p = ( HBQT_GC_T_QPageSetupDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPageSetupDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPageSetupDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPageSetupDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
index 5e0e4156f3..c30c6dbe58 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPaintEvent )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPaintEvent * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPaintEvent( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp
index 6ed9209695..6b3a9ae3be 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp
@@ -70,18 +70,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPainter )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPainter * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPainter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
index 7ce15da1dc..143fd1e444 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPainterPath )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPainterPath * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPainterPath( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp
index 4ed8abd9b6..df05cf7065 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp
@@ -60,18 +60,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPalette )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPalette * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPalette( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPen.cpp b/harbour/contrib/hbqt/qtgui/g/QPen.cpp
index a6358dcc9e..ff3ed41884 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPen.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPen.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPen )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPen * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPen( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp
index 7cf9d8d8bf..d9264eb03a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPicture )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPicture * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPicture( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
index 3e7830ae7d..384df12755 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
@@ -75,18 +75,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPixmap )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPixmap * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPixmap( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
index 899ed80cce..e0c2c1c572 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPlainTextDocumentLayout )
 {
    HBQT_GC_T_QPlainTextDocumentLayout * p = ( HBQT_GC_T_QPlainTextDocumentLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPlainTextDocumentLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPlainTextDocumentLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPlainTextDocumentLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
index 4cd3fe6701..9151b9dc9f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
@@ -59,25 +59,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPlainTextEdit )
 {
    HBQT_GC_T_QPlainTextEdit * p = ( HBQT_GC_T_QPlainTextEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPlainTextEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPlainTextEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPlainTextEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
index 78e1c96922..85d9809dc6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPolygon )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPolygon * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPolygon( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
index aa2972836f..3c89c4edc2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPolygonF )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPolygonF * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPolygonF( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
index 531b4c4389..9d3c160177 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
@@ -62,25 +62,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPrintDialog )
 {
    HBQT_GC_T_QPrintDialog * p = ( HBQT_GC_T_QPrintDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPrintDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPrintDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPrintDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
index 5390dae0dd..9807da9511 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPrintPreviewDialog )
 {
    HBQT_GC_T_QPrintPreviewDialog * p = ( HBQT_GC_T_QPrintPreviewDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPrintPreviewDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPrintPreviewDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
index 24855b35ed..7855892557 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
@@ -73,18 +73,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPrinter )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPrinter * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPrinter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp
index 3e832b7e77..c656b155e7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPrinterInfo )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QPrinterInfo * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPrinterInfo( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
index e210487d54..abe237b763 100644
--- a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QProgressBar )
 {
    HBQT_GC_T_QProgressBar * p = ( HBQT_GC_T_QProgressBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QProgressBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QProgressBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QProgressBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
index 62ae31f2db..ccb176b3c5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QProgressDialog )
 {
    HBQT_GC_T_QProgressDialog * p = ( HBQT_GC_T_QProgressDialog * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QProgressDialog * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QProgressDialog * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QProgressDialog( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
index b06f65fca5..d4c37a7e90 100644
--- a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
@@ -52,25 +52,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QPushButton )
 {
    HBQT_GC_T_QPushButton * p = ( HBQT_GC_T_QPushButton * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QPushButton * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QPushButton * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QPushButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
index 078f065674..5c5962f190 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRadialGradient )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QRadialGradient * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRadialGradient( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
index 901a8afb51..8bb131794e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRadioButton )
 {
    HBQT_GC_T_QRadioButton * p = ( HBQT_GC_T_QRadioButton * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QRadioButton * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QRadioButton * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRadioButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
index f3e4edd086..d45010b058 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRegExpValidator )
 {
    HBQT_GC_T_QRegExpValidator * p = ( HBQT_GC_T_QRegExpValidator * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QRegExpValidator * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QRegExpValidator * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRegExpValidator( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp
index a5acc91ecf..13022dc139 100644
--- a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp
@@ -66,18 +66,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QRegion )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QRegion * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QRegion( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
index 1089a86688..e7e0cbfa34 100644
--- a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QScrollArea )
 {
    HBQT_GC_T_QScrollArea * p = ( HBQT_GC_T_QScrollArea * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QScrollArea * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QScrollArea * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QScrollArea( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
index d72541d090..fa9b0f3f69 100644
--- a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QScrollBar )
 {
    HBQT_GC_T_QScrollBar * p = ( HBQT_GC_T_QScrollBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QScrollBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QScrollBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QScrollBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
index 5659ce6994..20045049e7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSizeGrip )
 {
    HBQT_GC_T_QSizeGrip * p = ( HBQT_GC_T_QSizeGrip * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSizeGrip * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSizeGrip * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSizeGrip( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
index aad1efb11e..018abc5f11 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSizePolicy )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QSizePolicy * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSizePolicy( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
index 9e375e4a16..5f2fb7a1af 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSlider )
 {
    HBQT_GC_T_QSlider * p = ( HBQT_GC_T_QSlider * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSlider * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSlider * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSlider( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
index 8d28ecba31..82365f78ab 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSortFilterProxyModel.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSortFilterProxyModel )
 {
    HBQT_GC_T_QSortFilterProxyModel * p = ( HBQT_GC_T_QSortFilterProxyModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSortFilterProxyModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSortFilterProxyModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSortFilterProxyModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSound.cpp b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
index 676a6baaf1..c607845af9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSound.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSound )
 {
    HBQT_GC_T_QSound * p = ( HBQT_GC_T_QSound * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSound * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSound * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSound( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
index b3c726414d..14f1299f81 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
@@ -49,18 +49,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSpacerItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QSpacerItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSpacerItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
index c55625a490..67ccc50521 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
@@ -49,25 +49,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSpinBox )
 {
    HBQT_GC_T_QSpinBox * p = ( HBQT_GC_T_QSpinBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSpinBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSpinBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSpinBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
index 5d173a296c..ab421fb8f0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSplashScreen )
 {
    HBQT_GC_T_QSplashScreen * p = ( HBQT_GC_T_QSplashScreen * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSplashScreen * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSplashScreen * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSplashScreen( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
index 14c8df3c1c..961d9bf135 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
@@ -58,25 +58,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSplitter )
 {
    HBQT_GC_T_QSplitter * p = ( HBQT_GC_T_QSplitter * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSplitter * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSplitter * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSplitter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
index 7f5f8d6d24..5833617cd7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStackedWidget )
 {
    HBQT_GC_T_QStackedWidget * p = ( HBQT_GC_T_QStackedWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QStackedWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QStackedWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStackedWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
index cb87913566..8d17f6acad 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
@@ -65,18 +65,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStandardItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStandardItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStandardItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
index 7e22afc16a..4a0b07af31 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
@@ -61,25 +61,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStandardItemModel )
 {
    HBQT_GC_T_QStandardItemModel * p = ( HBQT_GC_T_QStandardItemModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QStandardItemModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QStandardItemModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStandardItemModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
index 125cc09f9d..85564ff620 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStatusBar )
 {
    HBQT_GC_T_QStatusBar * p = ( HBQT_GC_T_QStatusBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QStatusBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QStatusBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStatusBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
index d5cb2fd81c..d547499076 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStringListModel )
 {
    HBQT_GC_T_QStringListModel * p = ( HBQT_GC_T_QStringListModel * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QStringListModel * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QStringListModel * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStringListModel( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
index c8c737051e..ec44c3fe30 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleFactory )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleFactory * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleFactory( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
index b958968421..27fbc5dc75 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOption )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOption * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOption( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
index 80a4b8e32a..ad7eb9ef2d 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionButton )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionButton * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
index 81692daa71..78025bc82f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionComboBox )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionComboBox * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
index f59db95a74..9043803784 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionComplex )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionComplex * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
index bda6ebd3f1..adc447fef8 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionDockWidget )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionDockWidget * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
index ab654c4b88..58144f5a44 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionFocusRect )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionFocusRect * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
index 223397e652..a864236fc0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionFrame )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionFrame * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp
index 36092bbef1..dcd81b0f61 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionGraphicsItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionGraphicsItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionGraphicsItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
index 875085acfd..67fb23f693 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionGroupBox )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionGroupBox * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
index 44faedf1dc..ddbfed1046 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionHeader )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionHeader * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
index bfd48da6b0..f0a3a91466 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionMenuItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionMenuItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
index 37112d3181..555a31780e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
@@ -56,18 +56,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionProgressBar )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionProgressBar * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
index 9c3bace68c..8ea88d7458 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionSizeGrip )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionSizeGrip * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
index a843bc2c64..a1cbfab81c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionSlider )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionSlider * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
index 772d4aec2d..820905cf17 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionSpinBox )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionSpinBox * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
index ed935df519..606085fbf2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionTab )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionTab * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionTab( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
index 7b42ebf9b4..129eaafea0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionTabBarBase )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionTabBarBase * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
index 372c5e7151..2b979d06e8 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionTabWidgetFrame )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionTabWidgetFrame * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
index 4cdf745e5f..558e43f898 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionTitleBar )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionTitleBar * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
index 5cd3d81acc..823b537d00 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionToolBar )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionToolBar * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
index 80835554d4..10857dc2bc 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionToolBox )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionToolBox * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
index ac78ad09d6..07583ee1d9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionToolButton )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionToolButton * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
index c3a4a7a0f1..d5fa7cb572 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
@@ -56,18 +56,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyleOptionViewItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStyleOptionViewItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
index 1675ed6cdc..9f6ab9ec2f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStylePainter )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QStylePainter * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStylePainter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
index a7b1054835..64398caa25 100644
--- a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QStyledItemDelegate )
 {
    HBQT_GC_T_QStyledItemDelegate * p = ( HBQT_GC_T_QStyledItemDelegate * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QStyledItemDelegate * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QStyledItemDelegate * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
index bbf45344e2..671f3a9f15 100644
--- a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QSystemTrayIcon )
 {
    HBQT_GC_T_QSystemTrayIcon * p = ( HBQT_GC_T_QSystemTrayIcon * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QSystemTrayIcon * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QSystemTrayIcon * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
index ed9d60c65e..da326aa6e5 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTabBar )
 {
    HBQT_GC_T_QTabBar * p = ( HBQT_GC_T_QTabBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTabBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTabBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTabBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
index 81561d3876..3bd5ad7f6a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
@@ -55,25 +55,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTabWidget )
 {
    HBQT_GC_T_QTabWidget * p = ( HBQT_GC_T_QTabWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTabWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTabWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
index 0770012eec..a548e308e7 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTableView )
 {
    HBQT_GC_T_QTableView * p = ( HBQT_GC_T_QTableView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTableView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTableView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTableView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
index 73c1dd4387..a73fe73b73 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTableWidget )
 {
    HBQT_GC_T_QTableWidget * p = ( HBQT_GC_T_QTableWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTableWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTableWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTableWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
index 82fabd3af8..6f81df4258 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
@@ -57,18 +57,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTableWidgetItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTableWidgetItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTableWidgetItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
index 745656c4cc..fc59428602 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTableWidgetSelectionRange )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTableWidgetSelectionRange * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
index 998f76625e..a11518eab3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextBlock )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextBlock * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextBlock( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
index 708de3afb8..04f315353b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
@@ -62,18 +62,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextBlockFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextBlockFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextBlockFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
index 5f49b9f98a..13c012b7ad 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
@@ -49,25 +49,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextBrowser )
 {
    HBQT_GC_T_QTextBrowser * p = ( HBQT_GC_T_QTextBrowser * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTextBrowser * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTextBrowser * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextBrowser( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
index f19449b865..d291f99ce0 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextCharFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextCharFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextCharFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
index 3ad3e541f4..a20f24ee22 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
@@ -68,18 +68,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextCursor )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextCursor * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextCursor( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
index 7004f9fd20..24c548ec2e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextDocument )
 {
    HBQT_GC_T_QTextDocument * p = ( HBQT_GC_T_QTextDocument * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTextDocument * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTextDocument * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextDocument( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
index 97bf606cc5..73878a7a9e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextDocumentFragment )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextDocumentFragment * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
index 32ffc1c8c3..ced03e570e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextDocumentWriter )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextDocumentWriter * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
index 098e87177f..ba699f1ce3 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
@@ -63,25 +63,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextEdit )
 {
    HBQT_GC_T_QTextEdit * p = ( HBQT_GC_T_QTextEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTextEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTextEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
index 65bcd5b6f4..34bfb04719 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
@@ -69,18 +69,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
index 34ba42f938..60d38f7f6e 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextFragment )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextFragment * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextFragment( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
index ecb5ff4a80..ab5bf6d460 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
@@ -56,25 +56,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextFrame )
 {
    HBQT_GC_T_QTextFrame * p = ( HBQT_GC_T_QTextFrame * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTextFrame * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTextFrame * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextFrame( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
index b9bddf2817..1dcc283578 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
@@ -59,18 +59,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextFrameFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextFrameFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextFrameFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
index a8e78b84a0..1eed188fac 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
@@ -50,18 +50,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextImageFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextImageFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextImageFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
index c63bf63d1c..3c31baa444 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
index 3291eb3f82..7421f442c1 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
@@ -64,18 +64,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextLayout )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextLayout * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
index 074d4c80a8..88c8770149 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextLength )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextLength * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextLength( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
index f3307a8b3f..00e755fb31 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
@@ -58,18 +58,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextLine )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextLine * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextLine( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
index 8e5004aa3d..c912ea71b2 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextListFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextListFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextListFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
index eb8360cc45..f65f77764b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
@@ -67,18 +67,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextOption )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextOption * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextOption( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
index 844f7dbf3d..c12e614791 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
@@ -52,18 +52,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTextTableFormat )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTextTableFormat * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTextTableFormat( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
index 2d1e7f52ce..11c444adef 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTimeEdit )
 {
    HBQT_GC_T_QTimeEdit * p = ( HBQT_GC_T_QTimeEdit * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTimeEdit * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTimeEdit * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTimeEdit( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
index ca752b83ea..b785c959d4 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QToolBar )
 {
    HBQT_GC_T_QToolBar * p = ( HBQT_GC_T_QToolBar * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QToolBar * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QToolBar * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QToolBar( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
index f7b38ec9b0..e4bbe2ddd6 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QToolBox )
 {
    HBQT_GC_T_QToolBox * p = ( HBQT_GC_T_QToolBox * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QToolBox * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QToolBox * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QToolBox( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
index ea97957d3b..7a5bfa8d5c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QToolButton )
 {
    HBQT_GC_T_QToolButton * p = ( HBQT_GC_T_QToolButton * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QToolButton * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QToolButton * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QToolButton( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp
index faa380c033..115fe4ca0f 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp
@@ -55,18 +55,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTransform )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTransform * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTransform( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
index 8b4379e780..c3b31ff946 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
@@ -62,25 +62,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTreeView )
 {
    HBQT_GC_T_QTreeView * p = ( HBQT_GC_T_QTreeView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTreeView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTreeView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTreeView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
index 08a17fe0c5..5d70154fed 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
@@ -54,25 +54,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTreeWidget )
 {
    HBQT_GC_T_QTreeWidget * p = ( HBQT_GC_T_QTreeWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QTreeWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QTreeWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTreeWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
index 8b3e64894c..e62d61926a 100644
--- a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
@@ -67,18 +67,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QTreeWidgetItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QTreeWidgetItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
index 21f57ec450..340035847c 100644
--- a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QVBoxLayout )
 {
    HBQT_GC_T_QVBoxLayout * p = ( HBQT_GC_T_QVBoxLayout * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QVBoxLayout * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QVBoxLayout * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QVBoxLayout( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
index caba810a06..02c9e532e9 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
@@ -87,25 +87,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWidget )
 {
    HBQT_GC_T_QWidget * p = ( HBQT_GC_T_QWidget * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWidget * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWidget * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
index 92b2e26353..10b0b08197 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
@@ -50,25 +50,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWidgetAction )
 {
    HBQT_GC_T_QWidgetAction * p = ( HBQT_GC_T_QWidgetAction * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWidgetAction * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWidgetAction * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWidgetAction( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
index c2f6966e54..95137be77b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
@@ -49,18 +49,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWidgetItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QWidgetItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWidgetItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
index 358a74176f..3ae8152e2b 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
@@ -51,25 +51,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWindowsStyle )
 {
    HBQT_GC_T_QWindowsStyle * p = ( HBQT_GC_T_QWindowsStyle * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWindowsStyle * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWindowsStyle * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWindowsStyle( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
index 668b89022e..45cf9b1924 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
@@ -62,25 +62,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWizard )
 {
    HBQT_GC_T_QWizard * p = ( HBQT_GC_T_QWizard * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWizard * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWizard * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
index 6e36fa3acc..6b289f7183 100644
--- a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
@@ -48,25 +48,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWizardPage )
 {
    HBQT_GC_T_QWizardPage * p = ( HBQT_GC_T_QWizardPage * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWizardPage * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWizardPage * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
index bd935b0c1e..d06802197d 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
@@ -77,25 +77,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QFtp )
 {
    HBQT_GC_T_QFtp * p = ( HBQT_GC_T_QFtp * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QFtp * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QFtp * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QFtp( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
index e890c49ffb..9e1ccf6017 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
@@ -80,25 +80,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QHttp )
 {
    HBQT_GC_T_QHttp * p = ( HBQT_GC_T_QHttp * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QHttp * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QHttp * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QHttp( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
index 44490d29f5..725efe849a 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QHttpRequestHeader )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QHttpRequestHeader * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
index 9d1c05d65f..9d2a8365b8 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
@@ -51,18 +51,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QHttpResponseHeader )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QHttpResponseHeader * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
index 9b7efa08c7..788f9b711b 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
@@ -61,18 +61,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QNetworkRequest )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QNetworkRequest * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp b/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
index 3653b2937d..b6cbb6a7f1 100644
--- a/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
+++ b/harbour/contrib/hbqt/qtuitools/g/QUiLoader.cpp
@@ -53,25 +53,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QUiLoader )
 {
    HBQT_GC_T_QUiLoader * p = ( HBQT_GC_T_QUiLoader * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QUiLoader * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QUiLoader * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp
index 3291de1e72..b3bfddaa32 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryItem )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QWebHistoryItem * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp
index dfb7f8eb53..b510011618 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp
@@ -53,18 +53,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWebHitTestResult )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QWebHitTestResult * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
index 7cfa73fc43..4ffdbf05a1 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp
@@ -70,25 +70,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWebPage )
 {
    HBQT_GC_T_QWebPage * p = ( HBQT_GC_T_QWebPage * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWebPage * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWebPage * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp
index 1fa9bcad40..1d93869e96 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp
@@ -54,18 +54,12 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWebSecurityOrigin )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
-   if( p && p->bNew )
+   if( p )
    {
-      if( p->ph )
-      {
+      if( p->bNew && p->ph )
          delete ( ( QWebSecurityOrigin * ) p->ph );
-         p->ph = NULL;
-      }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
index 7863cc65d9..136f0723ca 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
+++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp
@@ -53,25 +53,17 @@ HBQT_GC_FUNC( hbqt_gcRelease_QWebView )
 {
    HBQT_GC_T_QWebView * p = ( HBQT_GC_T_QWebView * ) Cargo;
 
-   if( p && p->bNew && p->ph )
+   if( p )
    {
-      QWebView * ph = p->ph;
-      if( ph )
+      if( p->bNew && p->ph )
       {
+         QWebView * ph = p->ph;
          const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
-         {
             delete ( p->ph );
-            p->ph = NULL;
-         }
-         else
-            p->ph = NULL;
       }
-      else
-         p->ph = NULL;
-   }
-   else
       p->ph = NULL;
+   }
 }
 
 void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew )
diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg
index 7d7c14a077..d5a10104e5 100644
--- a/harbour/contrib/hbqt/utils/hbqtgen.prg
+++ b/harbour/contrib/hbqt/utils/hbqtgen.prg
@@ -773,85 +773,66 @@ METHOD HbQtSource:build()
       IF ::isObject
          aadd( ::cpp_, "   HBQT_GC_T_" + ::cWidget + " * p = ( HBQT_GC_T_" + ::cWidget + " * ) Cargo; " )
          aadd( ::cpp_, "   " )
-         aadd( ::cpp_, "   if( p && p->bNew && p->ph )" )
+         aadd( ::cpp_, "   if( p )" )
          aadd( ::cpp_, "   {" )
-         aadd( ::cpp_, "      " + ::cWidget + " " + iif( ::isList, "< void * >", "" ) + "* ph = p->ph;" )
-         aadd( ::cpp_, "      if( ph )" )
+         aadd( ::cpp_, "      if( p->bNew && p->ph )" )
          aadd( ::cpp_, "      {" )
+         aadd( ::cpp_, "         " + ::cWidget + " " + iif( ::isList, "< void * >", "" ) + "* ph = p->ph;" )
          aadd( ::cpp_, "         const QMetaObject * m = ( ph )->metaObject();" )
          aadd( ::cpp_, '         if( ( QString ) m->className() != ( QString ) "QObject" )' )
-         aadd( ::cpp_, "         {" )
          #ifdef _GEN_TRACE_
+         aadd( ::cpp_, "         {" )
          aadd( ::cpp_, '            HB_TRACE( ' + ::cTrMode + ', ( "ph=%p %p YES_rel_' + ::cWidget + '   /.\\   ", (void*) ph, (void*) p->ph ) );' )
          #endif
          aadd( ::cpp_, "            delete ( p->ph ); " )
          #ifdef _GEN_TRACE_
          aadd( ::cpp_, '            HB_TRACE( ' + ::cTrMode + ', ( "ph=%p %p YES_rel_' + ::cWidget + '   \\./   ", (void*) ph, (void*) p->ph ) );' )
-         #endif
-         aadd( ::cpp_, "            p->ph = NULL;" )
          aadd( ::cpp_, "         }" )
          aadd( ::cpp_, "         else" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "         {" )
          aadd( ::cpp_, '            HB_TRACE( ' + ::cTrMode + ', ( "ph=%p NO__rel_' + ::cWidget + '          ", ph ) );')
-         #endif
-         aadd( ::cpp_, "            p->ph = NULL;" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "         }" )
          #endif
          aadd( ::cpp_, "      }" )
-         aadd( ::cpp_, "      else" )
          #ifdef _GEN_TRACE_
+         aadd( ::cpp_, "      else" )
          aadd( ::cpp_, "      {" )
          aadd( ::cpp_, '         HB_TRACE( ' + ::cTrMode + ', ( "ph=%p DEL_rel_' + ::cWidget + '    :     Object already deleted!", ph ) );' )
-         #endif
-         aadd( ::cpp_, "         p->ph = NULL;" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "      }" )
          #endif
+         aadd( ::cpp_, "      p->ph = NULL;" )
          aadd( ::cpp_, "   }" )
-         aadd( ::cpp_, "   else" )
          #ifdef _GEN_TRACE_
+         aadd( ::cpp_, "   else" )
          aadd( ::cpp_, "   {" )
          aadd( ::cpp_, '      HB_TRACE( ' + ::cTrMode + ', ( "ph=%p PTR_rel_' + ::cWidget + '    :    Object not created with new=true", ph ) );' )
-         #endif
-         aadd( ::cpp_, "      p->ph = NULL;" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "   }" )
          #endif
       ELSE
          aadd( ::cpp_, "   HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;" )
          aadd( ::cpp_, "   " )
-         aadd( ::cpp_, "   if( p && p->bNew )" )
+         aadd( ::cpp_, "   if( p )" )
          aadd( ::cpp_, "   {" )
-         aadd( ::cpp_, "      if( p->ph )" )
-         aadd( ::cpp_, "      {" )
+         aadd( ::cpp_, "      if( p->bNew && p->ph )" )
          #ifdef _GEN_TRACE_
+         aadd( ::cpp_, "      {" )
          aadd( ::cpp_, '         HB_TRACE( ' + ::cTrMode + ', ( "ph=%p    _rel_' + ::cWidget + '   /.\\", p->ph ) );' )
          #endif
          aadd( ::cpp_, "         delete ( ( " + ::cWidget + IF( ::isList, "< void * >", "" ) + " * ) p->ph ); " )
          #ifdef _GEN_TRACE_
          aadd( ::cpp_, '         HB_TRACE( ' + ::cTrMode + ', ( "ph=%p YES_rel_' + ::cWidget + '   \\./", p->ph ) );' )
-         #endif
-         aadd( ::cpp_, "         p->ph = NULL;" )
          aadd( ::cpp_, "      }" )
          aadd( ::cpp_, "      else" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "      {" )
          aadd( ::cpp_, '         HB_TRACE( ' + ::cTrMode + ', ( "ph=%p DEL_rel_' + ::cWidget + '    :     Object already deleted!", p->ph ) );' )
-         #endif
-         aadd( ::cpp_, "         p->ph = NULL;" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "      }" )
          #endif
+         aadd( ::cpp_, "      p->ph = NULL;" )
          aadd( ::cpp_, "   }" )
-         aadd( ::cpp_, "   else" )
          #ifdef _GEN_TRACE_
+         aadd( ::cpp_, "   else" )
          aadd( ::cpp_, "   {" )
          aadd( ::cpp_, '      HB_TRACE( ' + ::cTrMode + ', ( "ph=%p PTR_rel_' + ::cWidget + '    :    Object not created with new=true", p->ph ) );' )
-         #endif
-         aadd( ::cpp_, "      p->ph = NULL;" )
-         #ifdef _GEN_TRACE_
          aadd( ::cpp_, "   }" )
          #endif
       ENDIF