diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8fc0d5818f..93cc7483b3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-17 17:41 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbqt/qtgui/QLayout.cpp
+  * contrib/hbqt/qtgui/QTabWidget.cpp
+  * contrib/hbqt/qth/QLayout.qth
+  * contrib/hbqt/qth/QTabWidget.qth
+    ! Fix to prev commit and little synchronization.
+
 2010-04-17 15:21 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/qtgui/QTabWidget.cpp
   * contrib/hbqt/qth/QTabWidget.qth
diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg
index 09fad974f7..813c5a0f58 100644
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -433,6 +433,8 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
    s_isObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .and. lower( e_[ 2 ] ) == "no"} ) == 0
 
    /* Body */
+   lList := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "list"  .AND. lower( e_[ 2 ] ) == "yes" } ) > 0
+
    FOR EACH s IN protos_
       cOrg := s
 
@@ -468,7 +470,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
          fBody_:= PullOutFuncBody( protos_, s:__enumIndex() )
          s := substr( s, 1, len( s ) - 1 )
       ENDIF
-      IF ParseProto( s, cWidget, @txt_, @doc_, enum_, func_, fBody_ )
+      IF ParseProto( s, cWidget, @txt_, @doc_, enum_, func_, lList, fBody_ )
          nCnvrtd++
       ELSE
          aadd( dummy_, cOrg )
@@ -557,63 +559,82 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
       lDestructor := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .AND. lower( e_[ 2 ] ) == "no"  } ) == 0
       lObject     := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject"    .AND. lower( e_[ 2 ] ) == "no"  } ) == 0
 
-      IF ( lNewGCtoQT )
-         lConst := .f.
-         FOR i := 3 TO len( new_ ) - 1
-            IF left( ltrim( new_[ i ] ), 2 ) != "//"
-               IF "hb_retptr(" $ new_[ i ]
-                  lConst := .t.
-                  EXIT
-               ENDIF
+      lConst := .f.
+      FOR i := 3 TO len( new_ ) - 1
+         IF left( ltrim( new_[ i ] ), 2 ) != "//"
+            IF "hb_retptr(" $ new_[ i ]
+               lConst := .t.
+               EXIT
             ENDIF
-         NEXT
-
-         aadd( cpp_, "typedef struct"                  )
-         aadd( cpp_, "{"                               )
-         aadd( cpp_, "   void * ph;"                    )
-         aadd( cpp_, "   bool bNew;"                    )
-         aadd( cpp_, "   QT_G_FUNC_PTR func;"           )
-         IF lObject
-            aadd( cpp_, "   QPointer< "+ cWidget +" > pq;" )
          ENDIF
-         aadd( cpp_, "} QGC_POINTER_" + cWidget + ";"  )
-         aadd( cpp_, " "                               )
+      NEXT
 
