diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d945b0f43a..96399cb663 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,48 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-18 09:14 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/hbqt.h + * contrib/hbqt/hbqt_base.cpp + * contrib/hbqt/hbqt_destruct.cpp + * contrib/hbqt/hbqt_garbage.h + * contrib/hbqt/hbqt_hbdbfmodel.cpp + * contrib/hbqt/hbqt_hbevents.cpp + * contrib/hbqt/hbqt_hbevents.h + * contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp + * contrib/hbqt/hbqt_hbqsyntaxhighlighter.h + * contrib/hbqt/hbqt_hbqtableview.cpp + * contrib/hbqt/hbqt_hbslots.cpp + * contrib/hbqt/hbqt_hbslots.h + + * contrib/hbqt/qth/HBQTextBlockUserData.qth + * contrib/hbqt/qth/QAbstractItemModel.qth + * contrib/hbqt/qth/QSyntaxHighlighter.qth + * contrib/hbqt/qth/QTableView.qth + + + contrib/hbqt/qth/HBQTableView.qth + + contrib/hbqt/qth/HBDbfModel.qth + + contrib/hbqt/qth/HBQSyntaxHighLighter.qth + + Separated parts to auto/static generation. + + + contrib/hbqt/qth/HBEvents.qth + + contrib/hbqt/qth/HBSlots.qth + + Prepared to bring Events/Slots management on OO level. + Stll not activated as I have some technical issues on + c++ level. Just a matter of time... + + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/generator/qt45.qtp + + + This commit is generally towards separation of static/auto + generated parts of classes which has been hanging in for + manual updates to the structures indivisually if changes + were made effective overhaul. + + * contrib/hbqt/qtcore/* + * contrib/hbqt/qtgui/* + * contrib/hbqt/qtnetwork/* + 2010-01-18 17:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbwince.h * harbour/src/common/hbwince.c diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 6590efd5bd..4a1758d86e 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -565,8 +565,8 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "NO__rel_' + pad( cWidget, 27 ) + 'ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );') aadd( cpp_, " }" ) ELSE - aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" ) - aadd( cpp_, " " ) + aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) Cargo;" ) + aadd( cpp_, " " ) aadd( cpp_, " if( p && p->bNew )" ) aadd( cpp_, " {" ) aadd( cpp_, " if( p->ph )" ) @@ -654,6 +654,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) ENDIF ENDIF aadd( cpp_, new_[ len( new_ ) ] ) // } + aadd( cpp_, "" ) ENDIF /* Insert Functions */ @@ -850,6 +851,10 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) ENDIF DO CASE + CASE aA[ PRT_CAST ] == 'PHB_ITEM' + aA[ PRT_BODY ] := 'hb_param( ' + cHBIdx + ', HB_IT_ANY )' + aA[ PRT_DOC ] := 'x' + cDocNM + CASE aA[ PRT_CAST ] == 'T' aA[ PRT_BODY ] := 'hb_param( ' + cHBIdx + ', HB_IT_ANY )' aA[ PRT_DOC ] := 'x' + cDocNM diff --git a/harbour/contrib/hbqt/generator/qt45.qtp b/harbour/contrib/hbqt/generator/qt45.qtp index e3c48a4366..84de18af07 100644 --- a/harbour/contrib/hbqt/generator/qt45.qtp +++ b/harbour/contrib/hbqt/generator/qt45.qtp @@ -14,7 +14,13 @@ -D=../doc +HBDbfModel.qth +HBEvents.qth +HBQSyntaxHighlighter.qth +HBQTableView.qth HBQTextBlockUserData.qth +HBSlots.qth + QAbstractButton.qth QAbstractItemDelegate.qth QAbstractItemModel.qth diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 99c16aa7d7..0dc0f870b5 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -82,6 +82,7 @@ extern const HB_GC_FUNCS * hbqt_gcFuncs( void ); extern int hbqt_getmemused( void ); extern void * hbqt_pPtrFromObj( int iParam ); +extern void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #include "hbqt_garbage.h" diff --git a/harbour/contrib/hbqt/hbqt_base.cpp b/harbour/contrib/hbqt/hbqt_base.cpp index fc7b084b10..3cc8cec9fe 100644 --- a/harbour/contrib/hbqt/hbqt_base.cpp +++ b/harbour/contrib/hbqt/hbqt_base.cpp @@ -78,6 +78,16 @@ HB_FUNC( QT_FINDCHILD ) hb_retptr( object->findChild< QObject * >( hbqt_par_QString( 2 ) ) ); } +HB_FUNC( HBQT_ISEMPTYQTPOINTER ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); + + if( p && p->ph ) + hb_retl( false ); + else + hb_retl( true ); +} + HB_FUNC( HBQT_ISEQUALGCQTPOINTER ) { QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); diff --git a/harbour/contrib/hbqt/hbqt_destruct.cpp b/harbour/contrib/hbqt/hbqt_destruct.cpp index 95de79161d..d0c7629faa 100644 --- a/harbour/contrib/hbqt/hbqt_destruct.cpp +++ b/harbour/contrib/hbqt/hbqt_destruct.cpp @@ -82,6 +82,18 @@ const HB_GC_FUNCS * hbqt_gcFuncs( void ) return &QT_gcFuncs; } +void * hbqt_gcpointerFromItem( PHB_ITEM pObj ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) hb_itemGetPtrGC( pObj, hbqt_gcFuncs() ); + + if( p && p->ph ) + return p->ph; + else if( hb_itemGetPtr( pObj ) ) + return hb_itemGetPtr( pObj ); /* TOFIX: In what cases is this needed? Reference counting to avoid referring to freed pointers? */ + else + return NULL; /* TODO: Still better if RTE. */ +} + void * hbqt_gcpointer( int iParam ) { QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), iParam ); @@ -94,6 +106,22 @@ void * hbqt_gcpointer( int iParam ) return NULL; /* TODO: Still better if RTE. */ } +void * hbqt_pPtrFromItem( PHB_ITEM pObj ) +{ + if( hb_itemType( pObj ) == HB_IT_OBJECT ) + { + hb_vmPushSymbol( hb_dynsymSymbol( hb_dynsymFindName( "PPTR" ) ) ); + hb_vmPush( pObj ); + hb_vmSend( 0 ); + + return hbqt_gcpointer( -1 ); + } + else if( hb_itemType( pObj ) == HB_IT_POINTER ) + return hbqt_gcpointerFromItem( pObj ); + else + return NULL; +} + void * hbqt_pPtrFromObj( int iParam ) { PHB_ITEM pObj = hb_param( iParam, HB_IT_ANY ); diff --git a/harbour/contrib/hbqt/hbqt_garbage.h b/harbour/contrib/hbqt/hbqt_garbage.h index 585c0a63b6..37adb0b2a5 100644 --- a/harbour/contrib/hbqt/hbqt_garbage.h +++ b/harbour/contrib/hbqt/hbqt_garbage.h @@ -8,7 +8,12 @@ /* or the generator tool itself, and run regenarate. */ /* -------------------------------------------------------------------- */ +extern QT_G_FUNC( hbqt_gcRelease_HBDbfModel ); +extern QT_G_FUNC( hbqt_gcRelease_HBEvents ); +extern QT_G_FUNC( hbqt_gcRelease_HBQSyntaxHighlighter ); +extern QT_G_FUNC( hbqt_gcRelease_HBQTableView ); extern QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData ); +extern QT_G_FUNC( hbqt_gcRelease_HBSlots ); extern QT_G_FUNC( hbqt_gcRelease_QAbstractButton ); extern QT_G_FUNC( hbqt_gcRelease_QAbstractItemDelegate ); extern QT_G_FUNC( hbqt_gcRelease_QAbstractItemModel ); @@ -284,7 +289,12 @@ extern QT_G_FUNC( hbqt_gcRelease_QWindowsStyle ); extern QT_G_FUNC( hbqt_gcRelease_QWizard ); extern QT_G_FUNC( hbqt_gcRelease_QWizardPage ); +extern void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QAbstractButton( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew ); diff --git a/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp b/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp index 76faea719d..d7146fe787 100644 --- a/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp +++ b/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp @@ -306,80 +306,4 @@ void HBDbfModel::hbSetRowColumns( int rows, int cols ) iCols = cols; } -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - QPointer< HBDbfModel > pq; -} QGC_POINTER_HBDbfModel; - -static QT_G_FUNC( hbqt_release_HBDbfModel ) -{ - QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) Cargo; - -if( p->bNew ) -{ - if( p && p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( HBDbfModel * ) p->ph ); - p->ph = NULL; - HB_TRACE( HB_TR_DEBUG, ( "release_HBDbfModel Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO release_HBDbfModel Object Name Missing!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBDbfModel Object Already deleted!" ) ); - } -} -else -{ - HB_TRACE( HB_TR_ALWAYS, ( "PTR_rel_HBDbfModel Object not created with - new" ) ); - p->ph = NULL; -} -} - -static void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew ) -{ - QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) hb_gcAllocate( sizeof( QGC_POINTER_HBDbfModel ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = hbqt_release_HBDbfModel; - new( & p->pq ) QPointer< HBDbfModel >( ( HBDbfModel * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " new_HBDbfModel %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - return( p ); -} - -HB_FUNC( QT_HBDBFMODEL ) -{ - void * pObj = NULL; - - pObj = ( HBDbfModel * ) new HBDbfModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ); - - hb_retptrGC( hbqt_gcAllocate_HBDbfModel( pObj, true ) ); -} - -HB_FUNC( QT_HBDBFMODEL_RESET ) -{ - hbqt_par_HBDbfModel( 1 )->reset(); -} - -HB_FUNC( QT_HBDBFMODEL_INDEX ) -{ - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_HBDbfModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), QModelIndex() ) ), true ) ); -} - -HB_FUNC( QT_HBDBFMODEL_HBSETROWCOLUMNS ) -{ - hbqt_par_HBDbfModel( 1 )->hbSetRowColumns( hb_parni( 2 ), hb_parni( 3 ) ); -} - #endif diff --git a/harbour/contrib/hbqt/hbqt_hbevents.cpp b/harbour/contrib/hbqt/hbqt_hbevents.cpp index acb85fd545..b2f000c0a5 100644 --- a/harbour/contrib/hbqt/hbqt_hbevents.cpp +++ b/harbour/contrib/hbqt/hbqt_hbevents.cpp @@ -67,62 +67,6 @@ #include #include -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - QPointer< HBEvents > pq; -} QGC_POINTER_HBEvents; - -static QT_G_FUNC( hbqt_release_HBEvents ) -{ - QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) Cargo; - - if( p && p->bNew ) - { - if( p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( HBEvents * ) p->ph ); - p->ph = NULL; - HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO release_HBEvents Object Name Missing!" ) ); - p->ph = NULL; - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBEvents Object Already deleted!" ) ); - p->ph = NULL; - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBEvents : Object not created with - new" ) ); - p->ph = NULL; - } -} - -static void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ) -{ - QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) hb_gcAllocate( sizeof( QGC_POINTER_HBEvents ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = hbqt_release_HBEvents; - new( & p->pq ) QPointer< HBEvents >( ( HBEvents * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " new_HBEvents %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - return( p ); -} - -/*----------------------------------------------------------------------*/ - HBEvents::HBEvents( QObject * parent ) : QObject( parent ) { } @@ -142,16 +86,85 @@ HBEvents::~HBEvents() listObj[ i ] = NULL; } } - listBlock.clear(); } +bool HBEvents::hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ) +{ + HB_SYMBOL_UNUSED( pObj ); + HB_SYMBOL_UNUSED( iEvent ); + HB_SYMBOL_UNUSED( bBlock ); + + QObject * object = ( QObject* ) hbqt_pPtrFromObj( 1 ); /* get sender */ + + if( object ) + { + PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); + //PHB_ITEM codeblock = hb_itemNew( bBlock ); + + char prop[ 20 ]; + hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", iEvent, "P" ); /* Make it a unique identifier */ + + listBlock << codeblock; + listObj << object; /* TOFIX: Reference to GC collected pointer is stored. */ + + object->setProperty( prop, ( int ) listBlock.size() ); + + return HB_TRUE; + } + return HB_FALSE; +} + +bool HBEvents::hbDisconnect( PHB_ITEM pObj, int iEvent ) +{ + HB_SYMBOL_UNUSED( pObj ); + + QObject * object = ( QObject* ) hbqt_pPtrFromObj( 1 ); + + if( object ) + { + char prop[ 20 ]; + hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", iEvent, "P" ); /* Make it a unique identifier */ + + int i = object->property( prop ).toInt(); + if( i > 0 && i <= listBlock.size() ) + { + hb_itemRelease( listBlock.at( i - 1 ) ); + listBlock[ i - 1 ] = NULL; + listObj[ i - 1 ] = NULL; + object->setProperty( prop, QVariant() ); + + HB_TRACE( HB_TR_DEBUG, ( " QT_EVENTS_DISCONNECT: %i", iEvent ) ); + return HB_TRUE; + } + } + return HB_FALSE; +} + +bool HBEvents::hbClear() +{ + HB_TRACE( HB_TR_DEBUG, ( " HBEvents::hbClear()" ) ); + int i; + + for( i = 0; i < listBlock.size(); i++ ) + { + if( listBlock[ i ] != NULL ) + { + hb_itemRelease( listBlock.at( i ) ); + listBlock[ i ] = NULL; + listObj[ i ] = NULL; + } + } + listBlock.clear(); + return HB_TRUE; +} + bool HBEvents::eventFilter( QObject * object, QEvent * event ) { QEvent::Type eventtype = event->type(); if( ( int ) eventtype == 0 ) - return false; + return HB_FALSE; char prop[ 20 ]; hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", eventtype, "P" ); @@ -159,9 +172,9 @@ bool HBEvents::eventFilter( QObject * object, QEvent * event ) int found = object->property( prop ).toInt(); if( found == 0 ) - return false; + return HB_FALSE; - bool ret = true; + bool ret = HB_TRUE; if( found <= listBlock.size() && listObj.at( found - 1 ) == object && hb_vmRequestReenter() ) { @@ -176,7 +189,6 @@ bool HBEvents::eventFilter( QObject * object, QEvent * event ) if( eventtype == QEvent::Close ) event->ignore(); } - return ret; } @@ -198,15 +210,13 @@ HB_FUNC( QT_EVENTS_CONNECT ) hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */ t_events->listBlock << codeblock; - /* TOFIX: Reference to GC collected pointer is stored. */ - t_events->listObj << object; + t_events->listObj << object; /* TOFIX: Reference to GC collected pointer is stored. */ object->setProperty( prop, ( int ) t_events->listBlock.size() ); bRet = HB_TRUE; } } - hb_retl( bRet ); } @@ -239,7 +249,6 @@ HB_FUNC( QT_EVENTS_DISCONNECT ) } } } - hb_retl( bRet ); } diff --git a/harbour/contrib/hbqt/hbqt_hbevents.h b/harbour/contrib/hbqt/hbqt_hbevents.h index 6d5f131100..861ec16d7e 100644 --- a/harbour/contrib/hbqt/hbqt_hbevents.h +++ b/harbour/contrib/hbqt/hbqt_hbevents.h @@ -74,6 +74,10 @@ public: QList listActv; QList listObj; + bool hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ); + bool hbDisconnect( PHB_ITEM pObj, int iEvent ); + bool hbClear(); + protected: bool eventFilter( QObject * obj, QEvent * event ); diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp index acee3436f9..153a6ff25b 100644 --- a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp +++ b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp @@ -70,15 +70,22 @@ HBQTextBlockUserData::HBQTextBlockUserData() : QTextBlockUserData() HBQTextBlockUserData::~HBQTextBlockUserData() { } -void HBQTextBlockUserData::setData( int iState ) +int HBQTextBlockUserData::hbSetState( int istate ) { - state = iState; + int iCurState = state; + state = istate; + return iCurState; +} +int HBQTextBlockUserData::hbState() +{ + return state; } HBQTextBlockUserData * HBQTextBlockUserData::data( const QTextBlock& block ) { return static_cast( block.userData() ); } +/*----------------------------------------------------------------------*/ HBQSyntaxHighlighter::HBQSyntaxHighlighter( QTextDocument * parent ) : QSyntaxHighlighter( parent ) @@ -90,43 +97,28 @@ HBQSyntaxHighlighter::HBQSyntaxHighlighter( QTextDocument * parent ) commentEndExpression = QRegExp( "\\*/" ); } -void HBQSyntaxHighlighter::setHBRule( QString name, QString pattern, const QTextCharFormat & format ) +void HBQSyntaxHighlighter::hbSetRule( QString name, QString pattern, const QTextCharFormat & format ) { if( pattern != "" ) - hhighlightingRules.insert( name, hHighlightingRule( QRegExp( pattern ), format ) ); + HighlightingRules.insert( name, HighlightingRule( QRegExp( pattern ), format ) ); else - hhighlightingRules.remove( name ); + HighlightingRules.remove( name ); } - -void HBQSyntaxHighlighter::setHBFormat( QString name, const QTextCharFormat & format ) +void HBQSyntaxHighlighter::hbSetFormat( QString name, const QTextCharFormat & format ) { - if( hhighlightingRules.contains( name ) ) + if( HighlightingRules.contains( name ) ) { - hHighlightingRule rule = hhighlightingRules.value( name ); + HighlightingRule rule = HighlightingRules.value( name ); QRegExp reg = rule.pattern; - hhighlightingRules.insert( name, hHighlightingRule( reg, format ) ); + HighlightingRules.insert( name, HighlightingRule( reg, format ) ); } else { - hhighlightingRules.remove( name ); + HighlightingRules.remove( name ); } } - -void HBQSyntaxHighlighter::setHBCompilerDirectives( const QStringList & directives, const QTextCharFormat & format ) -{ - HighlightingRule rule; - - directivesFormat = format; - foreach( const QString &pattern, directives ) - { - rule.pattern = QRegExp( pattern ); - rule.format = directivesFormat; - highlightingRules.append( rule ); - } -} - -void HBQSyntaxHighlighter::setHBMultiLineCommentFormat( const QTextCharFormat & format ) +void HBQSyntaxHighlighter::hbSetMultiLineCommentFormat( const QTextCharFormat & format ) { multiLineCommentFormat = format; } @@ -141,13 +133,12 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text ) QRegExp expression; QTextBlock curBlock( currentBlock() ); bool bMerge = false; - //HBQTextBlockUserData * data = HBQTextBlockUserData::data( curBlock ); HBQTextBlockUserData * data = ( HBQTextBlockUserData * ) curBlock.userData(); if( data ) bMerge = ( data->state == 99 ); - foreach( const hHighlightingRule &rule, hhighlightingRules ) + foreach( const HighlightingRule &rule, HighlightingRules ) { QRegExp expression( rule.pattern ); int index = expression.indexIn( text ); @@ -159,11 +150,13 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text ) if( bMerge ) { - HB_TRACE( HB_TR_ALWAYS, ( "text = %s", ( char * ) &text ) ); - setFormat( index, length, rule.format ); + HB_TRACE( HB_TR_ALWAYS, ( "text = %i", data->state ) ); +// setFormat( index, length, rule.format ); } else + { setFormat( index, length, rule.format ); + } index = expression.indexIn( text, index + length ); } @@ -191,114 +184,4 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text ) } } -typedef struct -{ - void * ph; - QT_G_FUNC_PTR func; - QPointer< HBQSyntaxHighlighter > pq; -} QGC_POINTER_HBQSyntaxHighlighter; - -static QT_G_FUNC( release_HBQSyntaxHighlighter ) -{ - QGC_POINTER_HBQSyntaxHighlighter * p = ( QGC_POINTER_HBQSyntaxHighlighter * ) Cargo; - - HB_TRACE( HB_TR_DEBUG, ( "release_HBQSyntaxHighlighter p=%p", p)); - HB_TRACE( HB_TR_DEBUG, ( "release_HBQSyntaxHighlighter ph=%p pq=%p", p->ph, (void *)(p->pq))); - - if( p && p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( HBQSyntaxHighlighter * ) p->ph ); - HB_TRACE( HB_TR_DEBUG, ( "release_HBQSyntaxHighlighter Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - p->ph = NULL; - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO release_HBQSyntaxHighlighter Object Name Missing!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBQSyntaxHighlighter Object Already deleted!" ) ); - } -} - -static void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj ) -{ - QGC_POINTER_HBQSyntaxHighlighter * p = ( QGC_POINTER_HBQSyntaxHighlighter * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQSyntaxHighlighter ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->func = release_HBQSyntaxHighlighter; - new( & p->pq ) QPointer< HBQSyntaxHighlighter >( ( HBQSyntaxHighlighter * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " new_HBQSyntaxHighlighter %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - return( p ); -} - -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER ) -{ - void * pObj = NULL; - - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) - pObj = new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ; - - hb_retptrGC( hbqt_gcAllocate_HBQSyntaxHighlighter( pObj ) ); -} -/* - * QTextDocument * document () const - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_DOCUMENT ) -{ - hb_retptr( ( QTextDocument* ) hbqt_par_HBQSyntaxHighlighter( 1 )->document() ); -} - -/* - * void setDocument ( QTextDocument * doc ) - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETDOCUMENT ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->setDocument( hbqt_par_QTextDocument( 2 ) ); -} - -/* - * void rehighlight () - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_REHIGHLIGHT ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->rehighlight(); -} - -/* - * void setHBCompilerDirectives( const QStringList & directives, const QTextCharFormat & format ) - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBCOMPILERDIRECTIVES ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->setHBCompilerDirectives( *hbqt_par_QStringList( 2 ), *hbqt_par_QTextCharFormat( 3 ) ); -} - -/* - * void setHBMultiLineCommentFormat( const QTextCharFormat & format ) - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBMULTILINECOMMENTFORMAT ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->setHBMultiLineCommentFormat( *hbqt_par_QTextCharFormat( 2 ) ); -} - -/* - * void setRule( QString name, QString pattern, QTextCharFormat format ); - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBRULE ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->setHBRule( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), *hbqt_par_QTextCharFormat( 4 ) ); -} - -/* - * void setFormat( QString name, const QTextCharFormat & format ); - */ -HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBFORMAT ) -{ - hbqt_par_HBQSyntaxHighlighter( 1 )->setHBFormat( hbqt_par_QString( 2 ), *hbqt_par_QTextCharFormat( 3 ) ); -} - #endif diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h index 8d96f113ee..4780d452c9 100644 --- a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h +++ b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h @@ -69,11 +69,14 @@ public: HBQTextBlockUserData * data( const QTextBlock& block ); - void setData( int state ); + int hbSetState( int state ); + int hbState(); int state; }; +/*----------------------------------------------------------------------*/ + class HBQSyntaxHighlighter : public QSyntaxHighlighter { Q_OBJECT @@ -81,37 +84,27 @@ class HBQSyntaxHighlighter : public QSyntaxHighlighter public: HBQSyntaxHighlighter( QTextDocument *parent = 0 ); - void setHBCompilerDirectives( const QStringList & directives, const QTextCharFormat & format ); - void setHBMultiLineCommentFormat( const QTextCharFormat & format ); - void setHBRule( QString name, QString pattern, const QTextCharFormat & format ); - void setHBFormat( QString name, const QTextCharFormat & format ); + void hbSetMultiLineCommentFormat( const QTextCharFormat & format ); + void hbSetRule( QString name, QString pattern, const QTextCharFormat & format ); + void hbSetFormat( QString name, const QTextCharFormat & format ); protected: void highlightBlock( const QString &text ); - - struct hHighlightingRule - { - hHighlightingRule() - { - } - hHighlightingRule( QRegExp _pattern, const QTextCharFormat & _format ) - { - pattern = _pattern; - format = _format; - } - QRegExp pattern; - QTextCharFormat format; - }; - QMap< QString, hHighlightingRule > hhighlightingRules; - -private: struct HighlightingRule { QRegExp pattern; QTextCharFormat format; + + HighlightingRule() {;} + + HighlightingRule( QRegExp _pattern, const QTextCharFormat & _format ) + { + pattern = _pattern; + format = _format; + } }; - QVector highlightingRules; + QMap< QString, HighlightingRule > HighlightingRules; protected: diff --git a/harbour/contrib/hbqt/hbqt_hbqtableview.cpp b/harbour/contrib/hbqt/hbqt_hbqtableview.cpp index 98b6fdf374..808a544a91 100644 --- a/harbour/contrib/hbqt/hbqt_hbqtableview.cpp +++ b/harbour/contrib/hbqt/hbqt_hbqtableview.cpp @@ -128,72 +128,4 @@ void HBQTableView::scrollTo( const QModelIndex & index, QAbstractItemView::Scrol QTableView::scrollTo( index, hint ); } -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - QPointer< HBQTableView > pq; -} QGC_POINTER_HBQTableView; - -static QT_G_FUNC( release_HBQTableView ) -{ - QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) Cargo; - - if( p->bNew ) - { - HB_TRACE( HB_TR_DEBUG, ( "release_HBQTableView ph=%p pq=%p", p->ph, (void *)(p->pq))); - - if( p && p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( HBQTableView * ) p->ph ); - HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBQTableView ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - p->ph = NULL; - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBQTableView Object Name Missing!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBQTableView Object Already deleted!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBQTableView Object not created with - new" ) ); - p->ph = NULL; - } -} - -static void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew ) -{ - QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQTableView ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = release_HBQTableView; - new( & p->pq ) QPointer< HBQTableView >( ( HBQTableView * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " new_HBQTableView %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - return( p ); -} - -HB_FUNC( QT_HBQTABLEVIEW ) -{ - void * pObj = NULL; - - pObj = new HBQTableView( hbqt_par_QWidget( 1 ) ) ; - - hb_retptrGC( hbqt_gcAllocate_HBQTableView( pObj, true ) ); -} - -HB_FUNC( QT_HBQTABLEVIEW_NAVIGATE ) -{ - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_HBQTableView( 1 )->navigate( hb_parni( 2 ) ) ), true ) ); -} - #endif diff --git a/harbour/contrib/hbqt/hbqt_hbslots.cpp b/harbour/contrib/hbqt/hbqt_hbslots.cpp index 7154711f08..ee55b88bc3 100644 --- a/harbour/contrib/hbqt/hbqt_hbslots.cpp +++ b/harbour/contrib/hbqt/hbqt_hbslots.cpp @@ -326,60 +326,6 @@ static bool disconnect_signal( QObject * object, const char * signal ) /*----------------------------------------------------------------------*/ -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - QPointer< HBSlots > pq; -} QGC_POINTER_HBSlots; - -static QT_G_FUNC( hbqt_release_HBSlots ) -{ - QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) Cargo; - - if( p && p->bNew ) - { - if( p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( HBSlots * ) p->ph ); - p->ph = NULL; - HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO release_HBSlots Object Name Missing!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBSlots : Object Already deleted!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBSlots : Object not created with - new" ) ); - p->ph = NULL; - } -} - -static void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ) -{ - QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) hb_gcAllocate( sizeof( QGC_POINTER_HBSlots ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = hbqt_release_HBSlots; - new( & p->pq ) QPointer< HBSlots >( ( HBSlots * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " new_HBSlots %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - return( p ); -} - -/*----------------------------------------------------------------------*/ - static void hbqt_SlotsExec( HBSlots * t_slots, QObject * object, const char * pszEvent ) { if( object ) @@ -714,6 +660,103 @@ HBSlots::~HBSlots() listBlock.clear(); } +bool HBSlots::hbIsConnected( PHB_ITEM pObj, const char * slot ) +{ + HB_SYMBOL_UNUSED( pObj ); + + QObject * object = ( QObject * ) hbqt_pPtrFromObj( 1 ); + return isConnected( object, slot ); +} + +bool HBSlots::isConnected( QObject * object, const char * slot ) +{ + int i; + + for( i = 0; i < listBlock.size(); i++ ) + { + if( listBlock[ i ] != NULL && listObj[ i ] == object ) + { + if( object->property( slot ).toInt() == i + 1 ) + { + return HB_TRUE; + } + } + } + return HB_FALSE; +} + +bool HBSlots::hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) +{ + HB_SYMBOL_UNUSED( pObj ); + HB_SYMBOL_UNUSED( bBlock ); + + QObject * object = ( QObject * ) hbqt_pPtrFromItem( pObj ); /* get sender */ + + if( object ) + { + if( !isConnected( object, slot ) ) + { +HB_TRACE( HB_TR_ALWAYS, ( "AAA 3 %s %p", slot, object ) ); + bool bConnected = connect_signal( ( QString ) slot, object, this ); +HB_TRACE( HB_TR_ALWAYS, ( "AAA 4" ) ); + if( bConnected ) + { + //PHB_ITEM pBlock = hb_itemNew( hb_param( 3, HB_IT_BLOCK ) ); /* get codeblock */ + PHB_ITEM pBlock = hb_itemNew( bBlock ); /* get codeblock */ +HB_TRACE( HB_TR_ALWAYS, ( "AAA 5" ) ); + listBlock << pBlock; + listObj << object; + + object->setProperty( hb_parcx( 2 ), ( int ) listBlock.size() ); + + return HB_TRUE; + } + } + } + return HB_FALSE; +} + +bool HBSlots::hbDisconnect( PHB_ITEM pObj, const char * signal ) +{ + HB_SYMBOL_UNUSED( pObj ); + + QObject * object = ( QObject* ) hbqt_pPtrFromObj( 1 ); + + if( object ) + { + int i = object->property( signal ).toInt(); + + if( i > 0 && i <= listBlock.size() ) + { + hb_itemRelease( listBlock.at( i - 1 ) ); + listBlock[ i - 1 ] = NULL; + listObj[ i - 1 ] = NULL; + + bool bRet = disconnect_signal( object, signal ); + + HB_TRACE( HB_TR_DEBUG, ( " QT_SLOTS_DISCONNECT: %s %s", bRet ? "YES" : "NO", signal ) ); + + return bRet; + } + } + return HB_FALSE; +} + +bool HBSlots::hbClear() +{ + int i; + + for( i = 0; i < listBlock.size(); i++ ) + { + if( listBlock[ i ] != NULL ) + { + hb_itemRelease( listBlock.at( i ) ); + listBlock[ i ] = NULL; + } + } + listBlock.clear(); + return HB_TRUE; +} /* Generic Key and Mouse Events emitted by subclass objects */ void HBSlots::customContextMenuRequested( const QPoint & pos ) { hbqt_SlotsExecQPoint( this, qobject_cast( sender() ), "customContextMenuRequested(QPoint)", pos ); } void HBSlots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "keyPressEvent()", event ); } diff --git a/harbour/contrib/hbqt/hbqt_hbslots.h b/harbour/contrib/hbqt/hbqt_hbslots.h index d567115be7..28aeff4dc8 100644 --- a/harbour/contrib/hbqt/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/hbqt_hbslots.h @@ -57,12 +57,11 @@ #include "hbapiitm.h" -#include -#include -#include -//#include -#include -#include +#include +#include +#include +#include +#include /*----------------------------------------------------------------------*/ @@ -76,6 +75,12 @@ public: QList listBlock; QList listObj; + bool hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ); + bool hbDisconnect( PHB_ITEM pObj, const char * slot ); + bool hbIsConnected( PHB_ITEM pObj, const char * slot ); + bool isConnected( QObject * object, const char * slot ); + bool hbClear(); + public slots: /* QWidget */ void customContextMenuRequested( const QPoint & pos ); diff --git a/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp new file mode 100644 index 0000000000..b08c97b47b --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp @@ -0,0 +1,172 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +#include + +#include +#include "../hbqt_hbdbfmodel.h" + + +/* + * + * + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< HBDbfModel > pq; +} QGC_POINTER_HBDbfModel; + +QT_G_FUNC( hbqt_gcRelease_HBDbfModel ) +{ + QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) Cargo; + + if( p && p->bNew ) + { + if( p->ph && p->pq ) + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( HBDbfModel * ) p->ph ); + HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBDbfModel ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + p->ph = NULL; + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBDbfModel ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBDbfModel Object already deleted!" ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBDbfModel Object not created with - new" ) ); + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew ) +{ + QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) hb_gcAllocate( sizeof( QGC_POINTER_HBDbfModel ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_HBDbfModel; + + if( bNew ) + { + new( & p->pq ) QPointer< HBDbfModel >( ( HBDbfModel * ) pObj ); + HB_TRACE( HB_TR_DEBUG, ( " _new_HBDbfModel ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + return p; +} + +HB_FUNC( QT_HBDBFMODEL ) +{ + void * pObj = NULL; + + pObj = new HBDbfModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ) ; + + hb_retptrGC( hbqt_gcAllocate_HBDbfModel( pObj, true ) ); +} + +/* + * void hbSetRowColumns( int rows, int cols ) + */ +HB_FUNC( QT_HBDBFMODEL_HBSETROWCOLUMNS ) +{ + hbqt_par_HBDbfModel( 1 )->hbSetRowColumns( hb_parni( 2 ), hb_parni( 3 ) ); +} + +/* + * void reset() + */ +HB_FUNC( QT_HBDBFMODEL_RESET ) +{ + hbqt_par_HBDbfModel( 1 )->reset(); +} + +/* + * QModelIndex index( int row, int column, const QModelIndex & parent = QModelIndex() ) const + */ +HB_FUNC( QT_HBDBFMODEL_INDEX ) +{ + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_HBDbfModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/HBEvents.cpp new file mode 100644 index 0000000000..5582168cad --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/HBEvents.cpp @@ -0,0 +1,173 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +#include + +#include +#include "../hbqt_hbevents.h" + + +/* + * HBEvents() + * ~HBEvents() + * + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< HBEvents > pq; +} QGC_POINTER_HBEvents; + +QT_G_FUNC( hbqt_gcRelease_HBEvents ) +{ + QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) Cargo; + + if( p && p->bNew ) + { + if( p->ph && p->pq ) + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( HBEvents * ) p->ph ); + HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBEvents ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + p->ph = NULL; + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBEvents ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBEvents Object already deleted!" ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBEvents Object not created with - new" ) ); + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ) +{ + QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) hb_gcAllocate( sizeof( QGC_POINTER_HBEvents ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_HBEvents; + + if( bNew ) + { + new( & p->pq ) QPointer< HBEvents >( ( HBEvents * ) pObj ); + HB_TRACE( HB_TR_DEBUG, ( " _new_HBEvents ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + return p; +} + +HB_FUNC( QT_HBEVENTS ) +{ + void * pObj = NULL; + + pObj = new HBEvents() ; + + hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj, true ) ); +} + +/* + * bool hbConnect( PHB_ITEM obj, int event, PHB_ITEM block ) + */ +HB_FUNC( QT_HBEVENTS_HBCONNECT ) +{ + hb_retl( hbqt_par_HBEvents( 1 )->hbConnect( hb_param( 2, HB_IT_ANY ), hb_parni( 3 ), hb_param( 4, HB_IT_ANY ) ) ); +} + +/* + * bool hbDisconnect( PHB_ITEM obj, int event ) + */ +HB_FUNC( QT_HBEVENTS_HBDISCONNECT ) +{ + hb_retl( hbqt_par_HBEvents( 1 )->hbDisconnect( hb_param( 2, HB_IT_ANY ), hb_parni( 3 ) ) ); +} + +/* + * bool hbClear() + */ +HB_FUNC( QT_HBEVENTS_HBCLEAR ) +{ + hb_retl( hbqt_par_HBEvents( 1 )->hbClear() ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/HBSlots.cpp new file mode 100644 index 0000000000..a93576bf31 --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/HBSlots.cpp @@ -0,0 +1,180 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +#include + +#include +#include "../hbqt_hbslots.h" + + +/* + * HBSlots() + * ~HBSlots() + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< HBSlots > pq; +} QGC_POINTER_HBSlots; + +QT_G_FUNC( hbqt_gcRelease_HBSlots ) +{ + QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) Cargo; + + if( p && p->bNew ) + { + if( p->ph && p->pq ) + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( HBSlots * ) p->ph ); + HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBSlots ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + p->ph = NULL; + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBSlots ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBSlots Object already deleted!" ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBSlots Object not created with - new" ) ); + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ) +{ + QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) hb_gcAllocate( sizeof( QGC_POINTER_HBSlots ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_HBSlots; + + if( bNew ) + { + new( & p->pq ) QPointer< HBSlots >( ( HBSlots * ) pObj ); + HB_TRACE( HB_TR_DEBUG, ( " _new_HBSlots ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + return p; +} + +HB_FUNC( QT_HBSLOTS ) +{ + void * pObj = NULL; + + pObj = new HBSlots() ; + + hb_retptrGC( hbqt_gcAllocate_HBSlots( pObj, true ) ); +} + +/* + * bool hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) + */ +HB_FUNC( QT_HBSLOTS_HBCONNECT ) +{ + hb_retl( hbqt_par_HBSlots( 1 )->hbConnect( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ), hb_param( 4, HB_IT_ANY ) ) ); +} + +/* + * bool hbDisconnect( PHB_ITEM obj, const char * slot ) + */ +HB_FUNC( QT_HBSLOTS_HBDISCONNECT ) +{ + hb_retl( hbqt_par_HBSlots( 1 )->hbDisconnect( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ) ) ); +} + +/* + * bool hbIsConnected( PHB_ITEM obj, const char * slot ) + */ +HB_FUNC( QT_HBSLOTS_HBISCONNECTED ) +{ + hb_retl( hbqt_par_HBSlots( 1 )->hbIsConnected( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ) ) ); +} + +/* + * bool hbClear() + */ +HB_FUNC( QT_HBSLOTS_HBCLEAR ) +{ + hb_retl( hbqt_par_HBSlots( 1 )->hbClear() ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp index 1bff8314aa..16c3f8d1c0 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp @@ -87,7 +87,6 @@ #include #include -#include "../hbqt_hbdbfmodel.h" /* * QAbstractItemModel ( QObject * parent = 0 ) @@ -128,6 +127,7 @@ void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTITEMMODEL ) { } + /* * virtual QModelIndex buddy ( const QModelIndex & index ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp index dd7200aaa1..ef21a8abca 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTLISTMODEL ) { } + /* * virtual QModelIndex index ( int row, int column = 0, const QModelIndex & parent = QModelIndex() ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp index ab1ecfaee8..ec91505a61 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTTABLEMODEL ) { } + /* * virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/QBitArray.cpp index 603f7ee33c..78834a4c50 100644 --- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QBitArray.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QBitArray ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QBITARRAY ) hb_retptrGC( hbqt_gcAllocate_QBitArray( pObj, true ) ); } + /* * bool at ( int i ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/QByteArray.cpp index 7156168f90..2a484fea10 100644 --- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QByteArray.cpp @@ -103,7 +103,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QByteArray ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -148,6 +148,7 @@ HB_FUNC( QT_QBYTEARRAY ) hb_retptrGC( hbqt_gcAllocate_QByteArray( pObj, true ) ); } + /* * QByteArray & append ( const QByteArray & ba ) */ diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp index 4dd17084b1..4efde6a463 100644 --- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp @@ -113,6 +113,7 @@ void * hbqt_gcAllocate_QCoreApplication( void * pObj, bool bNew ) HB_FUNC( QT_QCOREAPPLICATION ) { } + /* * virtual bool notify ( QObject * receiver, QEvent * event ) */ diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/QDataStream.cpp index e1cef49283..587f7d1677 100644 --- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QDataStream.cpp @@ -93,7 +93,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QDataStream ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QDATASTREAM ) hb_retptrGC( hbqt_gcAllocate_QDataStream( pObj, true ) ); } + /* * bool atEnd () const */ diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/QDate.cpp index f7f04416bb..144583bffd 100644 --- a/harbour/contrib/hbqt/qtcore/QDate.cpp +++ b/harbour/contrib/hbqt/qtcore/QDate.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QDate ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QDATE ) hb_retptrGC( hbqt_gcAllocate_QDate( pObj, true ) ); } + /* * QDate addDays ( int ndays ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/QDateTime.cpp index e3479059a8..96a2e44761 100644 --- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QDateTime.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QDateTime ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QDATETIME ) hb_retptrGC( hbqt_gcAllocate_QDateTime( pObj, true ) ); } + /* * QDateTime addDays ( int ndays ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/QDir.cpp index 0cfc8352ec..5bd70d0e55 100644 --- a/harbour/contrib/hbqt/qtcore/QDir.cpp +++ b/harbour/contrib/hbqt/qtcore/QDir.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QDir ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QDIR ) hb_retptrGC( hbqt_gcAllocate_QDir( pObj, true ) ); } + /* * QString absoluteFilePath ( const QString & fileName ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/QEvent.cpp index 333b41c8d4..60464f9e94 100644 --- a/harbour/contrib/hbqt/qtcore/QEvent.cpp +++ b/harbour/contrib/hbqt/qtcore/QEvent.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QEVENT ) hb_retptrGC( hbqt_gcAllocate_QEvent( pObj, true ) ); } + /* * void accept () */ diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp index 479eb177a1..ab269500b6 100644 --- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp +++ b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp @@ -145,6 +145,7 @@ HB_FUNC( QT_QEVENTLOOP ) hb_retptrGC( hbqt_gcAllocate_QEventLoop( pObj, true ) ); } + /* * int exec ( ProcessEventsFlags flags = AllEvents ) */ diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/QFile.cpp index 5845f0ed95..a7c38d0925 100644 --- a/harbour/contrib/hbqt/qtcore/QFile.cpp +++ b/harbour/contrib/hbqt/qtcore/QFile.cpp @@ -153,6 +153,7 @@ HB_FUNC( QT_QFILE ) hb_retptrGC( hbqt_gcAllocate_QFile( pObj, true ) ); } + /* * virtual bool atEnd () const */ diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp index d4a55b567b..7cf8078d56 100644 --- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp +++ b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFileInfo ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QFILEINFO ) hb_retptrGC( hbqt_gcAllocate_QFileInfo( pObj, true ) ); } + /* * QDir absoluteDir () const */ diff --git a/harbour/contrib/hbqt/qtcore/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/QIODevice.cpp index 61d634bc59..d45de0a5b5 100644 --- a/harbour/contrib/hbqt/qtcore/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/QIODevice.cpp @@ -114,6 +114,7 @@ void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew ) HB_FUNC( QT_QIODEVICE ) { } + /* * virtual bool atEnd () const */ diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp index a58cb98f8d..0bbceb63e6 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLatin1Char ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QLATIN1CHAR ) hb_retptrGC( hbqt_gcAllocate_QLatin1Char( pObj, true ) ); } + /* * char toLatin1 () const */ diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp index 0fba86069e..0414943d77 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLatin1String ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QLATIN1STRING ) hb_retptrGC( hbqt_gcAllocate_QLatin1String( pObj, true ) ); } + /* * const char * latin1 () const */ diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/QLine.cpp index 072cb978c7..ed1aa0dd10 100644 --- a/harbour/contrib/hbqt/qtcore/QLine.cpp +++ b/harbour/contrib/hbqt/qtcore/QLine.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLine ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -146,6 +146,7 @@ HB_FUNC( QT_QLINE ) hb_retptrGC( hbqt_gcAllocate_QLine( pObj, true ) ); } + /* * QPoint p1 () const */ diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/QLineF.cpp index 6fa3ec8e8a..eb3fe3b73a 100644 --- a/harbour/contrib/hbqt/qtcore/QLineF.cpp +++ b/harbour/contrib/hbqt/qtcore/QLineF.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLineF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QLINEF ) hb_retptrGC( hbqt_gcAllocate_QLineF( pObj, true ) ); } + /* * QPointF p1 () const */ diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/QList.cpp index 242449f62c..b340b3178b 100644 --- a/harbour/contrib/hbqt/qtcore/QList.cpp +++ b/harbour/contrib/hbqt/qtcore/QList.cpp @@ -112,7 +112,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QList ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -158,6 +158,7 @@ HB_FUNC( QT_QLIST ) hb_retptrGC( hbqt_gcAllocate_QList( pObj, true ) ); } + /* * void append ( const T & value ) */ diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/QLocale.cpp index 1c1f2c9f9a..2111416729 100644 --- a/harbour/contrib/hbqt/qtcore/QLocale.cpp +++ b/harbour/contrib/hbqt/qtcore/QLocale.cpp @@ -114,7 +114,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLocale ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -159,6 +159,7 @@ HB_FUNC( QT_QLOCALE ) hb_retptrGC( hbqt_gcAllocate_QLocale( pObj, true ) ); } + /* * QString amText () const */ diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/QMimeData.cpp index b7e509890d..a834b27c55 100644 --- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp +++ b/harbour/contrib/hbqt/qtcore/QMimeData.cpp @@ -150,6 +150,7 @@ HB_FUNC( QT_QMIMEDATA ) hb_retptrGC( hbqt_gcAllocate_QMimeData( pObj, true ) ); } + /* * void clear () */ diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp index 4b2be4c1f1..0e0dc074bb 100644 --- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp +++ b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QModelIndex ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QMODELINDEX ) hb_retptrGC( hbqt_gcAllocate_QModelIndex( pObj, true ) ); } + /* * QModelIndex child ( int row, int column ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/QObject.cpp index d1dbc2c815..e3cc8de996 100644 --- a/harbour/contrib/hbqt/qtcore/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/QObject.cpp @@ -157,6 +157,7 @@ HB_FUNC( QT_QOBJECT ) hb_retptrGC( hbqt_gcAllocate_QObject( pObj, true ) ); } + /* * bool blockSignals ( bool block ) */ diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/QPoint.cpp index 0e5bd1249e..315c0a93af 100644 --- a/harbour/contrib/hbqt/qtcore/QPoint.cpp +++ b/harbour/contrib/hbqt/qtcore/QPoint.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPoint ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -142,6 +142,7 @@ HB_FUNC( QT_QPOINT ) hb_retptrGC( hbqt_gcAllocate_QPoint( pObj, true ) ); } + /* * bool isNull () const */ diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/QPointF.cpp index 06c1330d40..c0070ce24a 100644 --- a/harbour/contrib/hbqt/qtcore/QPointF.cpp +++ b/harbour/contrib/hbqt/qtcore/QPointF.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPointF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -142,6 +142,7 @@ HB_FUNC( QT_QPOINTF ) hb_retptrGC( hbqt_gcAllocate_QPointF( pObj, true ) ); } + /* * bool isNull () const */ diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/QProcess.cpp index 9a20b72b3e..186f8952a9 100644 --- a/harbour/contrib/hbqt/qtcore/QProcess.cpp +++ b/harbour/contrib/hbqt/qtcore/QProcess.cpp @@ -158,6 +158,7 @@ HB_FUNC( QT_QPROCESS ) hb_retptrGC( hbqt_gcAllocate_QProcess( pObj, true ) ); } + /* * virtual void close () */ diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/QRect.cpp index a308cd01cb..efe3fb789a 100644 --- a/harbour/contrib/hbqt/qtcore/QRect.cpp +++ b/harbour/contrib/hbqt/qtcore/QRect.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QRect ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -148,6 +148,7 @@ HB_FUNC( QT_QRECT ) hb_retptrGC( hbqt_gcAllocate_QRect( pObj, true ) ); } + /* * void adjust ( int dx1, int dy1, int dx2, int dy2 ) */ diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/QRectF.cpp index d1b8b6c08b..f1cc2fd248 100644 --- a/harbour/contrib/hbqt/qtcore/QRectF.cpp +++ b/harbour/contrib/hbqt/qtcore/QRectF.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QRectF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -149,6 +149,7 @@ HB_FUNC( QT_QRECTF ) hb_retptrGC( hbqt_gcAllocate_QRectF( pObj, true ) ); } + /* * void adjust ( qreal dx1, qreal dy1, qreal dx2, qreal dy2 ) */ diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/QRegExp.cpp index 52611b42e1..29efc07d11 100644 --- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp +++ b/harbour/contrib/hbqt/qtcore/QRegExp.cpp @@ -91,7 +91,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QRegExp ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -136,6 +136,7 @@ HB_FUNC( QT_QREGEXP ) hb_retptrGC( hbqt_gcAllocate_QRegExp( pObj, true ) ); } + /* * QString cap ( int nth = 0 ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/QResource.cpp index 9ed75207c1..38595ce9e2 100644 --- a/harbour/contrib/hbqt/qtcore/QResource.cpp +++ b/harbour/contrib/hbqt/qtcore/QResource.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QResource ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QRESOURCE ) hb_retptrGC( hbqt_gcAllocate_QResource( pObj, true ) ); } + /* * QString absoluteFilePath () const */ diff --git a/harbour/contrib/hbqt/qtcore/QSettings.cpp b/harbour/contrib/hbqt/qtcore/QSettings.cpp index 0b1907e488..40a3f02845 100644 --- a/harbour/contrib/hbqt/qtcore/QSettings.cpp +++ b/harbour/contrib/hbqt/qtcore/QSettings.cpp @@ -161,6 +161,7 @@ HB_FUNC( QT_QSETTINGS ) hb_retptrGC( hbqt_gcAllocate_QSettings( pObj, true ) ); } + /* * QStringList allKeys () const */ diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp index 54010c7bce..11f9e30361 100644 --- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSIGNALMAPPER ) hb_retptrGC( hbqt_gcAllocate_QSignalMapper( pObj, true ) ); } + /* * QObject * mapping ( int id ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/QSize.cpp index 35052b31c8..8395a66bee 100644 --- a/harbour/contrib/hbqt/qtcore/QSize.cpp +++ b/harbour/contrib/hbqt/qtcore/QSize.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QSize ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -142,6 +142,7 @@ HB_FUNC( QT_QSIZE ) hb_retptrGC( hbqt_gcAllocate_QSize( pObj, true ) ); } + /* * int height () const */ diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/QSizeF.cpp index 0a09332c16..89f9261657 100644 --- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp +++ b/harbour/contrib/hbqt/qtcore/QSizeF.cpp @@ -87,7 +87,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QSizeF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QSIZEF ) hb_retptrGC( hbqt_gcAllocate_QSizeF( pObj, true ) ); } + /* * QSizeF boundedTo ( const QSizeF & otherSize ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/QStringList.cpp index 0eff186a4d..31ceb19005 100644 --- a/harbour/contrib/hbqt/qtcore/QStringList.cpp +++ b/harbour/contrib/hbqt/qtcore/QStringList.cpp @@ -105,7 +105,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStringList ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -150,6 +150,7 @@ HB_FUNC( QT_QSTRINGLIST ) hb_retptrGC( hbqt_gcAllocate_QStringList( pObj, true ) ); } + /* * void append ( const QString & value ) */ diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp index f7ff897e0e..57e41c3284 100644 --- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextBoundaryFinder ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QTEXTBOUNDARYFINDER ) hb_retptrGC( hbqt_gcAllocate_QTextBoundaryFinder( pObj, true ) ); } + /* * BoundaryReasons boundaryReasons () const */ diff --git a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp index 98e85ecee5..83c84060e1 100644 --- a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp @@ -125,6 +125,7 @@ void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTCODEC ) { } + /* * bool canEncode ( QChar ch ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp index 22964bb7ba..5ddfb261d5 100644 --- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextDecoder ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QTEXTDECODER ) hb_retptrGC( hbqt_gcAllocate_QTextDecoder( pObj, true ) ); } + /* * QString toUnicode ( const char * chars, int len ) */ diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp index 637993767f..e6a68a90ee 100644 --- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextEncoder ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QTEXTENCODER ) hb_retptrGC( hbqt_gcAllocate_QTextEncoder( pObj, true ) ); } + /* * QByteArray fromUnicode ( const QString & str ) */ diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/QTextStream.cpp index 6af5c46e21..ac2dd394fa 100644 --- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextStream.cpp @@ -105,7 +105,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextStream ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -150,6 +150,7 @@ HB_FUNC( QT_QTEXTSTREAM ) hb_retptrGC( hbqt_gcAllocate_QTextStream( pObj, true ) ); } + /* * bool atEnd () const */ diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp index 475603594b..f7e449512d 100644 --- a/harbour/contrib/hbqt/qtcore/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/QThread.cpp @@ -143,6 +143,7 @@ HB_FUNC( QT_QTHREAD ) hb_retptrGC( hbqt_gcAllocate_QThread( pObj, true ) ); } + /* * void exit ( int returnCode = 0 ) */ diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/QTime.cpp index 349539232a..1db9f1f1ab 100644 --- a/harbour/contrib/hbqt/qtcore/QTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QTime.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTime ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QTIME ) hb_retptrGC( hbqt_gcAllocate_QTime( pObj, true ) ); } + /* * QTime addMSecs ( int ms ) const */ diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/QTimer.cpp index db877ebaf0..04e6ec1e2b 100644 --- a/harbour/contrib/hbqt/qtcore/QTimer.cpp +++ b/harbour/contrib/hbqt/qtcore/QTimer.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QTIMER ) hb_retptrGC( hbqt_gcAllocate_QTimer( pObj, true ) ); } + /* * int interval () const */ diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/QTranslator.cpp index 60a9e62ce9..64b6a96bea 100644 --- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp +++ b/harbour/contrib/hbqt/qtcore/QTranslator.cpp @@ -139,6 +139,7 @@ HB_FUNC( QT_QTRANSLATOR ) hb_retptrGC( hbqt_gcAllocate_QTranslator( pObj, true ) ); } + /* * virtual bool isEmpty () const */ diff --git a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp index 1ee7b427f8..ffceb637c6 100644 --- a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp +++ b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QUILOADER ) hb_retptrGC( hbqt_gcAllocate_QUiLoader( pObj, true ) ); } + /* * void addPluginPath ( const QString & path ) */ diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp index 0b664b50e7..b67a3fdf40 100644 --- a/harbour/contrib/hbqt/qtcore/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp @@ -119,7 +119,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QUrl ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -164,6 +164,7 @@ HB_FUNC( QT_QURL ) hb_retptrGC( hbqt_gcAllocate_QUrl( pObj, true ) ); } + /* * void addEncodedQueryItem ( const QByteArray & key, const QByteArray & value ) */ diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp index 4ff19e8bd4..089c7913a8 100644 --- a/harbour/contrib/hbqt/qtcore/QVariant.cpp +++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp @@ -148,7 +148,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QVariant ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -193,6 +193,7 @@ HB_FUNC( QT_QVARIANT ) hb_retptrGC( hbqt_gcAllocate_QVariant( pObj, true ) ); } + /* * bool canConvert ( Type t ) const */ diff --git a/harbour/contrib/hbqt/qtcore/THBDbfModel.prg b/harbour/contrib/hbqt/qtcore/THBDbfModel.prg new file mode 100644 index 0000000000..c368e0a53c --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/THBDbfModel.prg @@ -0,0 +1,96 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS HBDbfModel INHERIT HbQtObjectHandler, QAbstractItemModel + + METHOD new( ... ) + + METHOD hbSetRowColumns( nRows, nCols ) + METHOD reset() + METHOD index( nRow, nColumn, pParent ) + + ENDCLASS + + +METHOD HBDbfModel:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_HBDbfModel( ... ) + RETURN Self + + +METHOD HBDbfModel:hbSetRowColumns( nRows, nCols ) + RETURN Qt_HBDbfModel_hbSetRowColumns( ::pPtr, nRows, nCols ) + + +METHOD HBDbfModel:reset() + RETURN Qt_HBDbfModel_reset( ::pPtr ) + + +METHOD HBDbfModel:index( nRow, nColumn, pParent ) + RETURN Qt_HBDbfModel_index( ::pPtr, nRow, nColumn, hbqt_ptr( pParent ) ) + diff --git a/harbour/contrib/hbqt/qtcore/THBEvents.prg b/harbour/contrib/hbqt/qtcore/THBEvents.prg new file mode 100644 index 0000000000..413566977e --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/THBEvents.prg @@ -0,0 +1,96 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS HBEvents INHERIT HbQtObjectHandler, QObject + + METHOD new( ... ) + + METHOD hbConnect( xObj, nEvent, xBlock ) + METHOD hbDisconnect( xObj, nEvent ) + METHOD hbClear() + + ENDCLASS + + +METHOD HBEvents:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_HBEvents( ... ) + RETURN Self + + +METHOD HBEvents:hbConnect( xObj, nEvent, xBlock ) + RETURN Qt_HBEvents_hbConnect( ::pPtr, xObj, nEvent, xBlock ) + + +METHOD HBEvents:hbDisconnect( xObj, nEvent ) + RETURN Qt_HBEvents_hbDisconnect( ::pPtr, xObj, nEvent ) + + +METHOD HBEvents:hbClear() + RETURN Qt_HBEvents_hbClear( ::pPtr ) + diff --git a/harbour/contrib/hbqt/qtcore/THBSlots.prg b/harbour/contrib/hbqt/qtcore/THBSlots.prg new file mode 100644 index 0000000000..e7f617d682 --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/THBSlots.prg @@ -0,0 +1,101 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS HBSlots INHERIT HbQtObjectHandler, QObject + + METHOD new( ... ) + + METHOD hbConnect( xPObj, pSlot, xBBlock ) + METHOD hbDisconnect( xObj, pSlot ) + METHOD hbIsConnected( xObj, pSlot ) + METHOD hbClear() + + ENDCLASS + + +METHOD HBSlots:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_HBSlots( ... ) + RETURN Self + + +METHOD HBSlots:hbConnect( xPObj, pSlot, xBBlock ) + RETURN Qt_HBSlots_hbConnect( ::pPtr, xPObj, hbqt_ptr( pSlot ), xBBlock ) + + +METHOD HBSlots:hbDisconnect( xObj, pSlot ) + RETURN Qt_HBSlots_hbDisconnect( ::pPtr, xObj, hbqt_ptr( pSlot ) ) + + +METHOD HBSlots:hbIsConnected( xObj, pSlot ) + RETURN Qt_HBSlots_hbIsConnected( ::pPtr, xObj, hbqt_ptr( pSlot ) ) + + +METHOD HBSlots:hbClear() + RETURN Qt_HBSlots_hbClear( ::pPtr ) + diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg index f44663dbae..68093293d7 100644 --- a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg +++ b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg @@ -239,28 +239,3 @@ METHOD QAbstractItemModel:revert() METHOD QAbstractItemModel:submit() RETURN Qt_QAbstractItemModel_submit( ::pPtr ) - - -CREATE CLASS HBDbfModel INHERIT QAbstractItemModel - - METHOD new( bBlock ) - METHOD reset() - METHOD index( nRow, nCol ) - METHOD hbSetRowColumns( nRows, nCols ) - - ENDCLASS - -METHOD HBDbfModel:new( bBlock ) - ::pPtr := Qt_HBDbfModel( bBlock ) - RETURN Self - -METHOD HBDbfModel:reset() - RETURN Qt_HBDbfModel_reset( ::pPtr ) - -METHOD HBDbfModel:index( nRow, nCol ) - RETURN Qt_HBDbfModel_index( ::pPtr, nRow, nCol, 0 ) - -METHOD HBDbfModel:hbSetRowColumns( nRows, nCols ) - RETURN Qt_HBDbfModel_hbSetRowColumns( ::pPtr, nRows, nCols ) - - diff --git a/harbour/contrib/hbqt/qtcore/filelist.mk b/harbour/contrib/hbqt/qtcore/filelist.mk index 5d150c0bc0..90d94f4035 100644 --- a/harbour/contrib/hbqt/qtcore/filelist.mk +++ b/harbour/contrib/hbqt/qtcore/filelist.mk @@ -9,6 +9,9 @@ # -------------------------------------------------------------------- CPP_SOURCES := \ + HBDbfModel.cpp \ + HBEvents.cpp \ + HBSlots.cpp \ QAbstractItemModel.cpp \ QAbstractListModel.cpp \ QAbstractTableModel.cpp \ @@ -61,6 +64,9 @@ CPP_SOURCES := \ PRG_SOURCES := \ + THBDbfModel.prg \ + THBEvents.prg \ + THBSlots.prg \ TQAbstractItemModel.prg \ TQAbstractListModel.prg \ TQAbstractTableModel.prg \ diff --git a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp new file mode 100644 index 0000000000..2ef7ca9033 --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp @@ -0,0 +1,171 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +#include + +#include +#include "../hbqt_hbqsyntaxhighlighter.h" + +/* + * + * + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< HBQSyntaxHighlighter > pq; +} QGC_POINTER_HBQSyntaxHighlighter; + +QT_G_FUNC( hbqt_gcRelease_HBQSyntaxHighlighter ) +{ + QGC_POINTER_HBQSyntaxHighlighter * p = ( QGC_POINTER_HBQSyntaxHighlighter * ) Cargo; + + if( p && p->bNew ) + { + if( p->ph && p->pq ) + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( HBQSyntaxHighlighter * ) p->ph ); + HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBQSyntaxHighlighter ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + p->ph = NULL; + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBQSyntaxHighlighter ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBQSyntaxHighlighter Object already deleted!" ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBQSyntaxHighlighter Object not created with - new" ) ); + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj, bool bNew ) +{ + QGC_POINTER_HBQSyntaxHighlighter * p = ( QGC_POINTER_HBQSyntaxHighlighter * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQSyntaxHighlighter ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_HBQSyntaxHighlighter; + + if( bNew ) + { + new( & p->pq ) QPointer< HBQSyntaxHighlighter >( ( HBQSyntaxHighlighter * ) pObj ); + HB_TRACE( HB_TR_DEBUG, ( " _new_HBQSyntaxHighlighter ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + return p; +} + +HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER ) +{ + void * pObj = NULL; + + pObj = new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ; + + hb_retptrGC( hbqt_gcAllocate_HBQSyntaxHighlighter( pObj, true ) ); +} + +/* + * void hbSetMultiLineCommentFormat( const QTextCharFormat & format ) + */ +HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_HBSETMULTILINECOMMENTFORMAT ) +{ + hbqt_par_HBQSyntaxHighlighter( 1 )->hbSetMultiLineCommentFormat( *hbqt_par_QTextCharFormat( 2 ) ); +} + +/* + * void hbSetRule( QString name, QString pattern, QTextCharFormat & format ) + */ +HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_HBSETRULE ) +{ + hbqt_par_HBQSyntaxHighlighter( 1 )->hbSetRule( HBQSyntaxHighlighter::tr( hb_parc( 2 ) ), HBQSyntaxHighlighter::tr( hb_parc( 3 ) ), *hbqt_par_QTextCharFormat( 4 ) ); +} + +/* + * void hbSetFormat( QString name, const QTextCharFormat & format ) + */ +HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_HBSETFORMAT ) +{ + hbqt_par_HBQSyntaxHighlighter( 1 )->hbSetFormat( HBQSyntaxHighlighter::tr( hb_parc( 2 ) ), *hbqt_par_QTextCharFormat( 3 ) ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp new file mode 100644 index 0000000000..6a0db398ce --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp @@ -0,0 +1,148 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +#include + +#include +#include "../hbqt_hbqtableview.h" + + +/* + * + * + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + QPointer< HBQTableView > pq; +} QGC_POINTER_HBQTableView; + +QT_G_FUNC( hbqt_gcRelease_HBQTableView ) +{ + QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) Cargo; + + if( p && p->bNew ) + { + if( p->ph && p->pq ) + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( HBQTableView * ) p->ph ); + HB_TRACE( HB_TR_DEBUG, ( "YES_rel_HBQTableView ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + p->ph = NULL; + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBQTableView ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBQTableView Object already deleted!" ) ); + } + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBQTableView Object not created with - new" ) ); + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew ) +{ + QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQTableView ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_HBQTableView; + + if( bNew ) + { + new( & p->pq ) QPointer< HBQTableView >( ( HBQTableView * ) pObj ); + HB_TRACE( HB_TR_DEBUG, ( " _new_HBQTableView ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + } + return p; +} + +HB_FUNC( QT_HBQTABLEVIEW ) +{ + void * pObj = NULL; + + pObj = new HBQTableView( hbqt_par_QWidget( 1 ) ) ; + + hb_retptrGC( hbqt_gcAllocate_HBQTableView( pObj, true ) ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp index 1785a4e99b..dc2e528018 100644 --- a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,12 +130,21 @@ HB_FUNC( QT_HBQTEXTBLOCKUSERDATA ) hb_retptrGC( hbqt_gcAllocate_HBQTextBlockUserData( pObj, true ) ); } + /* - * void setData( int state ) + * int hbSetState( int state ) */ -HB_FUNC( QT_HBQTEXTBLOCKUSERDATA_SETDATA ) +HB_FUNC( QT_HBQTEXTBLOCKUSERDATA_HBSETSTATE ) { - hbqt_par_HBQTextBlockUserData( 1 )->setData( hb_parni( 2 ) ); + hb_retni( hbqt_par_HBQTextBlockUserData( 1 )->hbSetState( hb_parni( 2 ) ) ); +} + +/* + * int hbState() + */ +HB_FUNC( QT_HBQTEXTBLOCKUSERDATA_HBSTATE ) +{ + hb_retni( hbqt_par_HBQTextBlockUserData( 1 )->hbState() ); } diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp index 2106cdacf2..a44606cd52 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QAbstractButton( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTBUTTON ) { } + /* * bool autoExclusive () const */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp index e601581dc4..645a5c8971 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp @@ -111,6 +111,7 @@ void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTITEMDELEGATE ) { } + /* * virtual QWidget * createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp index e2290be241..f4bad8a45e 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp @@ -118,6 +118,7 @@ void * hbqt_gcAllocate_QAbstractItemView( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTITEMVIEW ) { } + /* * bool alternatingRowColors () const */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp index 556c25e224..997ec72923 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp @@ -122,6 +122,7 @@ void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTPRINTDIALOG ) { } + /* * virtual int exec () = 0 */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp index 6fd91671c8..1c100732f7 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp @@ -107,6 +107,7 @@ void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTPROXYMODEL ) { } + /* * virtual QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const = 0 */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp index b738116933..5903b8b1ac 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTSCROLLAREA ) { } + /* * void addScrollBarWidget ( QWidget * widget, Qt::Alignment alignment ) */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp index 2353029d66..6663829ee0 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp @@ -112,6 +112,7 @@ void * hbqt_gcAllocate_QAbstractSlider( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTSLIDER ) { } + /* * bool hasTracking () const */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp index f981a5d0d6..be1fb9577a 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp @@ -115,6 +115,7 @@ void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTSPINBOX ) { } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp index 9421b8ed9a..2eee19d84f 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp @@ -107,6 +107,7 @@ void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT ) { } + /* * QString anchorAt ( const QPointF & position ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/QAction.cpp index 4978ee6df1..e39149687f 100644 --- a/harbour/contrib/hbqt/qtgui/QAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QAction.cpp @@ -164,6 +164,7 @@ HB_FUNC( QT_QACTION ) hb_retptrGC( hbqt_gcAllocate_QAction( pObj, true ) ); } + /* * QActionGroup * actionGroup () const */ diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp index e70475496d..f08d9a5b2e 100644 --- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp @@ -151,6 +151,7 @@ HB_FUNC( QT_QACTIONGROUP ) hb_retptrGC( hbqt_gcAllocate_QActionGroup( pObj, true ) ); } + /* * QAction * addAction ( QAction * action ) */ diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp index a922305ce4..77d44b2eca 100644 --- a/harbour/contrib/hbqt/qtgui/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp @@ -221,6 +221,7 @@ HB_FUNC( QT_QAPPLICATION ) hb_retptrGC( hbqt_gcAllocate_QApplication( pObj, true ) ); } + /* * virtual void commitData ( QSessionManager & manager ) */ diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/QBitmap.cpp index ebf7d4cf62..39c938a53e 100644 --- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QBitmap.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QBitmap ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -168,6 +168,7 @@ HB_FUNC( QT_QBITMAP ) hb_retptrGC( hbqt_gcAllocate_QBitmap( pObj, true ) ); } + /* * void clear () */ diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp index 648bd60bc1..7abd1ba0c4 100644 --- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QBOXLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QBoxLayout( pObj, true ) ); } + /* * void addLayout ( QLayout * layout, int stretch = 0 ) */ diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/QBrush.cpp index fd768f9ba8..85f8f7ef6d 100644 --- a/harbour/contrib/hbqt/qtgui/QBrush.cpp +++ b/harbour/contrib/hbqt/qtgui/QBrush.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QBrush ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -191,6 +191,7 @@ HB_FUNC( QT_QBRUSH ) hb_retptrGC( hbqt_gcAllocate_QBrush( pObj, true ) ); } + /* * const QColor & color () const */ diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp index 04e8535044..0147f23a97 100644 --- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp @@ -156,6 +156,7 @@ HB_FUNC( QT_QBUTTONGROUP ) hb_retptrGC( hbqt_gcAllocate_QButtonGroup( pObj, true ) ); } + /* * void addButton ( QAbstractButton * button ) */ diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp index 0c4be321cf..60d46663b1 100644 --- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp @@ -155,6 +155,7 @@ HB_FUNC( QT_QCALENDARWIDGET ) hb_retptrGC( hbqt_gcAllocate_QCalendarWidget( pObj, true ) ); } + /* * int dateEditAcceptDelay () const */ diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp index 2ec6904a32..f0318ee230 100644 --- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp @@ -147,6 +147,7 @@ HB_FUNC( QT_QCHECKBOX ) hb_retptrGC( hbqt_gcAllocate_QCheckBox( pObj, true ) ); } + /* * Qt::CheckState checkState () const */ diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp index 6c2ec5daee..d00bfb6328 100644 --- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp +++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp @@ -119,6 +119,7 @@ HB_FUNC( QT_QCLIPBOARD ) hb_retptr( pObj ); } + /* * void clear ( Mode mode = Clipboard ) */ diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/QColor.cpp index c0fe1e30c3..e00047ea90 100644 --- a/harbour/contrib/hbqt/qtgui/QColor.cpp +++ b/harbour/contrib/hbqt/qtgui/QColor.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QColor ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -173,6 +173,7 @@ HB_FUNC( QT_QCOLOR ) hb_retptrGC( hbqt_gcAllocate_QColor( pObj, true ) ); } + /* * int alpha () const */ diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp index 80e5548bca..5be8ceea6d 100644 --- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp @@ -152,6 +152,7 @@ HB_FUNC( QT_QCOLORDIALOG ) hb_retptrGC( hbqt_gcAllocate_QColorDialog( pObj, true ) ); } + /* * QColor currentColor () const */ diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/QComboBox.cpp index 823d147b69..fb1afec88f 100644 --- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QComboBox.cpp @@ -145,6 +145,7 @@ HB_FUNC( QT_QCOMBOBOX ) hb_retptrGC( hbqt_gcAllocate_QComboBox( pObj, true ) ); } + /* * void addItem ( const QString & text, const QVariant & userData = QVariant() ) */ diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp index 5d7bae216e..51765704ee 100644 --- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QCOMMANDLINKBUTTON ) hb_retptrGC( hbqt_gcAllocate_QCommandLinkButton( pObj, true ) ); } + /* * QString description () const */ diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp index f8cb7be80e..e8c821e701 100644 --- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QCOMMONSTYLE ) hb_retptrGC( hbqt_gcAllocate_QCommonStyle( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/QCompleter.cpp index ba2db21737..3200b22df8 100644 --- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/QCompleter.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QCOMPLETER ) hb_retptrGC( hbqt_gcAllocate_QCompleter( pObj, true ) ); } + /* * Qt::CaseSensitivity caseSensitivity () const */ diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp index 3f1aa6cd33..33ddb8bd4f 100644 --- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QConicalGradient ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QCONICALGRADIENT ) hb_retptrGC( hbqt_gcAllocate_QConicalGradient( pObj, true ) ); } + /* * qreal angle () const */ diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp index 6bbe158cc6..03b824d17c 100644 --- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QContextMenuEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QCONTEXTMENUEVENT ) hb_retptrGC( hbqt_gcAllocate_QContextMenuEvent( pObj, true ) ); } + /* * const QPoint & globalPos () const */ diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp index 94f82df1af..d07720af50 100644 --- a/harbour/contrib/hbqt/qtgui/QCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QCursor ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -165,6 +165,7 @@ HB_FUNC( QT_QCURSOR ) hb_retptrGC( hbqt_gcAllocate_QCursor( pObj, true ) ); } + /* * const QBitmap * bitmap () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp index 9a5df6d92f..3eb358bd68 100644 --- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QDATEEDIT ) hb_retptrGC( hbqt_gcAllocate_QDateEdit( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp index 772b3d4702..b7ac2a4388 100644 --- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp @@ -147,6 +147,7 @@ HB_FUNC( QT_QDATETIMEEDIT ) hb_retptrGC( hbqt_gcAllocate_QDateTimeEdit( pObj, true ) ); } + /* * bool calendarPopup () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp index fa5d821f6f..4153300946 100644 --- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QDESKTOPWIDGET ) hb_retptrGC( hbqt_gcAllocate_QDesktopWidget( pObj, true ) ); } + /* * const QRect availableGeometry ( int screen = -1 ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/QDial.cpp index 9683394847..b29e03fe97 100644 --- a/harbour/contrib/hbqt/qtgui/QDial.cpp +++ b/harbour/contrib/hbqt/qtgui/QDial.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QDIAL ) hb_retptrGC( hbqt_gcAllocate_QDial( pObj, true ) ); } + /* * int notchSize () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/QDialog.cpp index 2ee43dff61..b4bad3318d 100644 --- a/harbour/contrib/hbqt/qtgui/QDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QDialog.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QDIALOG ) hb_retptrGC( hbqt_gcAllocate_QDialog( pObj, true ) ); } + /* * bool isSizeGripEnabled () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/QDirModel.cpp index 7d3d032562..a8e7d2b83e 100644 --- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QDirModel.cpp @@ -145,6 +145,7 @@ HB_FUNC( QT_QDIRMODEL ) hb_retptrGC( hbqt_gcAllocate_QDirModel( pObj, true ) ); } + /* * virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp index bae4e02dd3..5dde8a7afa 100644 --- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QDOCKWIDGET ) hb_retptrGC( hbqt_gcAllocate_QDockWidget( pObj, true ) ); } + /* * Qt::DockWidgetAreas allowedAreas () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp index 3e07157a50..d263da5f8b 100644 --- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp @@ -139,6 +139,7 @@ HB_FUNC( QT_QDOUBLESPINBOX ) hb_retptrGC( hbqt_gcAllocate_QDoubleSpinBox( pObj, true ) ); } + /* * QString cleanText () const */ diff --git a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp index 35cdacce81..4e8e261d74 100644 --- a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp @@ -106,6 +106,7 @@ HB_FUNC( QT_QDRAGENTEREVENT ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp index a35c5faaad..ea114ba392 100644 --- a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp @@ -106,6 +106,7 @@ HB_FUNC( QT_QDRAGLEAVEEVENT ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp index c1dff0b77e..546ed6de43 100644 --- a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QDragMoveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QDRAGMOVEEVENT ) { } + /* * void accept ( const QRect & rectangle ) */ diff --git a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp index 2eecf887cf..9fb0a0742b 100644 --- a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp @@ -105,6 +105,7 @@ void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew ) HB_FUNC( QT_QDROPEVENT ) { } + /* * void acceptProposedAction () */ diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp index f649e26477..cbcd138928 100644 --- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QERRORMESSAGE ) hb_retptrGC( hbqt_gcAllocate_QErrorMessage( pObj, true ) ); } + /* * void showMessage ( const QString & message ) */ diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp index 3306eadf10..bd41c0be41 100644 --- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp @@ -178,6 +178,7 @@ HB_FUNC( QT_QFILEDIALOG ) hb_retptrGC( hbqt_gcAllocate_QFileDialog( pObj, true ) ); } + /* * AcceptMode acceptMode () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp index 242930cae0..79ed14996b 100644 --- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFileIconProvider ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QFILEICONPROVIDER ) hb_retptrGC( hbqt_gcAllocate_QFileIconProvider( pObj, true ) ); } + /* * virtual QIcon icon ( IconType type ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp index e44d64951d..d0638ebbf3 100644 --- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL ) hb_retptrGC( hbqt_gcAllocate_QFileSystemModel( pObj, true ) ); } + /* * virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent ) */ diff --git a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp index 46146744da..8eaf5ce9aa 100644 --- a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp @@ -105,6 +105,7 @@ void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew ) HB_FUNC( QT_QFOCUSEVENT ) { } + /* * bool gotFocus () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp index 3106f2d0d9..bd719b3854 100644 --- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QFOCUSFRAME ) hb_retptrGC( hbqt_gcAllocate_QFocusFrame( pObj, true ) ); } + /* * void setWidget ( QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp index 95770ec6f5..a76e72c3ac 100644 --- a/harbour/contrib/hbqt/qtgui/QFont.cpp +++ b/harbour/contrib/hbqt/qtgui/QFont.cpp @@ -98,7 +98,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFont ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -170,6 +170,7 @@ HB_FUNC( QT_QFONT ) hb_retptrGC( hbqt_gcAllocate_QFont( pObj, true ) ); } + /* * bool bold () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp index 36dba715f5..7135374678 100644 --- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp @@ -145,6 +145,7 @@ HB_FUNC( QT_QFONTCOMBOBOX ) hb_retptrGC( hbqt_gcAllocate_QFontComboBox( pObj, true ) ); } + /* * QFont currentFont () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp index f18af532c3..06f1bd6e34 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp @@ -102,7 +102,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFontDatabase ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -147,6 +147,7 @@ HB_FUNC( QT_QFONTDATABASE ) hb_retptrGC( hbqt_gcAllocate_QFontDatabase( pObj, true ) ); } + /* * bool bold ( const QString & family, const QString & style ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp index 8efa0564f9..ea427e846a 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp @@ -156,6 +156,7 @@ HB_FUNC( QT_QFONTDIALOG ) hb_retptrGC( hbqt_gcAllocate_QFontDialog( pObj, true ) ); } + /* * QFont currentFont () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp index 5bab14c5f3..5f55f1462f 100644 --- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFontInfo ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QFONTINFO ) hb_retptrGC( hbqt_gcAllocate_QFontInfo( pObj, true ) ); } + /* * bool bold () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp index cdd2fc0a88..41e98924ee 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp @@ -87,7 +87,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFontMetrics ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -146,6 +146,7 @@ HB_FUNC( QT_QFONTMETRICS ) hb_retptrGC( hbqt_gcAllocate_QFontMetrics( pObj, true ) ); } + /* * int ascent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp index acc5b45a97..d8eb83de04 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QFontMetricsF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -151,6 +151,7 @@ HB_FUNC( QT_QFONTMETRICSF ) hb_retptrGC( hbqt_gcAllocate_QFontMetricsF( pObj, true ) ); } + /* * qreal ascent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp index 11ed468251..4185faab89 100644 --- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QFORMLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QFormLayout( pObj, true ) ); } + /* * void addRow ( QWidget * label, QWidget * field ) */ diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/QFrame.cpp index 01e2f7537c..89b26b2244 100644 --- a/harbour/contrib/hbqt/qtgui/QFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFrame.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QFRAME ) hb_retptrGC( hbqt_gcAllocate_QFrame( pObj, true ) ); } + /* * QRect frameRect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QGradient.cpp b/harbour/contrib/hbqt/qtgui/QGradient.cpp index 0e23ef36f2..0faed32ff8 100644 --- a/harbour/contrib/hbqt/qtgui/QGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QGradient.cpp @@ -111,6 +111,7 @@ void * hbqt_gcAllocate_QGradient( void * pObj, bool bNew ) HB_FUNC( QT_QGRADIENT ) { } + /* * CoordinateMode coordinateMode () const */ diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp index 7e39c5baf7..7a74d91472 100644 --- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QGRIDLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QGridLayout( pObj, true ) ); } + /* * void addItem ( QLayoutItem * item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0 ) */ diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp index 22be516e20..397a384eee 100644 --- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QGROUPBOX ) hb_retptrGC( hbqt_gcAllocate_QGroupBox( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp index df2cf1bea3..1cd88dc9c2 100644 --- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QHBOXLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QHBoxLayout( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp index 662044584b..5e84b9c6bb 100644 --- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp +++ b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QHEADERVIEW ) hb_retptrGC( hbqt_gcAllocate_QHeaderView( pObj, true ) ); } + /* * bool cascadingSectionResizes () const */ diff --git a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp index 2e248cff47..5a50491fd7 100644 --- a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp @@ -105,6 +105,7 @@ void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew ) HB_FUNC( QT_QHELPEVENT ) { } + /* * const QPoint & globalPos () const */ diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/QIcon.cpp index 09fc286318..ab74679e67 100644 --- a/harbour/contrib/hbqt/qtgui/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QIcon.cpp @@ -104,7 +104,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QIcon ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -160,6 +160,7 @@ HB_FUNC( QT_QICON ) hb_retptrGC( hbqt_gcAllocate_QIcon( pObj, true ) ); } + /* * QSize actualSize ( const QSize & size, Mode mode = Normal, State state = Off ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp index ad320f4e4f..9bafdae1dd 100644 --- a/harbour/contrib/hbqt/qtgui/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/QImage.cpp @@ -116,7 +116,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QImage ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -192,6 +192,7 @@ HB_FUNC( QT_QIMAGE ) hb_retptrGC( hbqt_gcAllocate_QImage( pObj, true ) ); } + /* * bool allGray () const */ diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp index 1ebe026d64..4fab3097a5 100644 --- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp @@ -101,7 +101,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QImageReader ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -146,6 +146,7 @@ HB_FUNC( QT_QIMAGEREADER ) hb_retptrGC( hbqt_gcAllocate_QImageReader( pObj, true ) ); } + /* * bool autoDetectImageFormat () const */ diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp index 9d977624b8..316ef1d87f 100644 --- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp @@ -100,7 +100,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QImageWriter ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -145,6 +145,7 @@ HB_FUNC( QT_QIMAGEWRITER ) hb_retptrGC( hbqt_gcAllocate_QImageWriter( pObj, true ) ); } + /* * bool canWrite () const */ diff --git a/harbour/contrib/hbqt/qtgui/QInputContext.cpp b/harbour/contrib/hbqt/qtgui/QInputContext.cpp index 8e759c74cd..ada300d4da 100644 --- a/harbour/contrib/hbqt/qtgui/QInputContext.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputContext.cpp @@ -124,6 +124,7 @@ void * hbqt_gcAllocate_QInputContext( void * pObj, bool bNew ) HB_FUNC( QT_QINPUTCONTEXT ) { } + /* * virtual bool filterEvent ( const QEvent * event ) */ diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp index 864e820141..265d7b7042 100644 --- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QINPUTDIALOG ) hb_retptrGC( hbqt_gcAllocate_QInputDialog( pObj, true ) ); } + /* * QString cancelButtonText () const */ diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp index 07ee9bf34d..38e3be8385 100644 --- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QInputEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QINPUTEVENT ) hb_retptrGC( hbqt_gcAllocate_QInputEvent( pObj, true ) ); } + /* * Qt::KeyboardModifiers modifiers () const */ diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp index d8256adc28..4f623d5beb 100644 --- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp @@ -98,7 +98,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QInputMethodEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -143,6 +143,7 @@ HB_FUNC( QT_QINPUTMETHODEVENT ) hb_retptrGC( hbqt_gcAllocate_QInputMethodEvent( pObj, true ) ); } + /* * const QString & commitString () const */ diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp index 17c39de325..dbac0fdfb7 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QItemSelection ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QITEMSELECTION ) hb_retptrGC( hbqt_gcAllocate_QItemSelection( pObj, true ) ); } + /* * bool contains ( const QModelIndex & index ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp index b9e8f72aee..3668f47ab6 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QITEMSELECTIONMODEL ) hb_retptrGC( hbqt_gcAllocate_QItemSelectionModel( pObj, true ) ); } + /* * bool columnIntersectsSelection ( int column, const QModelIndex & parent ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp index 2cb3fd1270..f79b6311a2 100644 --- a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew ) HB_FUNC( QT_QKEYEVENT ) { } + /* * int count () const */ diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp index 04d1cee092..5d8a0e13ea 100644 --- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp +++ b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp @@ -104,7 +104,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QKeySequence ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -156,6 +156,7 @@ HB_FUNC( QT_QKEYSEQUENCE ) hb_retptrGC( hbqt_gcAllocate_QKeySequence( pObj, true ) ); } + /* * uint count () const */ diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp index 536cd8d6f6..6a812a1ab4 100644 --- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QLCDNUMBER ) hb_retptrGC( hbqt_gcAllocate_QLCDNumber( pObj, true ) ); } + /* * bool checkOverflow ( double num ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/QLabel.cpp index 5fcbddbba4..3295a49daf 100644 --- a/harbour/contrib/hbqt/qtgui/QLabel.cpp +++ b/harbour/contrib/hbqt/qtgui/QLabel.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QLABEL ) hb_retptrGC( hbqt_gcAllocate_QLabel( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp index 7d8d72a77f..6811d501d6 100644 --- a/harbour/contrib/hbqt/qtgui/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp @@ -112,6 +112,7 @@ void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew ) HB_FUNC( QT_QLAYOUT ) { } + /* * bool activate () */ diff --git a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp index 736a53bb36..e90c037b19 100644 --- a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QLayoutItem( void * pObj, bool bNew ) HB_FUNC( QT_QLAYOUTITEM ) { } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp index df035e4b3d..c185c45625 100644 --- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QLINEEDIT ) hb_retptrGC( hbqt_gcAllocate_QLineEdit( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp index adaf8868bc..2e7ffac8a1 100644 --- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QLinearGradient ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -152,6 +152,7 @@ HB_FUNC( QT_QLINEARGRADIENT ) hb_retptrGC( hbqt_gcAllocate_QLinearGradient( pObj, true ) ); } + /* * QPointF finalStop () const */ diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/QListView.cpp index 5b15ff4522..971c771b96 100644 --- a/harbour/contrib/hbqt/qtgui/QListView.cpp +++ b/harbour/contrib/hbqt/qtgui/QListView.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QLISTVIEW ) hb_retptrGC( hbqt_gcAllocate_QListView( pObj, true ) ); } + /* * int batchSize () const */ diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp index 940c26b588..749dfa2efc 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp @@ -150,6 +150,7 @@ HB_FUNC( QT_QLISTWIDGET ) hb_retptrGC( hbqt_gcAllocate_QListWidget( pObj, true ) ); } + /* * void addItem ( const QString & label ) */ diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp index 396eb6d6c7..9c26283ff3 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QListWidgetItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QLISTWIDGETITEM ) hb_retptrGC( hbqt_gcAllocate_QListWidgetItem( pObj, true ) ); } + /* * QBrush background () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp index e946a4eaed..2ba7936269 100644 --- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp @@ -169,6 +169,7 @@ HB_FUNC( QT_QMAINWINDOW ) hb_retptrGC( hbqt_gcAllocate_QMainWindow( pObj, true ) ); } + /* * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) */ diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/QMatrix.cpp index f87eb5b82f..171a04b391 100644 --- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp +++ b/harbour/contrib/hbqt/qtgui/QMatrix.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QMatrix ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QMATRIX ) hb_retptrGC( hbqt_gcAllocate_QMatrix( pObj, true ) ); } + /* * qreal m11 () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp index 577820d154..2b12374edc 100644 --- a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp @@ -164,6 +164,7 @@ HB_FUNC( QT_QMDIAREA ) hb_retptrGC( hbqt_gcAllocate_QMdiArea( pObj, true ) ); } + /* * WindowOrder activationOrder () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp index 74b2fce25a..828405997e 100644 --- a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp @@ -153,6 +153,7 @@ HB_FUNC( QT_QMDISUBWINDOW ) hb_retptrGC( hbqt_gcAllocate_QMdiSubWindow( pObj, true ) ); } + /* * bool isShaded () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/QMenu.cpp index 3f61b263e1..5ea24702e4 100644 --- a/harbour/contrib/hbqt/qtgui/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenu.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QMENU ) hb_retptrGC( hbqt_gcAllocate_QMenu( pObj, true ) ); } + /* * QAction * actionAt ( const QPoint & pt ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp index 3b8234a8c5..2a77f15a8f 100644 --- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QMENUBAR ) hb_retptrGC( hbqt_gcAllocate_QMenuBar( pObj, true ) ); } + /* * QAction * activeAction () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp index c7912d160e..82eabcbed7 100644 --- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp @@ -157,6 +157,7 @@ HB_FUNC( QT_QMESSAGEBOX ) hb_retptrGC( hbqt_gcAllocate_QMessageBox( pObj, true ) ); } + /* * void addButton ( QAbstractButton * button, ButtonRole role ) */ diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp index d4306dd8a4..71d7502f89 100644 --- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QMouseEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QMOUSEEVENT ) hb_retptrGC( hbqt_gcAllocate_QMouseEvent( pObj, true ) ); } + /* * Qt::MouseButton button () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp index 9a6bc0e764..5f97db37ce 100644 --- a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QMOVEEVENT ) { } + /* * const QPoint & oldPos () const */ diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/QMovie.cpp index 9817464b4f..313366d0ea 100644 --- a/harbour/contrib/hbqt/qtgui/QMovie.cpp +++ b/harbour/contrib/hbqt/qtgui/QMovie.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QMOVIE ) hb_retptrGC( hbqt_gcAllocate_QMovie( pObj, true ) ); } + /* * QColor backgroundColor () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp index 8980dc8f99..43e0f624c5 100644 --- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QPAGESETUPDIALOG ) hb_retptrGC( hbqt_gcAllocate_QPageSetupDialog( pObj, true ) ); } + /* * virtual int exec () */ diff --git a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp index 5391f14114..956f5e9d83 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QPaintDevice( void * pObj, bool bNew ) HB_FUNC( QT_QPAINTDEVICE ) { } + /* * int depth () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp index 4a9697cc34..5739189696 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp @@ -115,6 +115,7 @@ void * hbqt_gcAllocate_QPaintEngine( void * pObj, bool bNew ) HB_FUNC( QT_QPAINTENGINE ) { } + /* * virtual bool begin ( QPaintDevice * pdev ) = 0 */ diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp index bd1c5c20ac..310f99de00 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPaintEvent ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -142,6 +142,7 @@ HB_FUNC( QT_QPAINTEVENT ) hb_retptrGC( hbqt_gcAllocate_QPaintEvent( pObj, true ) ); } + /* * const QRect & rect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/QPainter.cpp index cbf7031e24..2fdd8b7ed9 100644 --- a/harbour/contrib/hbqt/qtgui/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainter.cpp @@ -105,7 +105,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPainter ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -157,6 +157,7 @@ HB_FUNC( QT_QPAINTER ) hb_retptrGC( hbqt_gcAllocate_QPainter( pObj, true ) ); } + /* * const QBrush & background () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp index ffd13e147e..b22275fcb3 100644 --- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp @@ -106,7 +106,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPainterPath ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -151,6 +151,7 @@ HB_FUNC( QT_QPAINTERPATH ) hb_retptrGC( hbqt_gcAllocate_QPainterPath( pObj, true ) ); } + /* * void addEllipse ( const QRectF & boundingRectangle ) */ diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/QPalette.cpp index 122a758b33..0a8a7f1e43 100644 --- a/harbour/contrib/hbqt/qtgui/QPalette.cpp +++ b/harbour/contrib/hbqt/qtgui/QPalette.cpp @@ -95,7 +95,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPalette ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -155,6 +155,7 @@ HB_FUNC( QT_QPALETTE ) hb_retptrGC( hbqt_gcAllocate_QPalette( pObj, true ) ); } + /* * const QBrush & alternateBase () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/QPen.cpp index 885d1c45ab..0f448bb0d1 100644 --- a/harbour/contrib/hbqt/qtgui/QPen.cpp +++ b/harbour/contrib/hbqt/qtgui/QPen.cpp @@ -99,7 +99,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPen ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -176,6 +176,7 @@ HB_FUNC( QT_QPEN ) hb_retptrGC( hbqt_gcAllocate_QPen( pObj, true ) ); } + /* * QBrush brush () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/QPicture.cpp index 60c7d30b9b..42e7ea8294 100644 --- a/harbour/contrib/hbqt/qtgui/QPicture.cpp +++ b/harbour/contrib/hbqt/qtgui/QPicture.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPicture ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -142,6 +142,7 @@ HB_FUNC( QT_QPICTURE ) hb_retptrGC( hbqt_gcAllocate_QPicture( pObj, true ) ); } + /* * QRect boundingRect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/QPixmap.cpp index d332c9c51c..1df1be564a 100644 --- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QPixmap.cpp @@ -95,7 +95,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPixmap ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -155,6 +155,7 @@ HB_FUNC( QT_QPIXMAP ) hb_retptrGC( hbqt_gcAllocate_QPixmap( pObj, true ) ); } + /* * QPixmap alphaChannel () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp index 3be7c30608..7727ac9551 100644 --- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp @@ -175,6 +175,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT ) hb_retptrGC( hbqt_gcAllocate_QPlainTextEdit( pObj, true ) ); } + /* * bool backgroundVisible () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/QPolygon.cpp index b0a2414adf..6fa50e85fc 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygon.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPolygon ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QPOLYGON ) hb_retptrGC( hbqt_gcAllocate_QPolygon( pObj, true ) ); } + /* * QRect boundingRect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp index 3da549fa83..b1d1f73995 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPolygonF ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QPOLYGONF ) hb_retptrGC( hbqt_gcAllocate_QPolygonF( pObj, true ) ); } + /* * QRectF boundingRect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp index 84fe27d78f..1d614a8039 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QPRINTDIALOG ) hb_retptrGC( hbqt_gcAllocate_QPrintDialog( pObj, true ) ); } + /* * virtual void done ( int result ) */ diff --git a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp index 67fff9d544..0cd6a1679c 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp @@ -109,6 +109,7 @@ void * hbqt_gcAllocate_QPrintEngine( void * pObj, bool bNew ) HB_FUNC( QT_QPRINTENGINE ) { } + /* * virtual bool abort () */ diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp index 4173a326b5..f83a1843e3 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QPRINTPREVIEWDIALOG ) hb_retptrGC( hbqt_gcAllocate_QPrintPreviewDialog( pObj, true ) ); } + /* * void open ( QObject * receiver, const char * member ) */ diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/QPrinter.cpp index 66d6bdb2da..576f8e2448 100644 --- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrinter.cpp @@ -117,7 +117,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QPrinter ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -162,6 +162,7 @@ HB_FUNC( QT_QPRINTER ) hb_retptrGC( hbqt_gcAllocate_QPrinter( pObj, true ) ); } + /* * bool abort () */ diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp index 09a254f8f2..1e7148fe95 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp @@ -143,6 +143,7 @@ HB_FUNC( QT_QPROGRESSBAR ) hb_retptrGC( hbqt_gcAllocate_QProgressBar( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp index eca9cb36d7..6cb95d308c 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QPROGRESSDIALOG ) hb_retptrGC( hbqt_gcAllocate_QProgressDialog( pObj, true ) ); } + /* * bool autoClose () const */ diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/QPushButton.cpp index 1c9d9c7e85..0636a125cd 100644 --- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QPushButton.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QPUSHBUTTON ) hb_retptrGC( hbqt_gcAllocate_QPushButton( pObj, true ) ); } + /* * bool autoDefault () const */ diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp index 7947839fd6..a8a834969f 100644 --- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QRadialGradient ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -158,6 +158,7 @@ HB_FUNC( QT_QRADIALGRADIENT ) hb_retptrGC( hbqt_gcAllocate_QRadialGradient( pObj, true ) ); } + /* * QPointF center () const */ diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp index 9be51831c7..6d683190a7 100644 --- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QRADIOBUTTON ) hb_retptrGC( hbqt_gcAllocate_QRadioButton( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/QRegion.cpp index 5435255a65..631647e332 100644 --- a/harbour/contrib/hbqt/qtgui/QRegion.cpp +++ b/harbour/contrib/hbqt/qtgui/QRegion.cpp @@ -107,7 +107,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QRegion ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -186,6 +186,7 @@ HB_FUNC( QT_QREGION ) hb_retptrGC( hbqt_gcAllocate_QRegion( pObj, true ) ); } + /* * QRect boundingRect () const */ diff --git a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp index 8acfa06d4c..d1e5352107 100644 --- a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp @@ -105,6 +105,7 @@ void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew ) HB_FUNC( QT_QRESIZEEVENT ) { } + /* * const QSize & oldSize () const */ diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp index 7f4884babd..c41412ea6d 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSCROLLAREA ) hb_retptrGC( hbqt_gcAllocate_QScrollArea( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp index 06bb6c0627..8be35b85ab 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QSCROLLBAR ) hb_retptrGC( hbqt_gcAllocate_QScrollBar( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp index 4c5111202a..722e1d80a7 100644 --- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp @@ -111,6 +111,7 @@ void * hbqt_gcAllocate_QSessionManager( void * pObj, bool bNew ) HB_FUNC( QT_QSESSIONMANAGER ) { } + /* * bool allowsErrorInteraction () */ diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp index b378e12748..e7c727179c 100644 --- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QSIZEGRIP ) hb_retptrGC( hbqt_gcAllocate_QSizeGrip( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp index 31d3dbad6c..7a78f7d0b4 100644 --- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp @@ -93,7 +93,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QSizePolicy ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QSIZEPOLICY ) hb_retptrGC( hbqt_gcAllocate_QSizePolicy( pObj, true ) ); } + /* * ControlType controlType () const */ diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/QSlider.cpp index 8a99ffe57e..d21e78ba5c 100644 --- a/harbour/contrib/hbqt/qtgui/QSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QSlider.cpp @@ -148,6 +148,7 @@ HB_FUNC( QT_QSLIDER ) hb_retptrGC( hbqt_gcAllocate_QSlider( pObj, true ) ); } + /* * void setTickInterval ( int ti ) */ diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/QSound.cpp index 03ab6fe2f0..ecca9ca108 100644 --- a/harbour/contrib/hbqt/qtgui/QSound.cpp +++ b/harbour/contrib/hbqt/qtgui/QSound.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSOUND ) hb_retptrGC( hbqt_gcAllocate_QSound( pObj, true ) ); } + /* * QString fileName () const */ diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp index 7238b2d0db..307cbc277a 100644 --- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QSpacerItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -132,6 +132,7 @@ HB_FUNC( QT_QSPACERITEM ) hb_retptrGC( hbqt_gcAllocate_QSpacerItem( pObj, true ) ); } + /* * void changeSize ( int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum ) */ diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp index eff6322a3a..5a2cd033a2 100644 --- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp @@ -139,6 +139,7 @@ HB_FUNC( QT_QSPINBOX ) hb_retptrGC( hbqt_gcAllocate_QSpinBox( pObj, true ) ); } + /* * QString cleanText () const */ diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp index 8977b88954..f37fd57652 100644 --- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp @@ -141,6 +141,7 @@ HB_FUNC( QT_QSPLASHSCREEN ) hb_retptrGC( hbqt_gcAllocate_QSplashScreen( pObj, true ) ); } + /* * void finish ( QWidget * mainWin ) */ diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/QSplitter.cpp index b5110b6382..f9b2b59e57 100644 --- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplitter.cpp @@ -158,6 +158,7 @@ HB_FUNC( QT_QSPLITTER ) hb_retptrGC( hbqt_gcAllocate_QSplitter( pObj, true ) ); } + /* * void addWidget ( QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp index 4708921408..740c5b33e2 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp @@ -108,7 +108,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStandardItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -153,6 +153,7 @@ HB_FUNC( QT_QSTANDARDITEM ) hb_retptrGC( hbqt_gcAllocate_QStandardItem( pObj, true ) ); } + /* * QString accessibleDescription () const */ diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp index fd6208e0b2..6cb32ef7fe 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp @@ -160,6 +160,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL ) hb_retptrGC( hbqt_gcAllocate_QStandardItemModel( pObj, true ) ); } + /* * void appendRow ( QStandardItem * item ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp index a77b3b5da5..637ce615a9 100644 --- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSTATUSBAR ) hb_retptrGC( hbqt_gcAllocate_QStatusBar( pObj, true ) ); } + /* * void addPermanentWidget ( QWidget * widget, int stretch = 0 ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp index cf30f032d7..7d8396d252 100644 --- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL ) hb_retptrGC( hbqt_gcAllocate_QStringListModel( pObj, true ) ); } + /* * virtual QVariant data ( const QModelIndex & index, int role ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/QStyle.cpp index af113a25bf..8e97662dff 100644 --- a/harbour/contrib/hbqt/qtgui/QStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyle.cpp @@ -123,6 +123,7 @@ void * hbqt_gcAllocate_QStyle( void * pObj, bool bNew ) HB_FUNC( QT_QSTYLE ) { } + /* * int combinedLayoutSpacing ( QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, QStyleOption * option = 0, QWidget * widget = 0 ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp index e4db1a9d74..3dd13ac227 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleFactory ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QSTYLEFACTORY ) hb_retptrGC( hbqt_gcAllocate_QStyleFactory( pObj, true ) ); } + /* * QStyle * create ( const QString & key ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp index b8416643a2..790995d43d 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp @@ -122,6 +122,7 @@ HB_FUNC( QT_QSTYLEHINTRETURN ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp index 32b1428520..2437449453 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp @@ -120,6 +120,7 @@ HB_FUNC( QT_QSTYLEHINTRETURNMASK ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp index d9908a21ee..7c39e907d2 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp @@ -121,6 +121,7 @@ HB_FUNC( QT_QSTYLEHINTRETURNVARIANT ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp index a2d774af8a..7eeca9d2fb 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOption ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QSTYLEOPTION ) hb_retptrGC( hbqt_gcAllocate_QStyleOption( pObj, true ) ); } + /* * void initFrom ( const QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp index 2752bf3d40..7a6e41c8c9 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionButton ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionButton( pObj, true ) ); } + /* * ButtonFeatures features */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp index 45c50145c1..380d3d1c96 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionComboBox ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionComboBox( pObj, true ) ); } + /* * QIcon currentIcon */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp index 4dc03491c1..03687a9c24 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionComplex ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionComplex( pObj, true ) ); } + /* * QStyle::SubControls activeSubControls */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp index f1f02e818f..f6ccc2fe91 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionDockWidget ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionDockWidget( pObj, true ) ); } + /* * bool closable */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp index b408cd102c..ba19b89777 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionFocusRect ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionFocusRect( pObj, true ) ); } + /* * QColor backgroundColor */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp index 6e4e1031dd..0339b5e72d 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionFrame ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONFRAME ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionFrame( pObj, true ) ); } + /* * int lineWidth */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp index 586126cc25..ca178f134a 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionGroupBox ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionGroupBox( pObj, true ) ); } + /* * QStyleOptionFrameV2::FrameFeatures features */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp index dfbf985ade..553a55e2e6 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp @@ -93,7 +93,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionHeader ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionHeader( pObj, true ) ); } + /* * QIcon icon */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp index fa2d20524d..bed5c29ef0 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionMenuItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionMenuItem( pObj, true ) ); } + /* * CheckType checkType */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp index 1837fe91fb..9954b204e9 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp @@ -91,7 +91,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionProgressBar ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -136,6 +136,7 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionProgressBar( pObj, true ) ); } + /* * int maximum */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp index a3f3246175..d08fbc222f 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionSizeGrip ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionSizeGrip( pObj, true ) ); } + /* * Qt::Corner corner */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp index 0a9a4910b6..4c57b31fef 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionSlider ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionSlider( pObj, true ) ); } + /* * bool dialWrapping */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp index bc23bc8af4..ffea9a202c 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionSpinBox ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONSPINBOX ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionSpinBox( pObj, true ) ); } + /* * QAbstractSpinBox::ButtonSymbols buttonSymbols */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp index 2b241b8f37..5f4ae25435 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionTab ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QSTYLEOPTIONTAB ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionTab( pObj, true ) ); } + /* * CornerWidgets cornerWidgets */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp index e41548df56..11912077df 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionTabBarBase ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionTabBarBase( pObj, true ) ); } + /* * QRect selectedTabRect */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp index 36d26627ec..60319b447b 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionTabWidgetFrame ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionTabWidgetFrame( pObj, true ) ); } + /* * QSize leftCornerWidgetSize */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp index e35a077a56..1475c58cd1 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionTitleBar ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionTitleBar( pObj, true ) ); } + /* * QIcon icon */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp index e0f81654d2..b3b5c65799 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp @@ -93,7 +93,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolBar ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolBar( pObj, true ) ); } + /* * ToolBarFeatures features */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp index 3936f835e9..a91933e24b 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolBox ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolBox( pObj, true ) ); } + /* * QIcon icon */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp index 9156f516aa..03be542438 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolButton ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolButton( pObj, true ) ); } + /* * Qt::ArrowType arrowType */ diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp index d9980e633b..f55cc5483e 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp @@ -91,7 +91,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStyleOptionViewItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -136,6 +136,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM ) hb_retptrGC( hbqt_gcAllocate_QStyleOptionViewItem( pObj, true ) ); } + /* * Qt::Alignment decorationAlignment */ diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp index e1fb74e136..0fba0d7724 100644 --- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QStylePainter ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QSTYLEPAINTER ) hb_retptrGC( hbqt_gcAllocate_QStylePainter( pObj, true ) ); } + /* * bool begin ( QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp index cbe0cbbbe0..af2f5e1cb0 100644 --- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QSTYLEDITEMDELEGATE ) hb_retptrGC( hbqt_gcAllocate_QStyledItemDelegate( pObj, true ) ); } + /* * virtual QWidget * createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp index 9f9db82af5..5cbcdc8d5b 100644 --- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp @@ -88,34 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QSyntaxHighlighter ) { - QGC_POINTER_QSyntaxHighlighter * p = ( QGC_POINTER_QSyntaxHighlighter * ) Cargo; - - if( p && p->bNew ) - { - if( p->ph && p->pq ) - { - const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); - if( ( QString ) m->className() != ( QString ) "QObject" ) - { - delete ( ( QSyntaxHighlighter * ) p->ph ); - HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QSyntaxHighlighter ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - p->ph = NULL; - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "NO__rel_QSyntaxHighlighter ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QSyntaxHighlighter Object already deleted!" ) ); - } - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QSyntaxHighlighter Object not created with - new" ) ); - p->ph = NULL; - } + HB_SYMBOL_UNUSED( Cargo ); } void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj, bool bNew ) @@ -136,15 +109,8 @@ void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj, bool bNew ) HB_FUNC( QT_QSYNTAXHIGHLIGHTER ) { - void * pObj = NULL; - - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) - { - pObj = new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ; - } - - hb_retptrGC( hbqt_gcAllocate_QSyntaxHighlighter( pObj, true ) ); } + /* * QTextDocument * document () const */ diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp index b7f08aa162..4b57bd12db 100644 --- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp @@ -146,6 +146,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON ) hb_retptrGC( hbqt_gcAllocate_QSystemTrayIcon( pObj, true ) ); } + /* * QMenu * contextMenu () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/QTabBar.cpp index b3389e9cd3..cb2598c8b5 100644 --- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabBar.cpp @@ -147,6 +147,7 @@ HB_FUNC( QT_QTABBAR ) hb_retptrGC( hbqt_gcAllocate_QTabBar( pObj, true ) ); } + /* * int addTab ( const QString & text ) */ diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp index d838722791..d7b3b40abb 100644 --- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp @@ -145,6 +145,7 @@ HB_FUNC( QT_QTABWIDGET ) hb_retptrGC( hbqt_gcAllocate_QTabWidget( pObj, true ) ); } + /* * int addTab ( QWidget * page, const QString & label ) */ diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp index 671a444b20..5ac7aa1a5c 100644 --- a/harbour/contrib/hbqt/qtgui/QTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp @@ -70,8 +70,6 @@ #include -#include "../hbqt_hbqtableview.h" - /* * QTableView ( QWidget * parent = 0 ) * ~QTableView () @@ -142,6 +140,7 @@ HB_FUNC( QT_QTABLEVIEW ) hb_retptrGC( hbqt_gcAllocate_QTableView( pObj, true ) ); } + /* * void clearSpans () */ diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp index ae8b62c272..e4be66a94e 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp @@ -155,6 +155,7 @@ HB_FUNC( QT_QTABLEWIDGET ) hb_retptrGC( hbqt_gcAllocate_QTableWidget( pObj, true ) ); } + /* * QWidget * cellWidget ( int row, int column ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp index 727227b8d5..cf26719cba 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp @@ -92,7 +92,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTableWidgetItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -152,6 +152,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM ) hb_retptrGC( hbqt_gcAllocate_QTableWidgetItem( pObj, true ) ); } + /* * QBrush background () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp index 897c35ff0b..f3e06ea30f 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTableWidgetSelectionRange ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QTABLEWIDGETSELECTIONRANGE ) hb_retptrGC( hbqt_gcAllocate_QTableWidgetSelectionRange( pObj, true ) ); } + /* * int bottomRow () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp index ecb81b5913..ce39bb3532 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextBlock ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -137,6 +137,7 @@ HB_FUNC( QT_QTEXTBLOCK ) hb_retptrGC( hbqt_gcAllocate_QTextBlock( pObj, true ) ); } + /* * QTextBlockFormat blockFormat () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp index 9c53c78dba..e4e581dc17 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp @@ -103,7 +103,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextBlockFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -155,6 +155,7 @@ HB_FUNC( QT_QTEXTBLOCKFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextBlockFormat( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp index 2ac6856a09..4f72e0ee58 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp @@ -108,6 +108,7 @@ HB_FUNC( QT_QTEXTBLOCKGROUP ) { } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp index 8eee5a0f72..102de4bbf0 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp @@ -139,6 +139,7 @@ HB_FUNC( QT_QTEXTBROWSER ) hb_retptrGC( hbqt_gcAllocate_QTextBrowser( pObj, true ) ); } + /* * int backwardHistoryCount () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp index 8aa10e7c15..aa8ecb805b 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextCharFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( pObj, true ) ); } + /* * QString anchorHref () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp index da04efec44..c985ddaef8 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp @@ -97,7 +97,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextCursor ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -170,6 +170,7 @@ HB_FUNC( QT_QTEXTCURSOR ) hb_retptrGC( hbqt_gcAllocate_QTextCursor( pObj, true ) ); } + /* * int anchor () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp index a73607564e..e64d4c1c74 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp @@ -163,6 +163,7 @@ HB_FUNC( QT_QTEXTDOCUMENT ) hb_retptrGC( hbqt_gcAllocate_QTextDocument( pObj, true ) ); } + /* * void addResource ( int type, const QUrl & name, const QVariant & resource ) */ diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp index bdd4b6909a..28193b9a45 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextDocumentFragment ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT ) hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( pObj, true ) ); } + /* * bool isEmpty () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp index 03d31064f8..d86c1b5099 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp @@ -87,7 +87,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextDocumentWriter ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -132,6 +132,7 @@ HB_FUNC( QT_QTEXTDOCUMENTWRITER ) hb_retptrGC( hbqt_gcAllocate_QTextDocumentWriter( pObj, true ) ); } + /* * QTextCodec * codec () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp index 2f31efe08d..54b38d68e2 100644 --- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp @@ -159,6 +159,7 @@ HB_FUNC( QT_QTEXTEDIT ) hb_retptrGC( hbqt_gcAllocate_QTextEdit( pObj, true ) ); } + /* * bool acceptRichText () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp index 73ab5493d5..292c420f26 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp @@ -110,7 +110,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -155,6 +155,7 @@ HB_FUNC( QT_QTEXTFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextFormat( pObj, true ) ); } + /* * QBrush background () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp index 335ac69879..4718b49f4b 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextFragment ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QTEXTFRAGMENT ) hb_retptrGC( hbqt_gcAllocate_QTextFragment( pObj, true ) ); } + /* * QTextCharFormat charFormat () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp index 9aa21025be..2460c1545b 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp @@ -155,6 +155,7 @@ HB_FUNC( QT_QTEXTFRAME ) hb_retptrGC( hbqt_gcAllocate_QTextFrame( pObj, true ) ); } + /* * QTextCursor firstCursorPosition () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp index 79437556f5..e8dee8e751 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp @@ -94,7 +94,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextFrameFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -139,6 +139,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextFrameFormat( pObj, true ) ); } + /* * qreal border () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp index 5d26f88f5c..07d88a3eae 100644 --- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp @@ -85,7 +85,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextImageFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -130,6 +130,7 @@ HB_FUNC( QT_QTEXTIMAGEFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextImageFormat( pObj, true ) ); } + /* * qreal height () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp index e9d1328c2b..c1381bfb33 100644 --- a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QTextInlineObject( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTINLINEOBJECT ) { } + /* * qreal ascent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/QTextItem.cpp index e43429fb42..6e396cb869 100644 --- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextItem.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QTEXTITEM ) hb_retptrGC( hbqt_gcAllocate_QTextItem( pObj, true ) ); } + /* * qreal ascent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp index bfa3065a87..e1c018f3c4 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp @@ -102,7 +102,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextLayout ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -147,6 +147,7 @@ HB_FUNC( QT_QTEXTLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QTextLayout( pObj, true ) ); } + /* * void beginLayout () */ diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/QTextLength.cpp index e8c5e6ef67..98017e5f7b 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLength.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextLength ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QTEXTLENGTH ) hb_retptrGC( hbqt_gcAllocate_QTextLength( pObj, true ) ); } + /* * qreal rawValue () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/QTextLine.cpp index 0551b280c2..5a2f58630d 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLine.cpp @@ -89,7 +89,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextLine ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -134,6 +134,7 @@ HB_FUNC( QT_QTEXTLINE ) hb_retptrGC( hbqt_gcAllocate_QTextLine( pObj, true ) ); } + /* * qreal ascent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextList.cpp b/harbour/contrib/hbqt/qtgui/QTextList.cpp index 59cbd5fe7c..96b0741220 100644 --- a/harbour/contrib/hbqt/qtgui/QTextList.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextList.cpp @@ -108,6 +108,7 @@ void * hbqt_gcAllocate_QTextList( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTLIST ) { } + /* * void add ( const QTextBlock & block ) */ diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp index 5bb88423f4..690de15105 100644 --- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp @@ -88,7 +88,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextListFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -133,6 +133,7 @@ HB_FUNC( QT_QTEXTLISTFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextListFormat( pObj, true ) ); } + /* * int indent () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/QTextObject.cpp index 09c90d000b..ffb81312f8 100644 --- a/harbour/contrib/hbqt/qtgui/QTextObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextObject.cpp @@ -107,6 +107,7 @@ void * hbqt_gcAllocate_QTextObject( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTOBJECT ) { } + /* * QTextDocument * document () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/QTextOption.cpp index 53d49ce4a2..cd0c4392ca 100644 --- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextOption.cpp @@ -106,7 +106,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextOption ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -151,6 +151,7 @@ HB_FUNC( QT_QTEXTOPTION ) hb_retptrGC( hbqt_gcAllocate_QTextOption( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp index 2913850733..3e9997fb9c 100644 --- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp @@ -93,7 +93,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTextTableFormat ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -138,6 +138,7 @@ HB_FUNC( QT_QTEXTTABLEFORMAT ) hb_retptrGC( hbqt_gcAllocate_QTextTableFormat( pObj, true ) ); } + /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp index 6c553856ee..b9a2f0c311 100644 --- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QTIMEEDIT ) hb_retptrGC( hbqt_gcAllocate_QTimeEdit( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/QToolBar.cpp index eb403959b3..58762244d7 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBar.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QTOOLBAR ) hb_retptrGC( hbqt_gcAllocate_QToolBar( pObj, true ) ); } + /* * QAction * actionAt ( const QPoint & p ) const */ diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/QToolBox.cpp index c98af2d993..15b2b2f719 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBox.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QTOOLBOX ) hb_retptrGC( hbqt_gcAllocate_QToolBox( pObj, true ) ); } + /* * int addItem ( QWidget * widget, const QIcon & iconSet, const QString & text ) */ diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/QToolButton.cpp index 21476889f3..6e230f558b 100644 --- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolButton.cpp @@ -144,6 +144,7 @@ HB_FUNC( QT_QTOOLBUTTON ) hb_retptrGC( hbqt_gcAllocate_QToolButton( pObj, true ) ); } + /* * Qt::ArrowType arrowType () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/QTransform.cpp index c565baff2e..de942723e1 100644 --- a/harbour/contrib/hbqt/qtgui/QTransform.cpp +++ b/harbour/contrib/hbqt/qtgui/QTransform.cpp @@ -90,7 +90,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTransform ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -135,6 +135,7 @@ HB_FUNC( QT_QTRANSFORM ) hb_retptrGC( hbqt_gcAllocate_QTransform( pObj, true ) ); } + /* * qreal m11 () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/QTreeView.cpp index 1ef121a871..5136e332bb 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeView.cpp @@ -152,6 +152,7 @@ HB_FUNC( QT_QTREEVIEW ) hb_retptrGC( hbqt_gcAllocate_QTreeView( pObj, true ) ); } + /* * bool allColumnsShowFocus () const */ diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp index b57a77ab4a..d0941f02b4 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp @@ -152,6 +152,7 @@ HB_FUNC( QT_QTREEWIDGET ) hb_retptrGC( hbqt_gcAllocate_QTreeWidget( pObj, true ) ); } + /* * void addTopLevelItem ( QTreeWidgetItem * item ) */ diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp index bf5ee747a3..5734bf2843 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp @@ -109,7 +109,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QTreeWidgetItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -161,6 +161,7 @@ HB_FUNC( QT_QTREEWIDGETITEM ) hb_retptrGC( hbqt_gcAllocate_QTreeWidgetItem( pObj, true ) ); } + /* * void addChild ( QTreeWidgetItem * child ) */ diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp index 7fb2114f88..9afc5f2fc7 100644 --- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QVBOXLAYOUT ) hb_retptrGC( hbqt_gcAllocate_QVBoxLayout( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QValidator.cpp b/harbour/contrib/hbqt/qtgui/QValidator.cpp index 49bcac19b1..4f874de8d3 100644 --- a/harbour/contrib/hbqt/qtgui/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/QValidator.cpp @@ -111,6 +111,7 @@ void * hbqt_gcAllocate_QValidator( void * pObj, bool bNew ) HB_FUNC( QT_QVALIDATOR ) { } + /* * QLocale locale () const */ diff --git a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp index 994d8140d2..77371886d5 100644 --- a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp @@ -106,6 +106,7 @@ void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew ) HB_FUNC( QT_QWHEELEVENT ) { } + /* * Qt::MouseButtons buttons () const */ diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp index b5583ed49c..86f0242bcf 100644 --- a/harbour/contrib/hbqt/qtgui/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp @@ -179,6 +179,7 @@ HB_FUNC( QT_QWIDGET ) hb_retptrGC( hbqt_gcAllocate_QWidget( pObj, true ) ); } + /* * bool acceptDrops () const */ diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp index 72a0c9a540..0b60138664 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp @@ -140,6 +140,7 @@ HB_FUNC( QT_QWIDGETACTION ) hb_retptrGC( hbqt_gcAllocate_QWidgetAction( pObj, true ) ); } + /* * QWidget * defaultWidget () const */ diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp index 7dbb46d5d5..fedde579d5 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp @@ -84,7 +84,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QWidgetItem ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -129,6 +129,7 @@ HB_FUNC( QT_QWIDGETITEM ) hb_retptrGC( hbqt_gcAllocate_QWidgetItem( pObj, true ) ); } + /* * virtual bool isEmpty () const */ diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp index 8f3c9cf8eb..1d2a0d6645 100644 --- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp @@ -142,6 +142,7 @@ HB_FUNC( QT_QWINDOWSSTYLE ) hb_retptrGC( hbqt_gcAllocate_QWindowsStyle( pObj, true ) ); } + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/QWizard.cpp index 048c2d3c8a..a4d772c157 100644 --- a/harbour/contrib/hbqt/qtgui/QWizard.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizard.cpp @@ -160,6 +160,7 @@ HB_FUNC( QT_QWIZARD ) hb_retptrGC( hbqt_gcAllocate_QWizard( pObj, true ) ); } + /* * int addPage ( QWizardPage * page ) */ diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp index 41be4ac587..abf32b5d84 100644 --- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp @@ -138,6 +138,7 @@ HB_FUNC( QT_QWIZARDPAGE ) hb_retptrGC( hbqt_gcAllocate_QWizardPage( pObj, true ) ); } + /* * QString buttonText ( QWizard::WizardButton which ) const */ diff --git a/harbour/contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg new file mode 100644 index 0000000000..f9ff806d0a --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg @@ -0,0 +1,96 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS HBQSyntaxHighlighter INHERIT HbQtObjectHandler, QSyntaxHighlighter + + METHOD new( ... ) + + METHOD hbSetMultiLineCommentFormat( pFormat ) + METHOD hbSetRule( cName, cPattern, pFormat ) + METHOD hbSetFormat( cName, pFormat ) + + ENDCLASS + + +METHOD HBQSyntaxHighlighter:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_HBQSyntaxHighlighter( ... ) + RETURN Self + + +METHOD HBQSyntaxHighlighter:hbSetMultiLineCommentFormat( pFormat ) + RETURN Qt_HBQSyntaxHighlighter_hbSetMultiLineCommentFormat( ::pPtr, hbqt_ptr( pFormat ) ) + + +METHOD HBQSyntaxHighlighter:hbSetRule( cName, cPattern, pFormat ) + RETURN Qt_HBQSyntaxHighlighter_hbSetRule( ::pPtr, cName, cPattern, hbqt_ptr( pFormat ) ) + + +METHOD HBQSyntaxHighlighter:hbSetFormat( cName, pFormat ) + RETURN Qt_HBQSyntaxHighlighter_hbSetFormat( ::pPtr, cName, hbqt_ptr( pFormat ) ) + diff --git a/harbour/contrib/hbqt/qtgui/THBQTableView.prg b/harbour/contrib/hbqt/qtgui/THBQTableView.prg new file mode 100644 index 0000000000..671ce79f30 --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/THBQTableView.prg @@ -0,0 +1,81 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS HBQTableView INHERIT HbQtObjectHandler, QTableView + + METHOD new( ... ) + + + ENDCLASS + + +METHOD HBQTableView:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_HBQTableView( ... ) + RETURN Self + diff --git a/harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg b/harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg index aa3ef073a1..b3e2f1ae77 100644 --- a/harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg +++ b/harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg @@ -67,7 +67,8 @@ CREATE CLASS HBQTextBlockUserData INHERIT HbQtObjectHandler METHOD new( ... ) - METHOD setData( nState ) + METHOD hbSetState( nState ) + METHOD hbState() ENDCLASS @@ -81,6 +82,10 @@ METHOD HBQTextBlockUserData:new( ... ) RETURN Self -METHOD HBQTextBlockUserData:setData( nState ) - RETURN Qt_HBQTextBlockUserData_setData( ::pPtr, nState ) +METHOD HBQTextBlockUserData:hbSetState( nState ) + RETURN Qt_HBQTextBlockUserData_hbSetState( ::pPtr, nState ) + + +METHOD HBQTextBlockUserData:hbState() + RETURN Qt_HBQTextBlockUserData_hbState( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg index d073528d9b..d3bab64b92 100644 --- a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg +++ b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg @@ -94,52 +94,3 @@ METHOD QSyntaxHighlighter:setDocument( pDoc ) METHOD QSyntaxHighlighter:rehighlight() RETURN Qt_QSyntaxHighlighter_rehighlight( ::pPtr ) - - - -CREATE CLASS HBQSyntaxHighlighter INHERIT QSyntaxHighlighter - - METHOD new( ... ) - METHOD configure( xObject ) - METHOD setHBCompilerDirectives( pDirectives, pFormat ) - METHOD setHBRule( cName, cPattern, pFormat ) - METHOD setHBFormat( cName, pFormat ) - METHOD setHBMultiLineCommentFormat( pFormat ) - - ENDCLASS - -METHOD HBQSyntaxHighlighter:new( ... ) - LOCAL p - FOR EACH p IN { ... } - p := hbqt_ptr( p ) - hb_pvalue( p:__enumIndex(), p ) - NEXT - ::pPtr := Qt_QSyntaxHighlighter( ... ) - RETURN Self - - -METHOD HBQSyntaxHighlighter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD HBQSyntaxHighlighter:setHBCompilerDirectives( pDirectives, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBCompilerDirectives( ::pPtr, hbqt_ptr( pDirectives ), hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBRule( cName, cPattern, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBRule( ::pPtr, cName, cPattern, hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBFormat( cName, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBFormat( ::pPtr, cName, hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBMultiLineCommentFormat( pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBMultiLineCommentFormat( ::pPtr, hbqt_ptr( pFormat ) ) - - diff --git a/harbour/contrib/hbqt/qtgui/TQTableView.prg b/harbour/contrib/hbqt/qtgui/TQTableView.prg index 724aa6db82..b78f83747d 100644 --- a/harbour/contrib/hbqt/qtgui/TQTableView.prg +++ b/harbour/contrib/hbqt/qtgui/TQTableView.prg @@ -289,20 +289,3 @@ METHOD QTableView:showColumn( nColumn ) METHOD QTableView:showRow( nRow ) RETURN Qt_QTableView_showRow( ::pPtr, nRow ) - - -CREATE CLASS HBQTableView INHERIT QTableView - - METHOD new( pParent ) - METHOD navigate( nCursorAction, nModifiers ) - - ENDCLASS - -METHOD HBQTableView:new( pParent ) - ::pPtr := Qt_HBQTableView( pParent ) - RETURN Self - -METHOD HBQTableView:navigate( nCursorAction, nModifiers ) - RETURN Qt_HBQTableView_navigate( ::pPtr, nCursorAction, nModifiers ) - - diff --git a/harbour/contrib/hbqt/qtgui/filelist.mk b/harbour/contrib/hbqt/qtgui/filelist.mk index 3afc77de28..8c84b9e361 100644 --- a/harbour/contrib/hbqt/qtgui/filelist.mk +++ b/harbour/contrib/hbqt/qtgui/filelist.mk @@ -9,6 +9,8 @@ # -------------------------------------------------------------------- CPP_SOURCES := \ + HBQSyntaxHighlighter.cpp \ + HBQTableView.cpp \ HBQTextBlockUserData.cpp \ QAbstractButton.cpp \ QAbstractItemDelegate.cpp \ @@ -224,6 +226,8 @@ CPP_SOURCES := \ PRG_SOURCES := \ + THBQSyntaxHighlighter.prg \ + THBQTableView.prg \ THBQTextBlockUserData.prg \ TQAbstractButton.prg \ TQAbstractItemDelegate.prg \ diff --git a/harbour/contrib/hbqt/qth/HBDbfModel.qth b/harbour/contrib/hbqt/qth/HBDbfModel.qth new file mode 100644 index 0000000000..57d9f99cab --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBDbfModel.qth @@ -0,0 +1,98 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QAbstractItemModel +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbdbfmodel.h" + + +/* + * + * + */ +HB_FUNC( QT_HBDBFMODEL ) +{ + hb_retptr( new HBDbfModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ) ); +} + + + + + + +void hbSetRowColumns( int rows, int cols ) +void reset() +QModelIndex index( int row, int column, const QModelIndex & parent = QModelIndex() ) const + + + + + + + diff --git a/harbour/contrib/hbqt/qth/HBEvents.qth b/harbour/contrib/hbqt/qth/HBEvents.qth new file mode 100644 index 0000000000..c53953fc67 --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBEvents.qth @@ -0,0 +1,99 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QObject +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbevents.h" + + +/* + * HBEvents() + * ~HBEvents() + * + */ +HB_FUNC( QT_HBEVENTS ) +{ + hb_retptr( new HBEvents() ); +} + + + + + + +bool hbConnect( PHB_ITEM obj, int event, PHB_ITEM block ) +bool hbDisconnect( PHB_ITEM obj, int event ) +bool hbClear() + + + + + + + diff --git a/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth b/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth new file mode 100644 index 0000000000..3763495f78 --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBQSyntaxHighLighter.qth @@ -0,0 +1,111 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QSyntaxHighlighter +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbqsyntaxhighlighter.h" + +/* + * + * + */ +HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER ) +{ + hb_retptr( new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ); +} + + + + + + + +void hbSetMultiLineCommentFormat( const QTextCharFormat & format ) +void hbSetRule( QString name, QString pattern, QTextCharFormat & format ) +void hbSetFormat( QString name, const QTextCharFormat & format ) + +# QTextBlock currentBlock () const +# int currentBlockState () const +# QTextBlockUserData * currentBlockUserData () const +# QTextCharFormat format ( int position ) const +# virtual void highlightBlock ( const QString & text ) = 0 +# int previousBlockState () const +# void setCurrentBlockState ( int newState ) +# void setCurrentBlockUserData ( QTextBlockUserData * data ) +# void setFormat ( int start, int count, const QTextCharFormat & format ) +# void setFormat ( int start, int count, const QColor & color ) +# void setFormat ( int start, int count, const QFont & font ) + + + + + + + + diff --git a/harbour/contrib/hbqt/qth/HBQTableView.qth b/harbour/contrib/hbqt/qth/HBQTableView.qth new file mode 100644 index 0000000000..3f6e49bc61 --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBQTableView.qth @@ -0,0 +1,95 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QTableView +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbqtableview.h" + + +/* + * + * + */ +HB_FUNC( QT_HBQTABLEVIEW ) +{ + hb_retptr( new HBQTableView( hbqt_par_QWidget( 1 ) ) ); +} + + + + + + + + + + + + + diff --git a/harbour/contrib/hbqt/qth/HBQTextBlockUserData.qth b/harbour/contrib/hbqt/qth/HBQTextBlockUserData.qth index 86e6ac4683..b3860fd2a2 100644 --- a/harbour/contrib/hbqt/qth/HBQTextBlockUserData.qth +++ b/harbour/contrib/hbqt/qth/HBQTextBlockUserData.qth @@ -85,7 +85,8 @@ HB_FUNC( QT_HBQTEXTBLOCKUSERDATA ) -void setData( int state ) +int hbSetState( int state ) +int hbState() diff --git a/harbour/contrib/hbqt/qth/HBSlots.qth b/harbour/contrib/hbqt/qth/HBSlots.qth new file mode 100644 index 0000000000..99cfe92ba7 --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBSlots.qth @@ -0,0 +1,99 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QObject +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbslots.h" + + +/* + * HBSlots() + * ~HBSlots() + */ +HB_FUNC( QT_HBSLOTS ) +{ + hb_retptr( new HBSlots() ); +} + + + + + + +bool hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) +bool hbDisconnect( PHB_ITEM obj, const char * slot ) +bool hbIsConnected( PHB_ITEM obj, const char * slot ) +bool hbClear() + + + + + + + diff --git a/harbour/contrib/hbqt/qth/QAbstractItemModel.qth b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth index c6f083334d..b2b7f6c730 100644 --- a/harbour/contrib/hbqt/qth/QAbstractItemModel.qth +++ b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth @@ -61,28 +61,6 @@ New = -CREATE CLASS HBDbfModel INHERIT QAbstractItemModel - - METHOD new( bBlock ) - METHOD reset() - METHOD index( nRow, nCol ) - METHOD hbSetRowColumns( nRows, nCols ) - - ENDCLASS - -METHOD HBDbfModel:new( bBlock ) - ::pPtr := Qt_HBDbfModel( bBlock ) - RETURN Self - -METHOD HBDbfModel:reset() - RETURN Qt_HBDbfModel_reset( ::pPtr ) - -METHOD HBDbfModel:index( nRow, nCol ) - RETURN Qt_HBDbfModel_index( ::pPtr, nRow, nCol, 0 ) - -METHOD HBDbfModel:hbSetRowColumns( nRows, nCols ) - RETURN Qt_HBDbfModel_hbSetRowColumns( ::pPtr, nRows, nCols ) - @@ -90,7 +68,6 @@ METHOD HBDbfModel:hbSetRowColumns( nRows, nCols ) #include #include -#include "../hbqt_hbdbfmodel.h" /* * QAbstractItemModel ( QObject * parent = 0 ) diff --git a/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth b/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth index 75add08a67..dec899cd72 100644 --- a/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth +++ b/harbour/contrib/hbqt/qth/QSyntaxHighlighter.qth @@ -62,58 +62,12 @@ New = - -CREATE CLASS HBQSyntaxHighlighter INHERIT QSyntaxHighlighter - - METHOD new( ... ) - METHOD configure( xObject ) - METHOD setHBCompilerDirectives( pDirectives, pFormat ) - METHOD setHBRule( cName, cPattern, pFormat ) - METHOD setHBFormat( cName, pFormat ) - METHOD setHBMultiLineCommentFormat( pFormat ) - - ENDCLASS - -METHOD HBQSyntaxHighlighter:new( ... ) - LOCAL p - FOR EACH p IN { ... } - p := hbqt_ptr( p ) - hb_pvalue( p:__enumIndex(), p ) - NEXT - ::pPtr := Qt_QSyntaxHighlighter( ... ) - RETURN Self - - -METHOD HBQSyntaxHighlighter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD HBQSyntaxHighlighter:setHBCompilerDirectives( pDirectives, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBCompilerDirectives( ::pPtr, hbqt_ptr( pDirectives ), hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBRule( cName, cPattern, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBRule( ::pPtr, cName, cPattern, hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBFormat( cName, pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBFormat( ::pPtr, cName, hbqt_ptr( pFormat ) ) - - -METHOD HBQSyntaxHighlighter:setHBMultiLineCommentFormat( pFormat ) - RETURN Qt_HBQSyntaxHighlighter_setHBMultiLineCommentFormat( ::pPtr, hbqt_ptr( pFormat ) ) - -oSynHiliter := QSyntaxHighlighter():new( pObject ) -oSynHiliter := QSyntaxHighlighter():new( "QTextDocument", pQTextDocument ) -oSynHiliter := QSyntaxHighlighter():new( "QTextEdit", pQTextEdit ) +oSynHiliter := HBQSyntaxHighlighter():new( pObject ) +oSynHiliter := HBQSyntaxHighlighter():new( "QTextDocument", pQTextDocument ) +oSynHiliter := HBQSyntaxHighlighter():new( "QTextEdit", pQTextEdit ) @@ -128,10 +82,7 @@ oSynHiliter := QSyntaxHighlighter():new( "QTextEdit", pQTextEdit ) */ HB_FUNC( QT_QSYNTAXHIGHLIGHTER ) { - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) - { - hb_retptr( new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ); - } + } @@ -139,8 +90,10 @@ HB_FUNC( QT_QSYNTAXHIGHLIGHTER ) + QTextDocument * document () const void setDocument ( QTextDocument * doc ) + diff --git a/harbour/contrib/hbqt/qth/QTableView.qth b/harbour/contrib/hbqt/qth/QTableView.qth index 569d6d95e2..1ead1325e0 100644 --- a/harbour/contrib/hbqt/qth/QTableView.qth +++ b/harbour/contrib/hbqt/qth/QTableView.qth @@ -60,27 +60,11 @@ New = pParent -CREATE CLASS HBQTableView INHERIT QTableView - - METHOD new( pParent ) - METHOD navigate( nCursorAction, nModifiers ) - - ENDCLASS - -METHOD HBQTableView:new( pParent ) - ::pPtr := Qt_HBQTableView( pParent ) - RETURN Self - -METHOD HBQTableView:navigate( nCursorAction, nModifiers ) - RETURN Qt_HBQTableView_navigate( ::pPtr, nCursorAction, nModifiers ) - #include -#include "../hbqt_hbqtableview.h" - /* * QTableView ( QWidget * parent = 0 ) * ~QTableView () diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp index 98f81f960d..1028542a3d 100644 --- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp @@ -163,6 +163,7 @@ HB_FUNC( QT_QFTP ) hb_retptrGC( hbqt_gcAllocate_QFtp( pObj, true ) ); } + /* * qint64 bytesAvailable () const */ diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp index 97090f25bd..eb4779e727 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp @@ -163,6 +163,7 @@ HB_FUNC( QT_QHTTP ) hb_retptrGC( hbqt_gcAllocate_QHttp( pObj, true ) ); } + /* * qint64 bytesAvailable () const */ diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp index 616b70ddf9..c653c64b68 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp @@ -117,6 +117,7 @@ void * hbqt_gcAllocate_QHttpHeader( void * pObj, bool bNew ) HB_FUNC( QT_QHTTPHEADER ) { } + /* * void addValue ( const QString & key, const QString & value ) */ diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp index 64dccbdee5..058c5ef844 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QHttpRequestHeader ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QHTTPREQUESTHEADER ) hb_retptrGC( hbqt_gcAllocate_QHttpRequestHeader( pObj, true ) ); } + /* * virtual int majorVersion () const */ diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp index ba1b90b28d..402a17d975 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp @@ -86,7 +86,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QHttpResponseHeader ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -131,6 +131,7 @@ HB_FUNC( QT_QHTTPRESPONSEHEADER ) hb_retptrGC( hbqt_gcAllocate_QHttpResponseHeader( pObj, true ) ); } + /* * virtual int majorVersion () const */ diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp index 52efd56c11..8fd26e4f4d 100644 --- a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp @@ -105,7 +105,7 @@ typedef struct QT_G_FUNC( hbqt_gcRelease_QNetworkRequest ) { - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; if( p && p->bNew ) { @@ -150,6 +150,7 @@ HB_FUNC( QT_QNETWORKREQUEST ) hb_retptrGC( hbqt_gcAllocate_QNetworkRequest( pObj, true ) ); } + /* * QVariant attribute ( Attribute code, const QVariant & defaultValue = QVariant() ) const */