From 82db2de89f5c37918c912197106cf19fcbd1f5fb Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 17 Apr 2010 01:09:20 +0000 Subject: [PATCH] 2010-04-16 18:06 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qtgui/QLayout.cpp * contrib/hbqt/qth/QLayout.qth * contrib/hbqt/generator/hbqtgen.prg + Implemented to pick function body from .qth headers and posted exactly the same within .cpp. Like: QLayout.qth bool activate () // some method before virtual void addItem ( QLayoutItem * item ){ // Code publishes by Istavin. } void addWidget ( QWidget * w ) // some method after or none Note for the opening and closing braces. These must be last character of the method header and first character of the methods last and separate line. This feature facilitates to put the code dierect in headers where we cannot generate it in automated way. This feature is strongly discouraged to be used heavily. --- harbour/ChangeLog | 22 ++ harbour/contrib/hbqt/generator/hbqtgen.prg | 356 +++++++++++---------- harbour/contrib/hbqt/qtgui/QLayout.cpp | 348 +++++--------------- harbour/contrib/hbqt/qth/QLayout.qth | 24 +- 4 files changed, 303 insertions(+), 447 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7522af095b..83c54a2403 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-16 18:06 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/qtgui/QLayout.cpp + * contrib/hbqt/qth/QLayout.qth + * contrib/hbqt/generator/hbqtgen.prg + + Implemented to pick function body from .qth headers and + posted exactly the same within .cpp. Like: + QLayout.qth + + bool activate () // some method before + virtual void addItem ( QLayoutItem * item ){ + // Code publishes by Istavin. + } + void addWidget ( QWidget * w ) // some method after or none + + Note for the opening and closing braces. These must be + last character of the method header and first character + of the methods last and separate line. + + This feature facilitates to put the code dierect in headers + where we cannot generate it in automated way. This feature is + strongly discouraged to be used heavily. + 2010-04-16 07:49 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qth/QApplication.qth * contrib/hbqt/qth/QLayout.qth diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 5f00a70151..09fad974f7 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -290,11 +290,34 @@ STATIC FUNCTION PullOutSection( cQth, cSec ) /*----------------------------------------------------------------------*/ +STATIC FUNCTION PullOutFuncBody( protos_, nFrom ) + LOCAL s, nTo := 0, a_:= {} + + FOR EACH s IN protos_ + IF s:__enumIndex() > nFrom + IF left( s, 1 ) == "}" + nTo := s:__enumIndex() + ENDIF + ENDIF + NEXT + IF nTo > nFrom + FOR EACH s IN protos_ + IF s:__enumIndex() > nFrom .AND. s:__enumIndex() < nTo + aadd( a_, s ) + s := "" + ENDIF + NEXT + ENDIF + + RETURN a_ + +/*----------------------------------------------------------------------*/ + STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) LOCAL cFile, cWidget, cExt, cPath, cOrg, cCPP, cPRG, lConst //, lList, cWgt LOCAL cQth, cFileCpp, s, n, nFuncs, nCnvrtd, n1, i, cFunc, lObject, lDestructor, lList LOCAL b_, txt_, enum_, code_, func_, dummy_, cpp_, cmntd_, doc_, varbls_ - LOCAL class_, cls_, protos_, slots_, enums_, docum_, subCls_, new_, old_ + LOCAL class_, cls_, protos_, slots_, enums_, docum_, subCls_, new_, old_, fBody_ hb_fNameSplit( cProFile, @cPath, @cWidget, @cExt ) @@ -410,8 +433,6 @@ 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 @@ -442,8 +463,12 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) aadd( dummy_, cOrg ) LOOP ENDIF - - IF ParseProto( s, cWidget, @txt_, @doc_, enum_, func_, lList ) + fBody_:={} + IF right( s, 1 ) == "{" + fBody_:= PullOutFuncBody( protos_, s:__enumIndex() ) + s := substr( s, 1, len( s ) - 1 ) + ENDIF + IF ParseProto( s, cWidget, @txt_, @doc_, enum_, func_, fBody_ ) nCnvrtd++ ELSE aadd( dummy_, cOrg ) @@ -532,82 +557,63 @@ 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 - lConst := .f. - FOR i := 3 TO len( new_ ) - 1 - IF left( ltrim( new_[ i ] ), 2 ) != "//" - IF "hb_retptr(" $ new_[ i ] - lConst := .t. - EXIT + 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 ENDIF - ENDIF - NEXT + NEXT - 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 ) + 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_, " " + 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_, " QPointer< "+ cWidget +" > pq;" ) + ENDIF + 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_, " 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_, " }" ) aadd( cpp_, " else" ) aadd( cpp_, " {" ) @@ -620,79 +626,89 @@ 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 - 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_, " }" ) + aadd( cpp_, "}" ) + aadd( cpp_, "" ) ENDIF - 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 - 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 + /* 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 - 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 + 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_, 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 + 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_, "" ) ENDIF - aadd( cpp_, new_[ len( new_ ) ] ) // } - aadd( cpp_, "" ) /* Insert Functions */ aeval( txt_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } ) @@ -762,11 +778,12 @@ 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_, lList ) +STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, 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, FP + LOCAL lSuccess + * LOCAL cInt := 'int,qint16,quint16,QChar,short,ushort' LOCAL cInt := 'int,qint16,quint16,short,ushort' LOCAL cIntLong := 'qint32,quint32,QRgb' LOCAL cIntLongLong := 'qint64,quint64,qlonglong,qulonglong' @@ -1207,33 +1224,32 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, lList ) aadd( txt_, "/*" ) aadd( txt_, " * " + strtran( cProto, chr(13), '' ) ) aadd( txt_, " */" ) + aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) + "_" + upper( cHBFunc ) + " )" ) aadd( txt_, "{" ) - aadd( txt_, " " + cWidget + iif( lList, "< void *>", "" ) + " * p = hbqt_par_" + cWidget + "( 1 );" ) - /* Insert parameters by reference */ - IF ! empty( aPre ) - FOR n := 1 TO len( aPre ) - aadd( txt_, " " + aPre[ n, 1 ] ) - NEXT - aadd( txt_, "" ) - ENDIF + IF !empty( fBody_ ) + aeval( fBody_, {|e| aadd( txt_, e ) } ) - /* One line function body */ - 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_, " }" ) + ELSE + /* Insert parameters by reference */ + IF ! empty( aPre ) + FOR n := 1 TO len( aPre ) + aadd( txt_, " " + aPre[ n, 1 ] ) + NEXT + aadd( txt_, "" ) + ENDIF - /* Return values back to PRG */ - IF ! empty( aPre ) - aadd( txt_, "" ) - FOR n := 1 TO len( aPre ) - aadd( txt_, " " + aPre[ n, 4 ] + "( " + aPre[ n, 3 ] + ", " + hb_ntos( aPre[ n, 2 ] ) + " );" ) - NEXT + /* One line function body */ + aadd( txt_, " "+ cCmd ) + + /* Return values back to PRG */ + IF ! empty( aPre ) + aadd( txt_, "" ) + FOR n := 1 TO len( aPre ) + aadd( txt_, " " + aPre[ n, 4 ] + "( " + aPre[ n, 3 ] + ", " + hb_ntos( aPre[ n, 2 ] ) + " );" ) + NEXT + ENDIF ENDIF aadd( txt_, "}" ) diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp index f730e47dc9..acb7805364 100644 --- a/harbour/contrib/hbqt/qtgui/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp @@ -69,6 +69,15 @@ * enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMaximumSize, SetMinAndMaxSize, SetNoConstraint } */ +/* + * Constructed[ 29/30 [ 96.67% ] ] + * + * *** Unconvered Prototypes *** + * ----------------------------- + * + * } + */ + #include #include @@ -79,10 +88,60 @@ * QLayout () */ +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< QLayout > pq; +} QGC_POINTER_QLayout; + +QT_G_FUNC( hbqt_gcRelease_QLayout ) +{ + HB_SYMBOL_UNUSED( Cargo ); + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + + if( p && p->bNew ) + { + p->ph = NULL; + } +} + +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; + 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 + { + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_QLayout", pObj ) ); + } + return p; +} + +HB_FUNC( QT_QLAYOUT ) +{ +} + /* - * virtual void addItem ( QLayoutItem * item ) = 0 + * bool activate () */ +HB_FUNC( QT_QLAYOUT_ACTIVATE ) +{ + hb_retl( hbqt_par_QLayout( 1 )->activate() ); +} + /* + * virtual void addItem ( QLayoutItem * item ) + */ HB_FUNC( QT_QLAYOUT_ADDITEM ) { QGC_POINTER * p; @@ -101,90 +160,13 @@ HB_FUNC( QT_QLAYOUT_ADDITEM ) hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) ); } -*/ - -typedef struct -{ - QPointer< QLayout > ph; - bool bNew; - QT_G_FUNC_PTR func; -} QGC_POINTER_QLayout; - -QT_G_FUNC( hbqt_gcRelease_QLayout ) -{ - HB_SYMBOL_UNUSED( Cargo ); - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; - - if( p && p->bNew ) - { - p->ph = NULL; - } -} - -void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew ) -{ - QGC_POINTER_QLayout * p = ( QGC_POINTER_QLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QLayout ), hbqt_gcFuncs() ); - - new( & p->ph ) QPointer< QLayout >( ( QLayout * ) pObj ); - p->bNew = bNew; - p->func = hbqt_gcRelease_QLayout; - - if( bNew ) - { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_QLayout under p->pq", pObj ) ); - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_QLayout", pObj ) ); - } - return p; -} - -HB_FUNC( QT_QLAYOUT ) -{ - -} - -/* - * bool activate () - */ -HB_FUNC( QT_QLAYOUT_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" ) ); - } -} - -/* - * virtual void addItem ( QLayoutItem * item ) = 0 - */ -HB_FUNC( QT_QLAYOUT_ADDITEM ) -{ - QLayout * p = hbqt_par_QLayout( 1 ); - if( p ) - ( p )->addItem( hbqt_par_QLayoutItem( 2 ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLAYOUT_ADDITEM FP=( p )->addItem( hbqt_par_QLayoutItem( 2 ) ); p is NULL" ) ); - } -} /* * void addWidget ( QWidget * w ) */ HB_FUNC( QT_QLAYOUT_ADDWIDGET ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ) ); } /* @@ -192,13 +174,7 @@ HB_FUNC( QT_QLAYOUT_ADDWIDGET ) */ HB_FUNC( QT_QLAYOUT_CONTENTSRECT ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ), true ) ); } /* @@ -206,13 +182,7 @@ HB_FUNC( QT_QLAYOUT_CONTENTSRECT ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hb_retni( hbqt_par_QLayout( 1 )->count() ); } /* @@ -220,13 +190,7 @@ HB_FUNC( QT_QLAYOUT_COUNT ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hb_retni( ( Qt::Orientations ) hbqt_par_QLayout( 1 )->expandingDirections() ); } /* @@ -234,18 +198,12 @@ 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; - 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" ) ); - } + hbqt_par_QLayout( 1 )->getContentsMargins( &iLeft, &iTop, &iRight, &iBottom ); hb_storni( iLeft, 2 ); hb_storni( iTop, 3 ); @@ -258,13 +216,7 @@ HB_FUNC( QT_QLAYOUT_GETCONTENTSMARGINS ) */ HB_FUNC( QT_QLAYOUT_INDEXOF ) { - 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" ) ); - } + hb_retni( hbqt_par_QLayout( 1 )->indexOf( hbqt_par_QWidget( 2 ) ) ); } /* @@ -272,13 +224,7 @@ HB_FUNC( QT_QLAYOUT_INDEXOF ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hb_retl( hbqt_par_QLayout( 1 )->isEnabled() ); } /* @@ -286,13 +232,7 @@ HB_FUNC( QT_QLAYOUT_ISENABLED ) */ HB_FUNC( QT_QLAYOUT_ITEMAT ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QLayoutItem( hbqt_par_QLayout( 1 )->itemAt( hb_parni( 2 ) ), false ) ); } /* @@ -300,13 +240,7 @@ HB_FUNC( QT_QLAYOUT_ITEMAT ) */ HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ), true ) ); } /* @@ -314,13 +248,7 @@ HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE ) */ HB_FUNC( QT_QLAYOUT_MENUBAR ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QLayout( 1 )->menuBar(), false ) ); } /* @@ -328,13 +256,7 @@ HB_FUNC( QT_QLAYOUT_MENUBAR ) */ HB_FUNC( QT_QLAYOUT_MINIMUMSIZE ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ), true ) ); } /* @@ -342,13 +264,7 @@ HB_FUNC( QT_QLAYOUT_MINIMUMSIZE ) */ HB_FUNC( QT_QLAYOUT_PARENTWIDGET ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QLayout( 1 )->parentWidget(), false ) ); } /* @@ -356,13 +272,7 @@ HB_FUNC( QT_QLAYOUT_PARENTWIDGET ) */ HB_FUNC( QT_QLAYOUT_REMOVEITEM ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->removeItem( hbqt_par_QLayoutItem( 2 ) ); } /* @@ -370,13 +280,7 @@ HB_FUNC( QT_QLAYOUT_REMOVEITEM ) */ HB_FUNC( QT_QLAYOUT_REMOVEWIDGET ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->removeWidget( hbqt_par_QWidget( 2 ) ); } /* @@ -384,13 +288,7 @@ HB_FUNC( QT_QLAYOUT_REMOVEWIDGET ) */ HB_FUNC( QT_QLAYOUT_SETALIGNMENT ) { - 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" ) ); - } + hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) ); } /* @@ -398,13 +296,7 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT ) */ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_1 ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) ); } /* @@ -412,13 +304,7 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_1 ) */ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_2 ) { - 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" ) ); - } + hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) ); } /* @@ -426,13 +312,7 @@ HB_FUNC( QT_QLAYOUT_SETALIGNMENT_2 ) */ HB_FUNC( QT_QLAYOUT_SETCONTENTSMARGINS ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } /* @@ -440,13 +320,7 @@ HB_FUNC( QT_QLAYOUT_SETCONTENTSMARGINS ) */ HB_FUNC( QT_QLAYOUT_SETENABLED ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setEnabled( hb_parl( 2 ) ); } /* @@ -454,13 +328,7 @@ HB_FUNC( QT_QLAYOUT_SETENABLED ) */ HB_FUNC( QT_QLAYOUT_SETMENUBAR ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setMenuBar( hbqt_par_QWidget( 2 ) ); } /* @@ -468,13 +336,7 @@ HB_FUNC( QT_QLAYOUT_SETMENUBAR ) */ HB_FUNC( QT_QLAYOUT_SETSIZECONSTRAINT ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) ); } /* @@ -482,13 +344,7 @@ HB_FUNC( QT_QLAYOUT_SETSIZECONSTRAINT ) */ HB_FUNC( QT_QLAYOUT_SETSPACING ) { - 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" ) ); - } + hbqt_par_QLayout( 1 )->setSpacing( hb_parni( 2 ) ); } /* @@ -496,13 +352,7 @@ HB_FUNC( QT_QLAYOUT_SETSPACING ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hb_retni( ( QLayout::SizeConstraint ) hbqt_par_QLayout( 1 )->sizeConstraint() ); } /* @@ -510,13 +360,7 @@ HB_FUNC( QT_QLAYOUT_SIZECONSTRAINT ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hb_retni( hbqt_par_QLayout( 1 )->spacing() ); } /* @@ -524,13 +368,7 @@ HB_FUNC( QT_QLAYOUT_SPACING ) */ HB_FUNC( QT_QLAYOUT_TAKEAT ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QLayoutItem( hbqt_par_QLayout( 1 )->takeAt( hb_parni( 2 ) ), false ) ); } /* @@ -538,13 +376,7 @@ HB_FUNC( QT_QLAYOUT_TAKEAT ) */ HB_FUNC( QT_QLAYOUT_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" ) ); - } + hbqt_par_QLayout( 1 )->update(); } /* @@ -552,13 +384,7 @@ HB_FUNC( QT_QLAYOUT_UPDATE ) */ HB_FUNC( QT_QLAYOUT_CLOSESTACCEPTABLESIZE ) { - 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" ) ); - } + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ), true ) ); } diff --git a/harbour/contrib/hbqt/qth/QLayout.qth b/harbour/contrib/hbqt/qth/QLayout.qth index c2ca42b6d5..93730807ab 100644 --- a/harbour/contrib/hbqt/qth/QLayout.qth +++ b/harbour/contrib/hbqt/qth/QLayout.qth @@ -71,13 +71,15 @@ HB_FUNC( QT_QLAYOUT ) { } + -/* - * virtual void addItem ( QLayoutItem * item ) = 0 - */ -/* -HB_FUNC( QT_QLAYOUT_ADDITEM ) -{ + +enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMaximumSize, SetMinAndMaxSize, SetNoConstraint } + + + +bool activate () +virtual void addItem ( QLayoutItem * item ){ QGC_POINTER * p; QGC_POINTER * q; @@ -94,16 +96,6 @@ HB_FUNC( QT_QLAYOUT_ADDITEM ) hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) ); } -*/ - - - -enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMaximumSize, SetMinAndMaxSize, SetNoConstraint } - - - -bool activate () -virtual void addItem ( QLayoutItem * item ) = 0 void addWidget ( QWidget * w ) QRect contentsRect () const virtual int count () const = 0