-         aadd( cpp_, "QT_G_FUNC( hbqt_gcRelease_" + cWidget + " )"  )
-         aadd( cpp_, "{"                                     )
-         IF ( lDestructor ) .AND. ( lConst )
-            IF lObject
-               aadd( cpp_, "   QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) Cargo; " )
-               aadd( cpp_, "   " )
-               aadd( cpp_, "   if( p && p->bNew )" )
-               aadd( cpp_, "   {" )
-               aadd( cpp_, "      if( p->ph && p->pq )" )
-               aadd( cpp_, "      {" )
-               aadd( cpp_, "         const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();" )
-               aadd( cpp_, '         if( ( QString ) m->className() != ( QString ) "QObject" )' )
-               aadd( cpp_, "         {" )
-               aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p YES_rel_' + cWidget + '   /.\\   pq=%p", p->ph, (void *)(p->pq) ) );')
-               aadd( cpp_, "            delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
-               aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p YES_rel_' + cWidget + '   \\./   pq=%p", p->ph, (void *)(p->pq) ) );')
-               aadd( cpp_, "            p->ph = NULL;" )
-               aadd( cpp_, "         }" )
-               aadd( cpp_, "         else" )
-               aadd( cpp_, "         {" )
-               aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p NO__rel_' + cWidget + '          pq=%p", p->ph, (void *)(p->pq) ) );')
-               aadd( cpp_, "            p->ph = NULL;" )
-               aadd( cpp_, "         }" )
-            ELSE
-               aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" )
-               aadd( cpp_, "   " )
-               aadd( cpp_, "   if( p && p->bNew )" )
-               aadd( cpp_, "   {" )
-               aadd( cpp_, "      if( p->ph )" )
-               aadd( cpp_, "      {" )
-               aadd( cpp_, '         HB_TRACE( ' + s_trMode + ', ( "ph=%p    _rel_' + cWidget + '   /.\\", p->ph ) );' )
-               aadd( cpp_, "         delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
-               aadd( cpp_, '         HB_TRACE( ' + s_trMode + ', ( "ph=%p YES_rel_' + cWidget + '   \\./", p->ph ) );' )
-               aadd( cpp_, "         p->ph = NULL;" )
-            ENDIF
+      aadd( cpp_, "typedef struct"                  )
+      aadd( cpp_, "{"                               )
+      IF lObject
+         aadd( cpp_, "   QPointer< "+ cWidget +" > ph;" )
+      ELSE
+         IF lList
+             aadd( cpp_, "   " + cWidget + "< void * > * ph;"                    )
+         ELSE
+             aadd( cpp_, "   " + cWidget + " * ph;"                    )
+         ENDIF
+      ENDIF
+      aadd( cpp_, "   bool bNew;"                    )
+      aadd( cpp_, "   QT_G_FUNC_PTR func;"           )
+      aadd( cpp_, "} QGC_POINTER_" + cWidget + ";"  )
+      aadd( cpp_, " "                               )
+
+      aadd( cpp_, "QT_G_FUNC( hbqt_gcRelease_" + cWidget + " )"  )
+      aadd( cpp_, "{"                                     )
+      IF ( lDestructor ) .AND. ( lConst )
+         IF lObject
+            aadd( cpp_, "   " + cWidget + " " + iif( lList, "< void * >", "" )+" * ph = NULL ;" )
+            aadd( cpp_, "   QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) Cargo; " )
+            aadd( cpp_, "   " )
+            aadd( cpp_, "   if( p && p->bNew && p->ph )" )
+            aadd( cpp_, "   {" )
+            aadd( cpp_, "      ph = p->ph; " )
+            aadd( cpp_, "      if( ph )" )
+            aadd( cpp_, "      {" )
+            aadd( cpp_, "         const QMetaObject * m = ( ph )->metaObject();" )
+            aadd( cpp_, '         if( ( QString ) m->className() != ( QString ) "QObject" )' )
+            aadd( cpp_, "         {" )
+            aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p %p YES_rel_' + cWidget + '   /.\\   ", (void*) ph, (void*) p->ph ) );' )
+            aadd( cpp_, "            delete ( p->ph ); " )
+         *  aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p %p YES_rel_' + cWidget + '   ====   ", (void*) ph, (void*) p->ph ) );' )
+         *  aadd( cpp_, "            delete ( ph ); " )
+            aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p %p YES_rel_' + cWidget + '   \\./   ", (void*) ph, (void*) p->ph ) );' )
+            aadd( cpp_, "            p->ph = NULL;" )
+            aadd( cpp_, "         }" )
+            aadd( cpp_, "         else" )
+            aadd( cpp_, "         {" )
+            aadd( cpp_, '            HB_TRACE( ' + s_trMode + ', ( "ph=%p NO__rel_' + cWidget + '          ", ph ) );')
+            aadd( cpp_, "            p->ph = NULL;" )
+            aadd( cpp_, "         }" )
+            aadd( cpp_, "      }" )
+            aadd( cpp_, "      else" )
+            aadd( cpp_, "      {" )
+            aadd( cpp_, '         HB_TRACE( ' + s_trMode + ', ( "ph=%p DEL_rel_' + cWidget + '    :     Object already deleted!", ph ) );' )
+            aadd( cpp_, "         p->ph = NULL;" )
+            aadd( cpp_, "      }" )
+            aadd( cpp_, "   }" )
+            aadd( cpp_, "   else" )
+            aadd( cpp_, "   {" )
+            aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p PTR_rel_' + cWidget + '    :    Object not created with new=true", ph ) );' )
+            aadd( cpp_, "      p->ph = NULL;" )
+            aadd( cpp_, "   }" )
+         ELSE
+            aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" )
+            aadd( cpp_, "   " )
+            aadd( cpp_, "   if( p && p->bNew )" )
+            aadd( cpp_, "   {" )
+            aadd( cpp_, "      if( p->ph )" )
+            aadd( cpp_, "      {" )
+            aadd( cpp_, '         HB_TRACE( ' + s_trMode + ', ( "ph=%p    _rel_' + cWidget + '   /.\\", p->ph ) );' )
+            aadd( cpp_, "         delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
+            aadd( cpp_, '         HB_TRACE( ' + s_trMode + ', ( "ph=%p YES_rel_' + cWidget + '   \\./", p->ph ) );' )
+            aadd( cpp_, "         p->ph = NULL;" )
             aadd( cpp_, "      }" )
             aadd( cpp_, "      else" )
             aadd( cpp_, "      {" )
@@ -626,89 +647,79 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
             aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p PTR_rel_' + cWidget + '    :    Object not created with new=true", p->ph ) );' )
             aadd( cpp_, "      p->ph = NULL;" )
             aadd( cpp_, "   }" )
-         ELSE
-            aadd( cpp_, "   HB_SYMBOL_UNUSED( Cargo );" )
-            aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" )
-            aadd( cpp_, "   " )
-            aadd( cpp_, "   if( p && p->bNew )" )
-            aadd( cpp_, "   {" )
-            aadd( cpp_, "      p->ph = NULL;" )
-            aadd( cpp_, "   }" )
          ENDIF
-         aadd( cpp_, "}" )
-         aadd( cpp_, "" )
+      ELSE
+         aadd( cpp_, "   HB_SYMBOL_UNUSED( Cargo );" )
+         aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" )
+         aadd( cpp_, "   " )
+         aadd( cpp_, "   if( p && p->bNew )" )
+         aadd( cpp_, "   {" )
+         aadd( cpp_, "      p->ph = NULL;" )
+         aadd( cpp_, "   }" )
       ENDIF
+      aadd( cpp_, "}" )
+      aadd( cpp_, "" )
 
-      /* Insert CONSTRUCTOR - if defined */
-      lConst := .f.
-      FOR i := 3 TO len( new_ ) - 1
-         IF left( ltrim( new_[ i ] ), 2 ) != "//"
-            IF "hb_retptr(" $ new_[ i ]
-               lConst := .t.
-               EXIT
-            ENDIF
-         ENDIF
-      NEXT
 
-      IF ( lNewGCtoQT )
-         aadd( cpp_, "void * hbqt_gcAllocate_" + cWidget + "( void * pObj, bool bNew )" )
-         aadd( cpp_, "{                                      " )
-         IF lObject
-            aadd( cpp_, "   QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), hbqt_gcFuncs() );" )
-         ELSE
-            aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
-         ENDIF
-         aadd( cpp_, "" )
-         aadd( cpp_, "   p->ph = pObj;" )
-         aadd( cpp_, "   p->bNew = bNew;" )
-         aadd( cpp_, "   p->func = hbqt_gcRelease_" + cWidget + ";" )
-         aadd( cpp_, "" )
-         aadd( cpp_, "   if( bNew )" )
-         aadd( cpp_, "   {" )
-         IF lObject
-            aadd( cpp_, "      new( & p->pq ) QPointer< "+ cWidget +" >( ( " + cWidget + " * ) pObj );" )
-         ENDIF
-         aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p    _new_' + cWidget + iif( lObject, '  under p->pq', '' ) + '", pObj ) );' )
-         aadd( cpp_, "   }" )
-         aadd( cpp_, "   else" )
-         aadd( cpp_, "   {" )
-         aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p NOT_new_' + cWidget + '", pObj ) );' )
-         aadd( cpp_, "   }" )
-         aadd( cpp_, "   return p;" )
-         aadd( cpp_, "}" )
-         aadd( cpp_, "" )
+      aadd( cpp_, "void * hbqt_gcAllocate_" + cWidget + "( void * pObj, bool bNew )" )
+      aadd( cpp_, "{                                      " )
+      IF lObject
+         aadd( cpp_, "   QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), hbqt_gcFuncs() );" )
+      ELSE
+         aadd( cpp_, "   QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
+      ENDIF
+      aadd( cpp_, "" )
+      IF lObject
+         aadd( cpp_, "   new( & p->ph ) QPointer< "+ cWidget +" >( ( " + cWidget + " * ) pObj );" )
+      ELSE
+         aadd( cpp_, "   p->ph = ( " + cWidget + iif( lList, "< void * >", "" ) + " * ) pObj;" )
+      ENDIF
+      aadd( cpp_, "   p->bNew = bNew;" )
+      aadd( cpp_, "   p->func = hbqt_gcRelease_" + cWidget + ";" )
+      aadd( cpp_, "" )
+      aadd( cpp_, "   if( bNew )" )
+      aadd( cpp_, "   {" )
+      aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p    _new_' + cWidget + iif( lObject, '  under p->pq', '' ) + '", pObj ) );' )
+      aadd( cpp_, "   }" )
+      aadd( cpp_, "   else" )
+      aadd( cpp_, "   {" )
+      aadd( cpp_, '      HB_TRACE( ' + s_trMode + ', ( "ph=%p NOT_new_' + cWidget + '", pObj ) );' )
+      aadd( cpp_, "   }" )
+      aadd( cpp_, "   return p;" )
+      aadd( cpp_, "}" )
+      aadd( cpp_, "" )
 
-         aadd( cpp_, new_[ 1 ] )           // Func definition
-         aadd( cpp_, new_[ 2 ] )           // {
-         IF lConst
-
-            aadd( cpp_, "   void * pObj = NULL;" )
-
-            aadd( cpp_, " " )
-            FOR i := 3 TO len( new_ ) - 1
-               IF left( ltrim( new_[ i ] ), 2 ) != "//"
-                  IF "hb_retptr(" $ new_[ i ]
-                     s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) )
-                     s := strtran( s, ");", ";" )
-                     aadd( cpp_, s )
-                  ELSE
-                     aadd( cpp_, new_[ i ] )
-                  ENDIF
+      aadd( cpp_, new_[ 1 ] )           // Func definition
+      aadd( cpp_, new_[ 2 ] )           // {
+      IF lConst
+         if ( lList )
+             aadd( cpp_, "   " + cWidget + "< void * > * pObj = NULL;" )
+         else
+             aadd( cpp_, "   " + cWidget + " * pObj = NULL;" )
+         endif
+         aadd( cpp_, " " )
+         FOR i := 3 TO len( new_ ) - 1
+             IF left( ltrim( new_[ i ] ), 2 ) != "//"
+                IF "hb_retptr(" $ new_[ i ]
+                   s := new_[ i ]
+                   s := trim( strtran( s, "hb_retptr(", "pObj =" ) )
+                   s := strtran( s, ");", ";" )
+                   s := strtran( s, "( "+ cWidget + "* )", "" )
+                   aadd( cpp_, s )
+               ELSE
+                  aadd( cpp_, new_[ i ] )
                ENDIF
-            NEXT
-            aadd( cpp_, " " )
-            aadd( cpp_, "   hb_retptrGC( hbqt_gcAllocate_" + cWidget + "( pObj, true ) );" )
-            #if 0
-            IF lDestructor
-               aadd( cpp_, "   hb_retptrGC( hbqt_gcAllocate_" + cWidget + "( pObj, true ) );" )
-            ELSE
-               aadd( cpp_, "   hb_retptr( pObj );" )
             ENDIF
-            #endif
-         ENDIF
-         aadd( cpp_, new_[ len( new_ ) ] ) // }
-         aadd( cpp_, "" )
+         NEXT
+         aadd( cpp_, " " )
+         aadd( cpp_, "   hb_retptrGC( hbqt_gcAllocate_" + cWidget + "( ( void * ) pObj, true ) );" )
+      ELSE
+         FOR i := 3 TO len( new_ ) - 1
+             aadd( cpp_, new_[ i ] )
+         NEXT
       ENDIF
+      aadd( cpp_, new_[ len( new_ ) ] ) // }
+      aadd( cpp_, "" )
 
       /* Insert Functions */
       aeval( txt_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } )
@@ -778,12 +789,11 @@ FUNCTION GetSourcePathByLib( cWidget, cPathOut, cExt, cPre )
 
 #define THIS_PROPER( s )   ( upper( left( s,1 ) ) + substr( s,2 ) )
 
-STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, fBody_ )
+STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, lList, fBody_ )
    LOCAL aRet, aA, aArgus, aArg, aPar, aPre, n, nn, nHBIdx
    LOCAL cPre, cPar, cRet, cFun, cParas, cDocs, cCmd, cPas, s, ss, cFirstParamCast
    LOCAL cWdg, cCmn, cPrgRet, cHBFunc, cHBIdx, cDocNM
-   LOCAL lSuccess
- * LOCAL cInt         := 'int,qint16,quint16,QChar,short,ushort'
+   LOCAL lSuccess, FP
    LOCAL cInt         := 'int,qint16,quint16,short,ushort'
    LOCAL cIntLong     := 'qint32,quint32,QRgb'
    LOCAL cIntLongLong := 'qint64,quint64,qlonglong,qulonglong'
@@ -1224,14 +1234,14 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, fBody_ )
       aadd( txt_, "/*" )
       aadd( txt_, " * " + strtran( cProto, chr(13), '' ) )
       aadd( txt_, " */" )
-
       aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) + "_" + upper( cHBFunc ) + " )" )
       aadd( txt_, "{" )
-
       IF !empty( fBody_ )
          aeval( fBody_, {|e| aadd( txt_, e ) } )
 
       ELSE
+         aadd( txt_, "   " + cWidget + iif( lList, "< void *>", "" ) + " * p = hbqt_par_" + cWidget + "( 1 );" )
+
          /* Insert parameters by reference */
          IF ! empty( aPre )
             FOR n := 1 TO len( aPre )
@@ -1241,7 +1251,13 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, fBody_ )
          ENDIF
 
          /* One line function body */
-         aadd( txt_, "   "+ cCmd )
+         FP = strtran( cCmd, "hbqt_par_" + cWidget + "( 1 )", "( p )" )
+         aadd( txt_, "   if( p )" )
+         aadd( txt_, "      " + FP )
+         aadd( txt_, "   else" )
+         aadd( txt_, "   {" )
+         aadd( txt_, '      HB_TRACE( ' + s_trMode + ', ( "............................... F=QT_' + upper( cWidget ) + '_' + upper( cHBFunc) + ' FP=' + FP + ' p is NULL" ) );')
+         aadd( txt_, "   }" )
 
          /* Return values back to PRG */
          IF ! empty( aPre )
@@ -1251,7 +1267,6 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, fBody_ )
             NEXT
          ENDIF
       ENDIF
-
       aadd( txt_, "}" )
       aadd( txt_, ""  )
 
diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp
index acb7805364..0dfafea75d 100644
--- a/harbour/contrib/hbqt/qtgui/QLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp
@@ -90,10 +90,9 @@
 
 typedef struct
 {
-   void * ph;
+   QPointer< QLayout > ph;
    bool bNew;
    QT_G_FUNC_PTR func;
-   QPointer< QLayout > pq;
 } QGC_POINTER_QLayout;
 
 QT_G_FUNC( hbqt_gcRelease_QLayout )
@@ -111,13 +110,12 @@ void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew )
 {
    QGC_POINTER_QLayout * p = ( QGC_POINTER_QLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QLayout ), hbqt_gcFuncs() );
 
-   p->ph = pObj;
+   new( & p->ph ) QPointer< QLayout >( ( QLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLayout;
 
    if( bNew )
    {
-      new( & p->pq ) QPointer< QLayout >( ( QLayout * ) pObj );
       HB_TRACE( HB_TR_DEBUG, ( "ph=%p    _new_QLayout  under p->pq", pObj ) );
    }
    else
@@ -129,6 +127,7 @@ void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew )
 
 HB_FUNC( QT_QLAYOUT )
 {
+
 }
 
 /*
@@ -136,7 +135,13 @@ HB_FUNC( QT_QLAYOUT )
  */
 HB_FUNC( QT_QLAYOUT_ACTIVATE )
 {
-   hb_retl( hbqt_par_QLayout( 1 )->activate() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retl( ( p )->activate() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_ACTIVATE FP=hb_retl( ( p )->activate() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -144,21 +149,18 @@ HB_FUNC( QT_QLAYOUT_ACTIVATE )
  */
 HB_FUNC( QT_QLAYOUT_ADDITEM )
 {
-   QGC_POINTER * p;
-   QGC_POINTER * q;
+   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
+   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
 
    HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLAYOUT_ADDITEM()" ) );
 
-   q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
-   p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
-
    if( p && p->ph && q && q->ph )
    {
-      HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDITEM() Qt oject: %p is attached to: %p", p->ph, q->ph ) );
-      p->bNew = HB_FALSE;
-   }
+      HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) );
+      q->bNew = HB_FALSE;
 
-   hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) );
+      hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) );
+   }
 }
 
 /*
@@ -166,7 +168,13 @@ HB_FUNC( QT_QLAYOUT_ADDITEM )
  */
 HB_FUNC( QT_QLAYOUT_ADDWIDGET )
 {
-   hbqt_par_QLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->addWidget( hbqt_par_QWidget( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_ADDWIDGET FP=( p )->addWidget( hbqt_par_QWidget( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -174,7 +182,13 @@ HB_FUNC( QT_QLAYOUT_ADDWIDGET )
  */
 HB_FUNC( QT_QLAYOUT_CONTENTSRECT )
 {
-   hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ), true ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->contentsRect() ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_CONTENTSRECT FP=hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->contentsRect() ), true ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -182,7 +196,13 @@ HB_FUNC( QT_QLAYOUT_CONTENTSRECT )
  */
 HB_FUNC( QT_QLAYOUT_COUNT )
 {
-   hb_retni( hbqt_par_QLayout( 1 )->count() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retni( ( p )->count() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_COUNT FP=hb_retni( ( p )->count() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -190,7 +210,13 @@ HB_FUNC( QT_QLAYOUT_COUNT )
  */
 HB_FUNC( QT_QLAYOUT_EXPANDINGDIRECTIONS )
 {
-   hb_retni( ( Qt::Orientations ) hbqt_par_QLayout( 1 )->expandingDirections() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retni( ( Qt::Orientations ) ( p )->expandingDirections() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_EXPANDINGDIRECTIONS FP=hb_retni( ( Qt::Orientations ) ( p )->expandingDirections() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -198,12 +224,18 @@ HB_FUNC( QT_QLAYOUT_EXPANDINGDIRECTIONS )
  */
 HB_FUNC( QT_QLAYOUT_GETCONTENTSMARGINS )
 {
+   QLayout * p = hbqt_par_QLayout( 1 );
    int iLeft = 0;
    int iTop = 0;
    int iRight = 0;
    int iBottom = 0;
 
-   hbqt_par_QLayout( 1 )->getContentsMargins( &iLeft, &iTop, &iRight, &iBottom );
+   if( p )
+      ( p )->getContentsMargins( &iLeft, &iTop, &iRight, &iBottom );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_GETCONTENTSMARGINS FP=( p )->getContentsMargins( &iLeft, &iTop, &iRight, &iBottom ); p is NULL" ) );
+   }
 
    hb_storni( iLeft, 2 );
    hb_storni( iTop, 3 );
@@ -216,7 +248,13 @@ HB_FUNC( QT_QLAYOUT_GETCONTENTSMARGINS )
  */
 HB_FUNC( QT_QLAYOUT_INDEXOF )
 {
-   hb_retni( hbqt_par_QLayout( 1 )->indexOf( hbqt_par_QWidget( 2 ) ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retni( ( p )->indexOf( hbqt_par_QWidget( 2 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_INDEXOF FP=hb_retni( ( p )->indexOf( hbqt_par_QWidget( 2 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -224,7 +262,13 @@ HB_FUNC( QT_QLAYOUT_INDEXOF )
  */
 HB_FUNC( QT_QLAYOUT_ISENABLED )
 {
-   hb_retl( hbqt_par_QLayout( 1 )->isEnabled() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retl( ( p )->isEnabled() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_ISENABLED FP=hb_retl( ( p )->isEnabled() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -232,7 +276,13 @@ HB_FUNC( QT_QLAYOUT_ISENABLED )
  */
 HB_FUNC( QT_QLAYOUT_ITEMAT )
 {
-   hb_retptrGC( hbqt_gcAllocate_QLayoutItem( hbqt_par_QLayout( 1 )->itemAt( hb_parni( 2 ) ), false ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QLayoutItem( ( p )->itemAt( hb_parni( 2 ) ), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_ITEMAT FP=hb_retptrGC( hbqt_gcAllocate_QLayoutItem( ( p )->itemAt( hb_parni( 2 ) ), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -240,7 +290,13 @@ HB_FUNC( QT_QLAYOUT_ITEMAT )
  */
 HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE )
 {
-   hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ), true ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->maximumSize() ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_MAXIMUMSIZE FP=hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->maximumSize() ), true ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -248,7 +304,13 @@ HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE )
  */
 HB_FUNC( QT_QLAYOUT_MENUBAR )
 {
-   hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QLayout( 1 )->menuBar(), false ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->menuBar(), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_MENUBAR FP=hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->menuBar(), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -256,7 +318,13 @@ HB_FUNC( QT_QLAYOUT_MENUBAR )
  */
 HB_FUNC( QT_QLAYOUT_MINIMUMSIZE )
 {
-   hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ), true ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->minimumSize() ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_MINIMUMSIZE FP=hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->minimumSize() ), true ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -264,7 +332,13 @@ HB_FUNC( QT_QLAYOUT_MINIMUMSIZE )
  */
 HB_FUNC( QT_QLAYOUT_PARENTWIDGET )
 {
-   hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QLayout( 1 )->parentWidget(), false ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->parentWidget(), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_PARENTWIDGET FP=hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->parentWidget(), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -272,7 +346,13 @@ HB_FUNC( QT_QLAYOUT_PARENTWIDGET )
  */
 HB_FUNC( QT_QLAYOUT_REMOVEITEM )
 {
-   hbqt_par_QLayout( 1 )->removeItem( hbqt_par_QLayoutItem( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->removeItem( hbqt_par_QLayoutItem( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_REMOVEITEM FP=( p )->removeItem( hbqt_par_QLayoutItem( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -280,7 +360,13 @@ HB_FUNC( QT_QLAYOUT_REMOVEITEM )
  */
 HB_FUNC( QT_QLAYOUT_REMOVEWIDGET )
 {
-   hbqt_par_QLayout( 1 )->removeWidget( hbqt_par_QWidget( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->removeWidget( hbqt_par_QWidget( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_REMOVEWIDGET FP=( p )->removeWidget( hbqt_par_QWidget( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -288,7 +374,13 @@ HB_FUNC( QT_QLAYOUT_REMOVEWIDGET )
  */
 HB_FUNC( QT_QLAYOUT_SETALIGNMENT )
 {
-   hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retl( ( p )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETALIGNMENT FP=hb_retl( ( p )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -296,7 +388,13 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT )
  */
 HB_FUNC( QT_QLAYOUT_SETALIGNMENT_1 )
 {
-   hbqt_par_QLayout( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETALIGNMENT_1 FP=( p )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -304,7 +402,13 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_1 )
  */
 HB_FUNC( QT_QLAYOUT_SETALIGNMENT_2 )
 {
-   hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retl( ( p )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETALIGNMENT_2 FP=hb_retl( ( p )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -312,7 +416,13 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_2 )
  */
 HB_FUNC( QT_QLAYOUT_SETCONTENTSMARGINS )
 {
-   hbqt_par_QLayout( 1 )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETCONTENTSMARGINS FP=( p )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -320,7 +430,13 @@ HB_FUNC( QT_QLAYOUT_SETCONTENTSMARGINS )
  */
 HB_FUNC( QT_QLAYOUT_SETENABLED )
 {
-   hbqt_par_QLayout( 1 )->setEnabled( hb_parl( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setEnabled( hb_parl( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETENABLED FP=( p )->setEnabled( hb_parl( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -328,7 +444,13 @@ HB_FUNC( QT_QLAYOUT_SETENABLED )
  */
 HB_FUNC( QT_QLAYOUT_SETMENUBAR )
 {
-   hbqt_par_QLayout( 1 )->setMenuBar( hbqt_par_QWidget( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setMenuBar( hbqt_par_QWidget( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETMENUBAR FP=( p )->setMenuBar( hbqt_par_QWidget( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -336,7 +458,13 @@ HB_FUNC( QT_QLAYOUT_SETMENUBAR )
  */
 HB_FUNC( QT_QLAYOUT_SETSIZECONSTRAINT )
 {
-   hbqt_par_QLayout( 1 )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETSIZECONSTRAINT FP=( p )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -344,7 +472,13 @@ HB_FUNC( QT_QLAYOUT_SETSIZECONSTRAINT )
  */
 HB_FUNC( QT_QLAYOUT_SETSPACING )
 {
-   hbqt_par_QLayout( 1 )->setSpacing( hb_parni( 2 ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->setSpacing( hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SETSPACING FP=( p )->setSpacing( hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -352,7 +486,13 @@ HB_FUNC( QT_QLAYOUT_SETSPACING )
  */
 HB_FUNC( QT_QLAYOUT_SIZECONSTRAINT )
 {
-   hb_retni( ( QLayout::SizeConstraint ) hbqt_par_QLayout( 1 )->sizeConstraint() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retni( ( QLayout::SizeConstraint ) ( p )->sizeConstraint() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SIZECONSTRAINT FP=hb_retni( ( QLayout::SizeConstraint ) ( p )->sizeConstraint() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -360,7 +500,13 @@ HB_FUNC( QT_QLAYOUT_SIZECONSTRAINT )
  */
 HB_FUNC( QT_QLAYOUT_SPACING )
 {
-   hb_retni( hbqt_par_QLayout( 1 )->spacing() );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retni( ( p )->spacing() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_SPACING FP=hb_retni( ( p )->spacing() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -368,7 +514,13 @@ HB_FUNC( QT_QLAYOUT_SPACING )
  */
 HB_FUNC( QT_QLAYOUT_TAKEAT )
 {
-   hb_retptrGC( hbqt_gcAllocate_QLayoutItem( hbqt_par_QLayout( 1 )->takeAt( hb_parni( 2 ) ), false ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QLayoutItem( ( p )->takeAt( hb_parni( 2 ) ), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_TAKEAT FP=hb_retptrGC( hbqt_gcAllocate_QLayoutItem( ( p )->takeAt( hb_parni( 2 ) ), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -376,7 +528,13 @@ HB_FUNC( QT_QLAYOUT_TAKEAT )
  */
 HB_FUNC( QT_QLAYOUT_UPDATE )
 {
-   hbqt_par_QLayout( 1 )->update();
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      ( p )->update();
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_UPDATE FP=( p )->update(); p is NULL" ) );
+   }
 }
 
 /*
@@ -384,7 +542,13 @@ HB_FUNC( QT_QLAYOUT_UPDATE )
  */
 HB_FUNC( QT_QLAYOUT_CLOSESTACCEPTABLESIZE )
 {
-   hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ), true ) );
+   QLayout * p = hbqt_par_QLayout( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_CLOSESTACCEPTABLESIZE FP=hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ), true ) ); p is NULL" ) );
+   }
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
index 8619feeded..fed2471a05 100644
--- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
@@ -91,43 +91,44 @@
 
 typedef struct
 {
-   void * ph;
+   QPointer< QTabWidget > ph;
    bool bNew;
    QT_G_FUNC_PTR func;
-   QPointer< QTabWidget > pq;
 } QGC_POINTER_QTabWidget;
 
 QT_G_FUNC( hbqt_gcRelease_QTabWidget )
 {
+   QTabWidget  * ph = NULL ;
    QGC_POINTER_QTabWidget * p = ( QGC_POINTER_QTabWidget * ) Cargo;
 
-   if( p && p->bNew )
+   if( p && p->bNew && p->ph )
    {
-      if( p->ph && p->pq )
+      ph = p->ph;
+      if( ph )
       {
-         const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
+         const QMetaObject * m = ( ph )->metaObject();
          if( ( QString ) m->className() != ( QString ) "QObject" )
          {
-            HB_TRACE( HB_TR_DEBUG, ( "ph=%p YES_rel_QTabWidget   /.\\   pq=%p", p->ph, (void *)(p->pq) ) );
-            delete ( ( QTabWidget * ) p->ph );
-            HB_TRACE( HB_TR_DEBUG, ( "ph=%p YES_rel_QTabWidget   \\./   pq=%p", p->ph, (void *)(p->pq) ) );
+            HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_QTabWidget   /.\\   ", (void*) ph, (void*) p->ph ) );
+            delete ( p->ph );
+            HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_QTabWidget   \\./   ", (void*) ph, (void*) p->ph ) );
             p->ph = NULL;
          }
          else
          {
-            HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_QTabWidget          pq=%p", p->ph, (void *)(p->pq) ) );
+            HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_QTabWidget          ", ph ) );
             p->ph = NULL;
          }
       }
       else
       {
-         HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_QTabWidget    :     Object already deleted!", p->ph ) );
+         HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_QTabWidget    :     Object already deleted!", ph ) );
          p->ph = NULL;
       }
    }
    else
    {
-      HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_QTabWidget    :    Object not created with new=true", p->ph ) );
+      HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_QTabWidget    :    Object not created with new=true", ph ) );
       p->ph = NULL;
    }
 }
@@ -136,13 +137,12 @@ void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew )
 {
    QGC_POINTER_QTabWidget * p = ( QGC_POINTER_QTabWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTabWidget ), hbqt_gcFuncs() );
 
-   p->ph = pObj;
+   new( & p->ph ) QPointer< QTabWidget >( ( QTabWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTabWidget;
 
    if( bNew )
    {
-      new( & p->pq ) QPointer< QTabWidget >( ( QTabWidget * ) pObj );
       HB_TRACE( HB_TR_DEBUG, ( "ph=%p    _new_QTabWidget  under p->pq", pObj ) );
    }
    else
@@ -154,11 +154,11 @@ void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew )
 
 HB_FUNC( QT_QTABWIDGET )
 {
-   void * pObj = NULL;
+   QTabWidget * pObj = NULL;
 
-   pObj = ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ;
+   pObj =  new QTabWidget( hbqt_par_QWidget( 1 ) ) ;
 
-   hb_retptrGC( hbqt_gcAllocate_QTabWidget( pObj, true ) );
+   hb_retptrGC( hbqt_gcAllocate_QTabWidget( ( void * ) pObj, true ) );
 }
 
 /*
@@ -166,14 +166,18 @@ HB_FUNC( QT_QTABWIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_ADDTAB )
 {
-   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
-   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
+   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
+   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
 
+   HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABWIDGET_ADDTAB()" ) );
    if( p && p->ph && q && q->ph )
    {
-      p->bNew = HB_FALSE;
+      HB_TRACE( HB_TR_DEBUG, ( "QT_QTABWIDGET_ADDTAB() Qt object: %p is attached to: %p", p->ph, q->ph ) );
+
+      q->bNew = HB_FALSE;
+
+      hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) ) );
    }
-   hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) );
 }
 
 /*
@@ -181,7 +185,13 @@ HB_FUNC( QT_QTABWIDGET_ADDTAB )
  */
 HB_FUNC( QT_QTABWIDGET_ADDTAB_1 )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ADDTAB_1 FP=hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -189,7 +199,13 @@ HB_FUNC( QT_QTABWIDGET_ADDTAB_1 )
  */
 HB_FUNC( QT_QTABWIDGET_CLEAR )
 {
-   hbqt_par_QTabWidget( 1 )->clear();
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->clear();
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_CLEAR FP=( p )->clear(); p is NULL" ) );
+   }
 }
 
 /*
@@ -197,7 +213,13 @@ HB_FUNC( QT_QTABWIDGET_CLEAR )
  */
 HB_FUNC( QT_QTABWIDGET_CORNERWIDGET )
 {
-   hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QTabWidget( 1 )->cornerWidget( ( HB_ISNUM( 2 ) ? ( Qt::Corner ) hb_parni( 2 ) : ( Qt::Corner ) Qt::TopRightCorner ) ), false ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->cornerWidget( ( HB_ISNUM( 2 ) ? ( Qt::Corner ) hb_parni( 2 ) : ( Qt::Corner ) Qt::TopRightCorner ) ), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_CORNERWIDGET FP=hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->cornerWidget( ( HB_ISNUM( 2 ) ? ( Qt::Corner ) hb_parni( 2 ) : ( Qt::Corner ) Qt::TopRightCorner ) ), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -205,7 +227,13 @@ HB_FUNC( QT_QTABWIDGET_CORNERWIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_COUNT )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->count() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->count() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_COUNT FP=hb_retni( ( p )->count() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -213,7 +241,13 @@ HB_FUNC( QT_QTABWIDGET_COUNT )
  */
 HB_FUNC( QT_QTABWIDGET_CURRENTINDEX )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->currentIndex() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->currentIndex() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_CURRENTINDEX FP=hb_retni( ( p )->currentIndex() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -221,7 +255,13 @@ HB_FUNC( QT_QTABWIDGET_CURRENTINDEX )
  */
 HB_FUNC( QT_QTABWIDGET_CURRENTWIDGET )
 {
-   hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QTabWidget( 1 )->currentWidget(), false ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->currentWidget(), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_CURRENTWIDGET FP=hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->currentWidget(), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -229,7 +269,13 @@ HB_FUNC( QT_QTABWIDGET_CURRENTWIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_DOCUMENTMODE )
 {
-   hb_retl( hbqt_par_QTabWidget( 1 )->documentMode() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retl( ( p )->documentMode() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_DOCUMENTMODE FP=hb_retl( ( p )->documentMode() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -237,7 +283,13 @@ HB_FUNC( QT_QTABWIDGET_DOCUMENTMODE )
  */
 HB_FUNC( QT_QTABWIDGET_ELIDEMODE )
 {
-   hb_retni( ( Qt::TextElideMode ) hbqt_par_QTabWidget( 1 )->elideMode() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( Qt::TextElideMode ) ( p )->elideMode() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ELIDEMODE FP=hb_retni( ( Qt::TextElideMode ) ( p )->elideMode() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -245,7 +297,13 @@ HB_FUNC( QT_QTABWIDGET_ELIDEMODE )
  */
 HB_FUNC( QT_QTABWIDGET_ICONSIZE )
 {
-   hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QTabWidget( 1 )->iconSize() ), true ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->iconSize() ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ICONSIZE FP=hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->iconSize() ), true ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -253,7 +311,13 @@ HB_FUNC( QT_QTABWIDGET_ICONSIZE )
  */
 HB_FUNC( QT_QTABWIDGET_INDEXOF )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->indexOf( hbqt_par_QWidget( 2 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->indexOf( hbqt_par_QWidget( 2 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_INDEXOF FP=hb_retni( ( p )->indexOf( hbqt_par_QWidget( 2 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -261,7 +325,13 @@ HB_FUNC( QT_QTABWIDGET_INDEXOF )
  */
 HB_FUNC( QT_QTABWIDGET_INSERTTAB )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QTabWidget::tr( hb_parc( 4 ) ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QTabWidget::tr( hb_parc( 4 ) ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_INSERTTAB FP=hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QTabWidget::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -269,7 +339,13 @@ HB_FUNC( QT_QTABWIDGET_INSERTTAB )
  */
 HB_FUNC( QT_QTABWIDGET_INSERTTAB_1 )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_INSERTTAB_1 FP=hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -277,7 +353,13 @@ HB_FUNC( QT_QTABWIDGET_INSERTTAB_1 )
  */
 HB_FUNC( QT_QTABWIDGET_ISMOVABLE )
 {
-   hb_retl( hbqt_par_QTabWidget( 1 )->isMovable() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retl( ( p )->isMovable() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ISMOVABLE FP=hb_retl( ( p )->isMovable() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -285,7 +367,13 @@ HB_FUNC( QT_QTABWIDGET_ISMOVABLE )
  */
 HB_FUNC( QT_QTABWIDGET_ISTABENABLED )
 {
-   hb_retl( hbqt_par_QTabWidget( 1 )->isTabEnabled( hb_parni( 2 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retl( ( p )->isTabEnabled( hb_parni( 2 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ISTABENABLED FP=hb_retl( ( p )->isTabEnabled( hb_parni( 2 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -293,7 +381,13 @@ HB_FUNC( QT_QTABWIDGET_ISTABENABLED )
  */
 HB_FUNC( QT_QTABWIDGET_REMOVETAB )
 {
-   hbqt_par_QTabWidget( 1 )->removeTab( hb_parni( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->removeTab( hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_REMOVETAB FP=( p )->removeTab( hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -301,7 +395,13 @@ HB_FUNC( QT_QTABWIDGET_REMOVETAB )
  */
 HB_FUNC( QT_QTABWIDGET_SETCORNERWIDGET )
 {
-   hbqt_par_QTabWidget( 1 )->setCornerWidget( hbqt_par_QWidget( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Corner ) hb_parni( 3 ) : ( Qt::Corner ) Qt::TopRightCorner ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setCornerWidget( hbqt_par_QWidget( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Corner ) hb_parni( 3 ) : ( Qt::Corner ) Qt::TopRightCorner ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETCORNERWIDGET FP=( p )->setCornerWidget( hbqt_par_QWidget( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Corner ) hb_parni( 3 ) : ( Qt::Corner ) Qt::TopRightCorner ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -309,7 +409,13 @@ HB_FUNC( QT_QTABWIDGET_SETCORNERWIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_SETDOCUMENTMODE )
 {
-   hbqt_par_QTabWidget( 1 )->setDocumentMode( hb_parl( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setDocumentMode( hb_parl( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETDOCUMENTMODE FP=( p )->setDocumentMode( hb_parl( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -317,7 +423,13 @@ HB_FUNC( QT_QTABWIDGET_SETDOCUMENTMODE )
  */
 HB_FUNC( QT_QTABWIDGET_SETELIDEMODE )
 {
-   hbqt_par_QTabWidget( 1 )->setElideMode( ( Qt::TextElideMode ) hb_parni( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setElideMode( ( Qt::TextElideMode ) hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETELIDEMODE FP=( p )->setElideMode( ( Qt::TextElideMode ) hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -325,7 +437,13 @@ HB_FUNC( QT_QTABWIDGET_SETELIDEMODE )
  */
 HB_FUNC( QT_QTABWIDGET_SETICONSIZE )
 {
-   hbqt_par_QTabWidget( 1 )->setIconSize( *hbqt_par_QSize( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setIconSize( *hbqt_par_QSize( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETICONSIZE FP=( p )->setIconSize( *hbqt_par_QSize( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -333,7 +451,13 @@ HB_FUNC( QT_QTABWIDGET_SETICONSIZE )
  */
 HB_FUNC( QT_QTABWIDGET_SETMOVABLE )
 {
-   hbqt_par_QTabWidget( 1 )->setMovable( hb_parl( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setMovable( hb_parl( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETMOVABLE FP=( p )->setMovable( hb_parl( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -341,7 +465,13 @@ HB_FUNC( QT_QTABWIDGET_SETMOVABLE )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABENABLED )
 {
-   hbqt_par_QTabWidget( 1 )->setTabEnabled( hb_parni( 2 ), hb_parl( 3 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabEnabled( hb_parni( 2 ), hb_parl( 3 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABENABLED FP=( p )->setTabEnabled( hb_parni( 2 ), hb_parl( 3 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -349,7 +479,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABENABLED )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABICON )
 {
-   hbqt_par_QTabWidget( 1 )->setTabIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABICON FP=( p )->setTabIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -357,7 +493,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABICON )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABPOSITION )
 {
-   hbqt_par_QTabWidget( 1 )->setTabPosition( ( QTabWidget::TabPosition ) hb_parni( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabPosition( ( QTabWidget::TabPosition ) hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABPOSITION FP=( p )->setTabPosition( ( QTabWidget::TabPosition ) hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -365,7 +507,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABPOSITION )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABSHAPE )
 {
-   hbqt_par_QTabWidget( 1 )->setTabShape( ( QTabWidget::TabShape ) hb_parni( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabShape( ( QTabWidget::TabShape ) hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABSHAPE FP=( p )->setTabShape( ( QTabWidget::TabShape ) hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -373,7 +521,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABSHAPE )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABTEXT )
 {
-   hbqt_par_QTabWidget( 1 )->setTabText( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabText( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABTEXT FP=( p )->setTabText( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -381,7 +535,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABTEXT )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABTOOLTIP )
 {
-   hbqt_par_QTabWidget( 1 )->setTabToolTip( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabToolTip( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABTOOLTIP FP=( p )->setTabToolTip( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -389,7 +549,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABTOOLTIP )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABWHATSTHIS )
 {
-   hbqt_par_QTabWidget( 1 )->setTabWhatsThis( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabWhatsThis( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABWHATSTHIS FP=( p )->setTabWhatsThis( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -397,7 +563,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABWHATSTHIS )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABSCLOSABLE )
 {
-   hbqt_par_QTabWidget( 1 )->setTabsClosable( hb_parl( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setTabsClosable( hb_parl( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABSCLOSABLE FP=( p )->setTabsClosable( hb_parl( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -405,7 +577,13 @@ HB_FUNC( QT_QTABWIDGET_SETTABSCLOSABLE )
  */
 HB_FUNC( QT_QTABWIDGET_SETUSESSCROLLBUTTONS )
 {
-   hbqt_par_QTabWidget( 1 )->setUsesScrollButtons( hb_parl( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setUsesScrollButtons( hb_parl( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETUSESSCROLLBUTTONS FP=( p )->setUsesScrollButtons( hb_parl( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -413,7 +591,13 @@ HB_FUNC( QT_QTABWIDGET_SETUSESSCROLLBUTTONS )
  */
 HB_FUNC( QT_QTABWIDGET_TABICON )
 {
-   hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QTabWidget( 1 )->tabIcon( hb_parni( 2 ) ) ), true ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->tabIcon( hb_parni( 2 ) ) ), true ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABICON FP=hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->tabIcon( hb_parni( 2 ) ) ), true ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -421,7 +605,13 @@ HB_FUNC( QT_QTABWIDGET_TABICON )
  */
 HB_FUNC( QT_QTABWIDGET_TABPOSITION )
 {
-   hb_retni( ( QTabWidget::TabPosition ) hbqt_par_QTabWidget( 1 )->tabPosition() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( QTabWidget::TabPosition ) ( p )->tabPosition() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABPOSITION FP=hb_retni( ( QTabWidget::TabPosition ) ( p )->tabPosition() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -429,7 +619,13 @@ HB_FUNC( QT_QTABWIDGET_TABPOSITION )
  */
 HB_FUNC( QT_QTABWIDGET_TABSHAPE )
 {
-   hb_retni( ( QTabWidget::TabShape ) hbqt_par_QTabWidget( 1 )->tabShape() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retni( ( QTabWidget::TabShape ) ( p )->tabShape() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABSHAPE FP=hb_retni( ( QTabWidget::TabShape ) ( p )->tabShape() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -437,7 +633,13 @@ HB_FUNC( QT_QTABWIDGET_TABSHAPE )
  */
 HB_FUNC( QT_QTABWIDGET_TABTEXT )
 {
-   hb_retc( hbqt_par_QTabWidget( 1 )->tabText( hb_parni( 2 ) ).toAscii().data() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retc( ( p )->tabText( hb_parni( 2 ) ).toAscii().data() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABTEXT FP=hb_retc( ( p )->tabText( hb_parni( 2 ) ).toAscii().data() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -445,7 +647,13 @@ HB_FUNC( QT_QTABWIDGET_TABTEXT )
  */
 HB_FUNC( QT_QTABWIDGET_TABTOOLTIP )
 {
-   hb_retc( hbqt_par_QTabWidget( 1 )->tabToolTip( hb_parni( 2 ) ).toAscii().data() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retc( ( p )->tabToolTip( hb_parni( 2 ) ).toAscii().data() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABTOOLTIP FP=hb_retc( ( p )->tabToolTip( hb_parni( 2 ) ).toAscii().data() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -453,7 +661,13 @@ HB_FUNC( QT_QTABWIDGET_TABTOOLTIP )
  */
 HB_FUNC( QT_QTABWIDGET_TABWHATSTHIS )
 {
-   hb_retc( hbqt_par_QTabWidget( 1 )->tabWhatsThis( hb_parni( 2 ) ).toAscii().data() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retc( ( p )->tabWhatsThis( hb_parni( 2 ) ).toAscii().data() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABWHATSTHIS FP=hb_retc( ( p )->tabWhatsThis( hb_parni( 2 ) ).toAscii().data() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -461,7 +675,13 @@ HB_FUNC( QT_QTABWIDGET_TABWHATSTHIS )
  */
 HB_FUNC( QT_QTABWIDGET_TABSCLOSABLE )
 {
-   hb_retl( hbqt_par_QTabWidget( 1 )->tabsClosable() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retl( ( p )->tabsClosable() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_TABSCLOSABLE FP=hb_retl( ( p )->tabsClosable() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -469,7 +689,13 @@ HB_FUNC( QT_QTABWIDGET_TABSCLOSABLE )
  */
 HB_FUNC( QT_QTABWIDGET_USESSCROLLBUTTONS )
 {
-   hb_retl( hbqt_par_QTabWidget( 1 )->usesScrollButtons() );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retl( ( p )->usesScrollButtons() );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_USESSCROLLBUTTONS FP=hb_retl( ( p )->usesScrollButtons() ); p is NULL" ) );
+   }
 }
 
 /*
@@ -477,7 +703,13 @@ HB_FUNC( QT_QTABWIDGET_USESSCROLLBUTTONS )
  */
 HB_FUNC( QT_QTABWIDGET_WIDGET )
 {
-   hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QTabWidget( 1 )->widget( hb_parni( 2 ) ), false ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->widget( hb_parni( 2 ) ), false ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_WIDGET FP=hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->widget( hb_parni( 2 ) ), false ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -485,7 +717,13 @@ HB_FUNC( QT_QTABWIDGET_WIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_SETCURRENTINDEX )
 {
-   hbqt_par_QTabWidget( 1 )->setCurrentIndex( hb_parni( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setCurrentIndex( hb_parni( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETCURRENTINDEX FP=( p )->setCurrentIndex( hb_parni( 2 ) ); p is NULL" ) );
+   }
 }
 
 /*
@@ -493,7 +731,13 @@ HB_FUNC( QT_QTABWIDGET_SETCURRENTINDEX )
  */
 HB_FUNC( QT_QTABWIDGET_SETCURRENTWIDGET )
 {
-   hbqt_par_QTabWidget( 1 )->setCurrentWidget( hbqt_par_QWidget( 2 ) );
+   QTabWidget * p = hbqt_par_QTabWidget( 1 );
+   if( p )
+      ( p )->setCurrentWidget( hbqt_par_QWidget( 2 ) );
+   else
+   {
+      HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETCURRENTWIDGET FP=( p )->setCurrentWidget( hbqt_par_QWidget( 2 ) ); p is NULL" ) );
+   }
 }
 
 
diff --git a/harbour/contrib/hbqt/qth/QLayout.qth b/harbour/contrib/hbqt/qth/QLayout.qth
index 93730807ab..cc6dfecab7 100644
--- a/harbour/contrib/hbqt/qth/QLayout.qth
+++ b/harbour/contrib/hbqt/qth/QLayout.qth
@@ -80,21 +80,18 @@ enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMax
 <PROTOS>
 bool activate ()
 virtual void addItem ( QLayoutItem * item ){
-   QGC_POINTER * p;
-   QGC_POINTER * q;
+   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
+   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
 
    HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLAYOUT_ADDITEM()" ) );
 
-   q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
-   p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
-
    if( p && p->ph && q && q->ph )
    {
-      HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDITEM() Qt oject: %p is attached to: %p", p->ph, q->ph ) );
-      p->bNew = HB_FALSE;
-   }
+      HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) );
+      q->bNew = HB_FALSE;
 
-   hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) );
+      hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) );
+   }
 }
 void addWidget ( QWidget * w )
 QRect contentsRect () const
diff --git a/harbour/contrib/hbqt/qth/QTabWidget.qth b/harbour/contrib/hbqt/qth/QTabWidget.qth
index 7a421d52df..33c23887ae 100644
--- a/harbour/contrib/hbqt/qth/QTabWidget.qth
+++ b/harbour/contrib/hbqt/qth/QTabWidget.qth
@@ -79,18 +79,20 @@ enum TabShape { Rounded, Triangular }
 </ENUMS>
 
 <PROTOS>
-
 int addTab ( QWidget * page, const QString & label ){
-   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
-   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
+   QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
+   QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
 
+   HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABWIDGET_ADDTAB()" ) );
    if( p && p->ph && q && q->ph )
    {
-      p->bNew = HB_FALSE;
-   }
-   hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) );
-}
+      HB_TRACE( HB_TR_DEBUG, ( "QT_QTABWIDGET_ADDTAB() Qt object: %p is attached to: %p", p->ph, q->ph ) );
 
+      q->bNew = HB_FALSE;
+
+      hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) ) );
+   }
+}
 int addTab ( QWidget * page, const QIcon & icon, const QString & label )
 void clear ()
 QWidget * cornerWidget ( Qt::Corner corner = Qt::TopRightCorner ) const