fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-16 22:29 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/generator/hbqtgen.prg
  * contrib/hbqt/generator/qt45.qtp
  * contrib/hbqt/hbqt.h
  * contrib/hbqt/hbqt_base.cpp
  * contrib/hbqt/hbqt_garbage.h
  * contrib/hbqt/hbqt_hbdbfmodel.cpp
  * contrib/hbqt/hbqt_hbevents.cpp
  * contrib/hbqt/hbqt_hbqmainwindow.cpp
  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
  * contrib/hbqt/hbqt_hbqtableview.cpp
  * contrib/hbqt/hbqt_hbslots.cpp

  + contrib/hbqt/qth/HBQTextBlockUserData.qth
  * contrib/hbqt/qth/QAbstractTextDocumentLayout.qth
  * contrib/hbqt/qth/QApplication.qth
  * contrib/hbqt/qth/QClipboard.qth
  * contrib/hbqt/qth/QComboBox.qth
  * contrib/hbqt/qth/QCursor.qth
  * contrib/hbqt/qth/QDragEnterEvent.qth
  * contrib/hbqt/qth/QDragLeaveEvent.qth
  * contrib/hbqt/qth/QDropEvent.qth
  * contrib/hbqt/qth/QFocusEvent.qth
  * contrib/hbqt/qth/QGradient.qth
  * contrib/hbqt/qth/QKeyEvent.qth
  * contrib/hbqt/qth/QLabel.qth
  * contrib/hbqt/qth/QLayoutItem.qth
  * contrib/hbqt/qth/QLineEdit.qth
  * contrib/hbqt/qth/QMoveEvent.qth
  * contrib/hbqt/qth/QPaintDevice.qth
  + contrib/hbqt/qth/QPaintEngine.qth
  * contrib/hbqt/qth/QPrintEngine.qth
  * contrib/hbqt/qth/QResizeEvent.qth
  * contrib/hbqt/qth/QSplitter.qth
  * contrib/hbqt/qth/QStandardItemModel.qth
  * contrib/hbqt/qth/QStyleHintReturn.qth
  * contrib/hbqt/qth/QStyleHintReturnMask.qth
  * contrib/hbqt/qth/QStyleHintReturnVariant.qth
  * contrib/hbqt/qth/QTextBlock.qth
  * contrib/hbqt/qth/QTextCursor.qth
  + contrib/hbqt/qth/QTextList.qth
  * contrib/hbqt/qth/QWheelEvent.qth
  * contrib/hbqt/qth/QWidget.qth

  * contrib/hbqt/tests/demoqt.prg

  * contrib/hbxbp/tests/demoxbp.prg

  * contrib/hbxbp/xbpgeneric.prg
  * contrib/hbxbp/xbpmenubar.prg

  * contrib/hbqt/qtcore/*.cpp
  * contrib/hbqt/qtgui/*.cpp
  * contrib/hbqt/qtnetwork/*.cpp

    ! This commit change some rules to parse .qth files to 
      prepare the wrappers to be encapsulated in hb_retptrGC 
      envelop. It also attempts to pin-point the spots where
      mem-leak could occur. Only very few calls are left to 
      plain hb_retptr() which eventually will be handled
      the other way.

      Only delete ( Q* ) p; is retained. Other two methods are
      eliminated. Demos are updated to respect it.

      demoQT and demoXBP now consume very less memory when new 
      dialogs are opened. It means memory management has 
      improved with this commit. Anyhow still I can see 
      memory growing specially in browser navigation. As I 
      remember sometime in past I could manage the sonstant memory,
      but now I do not remember at what stage we were on Qt.

      Though all the three variants, demoQT, demoXBP, hbIDE are 
      working properly, still there could be regression, please test.
This commit is contained in:
Pritpal Bedi
2010-01-17 07:11:24 +00:00
parent 1df5cb8b4d
commit 665579dcda
578 changed files with 10585 additions and 6195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
harbour/ChangeLog
View File

@@ -17,6 +17,82 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-16 22:29 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/generator/hbqtgen.prg
* contrib/hbqt/generator/qt45.qtp
* contrib/hbqt/hbqt.h
* contrib/hbqt/hbqt_base.cpp
* contrib/hbqt/hbqt_garbage.h
* contrib/hbqt/hbqt_hbdbfmodel.cpp
* contrib/hbqt/hbqt_hbevents.cpp
* contrib/hbqt/hbqt_hbqmainwindow.cpp
* contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
* contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
* contrib/hbqt/hbqt_hbqtableview.cpp
* contrib/hbqt/hbqt_hbslots.cpp
+ contrib/hbqt/qth/HBQTextBlockUserData.qth
* contrib/hbqt/qth/QAbstractTextDocumentLayout.qth
* contrib/hbqt/qth/QApplication.qth
* contrib/hbqt/qth/QClipboard.qth
* contrib/hbqt/qth/QComboBox.qth
* contrib/hbqt/qth/QCursor.qth
* contrib/hbqt/qth/QDragEnterEvent.qth
* contrib/hbqt/qth/QDragLeaveEvent.qth
* contrib/hbqt/qth/QDropEvent.qth
* contrib/hbqt/qth/QFocusEvent.qth
* contrib/hbqt/qth/QGradient.qth
* contrib/hbqt/qth/QKeyEvent.qth
* contrib/hbqt/qth/QLabel.qth
* contrib/hbqt/qth/QLayoutItem.qth
* contrib/hbqt/qth/QLineEdit.qth
* contrib/hbqt/qth/QMoveEvent.qth
* contrib/hbqt/qth/QPaintDevice.qth
+ contrib/hbqt/qth/QPaintEngine.qth
* contrib/hbqt/qth/QPrintEngine.qth
* contrib/hbqt/qth/QResizeEvent.qth
* contrib/hbqt/qth/QSplitter.qth
* contrib/hbqt/qth/QStandardItemModel.qth
* contrib/hbqt/qth/QStyleHintReturn.qth
* contrib/hbqt/qth/QStyleHintReturnMask.qth
* contrib/hbqt/qth/QStyleHintReturnVariant.qth
* contrib/hbqt/qth/QTextBlock.qth
* contrib/hbqt/qth/QTextCursor.qth
+ contrib/hbqt/qth/QTextList.qth
* contrib/hbqt/qth/QWheelEvent.qth
* contrib/hbqt/qth/QWidget.qth
* contrib/hbqt/tests/demoqt.prg
* contrib/hbxbp/tests/demoxbp.prg
* contrib/hbxbp/xbpgeneric.prg
* contrib/hbxbp/xbpmenubar.prg
* contrib/hbqt/qtcore/*.cpp
* contrib/hbqt/qtgui/*.cpp
* contrib/hbqt/qtnetwork/*.cpp
! This commit change some rules to parse .qth files to
prepare the wrappers to be encapsulated in hb_retptrGC
envelop. It also attempts to pin-point the spots where
mem-leak could occur. Only very few calls are left to
plain hb_retptr() which eventually will be handled
the other way.
Only delete ( Q* ) p; is retained. Other two methods are
eliminated. Demos are updated to respect it.
demoQT and demoXBP now consume very less memory when new
dialogs are opened. It means memory management has
improved with this commit. Anyhow still I can see
memory growing specially in browser navigation. As I
remember sometime in past I could manage the sonstant memory,
but now I do not remember at what stage we were on Qt.
Though all the three variants, demoQT, demoXBP, hbIDE are
working properly, still there could be regression, please test.
2010-01-16 13:43 UTC+0500 April White (april users.sourceforge.net)
* contrib/hbbtree/test/test.prg
* moved existing code into procedures in preparation for

341
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -517,10 +517,9 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
aadd( cpp_, "" )
ENDIF
lList := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "list" .and. lower( e_[ 2 ] ) == "yes" } ) > 0
//cWgt := IF( lList, cWidget +"< void * >", cWidget )
lDestructor := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .and. lower( e_[ 2 ] ) == "no"} ) == 0
lObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .and. lower( e_[ 2 ] ) == "no"} ) == 0
lList := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "list" .AND. lower( e_[ 2 ] ) == "yes" } ) > 0
lDestructor := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
lObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
IF ( lNewGCtoQT )
lConst := .f.
@@ -532,110 +531,68 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
ENDIF
ENDIF
NEXT
IF ( lDestructor ) .AND. ( lConst )
IF lObject
aadd( cpp_, "typedef struct" )
aadd( cpp_, "{" )
aadd( cpp_, " void * ph;" )
aadd( cpp_, " QT_G_FUNC_PTR func;" )
aadd( cpp_, " QPointer< "+ cWidget +" > pq;" )
aadd( cpp_, "} QGC_POINTER_" + cWidget + ";" )
aadd( cpp_, " " )
ENDIF
aadd( cpp_, "typedef struct" )
aadd( cpp_, "{" )
aadd( cpp_, " void * ph;" )
aadd( cpp_, " bool bNew;" )
aadd( cpp_, " QT_G_FUNC_PTR func;" )
IF lObject
aadd( cpp_, " QPointer< "+ cWidget +" > pq;" )
ENDIF
aadd( cpp_, "} QGC_POINTER_" + cWidget + ";" )
aadd( cpp_, " " )
aadd( cpp_, "QT_G_FUNC( hbqt_gcRelease_" + cWidget + " )" )
aadd( cpp_, "{" )
IF ( lDestructor ) .AND. ( lConst )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) Cargo; " )
aadd( cpp_, " " )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' p=%p", p));')
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' ph=%p pq=%p", p->ph, (void *)(p->pq)));')
aadd( cpp_, " " )
aadd( cpp_, " if( p && p->ph && p->pq ) " )
aadd( cpp_, " { " )
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " if( p && p->bNew )" )
aadd( cpp_, " {" )
aadd( cpp_, " if( p->ph && p->pq )" )
aadd( cpp_, " {" )
aadd( cpp_, " switch( hbqt_get_object_release_method() )" )
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " {" )
aadd( cpp_, " case HBQT_RELEASE_WITH_DELETE:" )
aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
aadd( cpp_, " break;" )
aadd( cpp_, " case HBQT_RELEASE_WITH_DESTRUTOR:" )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph )->~" + cWidget + "(); " )
aadd( cpp_, " break;" )
aadd( cpp_, " case HBQT_RELEASE_WITH_DELETE_LATER:" )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph )->deleteLater(); " )
aadd( cpp_, " break;" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "YES_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_, " p->ph = NULL;" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
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_, " if( p && p->bNew )" )
aadd( cpp_, " {" )
aadd( cpp_, " if( p->ph )" )
aadd( cpp_, " {" )
aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "YES_rel_' + pad( cWidget, 27 ) + 'ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
aadd( cpp_, " p->ph = NULL;" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_' + pad( cWidget, 27 ) + ' Object Name Missing!" ) );')
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) Cargo; " )
aadd( cpp_, " " )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' p=%p", p ) );' )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' ph=%p", p->ph ) );' )
aadd( cpp_, " " )
aadd( cpp_, " if( p && p->ph ) " )
aadd( cpp_, " { " )
aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph ); " )
//aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph )->~" + cWidget + "(); " )
aadd( cpp_, " p->ph = NULL;" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_' + pad( cWidget, 27 ) + ' Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
ENDIF
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_' + pad( cWidget, 27 ) + ' Object already deleted!" ) );' )
aadd( cpp_, " }" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_' + pad( cWidget, 27 ) + ' Object Already deleted!" ) );' )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_' + pad( cWidget, 27 ) + ' Object not created with - new" ) );' )
aadd( cpp_, " p->ph = NULL;" )
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )
ELSE
aadd( cpp_, "QT_G_FUNC( hbqt_gcRelease_" + cWidget + " ) " )
aadd( cpp_, "{ " )
IF lDestructor
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
aadd( cpp_, "" )
aadd( cpp_, " void * ph = ( void * ) Cargo; " )
aadd( cpp_, " if( ph ) " )
aadd( cpp_, " { " )
IF lObject
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " {" )
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( " Object Name Missin: ' + pad( cWidget, 27 ) + '" ) );')
aadd( cpp_, " }" )
ELSE
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
ENDIF
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "! ph_____' + cWidget + '" ) );')
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )
aadd( cpp_, "}" )
aadd( cpp_, "" )
ENDIF
/* Insert CONSTRUCTOR - if defined */
lConst := .f.
FOR i := 3 TO len( new_ ) - 1
@@ -648,27 +605,28 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
NEXT
IF ( lNewGCtoQT )
IF lConst
IF lDestructor
aadd( cpp_, "void * hbqt_gcAllocate_" + cWidget + "( void * pObj )" )
aadd( cpp_, "{ " )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), hbqt_gcFuncs() );" )
ELSE
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
ENDIF
aadd( cpp_, "" )
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->func = hbqt_gcRelease_" + cWidget + ";" )
IF lObject
aadd( cpp_, " new( & p->pq ) QPointer< "+ cWidget +" >( ( " + cWidget + " * ) pObj );" )
ENDIF
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( " new_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
aadd( cpp_, " return p;" )
aadd( cpp_, "}" )
aadd( cpp_, "" )
ENDIF
aadd( cpp_, "void * hbqt_gcAllocate_" + cWidget + "( void * pObj, bool bNew )" )
aadd( cpp_, "{ " )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), hbqt_gcFuncs() );" )
ELSE
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
ENDIF
aadd( cpp_, "" )
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->bNew = bNew;" )
aadd( cpp_, " p->func = hbqt_gcRelease_" + cWidget + ";" )
aadd( cpp_, "" )
aadd( cpp_, " if( bNew )" )
aadd( cpp_, " {" )
IF lObject
aadd( cpp_, " new( & p->pq ) QPointer< "+ cWidget +" >( ( " + cWidget + " * ) pObj );" )
ENDIF
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( " _new_' + pad( cWidget, 27 ) + 'ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );')
aadd( cpp_, " }" )
aadd( cpp_, " return p;" )
aadd( cpp_, "}" )
aadd( cpp_, "" )
aadd( cpp_, new_[ 1 ] ) // Func definition
aadd( cpp_, new_[ 2 ] ) // {
@@ -690,55 +648,14 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
NEXT
aadd( cpp_, " " )
IF lDestructor
aadd( cpp_, " hb_retptrGC( hbqt_gcAllocate_" + cWidget + "( pObj ) );" )
ELSE
aadd( cpp_, " hb_retptr( pObj );" )
ENDIF
ENDIF
aadd( cpp_, new_[ len( new_ ) ] ) // }
ELSE
aadd( cpp_, new_[ 1 ] ) // Func definition
aadd( cpp_, new_[ 2 ] ) // {
IF lConst
IF lDestructor
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
ENDIF
IF lObject
aadd( cpp_, " QPointer< "+ cWidget +" > pObj = NULL;" )
ELSE
aadd( cpp_, " void * pObj = NULL;" )
ENDIF
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( " ' + IIF( lDestructor, 'GC', 'NON-GC' ) + ': new ' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );' )
aadd( cpp_, "" )
FOR i := 3 TO len( new_ ) - 1
IF left( ltrim( new_[ i ] ), 2 ) != "//"
IF "hb_retptr(" $ new_[ i ]
s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) )
s := strtran( s, ");", ";" )
aadd( cpp_, s )
ELSE
aadd( cpp_, new_[ i ] )
ENDIF
ENDIF
NEXT
aadd( cpp_, "" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( " ' + IIF( lDestructor, 'GC', 'NON-GC' ) + ': ' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );' )
//IF lObject .or. IsMemObject( cWidget )
IF lDestructor
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->func = hbqt_gcRelease_" + cWidget +";" )
aadd( cpp_, " " )
aadd( cpp_, " hb_retptrGC( p );" )
aadd( cpp_, " hb_retptrGC( hbqt_gcAllocate_" + cWidget + "( pObj, true ) );" )
ELSE
aadd( cpp_, " hb_retptr( pObj );" )
ENDIF
ENDIF
aadd( cpp_, new_[ len( new_ ) ] ) // }
ENDIF
/* Insert Functions */
aeval( txt_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } )
@@ -788,36 +705,34 @@ FUNCTION GetSourcePathByLib( cWidget, cPathOut, cExt, cPre )
/*----------------------------------------------------------------------*/
#define PRT_L_CONST 1
#define PRT_L_FAR 2
#define PRT_L_AND 3
#define PRT_L_VIRT 4
#define PRT_NAME 5
#define PRT_CAST 6
#define PRT_DEFAULT 7
#define PRT_RAW 8
#define PRT_BODY 9
#define PRT_DOC 10
#define PRT_BODY_PRE 11
#define PRT_L_CONST 1
#define PRT_L_FAR 2
#define PRT_L_AND 3
#define PRT_L_VIRT 4
#define PRT_NAME 5
#define PRT_CAST 6
#define PRT_DEFAULT 7
#define PRT_RAW 8
#define PRT_BODY 9
#define PRT_DOC 10
#define PRT_BODY_PRE 11
#define PRT_L_CONST_LAST 12
#define PRT_ATTRB_MAX 11
#define PRT_ATTRB_MAX 12
#define THIS_PROPER( s ) ( upper( left( s,1 ) ) + substr( s,2 ) )
STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
LOCAL aRet, aA, aArgus, aArg, aPar, aPre
LOCAL n, nn, nHBIdx
LOCAL cPre, cPar, cRet, cFun, cParas, cDocs, cCmd, cPas, s, ss
LOCAL aRet, aA, aArgus, aArg, aPar, aPre, n, nn, nHBIdx
LOCAL cPre, cPar, cRet, cFun, cParas, cDocs, cCmd, cPas, s, ss, cFirstParamCast
LOCAL cWdg, cCmn, cPrgRet, cHBFunc, cHBIdx, cDocNM
LOCAL lSuccess
LOCAL cInt := 'int,qint16,quint16,QChar,short,ushort'
LOCAL cIntLong := 'qint32,quint32,QRgb'
LOCAL cIntLongLong := 'qint64,quint64,qlonglong,qulonglong'
LOCAL cFirstParamCast
cParas := ''
cDocs := ''
//aArgus := {}
aRet := {}; aArgus := {}
n := at( '(', cProto )
@@ -827,24 +742,25 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
/* Pull out pre-mid-post components */
cPre := alltrim( substr( cProto, 1, n-1 ) )
cPar := alltrim( substr( cProto, n+1, nn-1-n ) )
cPas := alltrim( substr( cProto, nn+1 ) )
cPas := alltrim( substr( cProto, nn+1 ) )
/* parse cPre, it has two components */
n := rat( ' ', cPre )
IF n > 0 /* And it must be, otherwise it is constructor function which we write in <CODE>section */
cFun := alltrim( substr( cPre, n+1 ) )
cRet := alltrim( substr( cPre, 1, n-1 ) )
cFun := alltrim( substr( cPre, n + 1 ) )
cRet := alltrim( substr( cPre, 1, n - 1 ) )
ELSE
cFun := cPre
cRet := ''
ENDIF
aRet := array( PRT_ATTRB_MAX )
aRet[ PRT_L_CONST ] := 'const' $ cRet .or. 'const' $ cPas
aRet[ PRT_L_AND ] := '&' $ cRet
aRet[ PRT_L_FAR ] := '*' $ cRet
aRet[ PRT_L_VIRT ] := 'virtual' $ cRet
JustACall( cPas ) ////////////////////////////////////////////////////////
aRet[ PRT_L_CONST ] := 'const' $ cRet //.or. 'const' $ cPas
aRet[ PRT_L_AND ] := '&' $ cRet
aRet[ PRT_L_FAR ] := '*' $ cRet
aRet[ PRT_L_VIRT ] := 'virtual' $ cRet
aRet[ PRT_L_CONST_LAST ] := 'const' $ cPas
cRet := strtran( cRet, 'const ' , '' )
cRet := strtran( cRet, '& ' , '' )
@@ -1064,7 +980,6 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
CASE aA[ PRT_L_AND ] .and. aA[ PRT_L_CONST ]
s := '*hbqt_par_' + aA[ PRT_CAST ] + '( ' + cHBIdx + ' )'
IF !empty( aA[ PRT_DEFAULT ] ) .and. ( '(' $ aA[ PRT_DEFAULT ] )
//aA[ PRT_BODY ] := '( HB_ISNIL( ' + cHBIdx + ' ) ? ' + aA[ PRT_DEFAULT ] + ' : ' + s + ' )'
aA[ PRT_BODY ] := '( HB_ISPOINTER( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
ELSE
aA[ PRT_BODY ] := s
@@ -1092,7 +1007,8 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
/* Build complete code line */
IF .t.
aA := aRet
aA := aRet /* T A K E C A R E */
//
cWdg := 'hbqt_par_' + cWidget + '( 1 )->'
cParas := '( ' + cParas + ' )'
cCmn := cWdg + cFun + cParas
@@ -1147,10 +1063,41 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
cCmd := 'hb_retc( ' + cCmn + ' )'
cPrgRet := 'c' + cDocNM
CASE aA[ PRT_L_FAR ]
CASE aA[ PRT_L_FAR ] .AND. ( aA[ PRT_CAST ] $ "uchar" )
cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
cPrgRet := 'p' + cDocNM
// CASE aA[ PRT_L_FAR ]
CASE aA[ PRT_L_FAR ] .AND. !( aA[ PRT_L_CONST ] )
//cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
IF ( left( aA[ PRT_CAST ], 1 ) == 'Q' )
cCmd := Get_Command( aA[ PRT_CAST ], cCmn, .F. )
ELSE
cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
ENDIF
cPrgRet := 'p' + cDocNM
CASE ( left( aA[ PRT_CAST ], 1 ) == 'Q' ) .AND. ;
aA[ PRT_L_FAR ] .AND. ;
aA[ PRT_L_CONST ] .AND. ;
( "Abstract" $ aA[ PRT_CAST ] )
cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
cPrgRet := 'p' + cDocNM
CASE ( left( aA[ PRT_CAST ], 1 ) == 'Q' ) .AND. ;
aA[ PRT_L_FAR ] .AND. ;
aA[ PRT_L_CONST ] .AND. ;
aA[ PRT_L_VIRT ]
cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
cPrgRet := 'p' + cDocNM
CASE ( left( aA[ PRT_CAST ], 1 ) == 'Q' ) .AND. ;
aA[ PRT_L_FAR ] .AND. ;
aA[ PRT_L_CONST ] .AND. ;
aA[ PRT_L_CONST_LAST ]
cCmd := Get_Command_1( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
CASE aA[ PRT_L_AND ] .AND. aA[ PRT_L_CONST ]
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
@@ -1165,7 +1112,7 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
OTHERWISE
/* No attribute is attached to return value */
IF (left( aA[ PRT_CAST ], 1 ) == 'Q')
IF ( left( aA[ PRT_CAST ], 1 ) == 'Q' )
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
@@ -1329,8 +1276,6 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
OTHERWISE
/* No attribute is attached to return value */
IF (left( aA[ PRT_CAST ], 1 ) == 'Q')
// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
@@ -1413,7 +1358,7 @@ STATIC FUNCTION BuildHeader( txt_, nMode )
aadd( txt_, " * Harbour Project source code:" )
aadd( txt_, " * QT wrapper main header" )
aadd( txt_, " * " )
aadd( txt_, " * Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>" )
aadd( txt_, " * Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>" )
aadd( txt_, " * " )
aadd( txt_, " * Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>" )
aadd( txt_, " * www - http://www.harbour-project.org" )
@@ -1462,7 +1407,7 @@ STATIC FUNCTION BuildHeader( txt_, nMode )
aadd( txt_, "" )
IF nMode == 0
aadd( txt_, '#include "hbapi.h"' )
aadd( txt_, '#include "../hbqt.h"' ) /////////////
aadd( txt_, '#include "../hbqt.h"' ) /////////////
aadd( txt_, "" )
aadd( txt_, "/*----------------------------------------------------------------------*/" )
aadd( txt_, "#if QT_VERSION >= 0x040500" )
@@ -1672,9 +1617,9 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut )
NEXT
aadd( txt_, "" )
IF (lNewGCtoQT)
IF ( lNewGCtoQT )
FOR EACH s IN cpp_
aadd( txt_, "extern void * hbqt_gcAllocate_" + s + "( void * pObj );" )
aadd( txt_, "extern void * hbqt_gcAllocate_" + s + "( void * pObj, bool bNew );" )
NEXT
aadd( txt_, "" )
ENDIF
@@ -2333,16 +2278,23 @@ FUNCTION IsMemObject( cWidget )
/*----------------------------------------------------------------------*/
FUNCTION Get_Command( cWgt, cCmn )
STATIC a_:={}
FUNCTION Get_Command_1( cWgt, cCmn )
RETURN 'hb_retptrGC( hbqt_gcAllocate_' + cWgt + '( new ' + cWgt + '( *( ' + cCmn + ' ) ), true ) )'
/*----------------------------------------------------------------------*/
FUNCTION Get_Command( cWgt, cCmn, lNew )
LOCAL cRet
IF ascan( a_, cWgt ) == 0
aadd( a_, cWgt )
ENDIF
DEFAULT lNew TO .T.
IF (lNewGCtoQT)
cRet := 'hb_retptrGC( hbqt_gcAllocate_' + cWgt + '( new ' + cWgt + '( ' + cCmn + ' ) ) )'
IF ( lNewGCtoQT )
IF lNew
cRet := 'hb_retptrGC( hbqt_gcAllocate_' + cWgt + '( new ' + cWgt + '( ' + cCmn + ' ), true ) )'
ELSE
cRet := 'hb_retptrGC( hbqt_gcAllocate_' + cWgt + '( ' + cCmn + ', false ) )'
ENDIF
ELSE
cRet := 'hb_retptrGC( hbqt_ptrTOgcpointer( new ' + cWgt + '( ' + cCmn + ' ), hbqt_gcRelease_' + cWgt +' ) )'
ENDIF
@@ -2391,3 +2343,8 @@ FUNCTION ParsePtr( cParam )
RETURN cPar
/*----------------------------------------------------------------------*/
FUNCTION JustACall()
RETURN nil
/*----------------------------------------------------------------------*/

8
harbour/contrib/hbqt/generator/qt45.qtp
View File

@@ -14,7 +14,7 @@
-D=../doc
HBQTextBlockUserData.qth
QAbstractButton.qth
QAbstractItemDelegate.qth
QAbstractItemModel.qth
@@ -137,10 +137,11 @@ QMoveEvent.qth
QMovie.qth
QNetworkRequest.qth
QObject.qth
QPaintDevice.qth
QPainterPath.qth
QPageSetupDialog.qth
QPaintDevice.qth
QPaintEngine.qth
QPainter.qth
QPainterPath.qth
QPaintEvent.qth
QPalette.qth
QPen.qth
@@ -248,6 +249,7 @@ QTextItem.qth
QTextLayout.qth
QTextLength.qth
QTextLine.qth
QTextList.qth
QTextListFormat.qth
QTextObject.qth
QTextOption.qth

6
harbour/contrib/hbqt/hbqt.h
View File

@@ -69,7 +69,8 @@ typedef QT_G_FUNC_ * QT_G_FUNC_PTR;
typedef struct
{
void * ph;
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER;
@@ -224,6 +225,8 @@ extern void * hbqt_pPtrFromObj( int iParam );
#define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPaintEngine( n ) ( ( QPaintEngine * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPaintEngineState( n ) ( ( QPaintEngineState * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPainter( n ) ( ( QPainter * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPainterPath( n ) ( ( QPainterPath * ) hbqt_gcpointer( n ) )
#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent * ) hbqt_gcpointer( n ) )
@@ -336,6 +339,7 @@ extern void * hbqt_pPtrFromObj( int iParam );
#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextItem( n ) ( ( QTextItem * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextList( n ) ( ( QTextList * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextLayout( n ) ( ( QTextLayout * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextLength( n ) ( ( QTextLength * ) hbqt_gcpointer( n ) )
#define hbqt_par_QTextLine( n ) ( ( QTextLine * ) hbqt_gcpointer( n ) )

17
harbour/contrib/hbqt/hbqt_base.cpp
View File

@@ -81,11 +81,22 @@ HB_FUNC( QT_FINDCHILD )
HB_FUNC( HBQT_ISEQUALGCQTPOINTER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
QGC_POINTER * q = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 2 );
if( p && p->ph )
hb_retl( p->ph == hb_parptr( 2 ) );
if( p && q )
{
if( p->ph && q->ph )
hb_retl( p->ph == q->ph );
else
hb_retl( false );
}
else
hb_retl( false );
{
if( p && p->ph )
hb_retl( p->ph == hb_parptr( 2 ) );
else
hb_retl( false );
}
}
#if defined( HB_OS_WIN )

554
harbour/contrib/hbqt/hbqt_garbage.h
View File

@@ -8,6 +8,7 @@
/* or the generator tool itself, and run regenarate. */
/* -------------------------------------------------------------------- */
extern QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData );
extern QT_G_FUNC( hbqt_gcRelease_QAbstractButton );
extern QT_G_FUNC( hbqt_gcRelease_QAbstractItemDelegate );
extern QT_G_FUNC( hbqt_gcRelease_QAbstractItemModel );
@@ -130,10 +131,11 @@ extern QT_G_FUNC( hbqt_gcRelease_QMoveEvent );
extern QT_G_FUNC( hbqt_gcRelease_QMovie );
extern QT_G_FUNC( hbqt_gcRelease_QNetworkRequest );
extern QT_G_FUNC( hbqt_gcRelease_QObject );
extern QT_G_FUNC( hbqt_gcRelease_QPaintDevice );
extern QT_G_FUNC( hbqt_gcRelease_QPainterPath );
extern QT_G_FUNC( hbqt_gcRelease_QPageSetupDialog );
extern QT_G_FUNC( hbqt_gcRelease_QPaintDevice );
extern QT_G_FUNC( hbqt_gcRelease_QPaintEngine );
extern QT_G_FUNC( hbqt_gcRelease_QPainter );
extern QT_G_FUNC( hbqt_gcRelease_QPainterPath );
extern QT_G_FUNC( hbqt_gcRelease_QPaintEvent );
extern QT_G_FUNC( hbqt_gcRelease_QPalette );
extern QT_G_FUNC( hbqt_gcRelease_QPen );
@@ -241,6 +243,7 @@ extern QT_G_FUNC( hbqt_gcRelease_QTextItem );
extern QT_G_FUNC( hbqt_gcRelease_QTextLayout );
extern QT_G_FUNC( hbqt_gcRelease_QTextLength );
extern QT_G_FUNC( hbqt_gcRelease_QTextLine );
extern QT_G_FUNC( hbqt_gcRelease_QTextList );
extern QT_G_FUNC( hbqt_gcRelease_QTextListFormat );
extern QT_G_FUNC( hbqt_gcRelease_QTextObject );
extern QT_G_FUNC( hbqt_gcRelease_QTextOption );
@@ -281,276 +284,279 @@ 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_QAbstractButton( void * pObj );
extern void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj );
extern void * hbqt_gcAllocate_QAbstractItemModel( void * pObj );
extern void * hbqt_gcAllocate_QAbstractItemView( void * pObj );
extern void * hbqt_gcAllocate_QAbstractListModel( void * pObj );
extern void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj );
extern void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj );
extern void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj );
extern void * hbqt_gcAllocate_QAbstractSlider( void * pObj );
extern void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj );
extern void * hbqt_gcAllocate_QAbstractTableModel( void * pObj );
extern void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj );
extern void * hbqt_gcAllocate_QAction( void * pObj );
extern void * hbqt_gcAllocate_QActionGroup( void * pObj );
extern void * hbqt_gcAllocate_QApplication( void * pObj );
extern void * hbqt_gcAllocate_QBitArray( void * pObj );
extern void * hbqt_gcAllocate_QBitmap( void * pObj );
extern void * hbqt_gcAllocate_QBoxLayout( void * pObj );
extern void * hbqt_gcAllocate_QBrush( void * pObj );
extern void * hbqt_gcAllocate_QButtonGroup( void * pObj );
extern void * hbqt_gcAllocate_QByteArray( void * pObj );
extern void * hbqt_gcAllocate_QCalendarWidget( void * pObj );
extern void * hbqt_gcAllocate_QCheckBox( void * pObj );
extern void * hbqt_gcAllocate_QClipboard( void * pObj );
extern void * hbqt_gcAllocate_QColor( void * pObj );
extern void * hbqt_gcAllocate_QColorDialog( void * pObj );
extern void * hbqt_gcAllocate_QComboBox( void * pObj );
extern void * hbqt_gcAllocate_QCommandLinkButton( void * pObj );
extern void * hbqt_gcAllocate_QCommonStyle( void * pObj );
extern void * hbqt_gcAllocate_QCompleter( void * pObj );
extern void * hbqt_gcAllocate_QConicalGradient( void * pObj );
extern void * hbqt_gcAllocate_QContextMenuEvent( void * pObj );
extern void * hbqt_gcAllocate_QCoreApplication( void * pObj );
extern void * hbqt_gcAllocate_QCursor( void * pObj );
extern void * hbqt_gcAllocate_QDataStream( void * pObj );
extern void * hbqt_gcAllocate_QDate( void * pObj );
extern void * hbqt_gcAllocate_QDateEdit( void * pObj );
extern void * hbqt_gcAllocate_QDateTime( void * pObj );
extern void * hbqt_gcAllocate_QDateTimeEdit( void * pObj );
extern void * hbqt_gcAllocate_QDesktopWidget( void * pObj );
extern void * hbqt_gcAllocate_QDial( void * pObj );
extern void * hbqt_gcAllocate_QDialog( void * pObj );
extern void * hbqt_gcAllocate_QDir( void * pObj );
extern void * hbqt_gcAllocate_QDirModel( void * pObj );
extern void * hbqt_gcAllocate_QDockWidget( void * pObj );
extern void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj );
extern void * hbqt_gcAllocate_QDropEvent( void * pObj );
extern void * hbqt_gcAllocate_QDragMoveEvent( void * pObj );
extern void * hbqt_gcAllocate_QDragEnterEvent( void * pObj );
extern void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj );
extern void * hbqt_gcAllocate_QErrorMessage( void * pObj );
extern void * hbqt_gcAllocate_QEvent( void * pObj );
extern void * hbqt_gcAllocate_QEventLoop( void * pObj );
extern void * hbqt_gcAllocate_QFile( void * pObj );
extern void * hbqt_gcAllocate_QFileDialog( void * pObj );
extern void * hbqt_gcAllocate_QFileInfo( void * pObj );
extern void * hbqt_gcAllocate_QFileIconProvider( void * pObj );
extern void * hbqt_gcAllocate_QFileSystemModel( void * pObj );
extern void * hbqt_gcAllocate_QFocusEvent( void * pObj );
extern void * hbqt_gcAllocate_QFocusFrame( void * pObj );
extern void * hbqt_gcAllocate_QFont( void * pObj );
extern void * hbqt_gcAllocate_QFontComboBox( void * pObj );
extern void * hbqt_gcAllocate_QFontDatabase( void * pObj );
extern void * hbqt_gcAllocate_QFontDialog( void * pObj );
extern void * hbqt_gcAllocate_QFontInfo( void * pObj );
extern void * hbqt_gcAllocate_QFontMetrics( void * pObj );
extern void * hbqt_gcAllocate_QFontMetricsF( void * pObj );
extern void * hbqt_gcAllocate_QFormLayout( void * pObj );
extern void * hbqt_gcAllocate_QFrame( void * pObj );
extern void * hbqt_gcAllocate_QFtp( void * pObj );
extern void * hbqt_gcAllocate_QGradient( void * pObj );
extern void * hbqt_gcAllocate_QGridLayout( void * pObj );
extern void * hbqt_gcAllocate_QGroupBox( void * pObj );
extern void * hbqt_gcAllocate_QHBoxLayout( void * pObj );
extern void * hbqt_gcAllocate_QHeaderView( void * pObj );
extern void * hbqt_gcAllocate_QHelpEvent( void * pObj );
extern void * hbqt_gcAllocate_QHttp( void * pObj );
extern void * hbqt_gcAllocate_QHttpHeader( void * pObj );
extern void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj );
extern void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj );
extern void * hbqt_gcAllocate_QIcon( void * pObj );
extern void * hbqt_gcAllocate_QInputContext( void * pObj );
extern void * hbqt_gcAllocate_QInputMethodEvent( void * pObj );
extern void * hbqt_gcAllocate_QImage( void * pObj );
extern void * hbqt_gcAllocate_QImageReader( void * pObj );
extern void * hbqt_gcAllocate_QImageWriter( void * pObj );
extern void * hbqt_gcAllocate_QInputDialog( void * pObj );
extern void * hbqt_gcAllocate_QInputEvent( void * pObj );
extern void * hbqt_gcAllocate_QIODevice( void * pObj );
extern void * hbqt_gcAllocate_QItemSelection( void * pObj );
extern void * hbqt_gcAllocate_QItemSelectionModel( void * pObj );
extern void * hbqt_gcAllocate_QKeyEvent( void * pObj );
extern void * hbqt_gcAllocate_QKeySequence( void * pObj );
extern void * hbqt_gcAllocate_QLabel( void * pObj );
extern void * hbqt_gcAllocate_QLatin1Char( void * pObj );
extern void * hbqt_gcAllocate_QLatin1String( void * pObj );
extern void * hbqt_gcAllocate_QLayout( void * pObj );
extern void * hbqt_gcAllocate_QLayoutItem( void * pObj );
extern void * hbqt_gcAllocate_QLCDNumber( void * pObj );
extern void * hbqt_gcAllocate_QLine( void * pObj );
extern void * hbqt_gcAllocate_QLineF( void * pObj );
extern void * hbqt_gcAllocate_QLinearGradient( void * pObj );
extern void * hbqt_gcAllocate_QLineEdit( void * pObj );
extern void * hbqt_gcAllocate_QList( void * pObj );
extern void * hbqt_gcAllocate_QListView( void * pObj );
extern void * hbqt_gcAllocate_QListWidget( void * pObj );
extern void * hbqt_gcAllocate_QListWidgetItem( void * pObj );
extern void * hbqt_gcAllocate_QLocale( void * pObj );
extern void * hbqt_gcAllocate_QMainWindow( void * pObj );
extern void * hbqt_gcAllocate_QMatrix( void * pObj );
extern void * hbqt_gcAllocate_QMdiArea( void * pObj );
extern void * hbqt_gcAllocate_QMdiSubWindow( void * pObj );
extern void * hbqt_gcAllocate_QMenu( void * pObj );
extern void * hbqt_gcAllocate_QMenuBar( void * pObj );
extern void * hbqt_gcAllocate_QMessageBox( void * pObj );
extern void * hbqt_gcAllocate_QMimeData( void * pObj );
extern void * hbqt_gcAllocate_QModelIndex( void * pObj );
extern void * hbqt_gcAllocate_QMouseEvent( void * pObj );
extern void * hbqt_gcAllocate_QMoveEvent( void * pObj );
extern void * hbqt_gcAllocate_QMovie( void * pObj );
extern void * hbqt_gcAllocate_QNetworkRequest( void * pObj );
extern void * hbqt_gcAllocate_QObject( void * pObj );
extern void * hbqt_gcAllocate_QPaintDevice( void * pObj );
extern void * hbqt_gcAllocate_QPainterPath( void * pObj );
extern void * hbqt_gcAllocate_QPageSetupDialog( void * pObj );
extern void * hbqt_gcAllocate_QPainter( void * pObj );
extern void * hbqt_gcAllocate_QPaintEvent( void * pObj );
extern void * hbqt_gcAllocate_QPalette( void * pObj );
extern void * hbqt_gcAllocate_QPen( void * pObj );
extern void * hbqt_gcAllocate_QPicture( void * pObj );
extern void * hbqt_gcAllocate_QPixmap( void * pObj );
extern void * hbqt_gcAllocate_QPlainTextEdit( void * pObj );
extern void * hbqt_gcAllocate_QPoint( void * pObj );
extern void * hbqt_gcAllocate_QPointF( void * pObj );
extern void * hbqt_gcAllocate_QPolygon( void * pObj );
extern void * hbqt_gcAllocate_QPolygonF( void * pObj );
extern void * hbqt_gcAllocate_QPrintDialog( void * pObj );
extern void * hbqt_gcAllocate_QPrintEngine( void * pObj );
extern void * hbqt_gcAllocate_QPrinter( void * pObj );
extern void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj );
extern void * hbqt_gcAllocate_QProcess( void * pObj );
extern void * hbqt_gcAllocate_QProgressBar( void * pObj );
extern void * hbqt_gcAllocate_QProgressDialog( void * pObj );
extern void * hbqt_gcAllocate_QPushButton( void * pObj );
extern void * hbqt_gcAllocate_QRadialGradient( void * pObj );
extern void * hbqt_gcAllocate_QRadioButton( void * pObj );
extern void * hbqt_gcAllocate_QRect( void * pObj );
extern void * hbqt_gcAllocate_QRectF( void * pObj );
extern void * hbqt_gcAllocate_QRegion( void * pObj );
extern void * hbqt_gcAllocate_QRegExp( void * pObj );
extern void * hbqt_gcAllocate_QResizeEvent( void * pObj );
extern void * hbqt_gcAllocate_QResource( void * pObj );
extern void * hbqt_gcAllocate_QScrollArea( void * pObj );
extern void * hbqt_gcAllocate_QScrollBar( void * pObj );
extern void * hbqt_gcAllocate_QSessionManager( void * pObj );
extern void * hbqt_gcAllocate_QSettings( void * pObj );
extern void * hbqt_gcAllocate_QSignalMapper( void * pObj );
extern void * hbqt_gcAllocate_QSize( void * pObj );
extern void * hbqt_gcAllocate_QSizeF( void * pObj );
extern void * hbqt_gcAllocate_QSizeGrip( void * pObj );
extern void * hbqt_gcAllocate_QSizePolicy( void * pObj );
extern void * hbqt_gcAllocate_QSlider( void * pObj );
extern void * hbqt_gcAllocate_QSound( void * pObj );
extern void * hbqt_gcAllocate_QSpacerItem( void * pObj );
extern void * hbqt_gcAllocate_QSpinBox( void * pObj );
extern void * hbqt_gcAllocate_QSplashScreen( void * pObj );
extern void * hbqt_gcAllocate_QSplitter( void * pObj );
extern void * hbqt_gcAllocate_QStandardItem( void * pObj );
extern void * hbqt_gcAllocate_QStandardItemModel( void * pObj );
extern void * hbqt_gcAllocate_QStatusBar( void * pObj );
extern void * hbqt_gcAllocate_QStringList( void * pObj );
extern void * hbqt_gcAllocate_QStringListModel( void * pObj );
extern void * hbqt_gcAllocate_QStyle( void * pObj );
extern void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj );
extern void * hbqt_gcAllocate_QStyleFactory( void * pObj );
extern void * hbqt_gcAllocate_QStyleHintReturn( void * pObj );
extern void * hbqt_gcAllocate_QStyleHintReturnMask( void * pObj );
extern void * hbqt_gcAllocate_QStyleHintReturnVariant( void * pObj );
extern void * hbqt_gcAllocate_QStyleOption( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionButton( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionTab( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj );
extern void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj );
extern void * hbqt_gcAllocate_QStylePainter( void * pObj );
extern void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj );
extern void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj );
extern void * hbqt_gcAllocate_QTabBar( void * pObj );
extern void * hbqt_gcAllocate_QTableView( void * pObj );
extern void * hbqt_gcAllocate_QTableWidget( void * pObj );
extern void * hbqt_gcAllocate_QTableWidgetItem( void * pObj );
extern void * hbqt_gcAllocate_QTabWidget( void * pObj );
extern void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj );
extern void * hbqt_gcAllocate_QTextBlock( void * pObj );
extern void * hbqt_gcAllocate_QTextBlockFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextBlockGroup( void * pObj );
extern void * hbqt_gcAllocate_QTextBrowser( void * pObj );
extern void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj );
extern void * hbqt_gcAllocate_QTextCharFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextCodec( void * pObj );
extern void * hbqt_gcAllocate_QTextCursor( void * pObj );
extern void * hbqt_gcAllocate_QTextDecoder( void * pObj );
extern void * hbqt_gcAllocate_QTextDocument( void * pObj );
extern void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj );
extern void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj );
extern void * hbqt_gcAllocate_QTextEdit( void * pObj );
extern void * hbqt_gcAllocate_QTextEncoder( void * pObj );
extern void * hbqt_gcAllocate_QTextFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextFragment( void * pObj );
extern void * hbqt_gcAllocate_QTextFrame( void * pObj );
extern void * hbqt_gcAllocate_QTextFrameFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextImageFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextInlineObject( void * pObj );
extern void * hbqt_gcAllocate_QTextItem( void * pObj );
extern void * hbqt_gcAllocate_QTextLayout( void * pObj );
extern void * hbqt_gcAllocate_QTextLength( void * pObj );
extern void * hbqt_gcAllocate_QTextLine( void * pObj );
extern void * hbqt_gcAllocate_QTextListFormat( void * pObj );
extern void * hbqt_gcAllocate_QTextObject( void * pObj );
extern void * hbqt_gcAllocate_QTextOption( void * pObj );
extern void * hbqt_gcAllocate_QTextStream( void * pObj );
extern void * hbqt_gcAllocate_QTextTableFormat( void * pObj );
extern void * hbqt_gcAllocate_QThread( void * pObj );
extern void * hbqt_gcAllocate_QTime( void * pObj );
extern void * hbqt_gcAllocate_QTimeEdit( void * pObj );
extern void * hbqt_gcAllocate_QTimer( void * pObj );
extern void * hbqt_gcAllocate_QToolBar( void * pObj );
extern void * hbqt_gcAllocate_QToolBox( void * pObj );
extern void * hbqt_gcAllocate_QToolButton( void * pObj );
extern void * hbqt_gcAllocate_QTransform( void * pObj );
extern void * hbqt_gcAllocate_QTranslator( void * pObj );
extern void * hbqt_gcAllocate_QTreeView( void * pObj );
extern void * hbqt_gcAllocate_QTreeWidget( void * pObj );
extern void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj );
extern void * hbqt_gcAllocate_QUiLoader( void * pObj );
extern void * hbqt_gcAllocate_QUrl( void * pObj );
extern void * hbqt_gcAllocate_QValidator( void * pObj );
extern void * hbqt_gcAllocate_QVariant( void * pObj );
extern void * hbqt_gcAllocate_QVBoxLayout( void * pObj );
extern void * hbqt_gcAllocate_QWebFrame( void * pObj );
extern void * hbqt_gcAllocate_QWebHistory( void * pObj );
extern void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj );
extern void * hbqt_gcAllocate_QWebHistoryItem( void * pObj );
extern void * hbqt_gcAllocate_QWebHitTestResult( void * pObj );
extern void * hbqt_gcAllocate_QWebPage( void * pObj );
extern void * hbqt_gcAllocate_QWebPluginFactory( void * pObj );
extern void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj );
extern void * hbqt_gcAllocate_QWebSettings( void * pObj );
extern void * hbqt_gcAllocate_QWebView( void * pObj );
extern void * hbqt_gcAllocate_QWheelEvent( void * pObj );
extern void * hbqt_gcAllocate_QWidget( void * pObj );
extern void * hbqt_gcAllocate_QWidgetAction( void * pObj );
extern void * hbqt_gcAllocate_QWidgetItem( void * pObj );
extern void * hbqt_gcAllocate_QWindowsStyle( void * pObj );
extern void * hbqt_gcAllocate_QWizard( void * pObj );
extern void * hbqt_gcAllocate_QWizardPage( void * pObj );
extern void * hbqt_gcAllocate_HBQTextBlockUserData( 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 );
extern void * hbqt_gcAllocate_QAbstractItemView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractSlider( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QAction( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QActionGroup( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QApplication( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QBitArray( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QBitmap( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QBoxLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QBrush( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QButtonGroup( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QByteArray( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCalendarWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCheckBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QClipboard( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QColor( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QColorDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QComboBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCommandLinkButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCommonStyle( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCompleter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QConicalGradient( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QContextMenuEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCoreApplication( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QCursor( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDataStream( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDate( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDateEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDateTimeEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDesktopWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDial( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDir( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDirModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDockWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDragMoveEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDragEnterEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QErrorMessage( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFile( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFileDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFileIconProvider( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFileSystemModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFocusFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFont( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontComboBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontDatabase( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontInfo( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontMetrics( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFontMetricsF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFormLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QFtp( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QGradient( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QGridLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QGroupBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHBoxLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHeaderView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHttp( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHttpHeader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QIcon( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QInputContext( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QInputMethodEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QImage( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QImageReader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QImageWriter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QInputDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QInputEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QItemSelection( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QItemSelectionModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QKeySequence( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLabel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLayoutItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLCDNumber( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLine( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLinearGradient( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLineEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QList( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QListView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QListWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QListWidgetItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMainWindow( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMatrix( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMdiArea( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMdiSubWindow( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMenu( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMenuBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMessageBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMouseEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QMovie( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QObject( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPageSetupDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPaintDevice( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPaintEngine( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPainter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPainterPath( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPaintEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPalette( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPen( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPicture( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPixmap( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPlainTextEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPointF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPolygon( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPolygonF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPrintDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPrintEngine( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPrinter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QProcess( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QProgressBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QProgressDialog( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QPushButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRadialGradient( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRadioButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRect( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRectF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRegion( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QRegExp( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QResource( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QScrollArea( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QScrollBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSessionManager( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSettings( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSignalMapper( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSize( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSizeGrip( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSizePolicy( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSlider( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSound( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSpacerItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSpinBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSplashScreen( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSplitter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStandardItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStandardItemModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStatusBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStringListModel( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyle( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleFactory( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleHintReturn( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleHintReturnMask( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleHintReturnVariant( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOption( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionTab( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QStylePainter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTabBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTableView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTableWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTableWidgetItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextBlock( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextBlockFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextBlockGroup( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextBrowser( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextCharFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextCursor( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextDecoder( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextDocument( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextEncoder( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextFragment( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextFrameFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextImageFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextInlineObject( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextLength( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextLine( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextList( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextListFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextObject( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextOption( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextStream( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTextTableFormat( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QThread( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTime( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTimeEdit( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTimer( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QToolBar( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QToolBox( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QToolButton( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTransform( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTreeView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTreeWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QValidator( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QVBoxLayout( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWidgetAction( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWidgetItem( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWindowsStyle( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew );
extern void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew );

32
harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp
View File

@@ -309,6 +309,7 @@ void HBDbfModel::hbSetRowColumns( int rows, int cols )
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< HBDbfModel > pq;
} QGC_POINTER_HBDbfModel;
@@ -317,26 +318,14 @@ static QT_G_FUNC( hbqt_release_HBDbfModel )
{
QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_HBDbfModel p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_HBDbfModel ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p->bNew )
{
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
switch( hbqt_get_object_release_method() )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBDbfModel * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBDbfModel * ) p->ph )->~HBDbfModel();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBDbfModel * ) p->ph )->deleteLater();
break;
}
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() ) );
}
@@ -350,12 +339,19 @@ static QT_G_FUNC( hbqt_release_HBDbfModel )
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 )
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() ) );
@@ -368,7 +364,7 @@ HB_FUNC( QT_HBDBFMODEL )
pObj = ( HBDbfModel * ) new HBDbfModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) );
hb_retptrGC( hbqt_gcAllocate_HBDbfModel( pObj ) );
hb_retptrGC( hbqt_gcAllocate_HBDbfModel( pObj, true ) );
}
HB_FUNC( QT_HBDBFMODEL_RESET )
@@ -378,7 +374,7 @@ HB_FUNC( QT_HBDBFMODEL_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() ) ) ) );
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 )

40
harbour/contrib/hbqt/hbqt_hbevents.cpp
View File

@@ -70,6 +70,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< HBEvents > pq;
} QGC_POINTER_HBEvents;
@@ -78,45 +79,42 @@ static QT_G_FUNC( hbqt_release_HBEvents )
{
QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBEvents * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBEvents * ) p->ph )->~HBEvents();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBEvents * ) p->ph )->deleteLater();
break;
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;
}
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!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBEvents Object Already deleted!" ) );
p->ph = NULL;
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBEvents Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBEvents : Object not created with - new" ) );
p->ph = NULL;
}
}
static void * hbqt_gcAllocate_HBEvents( void * pObj )
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() ) );
@@ -251,7 +249,7 @@ HB_FUNC( QT_EVENTS_NEW )
pObj = ( HBEvents * ) new HBEvents();
hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj ) );
hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj, true ) );
}
#endif

40
harbour/contrib/hbqt/hbqt_hbqmainwindow.cpp
View File

@@ -255,6 +255,7 @@ void HBQMainWindow::closeEvent( QCloseEvent * event )
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< HBQMainWindow > pq;
} QGC_POINTER_HBQMainWindow;
@@ -263,45 +264,42 @@ static QT_G_FUNC( release_HBQMainWindow )
{
QGC_POINTER_HBQMainWindow * p = ( QGC_POINTER_HBQMainWindow * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_HBQMainWindow p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_HBQMainWindow ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p && p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBQMainWindow * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBQMainWindow * ) p->ph )->~HBQMainWindow();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBQMainWindow * ) p->ph )->deleteLater();
break;
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_HBQMainWindow Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO__rel_HBQMainWindow : Object Name Missing!" ) );
p->ph = NULL;
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_HBQMainWindow Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO release_HBQMainWindow Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBQMainWindow : Object Already deleted!" ) );
p->ph = NULL;
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBQMainWindow Object Already deleted!" ) );
HB_TRACE( HB_TR_ALWAYS, ( "PTR_rel_HBQMainWindow : Object not created with - new" ) );
p->ph = NULL;
}
}
static void * hbqt_gcAllocate_HBQMainWindow( void * pObj )
static void * hbqt_gcAllocate_HBQMainWindow( void * pObj, bool bNew )
{
QGC_POINTER_HBQMainWindow * p = ( QGC_POINTER_HBQMainWindow * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQMainWindow ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = release_HBQMainWindow;
new( & p->pq ) QPointer< HBQMainWindow >( ( HBQMainWindow * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_HBQMainWindow %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
@@ -314,7 +312,7 @@ HB_FUNC( QT_HBQMAINWINDOW )
pObj = ( HBQMainWindow * ) new HBQMainWindow( hb_itemNew( hb_param( 1, HB_IT_BLOCK ) ), hb_parni( 2 ) );
hb_retptrGC( hbqt_gcAllocate_HBQMainWindow( pObj ) );
hb_retptrGC( hbqt_gcAllocate_HBQMainWindow( pObj, true ) );
}
#endif

70
harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
View File

@@ -63,8 +63,7 @@
#include <QHash>
#include <QTextCharFormat>
HBQTextBlockUserData::HBQTextBlockUserData()
: QTextBlockUserData()
HBQTextBlockUserData::HBQTextBlockUserData() : QTextBlockUserData()
{
state = -1;
}
@@ -75,6 +74,10 @@ void HBQTextBlockUserData::setData( int iState )
{
state = iState;
}
HBQTextBlockUserData * HBQTextBlockUserData::data( const QTextBlock& block )
{
return static_cast<HBQTextBlockUserData *>( block.userData() );
}
HBQSyntaxHighlighter::HBQSyntaxHighlighter( QTextDocument * parent )
@@ -136,6 +139,13 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text )
#endif
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 )
{
@@ -144,7 +154,17 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text )
while( index >= 0 )
{
int length = expression.matchedLength();
setFormat( index, length, rule.format );
QTextBlockFormat tBlockFormat( curBlock.blockFormat() );
QBrush brush( tBlockFormat.background() );
if( bMerge )
{
HB_TRACE( HB_TR_ALWAYS, ( "text = %s", ( char * ) &text ) );
setFormat( index, length, rule.format );
}
else
setFormat( index, length, rule.format );
index = expression.indexIn( text, index + length );
}
}
@@ -292,48 +312,4 @@ HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBFORMAT )
hbqt_par_HBQSyntaxHighlighter( 1 )->setHBFormat( hbqt_par_QString( 2 ), *hbqt_par_QTextCharFormat( 3 ) );
}
QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
if( p && p->ph )
{
delete ( ( HBQTextBlockUserData * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_HBQTextBlockUserData Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_HBQTextBlockUserData Object Already deleted!" ) );
}
}
void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = hbqt_gcRelease_HBQTextBlockUserData;
HB_TRACE( HB_TR_DEBUG, ( " new_HBQTextBlockUserData %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
return p;
}
HB_FUNC( QT_HBQTEXTBLOCKUSERDATA )
{
void * pObj = NULL;
pObj = new HBQTextBlockUserData();
hb_retptrGC( hbqt_gcAllocate_HBQTextBlockUserData( pObj ) );
}
HB_FUNC( QT_HBQTEXTBLOCKUSERDATA_SETDATA )
{
hbqt_par_HBQTextBlockUserData( 1 )->setData( hb_parni( 2 ) );
}
#endif

2
harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
View File

@@ -67,6 +67,8 @@ public:
HBQTextBlockUserData();
~HBQTextBlockUserData();
HBQTextBlockUserData * data( const QTextBlock& block );
void setData( int state );
int state;

44
harbour/contrib/hbqt/hbqt_hbqtableview.cpp
View File

@@ -131,6 +131,7 @@ void HBQTableView::scrollTo( const QModelIndex & index, QAbstractItemView::Scrol
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< HBQTableView > pq;
} QGC_POINTER_HBQTableView;
@@ -139,45 +140,42 @@ static QT_G_FUNC( release_HBQTableView )
{
QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_HBQTableView p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_HBQTableView ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
HB_TRACE( HB_TR_DEBUG, ( "release_HBQTableView ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBQTableView * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBQTableView * ) p->ph )->~HBQTableView();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBQTableView * ) p->ph )->deleteLater();
break;
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!" ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_HBQTableView Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO release_HBQTableView Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBQTableView Object Already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBQTableView Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBQTableView Object not created with - new" ) );
p->ph = NULL;
}
}
static void * hbqt_gcAllocate_HBQTableView( void * pObj )
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() ) );
@@ -188,14 +186,14 @@ HB_FUNC( QT_HBQTABLEVIEW )
{
void * pObj = NULL;
pObj = ( HBQTableView* ) new HBQTableView( hbqt_par_QWidget( 1 ) ) ;
pObj = new HBQTableView( hbqt_par_QWidget( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_HBQTableView( pObj ) );
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 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_HBQTableView( 1 )->navigate( hb_parni( 2 ) ) ), true ) );
}
#endif

42
harbour/contrib/hbqt/hbqt_hbslots.cpp
View File

@@ -329,6 +329,7 @@ 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;
@@ -337,45 +338,40 @@ static QT_G_FUNC( hbqt_release_HBSlots )
{
QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( HBSlots * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( HBSlots * ) p->ph )->~HBSlots();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( HBSlots * ) p->ph )->deleteLater();
break;
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!" ) );
}
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!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_HBSlots : Object Already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBSlots Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_HBSlots : Object not created with - new" ) );
p->ph = NULL;
}
}
static void * hbqt_gcAllocate_HBSlots( void * pObj )
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() ) );
@@ -576,7 +572,6 @@ static void hbqt_SlotsExecQTextCursor( HBSlots * t_slots, QObject * object, cons
{
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QTextCursor( cursor ) );
//PHB_ITEM p1 = hb_itemPutPtr( NULL, *cursor );
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, p1 );
hb_itemRelease( pObject );
delete ( ( QTextCursor * ) hb_itemGetPtr( p1 ) );
@@ -912,6 +907,7 @@ HB_FUNC( QT_SLOTS_DISCONNECT )
if( object )
{
const char * signal = hb_parcx( 3 );
int i = object->property( signal ).toInt();
if( i > 0 && i <= t_slots->listBlock.size() )
@@ -922,7 +918,7 @@ HB_FUNC( QT_SLOTS_DISCONNECT )
bRet = ( disconnect_signal( object, signal ) == true );
//HB_TRACE( HB_TR_DEBUG, ( " QT_SLOTS_DISCONNECT: %s %s", bRet ? "YES" : "NO", signal ) );
HB_TRACE( HB_TR_DEBUG, ( " QT_SLOTS_DISCONNECT: %s %s", bRet ? "YES" : "NO", signal ) );
}
}
}
@@ -936,7 +932,7 @@ HB_FUNC( QT_SLOTS_NEW )
pObj = ( HBSlots * ) new HBSlots();
hb_retptrGC( hbqt_gcAllocate_HBSlots( pObj ) );
hb_retptrGC( hbqt_gcAllocate_HBSlots( pObj, true ) );
}
#endif

42
harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -96,11 +96,35 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QAbstractItemModel > pq;
} QGC_POINTER_QAbstractItemModel;
QT_G_FUNC( hbqt_gcRelease_QAbstractItemModel )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew )
{
QGC_POINTER_QAbstractItemModel * p = ( QGC_POINTER_QAbstractItemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QAbstractItemModel ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QAbstractItemModel;
if( bNew )
{
new( & p->pq ) QPointer< QAbstractItemModel >( ( QAbstractItemModel * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QAbstractItemModel ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QABSTRACTITEMMODEL )
{
}
@@ -109,7 +133,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_BUDDY )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ), true ) );
}
/*
@@ -133,7 +157,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_DATA )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ), true ) );
}
/*
@@ -181,7 +205,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ), true ) );
}
/*
@@ -189,7 +213,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) );
}
/*
@@ -229,7 +253,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROWS )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ), true ) );
}
/*
@@ -237,7 +261,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_PARENT )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ), true ) );
}
/*
@@ -309,7 +333,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SETSUPPORTEDDRAGACTIONS )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_SIBLING )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ), true ) );
}
/*
@@ -325,7 +349,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SORT )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_SPAN )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ), true ) );
}
/*

28
harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,11 +76,35 @@
* ~QAbstractListModel ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QAbstractListModel > pq;
} QGC_POINTER_QAbstractListModel;
QT_G_FUNC( hbqt_gcRelease_QAbstractListModel )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew )
{
QGC_POINTER_QAbstractListModel * p = ( QGC_POINTER_QAbstractListModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QAbstractListModel ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QAbstractListModel;
if( bNew )
{
new( & p->pq ) QPointer< QAbstractListModel >( ( QAbstractListModel * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QAbstractListModel ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QABSTRACTLISTMODEL )
{
}
@@ -89,7 +113,7 @@ HB_FUNC( QT_QABSTRACTLISTMODEL )
*/
HB_FUNC( QT_QABSTRACTLISTMODEL_INDEX )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) );
}

28
harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,11 +76,35 @@
* ~QAbstractTableModel ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QAbstractTableModel > pq;
} QGC_POINTER_QAbstractTableModel;
QT_G_FUNC( hbqt_gcRelease_QAbstractTableModel )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew )
{
QGC_POINTER_QAbstractTableModel * p = ( QGC_POINTER_QAbstractTableModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QAbstractTableModel ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QAbstractTableModel;
if( bNew )
{
new( & p->pq ) QPointer< QAbstractTableModel >( ( QAbstractTableModel * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QAbstractTableModel ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QABSTRACTTABLEMODEL )
{
}
@@ -89,7 +113,7 @@ HB_FUNC( QT_QABSTRACTTABLEMODEL )
*/
HB_FUNC( QT_QABSTRACTTABLEMODEL_INDEX )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) );
}

43
harbour/contrib/hbqt/qtcore/QBitArray.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,32 +76,49 @@
* QBitArray ( const QBitArray & other )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QBitArray;
QT_G_FUNC( hbqt_gcRelease_QBitArray )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QBitArray p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QBitArray ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QBitArray * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QBitArray Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QBitArray * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QBitArray ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QBitArray Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QBitArray Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QBitArray Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QBitArray( void * pObj )
void * hbqt_gcAllocate_QBitArray( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QBitArray;
HB_TRACE( HB_TR_DEBUG, ( " new_QBitArray %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QBitArray ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -111,7 +128,7 @@ HB_FUNC( QT_QBITARRAY )
pObj = new QBitArray() ;
hb_retptrGC( hbqt_gcAllocate_QBitArray( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QBitArray( pObj, true ) );
}
/*
* bool at ( int i ) const

139
harbour/contrib/hbqt/qtcore/QByteArray.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -94,32 +94,49 @@
* ~QByteArray ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QByteArray;
QT_G_FUNC( hbqt_gcRelease_QByteArray )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QByteArray p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QByteArray ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QByteArray * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QByteArray Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QByteArray * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QByteArray ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QByteArray Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QByteArray Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QByteArray Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QByteArray( void * pObj )
void * hbqt_gcAllocate_QByteArray( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QByteArray;
HB_TRACE( HB_TR_DEBUG, ( " new_QByteArray %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QByteArray ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -129,14 +146,14 @@ HB_FUNC( QT_QBYTEARRAY )
pObj = new QByteArray() ;
hb_retptrGC( hbqt_gcAllocate_QByteArray( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( pObj, true ) );
}
/*
* QByteArray & append ( const QByteArray & ba )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ), true ) );
}
/*
@@ -144,7 +161,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -152,7 +169,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_1 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_2 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ), true ) );
}
/*
@@ -160,7 +177,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_2 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_3 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ), true ) );
}
/*
@@ -168,7 +185,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_3 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_4 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ), true ) );
}
/*
@@ -288,7 +305,7 @@ HB_FUNC( QT_QBYTEARRAY_ENDSWITH_2 )
*/
HB_FUNC( QT_QBYTEARRAY_FILL )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ), true ) );
}
/*
@@ -328,7 +345,7 @@ HB_FUNC( QT_QBYTEARRAY_INDEXOF_3 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ), true ) );
}
/*
@@ -336,7 +353,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -344,7 +361,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_1 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_2 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ), true ) );
}
/*
@@ -352,7 +369,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_2 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_3 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ), true ) );
}
/*
@@ -408,7 +425,7 @@ HB_FUNC( QT_QBYTEARRAY_LASTINDEXOF_3 )
*/
HB_FUNC( QT_QBYTEARRAY_LEFT )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -416,7 +433,7 @@ HB_FUNC( QT_QBYTEARRAY_LEFT )
*/
HB_FUNC( QT_QBYTEARRAY_LEFTJUSTIFIED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ), true ) );
}
/*
@@ -432,7 +449,7 @@ HB_FUNC( QT_QBYTEARRAY_LENGTH )
*/
HB_FUNC( QT_QBYTEARRAY_MID )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ), true ) );
}
/*
@@ -440,7 +457,7 @@ HB_FUNC( QT_QBYTEARRAY_MID )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ), true ) );
}
/*
@@ -448,7 +465,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ), true ) );
}
/*
@@ -456,7 +473,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND_1 )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND_2 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ), true ) );
}
/*
@@ -512,7 +529,7 @@ HB_FUNC( QT_QBYTEARRAY_PUSH_FRONT_2 )
*/
HB_FUNC( QT_QBYTEARRAY_REMOVE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ), true ) );
}
/*
@@ -520,7 +537,7 @@ HB_FUNC( QT_QBYTEARRAY_REMOVE )
*/
HB_FUNC( QT_QBYTEARRAY_REPEATED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -528,7 +545,7 @@ HB_FUNC( QT_QBYTEARRAY_REPEATED )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ), true ) );
}
/*
@@ -536,7 +553,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ), true ) );
}
/*
@@ -544,7 +561,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_1 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_2 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ), true ) );
}
/*
@@ -552,7 +569,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_2 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_3 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ), true ) );
}
/*
@@ -560,7 +577,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_3 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_4 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ), hb_parni( 5 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ), hb_parni( 5 ) ) ), true ) );
}
/*
@@ -568,7 +585,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_4 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_5 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ), true ) );
}
/*
@@ -576,7 +593,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_5 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_6 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ), true ) );
}
/*
@@ -584,7 +601,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_6 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_7 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ), true ) );
}
/*
@@ -592,7 +609,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_7 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_8 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ), true ) );
}
/*
@@ -600,7 +617,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_8 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_9 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ), true ) );
}
/*
@@ -608,7 +625,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_9 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_10 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -616,7 +633,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_10 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_11 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ), true ) );
}
/*
@@ -624,7 +641,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_11 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_12 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ), true ) );
}
/*
@@ -648,7 +665,7 @@ HB_FUNC( QT_QBYTEARRAY_RESIZE )
*/
HB_FUNC( QT_QBYTEARRAY_RIGHT )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -656,7 +673,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHT )
*/
HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ), true ) );
}
/*
@@ -664,7 +681,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -672,7 +689,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -680,7 +697,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_1 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_2 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -688,7 +705,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_2 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_3 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -696,7 +713,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_3 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_4 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -704,7 +721,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_4 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_5 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), true ) );
}
/*
@@ -712,7 +729,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_5 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_6 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ), true ) );
}
/*
@@ -720,7 +737,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_6 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_7 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ), true ) );
}
/*
@@ -728,7 +745,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_7 )
*/
HB_FUNC( QT_QBYTEARRAY_SIMPLIFIED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ), true ) );
}
/*
@@ -776,7 +793,7 @@ HB_FUNC( QT_QBYTEARRAY_STARTSWITH_2 )
*/
HB_FUNC( QT_QBYTEARRAY_TOBASE64 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ), true ) );
}
/*
@@ -808,7 +825,7 @@ HB_FUNC( QT_QBYTEARRAY_TOFLOAT )
*/
HB_FUNC( QT_QBYTEARRAY_TOHEX )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ), true ) );
}
/*
@@ -852,7 +869,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLONGLONG )
*/
HB_FUNC( QT_QBYTEARRAY_TOLOWER )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ), true ) );
}
/*
@@ -860,7 +877,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLOWER )
*/
HB_FUNC( QT_QBYTEARRAY_TOPERCENTENCODING )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toPercentEncoding( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toPercentEncoding( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ), true ) );
}
/*
@@ -928,7 +945,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUSHORT )
*/
HB_FUNC( QT_QBYTEARRAY_TOUPPER )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ), true ) );
}
/*
@@ -936,7 +953,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUPPER )
*/
HB_FUNC( QT_QBYTEARRAY_TRIMMED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ), true ) );
}
/*

32
harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -81,11 +81,35 @@
* ~QCoreApplication ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QCoreApplication > pq;
} QGC_POINTER_QCoreApplication;
QT_G_FUNC( hbqt_gcRelease_QCoreApplication )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QCoreApplication( void * pObj, bool bNew )
{
QGC_POINTER_QCoreApplication * p = ( QGC_POINTER_QCoreApplication * ) hb_gcAllocate( sizeof( QGC_POINTER_QCoreApplication ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QCoreApplication;
if( bNew )
{
new( & p->pq ) QPointer< QCoreApplication >( ( QCoreApplication * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QCoreApplication ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QCOREAPPLICATION )
{
}
@@ -150,7 +174,7 @@ HB_FUNC( QT_QCOREAPPLICATION_APPLICATIONVERSION )
*/
HB_FUNC( QT_QCOREAPPLICATION_ARGUMENTS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ), true ) );
}
/*
@@ -206,7 +230,7 @@ HB_FUNC( QT_QCOREAPPLICATION_INSTALLTRANSLATOR )
*/
HB_FUNC( QT_QCOREAPPLICATION_INSTANCE )
{
hb_retptr( ( QCoreApplication* ) hbqt_par_QCoreApplication( 1 )->instance() );
hb_retptrGC( hbqt_gcAllocate_QCoreApplication( hbqt_par_QCoreApplication( 1 )->instance(), false ) );
}
/*
@@ -214,7 +238,7 @@ HB_FUNC( QT_QCOREAPPLICATION_INSTANCE )
*/
HB_FUNC( QT_QCOREAPPLICATION_LIBRARYPATHS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ), true ) );
}
/*

45
harbour/contrib/hbqt/qtcore/QDataStream.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -84,32 +84,49 @@
* virtual ~QDataStream ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QDataStream;
QT_G_FUNC( hbqt_gcRelease_QDataStream )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDataStream p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDataStream ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QDataStream * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QDataStream Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QDataStream * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QDataStream ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QDataStream Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QDataStream Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QDataStream Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QDataStream( void * pObj )
void * hbqt_gcAllocate_QDataStream( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QDataStream;
HB_TRACE( HB_TR_DEBUG, ( " new_QDataStream %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QDataStream ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -119,7 +136,7 @@ HB_FUNC( QT_QDATASTREAM )
pObj = new QDataStream() ;
hb_retptrGC( hbqt_gcAllocate_QDataStream( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QDataStream( pObj, true ) );
}
/*
* bool atEnd () const
@@ -142,7 +159,7 @@ HB_FUNC( QT_QDATASTREAM_BYTEORDER )
*/
HB_FUNC( QT_QDATASTREAM_DEVICE )
{
hb_retptr( ( QIODevice* ) hbqt_par_QDataStream( 1 )->device() );
hb_retptrGC( hbqt_gcAllocate_QIODevice( hbqt_par_QDataStream( 1 )->device(), false ) );
}
/*

49
harbour/contrib/hbqt/qtcore/QDate.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -79,32 +79,49 @@
* QDate ( int y, int m, int d )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QDate;
QT_G_FUNC( hbqt_gcRelease_QDate )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDate p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDate ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QDate * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QDate Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QDate * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QDate ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QDate Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QDate Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QDate Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QDate( void * pObj )
void * hbqt_gcAllocate_QDate( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QDate;
HB_TRACE( HB_TR_DEBUG, ( " new_QDate %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QDate ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -114,14 +131,14 @@ HB_FUNC( QT_QDATE )
pObj = new QDate() ;
hb_retptrGC( hbqt_gcAllocate_QDate( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QDate( pObj, true ) );
}
/*
* QDate addDays ( int ndays ) const
*/
HB_FUNC( QT_QDATE_ADDDAYS )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -129,7 +146,7 @@ HB_FUNC( QT_QDATE_ADDDAYS )
*/
HB_FUNC( QT_QDATE_ADDMONTHS )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -137,7 +154,7 @@ HB_FUNC( QT_QDATE_ADDMONTHS )
*/
HB_FUNC( QT_QDATE_ADDYEARS )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ), true ) );
}
/*

71
harbour/contrib/hbqt/qtcore/QDateTime.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -79,32 +79,49 @@
* ~QDateTime ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QDateTime;
QT_G_FUNC( hbqt_gcRelease_QDateTime )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDateTime p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDateTime ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QDateTime * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QDateTime Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QDateTime * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QDateTime ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QDateTime Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QDateTime Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QDateTime Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QDateTime( void * pObj )
void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QDateTime;
HB_TRACE( HB_TR_DEBUG, ( " new_QDateTime %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QDateTime ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -114,14 +131,14 @@ HB_FUNC( QT_QDATETIME )
pObj = ( QDateTime* ) new QDateTime() ;
hb_retptrGC( hbqt_gcAllocate_QDateTime( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( pObj, true ) );
}
/*
* QDateTime addDays ( int ndays ) const
*/
HB_FUNC( QT_QDATETIME_ADDDAYS )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -129,7 +146,7 @@ HB_FUNC( QT_QDATETIME_ADDDAYS )
*/
HB_FUNC( QT_QDATETIME_ADDMSECS )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ), true ) );
}
/*
@@ -137,7 +154,7 @@ HB_FUNC( QT_QDATETIME_ADDMSECS )
*/
HB_FUNC( QT_QDATETIME_ADDMONTHS )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -145,7 +162,7 @@ HB_FUNC( QT_QDATETIME_ADDMONTHS )
*/
HB_FUNC( QT_QDATETIME_ADDSECS )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -153,7 +170,7 @@ HB_FUNC( QT_QDATETIME_ADDSECS )
*/
HB_FUNC( QT_QDATETIME_ADDYEARS )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -161,7 +178,7 @@ HB_FUNC( QT_QDATETIME_ADDYEARS )
*/
HB_FUNC( QT_QDATETIME_DATE )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTime( 1 )->date() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTime( 1 )->date() ), true ) );
}
/*
@@ -233,7 +250,7 @@ HB_FUNC( QT_QDATETIME_SETTIME_T )
*/
HB_FUNC( QT_QDATETIME_TIME )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTime( 1 )->time() ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTime( 1 )->time() ), true ) );
}
/*
@@ -249,7 +266,7 @@ HB_FUNC( QT_QDATETIME_TIMESPEC )
*/
HB_FUNC( QT_QDATETIME_TOLOCALTIME )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ), true ) );
}
/*
@@ -273,7 +290,7 @@ HB_FUNC( QT_QDATETIME_TOSTRING_1 )
*/
HB_FUNC( QT_QDATETIME_TOTIMESPEC )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ), true ) );
}
/*
@@ -289,7 +306,7 @@ HB_FUNC( QT_QDATETIME_TOTIME_T )
*/
HB_FUNC( QT_QDATETIME_TOUTC )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ), true ) );
}
/*
@@ -297,7 +314,7 @@ HB_FUNC( QT_QDATETIME_TOUTC )
*/
HB_FUNC( QT_QDATETIME_CURRENTDATETIME )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ), true ) );
}
/*
@@ -305,7 +322,7 @@ HB_FUNC( QT_QDATETIME_CURRENTDATETIME )
*/
HB_FUNC( QT_QDATETIME_FROMSTRING )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ), true ) );
}
/*
@@ -313,7 +330,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING )
*/
HB_FUNC( QT_QDATETIME_FROMSTRING_1 )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -321,7 +338,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING_1 )
*/
HB_FUNC( QT_QDATETIME_FROMTIME_T )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ), true ) );
}

59
harbour/contrib/hbqt/qtcore/QDir.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -85,32 +85,49 @@
* ~QDir ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QDir;
QT_G_FUNC( hbqt_gcRelease_QDir )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDir p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QDir ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QDir * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QDir Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QDir * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QDir ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QDir Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QDir Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QDir Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QDir( void * pObj )
void * hbqt_gcAllocate_QDir( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QDir;
HB_TRACE( HB_TR_DEBUG, ( " new_QDir %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QDir ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -120,7 +137,7 @@ HB_FUNC( QT_QDIR )
pObj = new QDir( hbqt_par_QString( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QDir( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QDir( pObj, true ) );
}
/*
* QString absoluteFilePath ( const QString & fileName ) const
@@ -183,7 +200,7 @@ HB_FUNC( QT_QDIR_DIRNAME )
*/
HB_FUNC( QT_QDIR_ENTRYLIST )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ), true ) );
}
/*
@@ -191,7 +208,7 @@ HB_FUNC( QT_QDIR_ENTRYLIST )
*/
HB_FUNC( QT_QDIR_ENTRYLIST_1 )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ), true ) );
}
/*
@@ -287,7 +304,7 @@ HB_FUNC( QT_QDIR_MKPATH )
*/
HB_FUNC( QT_QDIR_NAMEFILTERS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ), true ) );
}
/*
@@ -407,7 +424,7 @@ HB_FUNC( QT_QDIR_CLEANPATH )
*/
HB_FUNC( QT_QDIR_CURRENT )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->current() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->current() ), true ) );
}
/*
@@ -431,7 +448,7 @@ HB_FUNC( QT_QDIR_FROMNATIVESEPARATORS )
*/
HB_FUNC( QT_QDIR_HOME )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->home() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->home() ), true ) );
}
/*
@@ -479,7 +496,7 @@ HB_FUNC( QT_QDIR_MATCH_1 )
*/
HB_FUNC( QT_QDIR_ROOT )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->root() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->root() ), true ) );
}
/*
@@ -495,7 +512,7 @@ HB_FUNC( QT_QDIR_ROOTPATH )
*/
HB_FUNC( QT_QDIR_SEARCHPATHS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -519,7 +536,7 @@ HB_FUNC( QT_QDIR_SETSEARCHPATHS )
*/
HB_FUNC( QT_QDIR_TEMP )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->temp() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->temp() ), true ) );
}
/*

43
harbour/contrib/hbqt/qtcore/QEvent.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -80,32 +80,49 @@
* virtual ~QEvent ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QEvent;
QT_G_FUNC( hbqt_gcRelease_QEvent )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QEvent p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QEvent ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QEvent * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QEvent Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QEvent * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QEvent ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QEvent Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QEvent Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QEvent Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QEvent( void * pObj )
void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QEvent;
HB_TRACE( HB_TR_DEBUG, ( " new_QEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QEvent ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -115,7 +132,7 @@ HB_FUNC( QT_QEVENT )
pObj = ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QEvent( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QEvent( pObj, true ) );
}
/*
* void accept ()

48
harbour/contrib/hbqt/qtcore/QEventLoop.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -84,6 +84,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QEventLoop > pq;
} QGC_POINTER_QEventLoop;
@@ -92,48 +93,47 @@ QT_G_FUNC( hbqt_gcRelease_QEventLoop )
{
QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QEventLoop p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QEventLoop ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QEventLoop * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QEventLoop * ) p->ph )->~QEventLoop();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QEventLoop * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QEventLoop 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_QEventLoop ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QEventLoop Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QEventLoop Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QEventLoop Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QEventLoop Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QEventLoop Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QEventLoop( void * pObj )
void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew )
{
QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) hb_gcAllocate( sizeof( QGC_POINTER_QEventLoop ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QEventLoop;
new( & p->pq ) QPointer< QEventLoop >( ( QEventLoop * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QEventLoop %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QEventLoop >( ( QEventLoop * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QEventLoop ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -143,7 +143,7 @@ HB_FUNC( QT_QEVENTLOOP )
pObj = new QEventLoop( hbqt_par_QObject( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QEventLoop( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QEventLoop( pObj, true ) );
}
/*
* int exec ( ProcessEventsFlags flags = AllEvents )

50
harbour/contrib/hbqt/qtcore/QFile.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -89,6 +89,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QFile > pq;
} QGC_POINTER_QFile;
@@ -97,48 +98,47 @@ QT_G_FUNC( hbqt_gcRelease_QFile )
{
QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QFile p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QFile ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QFile * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QFile * ) p->ph )->~QFile();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QFile * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QFile 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_QFile ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QFile Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QFile Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QFile Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QFile Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QFile Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QFile( void * pObj )
void * hbqt_gcAllocate_QFile( void * pObj, bool bNew )
{
QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) hb_gcAllocate( sizeof( QGC_POINTER_QFile ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QFile;
new( & p->pq ) QPointer< QFile >( ( QFile * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QFile %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QFile >( ( QFile * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QFile ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -151,7 +151,7 @@ HB_FUNC( QT_QFILE )
pObj = new QFile( hbqt_par_QString( 1 ) ) ;
}
hb_retptrGC( hbqt_gcAllocate_QFile( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QFile( pObj, true ) );
}
/*
* virtual bool atEnd () const
@@ -358,7 +358,7 @@ HB_FUNC( QT_QFILE_DECODENAME_1 )
*/
HB_FUNC( QT_QFILE_ENCODENAME )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( QFile::tr( hb_parc( 2 ) ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( QFile::tr( hb_parc( 2 ) ) ) ), true ) );
}
/*

53
harbour/contrib/hbqt/qtcore/QFileInfo.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -85,32 +85,49 @@
* ~QFileInfo ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QFileInfo;
QT_G_FUNC( hbqt_gcRelease_QFileInfo )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QFileInfo p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QFileInfo ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QFileInfo * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QFileInfo Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QFileInfo * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QFileInfo ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QFileInfo Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QFileInfo Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QFileInfo Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QFileInfo( void * pObj )
void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QFileInfo;
HB_TRACE( HB_TR_DEBUG, ( " new_QFileInfo %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QFileInfo ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -120,14 +137,14 @@ HB_FUNC( QT_QFILEINFO )
pObj = new QFileInfo() ;
hb_retptrGC( hbqt_gcAllocate_QFileInfo( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QFileInfo( pObj, true ) );
}
/*
* QDir absoluteDir () const
*/
HB_FUNC( QT_QFILEINFO_ABSOLUTEDIR )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ), true ) );
}
/*
@@ -207,7 +224,7 @@ HB_FUNC( QT_QFILEINFO_COMPLETESUFFIX )
*/
HB_FUNC( QT_QFILEINFO_CREATED )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ), true ) );
}
/*
@@ -215,7 +232,7 @@ HB_FUNC( QT_QFILEINFO_CREATED )
*/
HB_FUNC( QT_QFILEINFO_DIR )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->dir() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->dir() ), true ) );
}
/*
@@ -351,7 +368,7 @@ HB_FUNC( QT_QFILEINFO_ISWRITABLE )
*/
HB_FUNC( QT_QFILEINFO_LASTMODIFIED )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ), true ) );
}
/*
@@ -359,7 +376,7 @@ HB_FUNC( QT_QFILEINFO_LASTMODIFIED )
*/
HB_FUNC( QT_QFILEINFO_LASTREAD )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ), true ) );
}
/*

34
harbour/contrib/hbqt/qtcore/QIODevice.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -82,11 +82,35 @@
* virtual ~QIODevice ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QIODevice > pq;
} QGC_POINTER_QIODevice;
QT_G_FUNC( hbqt_gcRelease_QIODevice )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew )
{
QGC_POINTER_QIODevice * p = ( QGC_POINTER_QIODevice * ) hb_gcAllocate( sizeof( QGC_POINTER_QIODevice ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QIODevice;
if( bNew )
{
new( & p->pq ) QPointer< QIODevice >( ( QIODevice * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QIODevice ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QIODEVICE )
{
}
@@ -215,7 +239,7 @@ HB_FUNC( QT_QIODEVICE_PEEK )
*/
HB_FUNC( QT_QIODEVICE_PEEK_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ), true ) );
}
/*
@@ -247,7 +271,7 @@ HB_FUNC( QT_QIODEVICE_READ )
*/
HB_FUNC( QT_QIODEVICE_READ_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ), true ) );
}
/*
@@ -255,7 +279,7 @@ HB_FUNC( QT_QIODEVICE_READ_1 )
*/
HB_FUNC( QT_QIODEVICE_READALL )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ), true ) );
}
/*
@@ -271,7 +295,7 @@ HB_FUNC( QT_QIODEVICE_READLINE )
*/
HB_FUNC( QT_QIODEVICE_READLINE_1 )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ), true ) );
}
/*

43
harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -75,32 +75,49 @@
* QLatin1Char ( char c )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QLatin1Char;
QT_G_FUNC( hbqt_gcRelease_QLatin1Char )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLatin1Char p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLatin1Char ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QLatin1Char * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QLatin1Char Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QLatin1Char * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QLatin1Char ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QLatin1Char Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QLatin1Char Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QLatin1Char Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QLatin1Char( void * pObj )
void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QLatin1Char;
HB_TRACE( HB_TR_DEBUG, ( " new_QLatin1Char %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QLatin1Char ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -110,7 +127,7 @@ HB_FUNC( QT_QLATIN1CHAR )
pObj = ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QLatin1Char( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QLatin1Char( pObj, true ) );
}
/*
* char toLatin1 () const

43
harbour/contrib/hbqt/qtcore/QLatin1String.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -75,32 +75,49 @@
* QLatin1String ( const char * str )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QLatin1String;
QT_G_FUNC( hbqt_gcRelease_QLatin1String )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLatin1String p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLatin1String ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QLatin1String * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QLatin1String Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QLatin1String * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QLatin1String ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QLatin1String Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QLatin1String Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QLatin1String Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QLatin1String( void * pObj )
void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QLatin1String;
HB_TRACE( HB_TR_DEBUG, ( " new_QLatin1String %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QLatin1String ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -110,7 +127,7 @@ HB_FUNC( QT_QLATIN1STRING )
pObj = ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QLatin1String( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QLatin1String( pObj, true ) );
}
/*
* const char * latin1 () const

51
harbour/contrib/hbqt/qtcore/QLine.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -77,32 +77,49 @@
* QLine ( int x1, int y1, int x2, int y2 )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QLine;
QT_G_FUNC( hbqt_gcRelease_QLine )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLine p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLine ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QLine * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QLine Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QLine * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QLine ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QLine Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QLine Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QLine Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QLine( void * pObj )
void * hbqt_gcAllocate_QLine( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QLine;
HB_TRACE( HB_TR_DEBUG, ( " new_QLine %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QLine ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -127,14 +144,14 @@ HB_FUNC( QT_QLINE )
pObj = ( QLine* ) new QLine() ;
}
hb_retptrGC( hbqt_gcAllocate_QLine( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QLine( pObj, true ) );
}
/*
* QPoint p1 () const
*/
HB_FUNC( QT_QLINE_P1 )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p1() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p1() ), true ) );
}
/*
@@ -142,7 +159,7 @@ HB_FUNC( QT_QLINE_P1 )
*/
HB_FUNC( QT_QLINE_P2 )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p2() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p2() ), true ) );
}
/*
@@ -254,7 +271,7 @@ HB_FUNC( QT_QLINE_TRANSLATE_1 )
*/
HB_FUNC( QT_QLINE_TRANSLATED )
{
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ), true ) );
}
/*
@@ -262,7 +279,7 @@ HB_FUNC( QT_QLINE_TRANSLATED )
*/
HB_FUNC( QT_QLINE_TRANSLATED_1 )
{
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ), true ) );
}

59
harbour/contrib/hbqt/qtcore/QLineF.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -81,32 +81,49 @@
* QLineF ( const QLine & line )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QLineF;
QT_G_FUNC( hbqt_gcRelease_QLineF )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLineF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLineF ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QLineF * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QLineF Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QLineF * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QLineF ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QLineF Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QLineF Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QLineF Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QLineF( void * pObj )
void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QLineF;
HB_TRACE( HB_TR_DEBUG, ( " new_QLineF %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QLineF ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -116,14 +133,14 @@ HB_FUNC( QT_QLINEF )
pObj = new QLineF() ;
hb_retptrGC( hbqt_gcAllocate_QLineF( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( pObj, true ) );
}
/*
* QPointF p1 () const
*/
HB_FUNC( QT_QLINEF_P1 )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p1() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p1() ), true ) );
}
/*
@@ -131,7 +148,7 @@ HB_FUNC( QT_QLINEF_P1 )
*/
HB_FUNC( QT_QLINEF_P2 )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p2() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p2() ), true ) );
}
/*
@@ -227,7 +244,7 @@ HB_FUNC( QT_QLINEF_LENGTH )
*/
HB_FUNC( QT_QLINEF_NORMALVECTOR )
{
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ), true ) );
}
/*
@@ -235,7 +252,7 @@ HB_FUNC( QT_QLINEF_NORMALVECTOR )
*/
HB_FUNC( QT_QLINEF_POINTAT )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ), true ) );
}
/*
@@ -291,7 +308,7 @@ HB_FUNC( QT_QLINEF_SETPOINTS )
*/
HB_FUNC( QT_QLINEF_TOLINE )
{
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLineF( 1 )->toLine() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLineF( 1 )->toLine() ), true ) );
}
/*
@@ -315,7 +332,7 @@ HB_FUNC( QT_QLINEF_TRANSLATE_1 )
*/
HB_FUNC( QT_QLINEF_TRANSLATED )
{
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ), true ) );
}
/*
@@ -323,7 +340,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED )
*/
HB_FUNC( QT_QLINEF_TRANSLATED_1 )
{
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ), true ) );
}
/*
@@ -331,7 +348,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED_1 )
*/
HB_FUNC( QT_QLINEF_UNITVECTOR )
{
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ), true ) );
}

43
harbour/contrib/hbqt/qtcore/QList.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -103,32 +103,49 @@
* ~QList ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QList;
QT_G_FUNC( hbqt_gcRelease_QList )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QList p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QList ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QList< void * > * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QList Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QList< void * > * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QList ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QList Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QList Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QList Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QList( void * pObj )
void * hbqt_gcAllocate_QList( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QList;
HB_TRACE( HB_TR_DEBUG, ( " new_QList %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QList ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -139,7 +156,7 @@ HB_FUNC( QT_QLIST )
QList<void*>* list = NULL;
pObj = ( QList<void*>* ) list ;
hb_retptrGC( hbqt_gcAllocate_QList( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QList( pObj, true ) );
}
/*
* void append ( const T & value )

59
harbour/contrib/hbqt/qtcore/QLocale.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -105,32 +105,49 @@
* QLocale ( const QLocale & other )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QLocale;
QT_G_FUNC( hbqt_gcRelease_QLocale )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLocale p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QLocale ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QLocale * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QLocale Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QLocale * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QLocale ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QLocale Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QLocale Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QLocale Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QLocale( void * pObj )
void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QLocale;
HB_TRACE( HB_TR_DEBUG, ( " new_QLocale %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QLocale ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -140,7 +157,7 @@ HB_FUNC( QT_QLOCALE )
pObj = new QLocale() ;
hb_retptrGC( hbqt_gcAllocate_QLocale( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( pObj, true ) );
}
/*
* QString amText () const
@@ -267,7 +284,7 @@ HB_FUNC( QT_QLOCALE_TIMEFORMAT )
*/
HB_FUNC( QT_QLOCALE_TODATE )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), true ) );
}
/*
@@ -275,7 +292,7 @@ HB_FUNC( QT_QLOCALE_TODATE )
*/
HB_FUNC( QT_QLOCALE_TODATE_1 )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -283,7 +300,7 @@ HB_FUNC( QT_QLOCALE_TODATE_1 )
*/
HB_FUNC( QT_QLOCALE_TODATETIME )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), true ) );
}
/*
@@ -291,7 +308,7 @@ HB_FUNC( QT_QLOCALE_TODATETIME )
*/
HB_FUNC( QT_QLOCALE_TODATETIME_1 )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -471,7 +488,7 @@ HB_FUNC( QT_QLOCALE_TOSTRING_13 )
*/
HB_FUNC( QT_QLOCALE_TOTIME )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), true ) );
}
/*
@@ -479,7 +496,7 @@ HB_FUNC( QT_QLOCALE_TOTIME )
*/
HB_FUNC( QT_QLOCALE_TOTIME_1 )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*
@@ -523,7 +540,7 @@ HB_FUNC( QT_QLOCALE_TOUSHORT )
*/
HB_FUNC( QT_QLOCALE_C )
{
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->c() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->c() ), true ) );
}
/*
@@ -555,7 +572,7 @@ HB_FUNC( QT_QLOCALE_SETDEFAULT )
*/
HB_FUNC( QT_QLOCALE_SYSTEM )
{
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->system() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->system() ), true ) );
}

56
harbour/contrib/hbqt/qtcore/QMimeData.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -89,6 +89,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QMimeData > pq;
} QGC_POINTER_QMimeData;
@@ -97,48 +98,47 @@ QT_G_FUNC( hbqt_gcRelease_QMimeData )
{
QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMimeData p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMimeData ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QMimeData * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QMimeData * ) p->ph )->~QMimeData();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QMimeData * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QMimeData 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_QMimeData ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QMimeData Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QMimeData Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QMimeData Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QMimeData Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QMimeData Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QMimeData( void * pObj )
void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew )
{
QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) hb_gcAllocate( sizeof( QGC_POINTER_QMimeData ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QMimeData;
new( & p->pq ) QPointer< QMimeData >( ( QMimeData * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QMimeData %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QMimeData >( ( QMimeData * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QMimeData ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -148,7 +148,7 @@ HB_FUNC( QT_QMIMEDATA )
pObj = new QMimeData() ;
hb_retptrGC( hbqt_gcAllocate_QMimeData( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QMimeData( pObj, true ) );
}
/*
* void clear ()
@@ -163,7 +163,7 @@ HB_FUNC( QT_QMIMEDATA_CLEAR )
*/
HB_FUNC( QT_QMIMEDATA_COLORDATA )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ), true ) );
}
/*
@@ -171,7 +171,7 @@ HB_FUNC( QT_QMIMEDATA_COLORDATA )
*/
HB_FUNC( QT_QMIMEDATA_DATA )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( QMimeData::tr( hb_parc( 2 ) ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( QMimeData::tr( hb_parc( 2 ) ) ) ), true ) );
}
/*
@@ -179,7 +179,7 @@ HB_FUNC( QT_QMIMEDATA_DATA )
*/
HB_FUNC( QT_QMIMEDATA_FORMATS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QMimeData( 1 )->formats() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QMimeData( 1 )->formats() ), true ) );
}
/*
@@ -243,7 +243,7 @@ HB_FUNC( QT_QMIMEDATA_HTML )
*/
HB_FUNC( QT_QMIMEDATA_IMAGEDATA )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ), true ) );
}
/*

51
harbour/contrib/hbqt/qtcore/QModelIndex.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -77,32 +77,49 @@
* ~QModelIndex ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QModelIndex;
QT_G_FUNC( hbqt_gcRelease_QModelIndex )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QModelIndex p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QModelIndex ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QModelIndex * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QModelIndex Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QModelIndex * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QModelIndex ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QModelIndex Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QModelIndex Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QModelIndex Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QModelIndex( void * pObj )
void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QModelIndex;
HB_TRACE( HB_TR_DEBUG, ( " new_QModelIndex %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QModelIndex ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -112,14 +129,14 @@ HB_FUNC( QT_QMODELINDEX )
pObj = new QModelIndex() ;
hb_retptrGC( hbqt_gcAllocate_QModelIndex( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( pObj, true ) );
}
/*
* QModelIndex child ( int row, int column ) const
*/
HB_FUNC( QT_QMODELINDEX_CHILD )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ), true ) );
}
/*
@@ -135,7 +152,7 @@ HB_FUNC( QT_QMODELINDEX_COLUMN )
*/
HB_FUNC( QT_QMODELINDEX_DATA )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ), true ) );
}
/*
@@ -183,7 +200,7 @@ HB_FUNC( QT_QMODELINDEX_MODEL )
*/
HB_FUNC( QT_QMODELINDEX_PARENT )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ), true ) );
}
/*
@@ -199,7 +216,7 @@ HB_FUNC( QT_QMODELINDEX_ROW )
*/
HB_FUNC( QT_QMODELINDEX_SIBLING )
{
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ), true ) );
}

54
harbour/contrib/hbqt/qtcore/QObject.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -96,6 +96,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QObject > pq;
} QGC_POINTER_QObject;
@@ -104,48 +105,47 @@ QT_G_FUNC( hbqt_gcRelease_QObject )
{
QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QObject p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QObject ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QObject * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QObject * ) p->ph )->~QObject();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QObject * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QObject 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_QObject ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QObject Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QObject Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QObject Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QObject Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QObject Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QObject( void * pObj )
void * hbqt_gcAllocate_QObject( void * pObj, bool bNew )
{
QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) hb_gcAllocate( sizeof( QGC_POINTER_QObject ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QObject;
new( & p->pq ) QPointer< QObject >( ( QObject * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QObject %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QObject >( ( QObject * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QObject ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -155,7 +155,7 @@ HB_FUNC( QT_QOBJECT )
pObj = ( QObject* ) new QObject( hbqt_par_QObject( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QObject( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QObject( pObj, true ) );
}
/*
* bool blockSignals ( bool block )
@@ -282,7 +282,7 @@ HB_FUNC( QT_QOBJECT_OBJECTNAME )
*/
HB_FUNC( QT_QOBJECT_PARENT )
{
hb_retptr( ( QObject* ) hbqt_par_QObject( 1 )->parent() );
hb_retptrGC( hbqt_gcAllocate_QObject( hbqt_par_QObject( 1 )->parent(), false ) );
}
/*
@@ -290,7 +290,7 @@ HB_FUNC( QT_QOBJECT_PARENT )
*/
HB_FUNC( QT_QOBJECT_PROPERTY )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ), true ) );
}
/*
@@ -346,7 +346,7 @@ HB_FUNC( QT_QOBJECT_STARTTIMER )
*/
HB_FUNC( QT_QOBJECT_THREAD )
{
hb_retptr( ( QThread* ) hbqt_par_QObject( 1 )->thread() );
hb_retptrGC( hbqt_gcAllocate_QThread( hbqt_par_QObject( 1 )->thread(), false ) );
}
/*

43
harbour/contrib/hbqt/qtcore/QPoint.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -77,32 +77,49 @@
* ~QPoint ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QPoint;
QT_G_FUNC( hbqt_gcRelease_QPoint )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QPoint p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QPoint ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QPoint * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QPoint Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QPoint * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QPoint ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QPoint Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QPoint Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QPoint Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QPoint( void * pObj )
void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QPoint;
HB_TRACE( HB_TR_DEBUG, ( " new_QPoint %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QPoint ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -123,7 +140,7 @@ HB_FUNC( QT_QPOINT )
pObj = ( QPoint* ) new QPoint() ;
}
hb_retptrGC( hbqt_gcAllocate_QPoint( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( pObj, true ) );
}
/*
* bool isNull () const

45
harbour/contrib/hbqt/qtcore/QPointF.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -77,32 +77,49 @@
* QPointF ( qreal x, qreal y )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QPointF;
QT_G_FUNC( hbqt_gcRelease_QPointF )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QPointF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QPointF ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QPointF * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QPointF Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QPointF * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QPointF ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QPointF Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QPointF Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QPointF Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QPointF( void * pObj )
void * hbqt_gcAllocate_QPointF( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QPointF;
HB_TRACE( HB_TR_DEBUG, ( " new_QPointF %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QPointF ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -123,7 +140,7 @@ HB_FUNC( QT_QPOINTF )
pObj = ( QPointF* ) new QPointF() ;
}
hb_retptrGC( hbqt_gcAllocate_QPointF( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( pObj, true ) );
}
/*
* bool isNull () const
@@ -170,7 +187,7 @@ HB_FUNC( QT_QPOINTF_SETY )
*/
HB_FUNC( QT_QPOINTF_TOPOINT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ), true ) );
}
/*

56
harbour/contrib/hbqt/qtcore/QProcess.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -90,6 +90,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QProcess > pq;
} QGC_POINTER_QProcess;
@@ -98,48 +99,47 @@ QT_G_FUNC( hbqt_gcRelease_QProcess )
{
QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QProcess p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QProcess ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QProcess * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QProcess * ) p->ph )->~QProcess();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QProcess * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QProcess 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_QProcess ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QProcess Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QProcess Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QProcess Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QProcess Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QProcess Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QProcess( void * pObj )
void * hbqt_gcAllocate_QProcess( void * pObj, bool bNew )
{
QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) hb_gcAllocate( sizeof( QGC_POINTER_QProcess ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QProcess;
new( & p->pq ) QPointer< QProcess >( ( QProcess * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QProcess %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QProcess >( ( QProcess * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QProcess ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -156,7 +156,7 @@ HB_FUNC( QT_QPROCESS )
pObj = ( QProcess* ) new QProcess() ;
}
hb_retptrGC( hbqt_gcAllocate_QProcess( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QProcess( pObj, true ) );
}
/*
* virtual void close ()
@@ -187,7 +187,7 @@ HB_FUNC( QT_QPROCESS_CLOSEWRITECHANNEL )
*/
HB_FUNC( QT_QPROCESS_ENVIRONMENT )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->environment() ), true ) );
}
/*
@@ -227,7 +227,7 @@ HB_FUNC( QT_QPROCESS_PROCESSCHANNELMODE )
*/
HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ), true ) );
}
/*
@@ -235,7 +235,7 @@ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR )
*/
HB_FUNC( QT_QPROCESS_READALLSTANDARDOUTPUT )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ), true ) );
}
/*
@@ -407,7 +407,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED_2 )
*/
HB_FUNC( QT_QPROCESS_SYSTEMENVIRONMENT )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ), true ) );
}
/*

67
harbour/contrib/hbqt/qtcore/QRect.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -79,32 +79,49 @@
* ~QRect ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QRect;
QT_G_FUNC( hbqt_gcRelease_QRect )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRect p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRect ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QRect * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QRect Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QRect * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QRect ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QRect Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QRect Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QRect Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QRect( void * pObj )
void * hbqt_gcAllocate_QRect( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QRect;
HB_TRACE( HB_TR_DEBUG, ( " new_QRect %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QRect ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -129,7 +146,7 @@ HB_FUNC( QT_QRECT )
pObj = ( QRect* ) new QRect() ;
}
hb_retptrGC( hbqt_gcAllocate_QRect( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QRect( pObj, true ) );
}
/*
* void adjust ( int dx1, int dy1, int dx2, int dy2 )
@@ -144,7 +161,7 @@ HB_FUNC( QT_QRECT_ADJUST )
*/
HB_FUNC( QT_QRECT_ADJUSTED )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) );
}
/*
@@ -160,7 +177,7 @@ HB_FUNC( QT_QRECT_BOTTOM )
*/
HB_FUNC( QT_QRECT_BOTTOMLEFT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ), true ) );
}
/*
@@ -168,7 +185,7 @@ HB_FUNC( QT_QRECT_BOTTOMLEFT )
*/
HB_FUNC( QT_QRECT_BOTTOMRIGHT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ), true ) );
}
/*
@@ -176,7 +193,7 @@ HB_FUNC( QT_QRECT_BOTTOMRIGHT )
*/
HB_FUNC( QT_QRECT_CENTER )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->center() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->center() ), true ) );
}
/*
@@ -260,7 +277,7 @@ HB_FUNC( QT_QRECT_HEIGHT )
*/
HB_FUNC( QT_QRECT_INTERSECTED )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ), true ) );
}
/*
@@ -396,7 +413,7 @@ HB_FUNC( QT_QRECT_MOVETOPRIGHT )
*/
HB_FUNC( QT_QRECT_NORMALIZED )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->normalized() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->normalized() ), true ) );
}
/*
@@ -532,7 +549,7 @@ HB_FUNC( QT_QRECT_SETY )
*/
HB_FUNC( QT_QRECT_SIZE )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QRect( 1 )->size() ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QRect( 1 )->size() ), true ) );
}
/*
@@ -548,7 +565,7 @@ HB_FUNC( QT_QRECT_TOP )
*/
HB_FUNC( QT_QRECT_TOPLEFT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topLeft() ), true ) );
}
/*
@@ -556,7 +573,7 @@ HB_FUNC( QT_QRECT_TOPLEFT )
*/
HB_FUNC( QT_QRECT_TOPRIGHT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topRight() ), true ) );
}
/*
@@ -580,7 +597,7 @@ HB_FUNC( QT_QRECT_TRANSLATE_1 )
*/
HB_FUNC( QT_QRECT_TRANSLATED )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ), true ) );
}
/*
@@ -588,7 +605,7 @@ HB_FUNC( QT_QRECT_TRANSLATED )
*/
HB_FUNC( QT_QRECT_TRANSLATED_1 )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ), true ) );
}
/*
@@ -596,7 +613,7 @@ HB_FUNC( QT_QRECT_TRANSLATED_1 )
*/
HB_FUNC( QT_QRECT_UNITED )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ), true ) );
}
/*

71
harbour/contrib/hbqt/qtcore/QRectF.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -80,32 +80,49 @@
* ~QRectF ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QRectF;
QT_G_FUNC( hbqt_gcRelease_QRectF )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRectF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRectF ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QRectF * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QRectF Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QRectF * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QRectF ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QRectF Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QRectF Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QRectF Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QRectF( void * pObj )
void * hbqt_gcAllocate_QRectF( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QRectF;
HB_TRACE( HB_TR_DEBUG, ( " new_QRectF %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QRectF ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -130,7 +147,7 @@ HB_FUNC( QT_QRECTF )
pObj = ( QRectF* ) new QRectF() ;
}
hb_retptrGC( hbqt_gcAllocate_QRectF( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( pObj, true ) );
}
/*
* void adjust ( qreal dx1, qreal dy1, qreal dx2, qreal dy2 )
@@ -145,7 +162,7 @@ HB_FUNC( QT_QRECTF_ADJUST )
*/
HB_FUNC( QT_QRECTF_ADJUSTED )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ), true ) );
}
/*
@@ -161,7 +178,7 @@ HB_FUNC( QT_QRECTF_BOTTOM )
*/
HB_FUNC( QT_QRECTF_BOTTOMLEFT )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ), true ) );
}
/*
@@ -169,7 +186,7 @@ HB_FUNC( QT_QRECTF_BOTTOMLEFT )
*/
HB_FUNC( QT_QRECTF_BOTTOMRIGHT )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ), true ) );
}
/*
@@ -177,7 +194,7 @@ HB_FUNC( QT_QRECTF_BOTTOMRIGHT )
*/
HB_FUNC( QT_QRECTF_CENTER )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->center() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->center() ), true ) );
}
/*
@@ -253,7 +270,7 @@ HB_FUNC( QT_QRECTF_HEIGHT )
*/
HB_FUNC( QT_QRECTF_INTERSECTED )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ), true ) );
}
/*
@@ -389,7 +406,7 @@ HB_FUNC( QT_QRECTF_MOVETOPRIGHT )
*/
HB_FUNC( QT_QRECTF_NORMALIZED )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->normalized() ), true ) );
}
/*
@@ -525,7 +542,7 @@ HB_FUNC( QT_QRECTF_SETY )
*/
HB_FUNC( QT_QRECTF_SIZE )
{
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ) );
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QRectF( 1 )->size() ), true ) );
}
/*
@@ -533,7 +550,7 @@ HB_FUNC( QT_QRECTF_SIZE )
*/
HB_FUNC( QT_QRECTF_TOALIGNEDRECT )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ), true ) );
}
/*
@@ -541,7 +558,7 @@ HB_FUNC( QT_QRECTF_TOALIGNEDRECT )
*/
HB_FUNC( QT_QRECTF_TORECT )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toRect() ), true ) );
}
/*
@@ -557,7 +574,7 @@ HB_FUNC( QT_QRECTF_TOP )
*/
HB_FUNC( QT_QRECTF_TOPLEFT )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ), true ) );
}
/*
@@ -565,7 +582,7 @@ HB_FUNC( QT_QRECTF_TOPLEFT )
*/
HB_FUNC( QT_QRECTF_TOPRIGHT )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topRight() ), true ) );
}
/*
@@ -589,7 +606,7 @@ HB_FUNC( QT_QRECTF_TRANSLATE_1 )
*/
HB_FUNC( QT_QRECTF_TRANSLATED )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ), true ) );
}
/*
@@ -597,7 +614,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED )
*/
HB_FUNC( QT_QRECTF_TRANSLATED_1 )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ), true ) );
}
/*
@@ -605,7 +622,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED_1 )
*/
HB_FUNC( QT_QRECTF_UNITED )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ), true ) );
}
/*

45
harbour/contrib/hbqt/qtcore/QRegExp.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -82,32 +82,49 @@
* ~QRegExp ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QRegExp;
QT_G_FUNC( hbqt_gcRelease_QRegExp )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRegExp p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QRegExp ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QRegExp * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QRegExp Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QRegExp * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QRegExp ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QRegExp Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QRegExp Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QRegExp Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QRegExp( void * pObj )
void * hbqt_gcAllocate_QRegExp( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QRegExp;
HB_TRACE( HB_TR_DEBUG, ( " new_QRegExp %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QRegExp ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -117,7 +134,7 @@ HB_FUNC( QT_QREGEXP )
pObj = new QRegExp() ;
hb_retptrGC( hbqt_gcAllocate_QRegExp( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QRegExp( pObj, true ) );
}
/*
* QString cap ( int nth = 0 ) const
@@ -132,7 +149,7 @@ HB_FUNC( QT_QREGEXP_CAP )
*/
HB_FUNC( QT_QREGEXP_CAPTUREDTEXTS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ), true ) );
}
/*

47
harbour/contrib/hbqt/qtcore/QResource.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,32 +76,49 @@
* ~QResource ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QResource;
QT_G_FUNC( hbqt_gcRelease_QResource )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QResource p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QResource ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QResource * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QResource Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QResource * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QResource ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QResource Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QResource Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QResource Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QResource( void * pObj )
void * hbqt_gcAllocate_QResource( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QResource;
HB_TRACE( HB_TR_DEBUG, ( " new_QResource %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QResource ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -111,7 +128,7 @@ HB_FUNC( QT_QRESOURCE )
pObj = ( QResource* ) new QResource() ;
hb_retptrGC( hbqt_gcAllocate_QResource( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QResource( pObj, true ) );
}
/*
* QString absoluteFilePath () const
@@ -158,7 +175,7 @@ HB_FUNC( QT_QRESOURCE_ISVALID )
*/
HB_FUNC( QT_QRESOURCE_LOCALE )
{
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QResource( 1 )->locale() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QResource( 1 )->locale() ), true ) );
}
/*
@@ -198,7 +215,7 @@ HB_FUNC( QT_QRESOURCE_REGISTERRESOURCE )
*/
HB_FUNC( QT_QRESOURCE_SEARCHPATHS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ), true ) );
}
/*

58
harbour/contrib/hbqt/qtcore/QSettings.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -89,6 +89,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QSettings > pq;
} QGC_POINTER_QSettings;
@@ -97,48 +98,47 @@ QT_G_FUNC( hbqt_gcRelease_QSettings )
{
QGC_POINTER_QSettings * p = ( QGC_POINTER_QSettings * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QSettings * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QSettings * ) p->ph )->~QSettings();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QSettings * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QSettings 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_QSettings ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QSettings Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QSettings Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QSettings Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QSettings Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QSettings( void * pObj )
void * hbqt_gcAllocate_QSettings( void * pObj, bool bNew )
{
QGC_POINTER_QSettings * p = ( QGC_POINTER_QSettings * ) hb_gcAllocate( sizeof( QGC_POINTER_QSettings ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QSettings;
new( & p->pq ) QPointer< QSettings >( ( QSettings * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QSettings %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QSettings >( ( QSettings * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QSettings ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -159,14 +159,14 @@ HB_FUNC( QT_QSETTINGS )
pObj = new QSettings() ;
}
hb_retptrGC( hbqt_gcAllocate_QSettings( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QSettings( pObj, true ) );
}
/*
* QStringList allKeys () const
*/
HB_FUNC( QT_QSETTINGS_ALLKEYS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->allKeys() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->allKeys() ), true ) );
}
/*
@@ -206,7 +206,7 @@ HB_FUNC( QT_QSETTINGS_BEGINWRITEARRAY )
*/
HB_FUNC( QT_QSETTINGS_CHILDGROUPS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->childGroups() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->childGroups() ), true ) );
}
/*
@@ -214,7 +214,7 @@ HB_FUNC( QT_QSETTINGS_CHILDGROUPS )
*/
HB_FUNC( QT_QSETTINGS_CHILDKEYS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->childKeys() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSettings( 1 )->childKeys() ), true ) );
}
/*
@@ -286,7 +286,7 @@ HB_FUNC( QT_QSETTINGS_GROUP )
*/
HB_FUNC( QT_QSETTINGS_INICODEC )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QSettings( 1 )->iniCodec() );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QSettings( 1 )->iniCodec(), false ) );
}
/*
@@ -382,7 +382,7 @@ HB_FUNC( QT_QSETTINGS_SYNC )
*/
HB_FUNC( QT_QSETTINGS_VALUE )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QSettings( 1 )->value( QSettings::tr( hb_parc( 2 ) ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QSettings( 1 )->value( QSettings::tr( hb_parc( 2 ) ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ), true ) );
}
/*

56
harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -79,6 +79,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QSignalMapper > pq;
} QGC_POINTER_QSignalMapper;
@@ -87,48 +88,47 @@ QT_G_FUNC( hbqt_gcRelease_QSignalMapper )
{
QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSignalMapper p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSignalMapper ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QSignalMapper * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QSignalMapper * ) p->ph )->~QSignalMapper();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QSignalMapper * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QSignalMapper 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_QSignalMapper ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSignalMapper Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QSignalMapper Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QSignalMapper Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QSignalMapper Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QSignalMapper Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QSignalMapper( void * pObj )
void * hbqt_gcAllocate_QSignalMapper( void * pObj, bool bNew )
{
QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) hb_gcAllocate( sizeof( QGC_POINTER_QSignalMapper ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QSignalMapper;
new( & p->pq ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QSignalMapper %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QSignalMapper ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -138,14 +138,14 @@ HB_FUNC( QT_QSIGNALMAPPER )
pObj = new QSignalMapper( hbqt_par_QObject( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QSignalMapper( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QSignalMapper( pObj, true ) );
}
/*
* QObject * mapping ( int id ) const
*/
HB_FUNC( QT_QSIGNALMAPPER_MAPPING )
{
hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( hb_parni( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QObject( hbqt_par_QSignalMapper( 1 )->mapping( hb_parni( 2 ) ), false ) );
}
/*
@@ -153,7 +153,7 @@ HB_FUNC( QT_QSIGNALMAPPER_MAPPING )
*/
HB_FUNC( QT_QSIGNALMAPPER_MAPPING_1 )
{
hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( QSignalMapper::tr( hb_parc( 2 ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QObject( hbqt_par_QSignalMapper( 1 )->mapping( QSignalMapper::tr( hb_parc( 2 ) ) ), false ) );
}
/*
@@ -161,7 +161,7 @@ HB_FUNC( QT_QSIGNALMAPPER_MAPPING_1 )
*/
HB_FUNC( QT_QSIGNALMAPPER_MAPPING_2 )
{
hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( hbqt_par_QWidget( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QObject( hbqt_par_QSignalMapper( 1 )->mapping( hbqt_par_QWidget( 2 ) ), false ) );
}
/*
@@ -169,7 +169,7 @@ HB_FUNC( QT_QSIGNALMAPPER_MAPPING_2 )
*/
HB_FUNC( QT_QSIGNALMAPPER_MAPPING_3 )
{
hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( hbqt_par_QObject( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QObject( hbqt_par_QSignalMapper( 1 )->mapping( hbqt_par_QObject( 2 ) ), false ) );
}
/*

47
harbour/contrib/hbqt/qtcore/QSize.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -77,32 +77,49 @@
* ~QSize ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QSize;
QT_G_FUNC( hbqt_gcRelease_QSize )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSize p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSize ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QSize * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QSize Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QSize * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QSize ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QSize Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QSize Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QSize Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QSize( void * pObj )
void * hbqt_gcAllocate_QSize( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QSize;
HB_TRACE( HB_TR_DEBUG, ( " new_QSize %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QSize ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -123,7 +140,7 @@ HB_FUNC( QT_QSIZE )
pObj = ( QSize* ) new QSize() ;
}
hb_retptrGC( hbqt_gcAllocate_QSize( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QSize( pObj, true ) );
}
/*
* int height () const
@@ -226,7 +243,7 @@ HB_FUNC( QT_QSIZE_WIDTH )
*/
HB_FUNC( QT_QSIZE_BOUNDEDTO )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ), true ) );
}
/*
@@ -234,7 +251,7 @@ HB_FUNC( QT_QSIZE_BOUNDEDTO )
*/
HB_FUNC( QT_QSIZE_EXPANDEDTO )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ), true ) );
}

49
harbour/contrib/hbqt/qtcore/QSizeF.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -78,32 +78,49 @@
* ~QSizeF ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QSizeF;
QT_G_FUNC( hbqt_gcRelease_QSizeF )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSizeF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSizeF ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QSizeF * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QSizeF Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QSizeF * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QSizeF ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QSizeF Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QSizeF Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QSizeF Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QSizeF( void * pObj )
void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QSizeF;
HB_TRACE( HB_TR_DEBUG, ( " new_QSizeF %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QSizeF ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -120,14 +137,14 @@ HB_FUNC( QT_QSIZEF )
pObj = ( QSizeF* ) new QSizeF() ;
}
hb_retptrGC( hbqt_gcAllocate_QSizeF( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QSizeF( pObj, true ) );
}
/*
* QSizeF boundedTo ( const QSizeF & otherSize ) const
*/
HB_FUNC( QT_QSIZEF_BOUNDEDTO )
{
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ), true ) );
}
/*
@@ -135,7 +152,7 @@ HB_FUNC( QT_QSIZEF_BOUNDEDTO )
*/
HB_FUNC( QT_QSIZEF_EXPANDEDTO )
{
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ), true ) );
}
/*
@@ -223,7 +240,7 @@ HB_FUNC( QT_QSIZEF_SETWIDTH )
*/
HB_FUNC( QT_QSIZEF_TOSIZE )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSizeF( 1 )->toSize() ), true ) );
}
/*

47
harbour/contrib/hbqt/qtcore/QStringList.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -96,32 +96,49 @@
* QStringList ( const QList<QString> & other )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QStringList;
QT_G_FUNC( hbqt_gcRelease_QStringList )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QStringList p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QStringList ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QStringList * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QStringList Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QStringList * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QStringList ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QStringList Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QStringList Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QStringList Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QStringList( void * pObj )
void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QStringList;
HB_TRACE( HB_TR_DEBUG, ( " new_QStringList %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QStringList ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -131,7 +148,7 @@ HB_FUNC( QT_QSTRINGLIST )
pObj = ( QStringList* ) new QStringList() ;
hb_retptrGC( hbqt_gcAllocate_QStringList( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( pObj, true ) );
}
/*
* void append ( const QString & value )
@@ -146,7 +163,7 @@ HB_FUNC( QT_QSTRINGLIST_APPEND )
*/
HB_FUNC( QT_QSTRINGLIST_FILTER )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ), true ) );
}
/*
@@ -154,7 +171,7 @@ HB_FUNC( QT_QSTRINGLIST_FILTER )
*/
HB_FUNC( QT_QSTRINGLIST_FILTER_1 )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ), true ) );
}
/*

43
harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -85,32 +85,49 @@
* ~QTextBoundaryFinder ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTextBoundaryFinder;
QT_G_FUNC( hbqt_gcRelease_QTextBoundaryFinder )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextBoundaryFinder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextBoundaryFinder ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QTextBoundaryFinder * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QTextBoundaryFinder Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QTextBoundaryFinder * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTextBoundaryFinder ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTextBoundaryFinder Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTextBoundaryFinder Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTextBoundaryFinder Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj )
void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTextBoundaryFinder;
HB_TRACE( HB_TR_DEBUG, ( " new_QTextBoundaryFinder %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTextBoundaryFinder ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -120,7 +137,7 @@ HB_FUNC( QT_QTEXTBOUNDARYFINDER )
pObj = ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ;
hb_retptrGC( hbqt_gcAllocate_QTextBoundaryFinder( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTextBoundaryFinder( pObj, true ) );
}
/*
* BoundaryReasons boundaryReasons () const

48
harbour/contrib/hbqt/qtcore/QTextCodec.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -95,11 +95,33 @@
*
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTextCodec;
QT_G_FUNC( hbqt_gcRelease_QTextCodec )
{
HB_SYMBOL_UNUSED( Cargo );
}
void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTextCodec;
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTextCodec ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
HB_FUNC( QT_QTEXTCODEC )
{
}
@@ -124,7 +146,7 @@ HB_FUNC( QT_QTEXTCODEC_CANENCODE_1 )
*/
HB_FUNC( QT_QTEXTCODEC_FROMUNICODE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -132,7 +154,7 @@ HB_FUNC( QT_QTEXTCODEC_FROMUNICODE )
*/
HB_FUNC( QT_QTEXTCODEC_MAKEDECODER )
{
hb_retptr( ( QTextDecoder* ) hbqt_par_QTextCodec( 1 )->makeDecoder() );
hb_retptrGC( hbqt_gcAllocate_QTextDecoder( hbqt_par_QTextCodec( 1 )->makeDecoder(), false ) );
}
/*
@@ -140,7 +162,7 @@ HB_FUNC( QT_QTEXTCODEC_MAKEDECODER )
*/
HB_FUNC( QT_QTEXTCODEC_MAKEENCODER )
{
hb_retptr( ( QTextEncoder* ) hbqt_par_QTextCodec( 1 )->makeEncoder() );
hb_retptrGC( hbqt_gcAllocate_QTextEncoder( hbqt_par_QTextCodec( 1 )->makeEncoder(), false ) );
}
/*
@@ -156,7 +178,7 @@ HB_FUNC( QT_QTEXTCODEC_MIBENUM )
*/
HB_FUNC( QT_QTEXTCODEC_NAME )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ), true ) );
}
/*
@@ -180,7 +202,7 @@ HB_FUNC( QT_QTEXTCODEC_TOUNICODE_1 )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORCSTRINGS )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForCStrings() );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForCStrings(), false ) );
}
/*
@@ -188,7 +210,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORCSTRINGS )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORHTML )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForHtml( *hbqt_par_QByteArray( 2 ), hbqt_par_QTextCodec( 3 ) ) );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForHtml( *hbqt_par_QByteArray( 2 ), hbqt_par_QTextCodec( 3 ) ), false ) );
}
/*
@@ -196,7 +218,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORHTML )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORHTML_1 )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForHtml( *hbqt_par_QByteArray( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForHtml( *hbqt_par_QByteArray( 2 ) ), false ) );
}
/*
@@ -204,7 +226,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORHTML_1 )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORLOCALE )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForLocale() );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForLocale(), false ) );
}
/*
@@ -212,7 +234,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORLOCALE )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORMIB )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForMib( hb_parni( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForMib( hb_parni( 2 ) ), false ) );
}
/*
@@ -220,7 +242,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORMIB )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORNAME )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForName( *hbqt_par_QByteArray( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForName( *hbqt_par_QByteArray( 2 ) ), false ) );
}
/*
@@ -228,7 +250,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORNAME )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORNAME_1 )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForName( hbqt_par_char( 2 ) ) );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForName( hbqt_par_char( 2 ) ), false ) );
}
/*
@@ -236,7 +258,7 @@ HB_FUNC( QT_QTEXTCODEC_CODECFORNAME_1 )
*/
HB_FUNC( QT_QTEXTCODEC_CODECFORTR )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextCodec( 1 )->codecForTr() );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextCodec( 1 )->codecForTr(), false ) );
}
/*

43
harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,32 +76,49 @@
* ~QTextDecoder ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTextDecoder;
QT_G_FUNC( hbqt_gcRelease_QTextDecoder )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextDecoder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextDecoder ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QTextDecoder * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QTextDecoder Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QTextDecoder * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTextDecoder ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTextDecoder Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTextDecoder Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTextDecoder Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTextDecoder( void * pObj )
void * hbqt_gcAllocate_QTextDecoder( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTextDecoder;
HB_TRACE( HB_TR_DEBUG, ( " new_QTextDecoder %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTextDecoder ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -111,7 +128,7 @@ HB_FUNC( QT_QTEXTDECODER )
pObj = ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QTextDecoder( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTextDecoder( pObj, true ) );
}
/*
* QString toUnicode ( const char * chars, int len )

45
harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -76,32 +76,49 @@
* ~QTextEncoder ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTextEncoder;
QT_G_FUNC( hbqt_gcRelease_QTextEncoder )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextEncoder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextEncoder ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QTextEncoder * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QTextEncoder Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QTextEncoder * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTextEncoder ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTextEncoder Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTextEncoder Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTextEncoder Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTextEncoder( void * pObj )
void * hbqt_gcAllocate_QTextEncoder( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTextEncoder;
HB_TRACE( HB_TR_DEBUG, ( " new_QTextEncoder %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTextEncoder ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -111,14 +128,14 @@ HB_FUNC( QT_QTEXTENCODER )
pObj = ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QTextEncoder( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTextEncoder( pObj, true ) );
}
/*
* QByteArray fromUnicode ( const QString & str )
*/
HB_FUNC( QT_QTEXTENCODER_FROMUNICODE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ), true ) );
}

49
harbour/contrib/hbqt/qtcore/QTextStream.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -96,32 +96,49 @@ HB_FUNC( QT_QTEXTSTREAM_PADCHAR )
}
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTextStream;
QT_G_FUNC( hbqt_gcRelease_QTextStream )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextStream p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTextStream ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QTextStream * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QTextStream Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QTextStream * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTextStream ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTextStream Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTextStream Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTextStream Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTextStream( void * pObj )
void * hbqt_gcAllocate_QTextStream( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTextStream;
HB_TRACE( HB_TR_DEBUG, ( " new_QTextStream %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTextStream ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -131,7 +148,7 @@ HB_FUNC( QT_QTEXTSTREAM )
pObj = new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ;
hb_retptrGC( hbqt_gcAllocate_QTextStream( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTextStream( pObj, true ) );
}
/*
* bool atEnd () const
@@ -154,7 +171,7 @@ HB_FUNC( QT_QTEXTSTREAM_AUTODETECTUNICODE )
*/
HB_FUNC( QT_QTEXTSTREAM_CODEC )
{
hb_retptr( ( QTextCodec* ) hbqt_par_QTextStream( 1 )->codec() );
hb_retptrGC( hbqt_gcAllocate_QTextCodec( hbqt_par_QTextStream( 1 )->codec(), false ) );
}
/*
@@ -162,7 +179,7 @@ HB_FUNC( QT_QTEXTSTREAM_CODEC )
*/
HB_FUNC( QT_QTEXTSTREAM_DEVICE )
{
hb_retptr( ( QIODevice* ) hbqt_par_QTextStream( 1 )->device() );
hb_retptrGC( hbqt_gcAllocate_QIODevice( hbqt_par_QTextStream( 1 )->device(), false ) );
}
/*
@@ -210,7 +227,7 @@ HB_FUNC( QT_QTEXTSTREAM_INTEGERBASE )
*/
HB_FUNC( QT_QTEXTSTREAM_LOCALE )
{
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QTextStream( 1 )->locale() ), true ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QThread.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -82,6 +82,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QThread > pq;
} QGC_POINTER_QThread;
@@ -90,48 +91,47 @@ QT_G_FUNC( hbqt_gcRelease_QThread )
{
QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QThread p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QThread ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QThread * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QThread * ) p->ph )->~QThread();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QThread * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QThread 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_QThread ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QThread Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QThread Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QThread Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QThread Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QThread Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QThread( void * pObj )
void * hbqt_gcAllocate_QThread( void * pObj, bool bNew )
{
QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) hb_gcAllocate( sizeof( QGC_POINTER_QThread ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QThread;
new( & p->pq ) QPointer< QThread >( ( QThread * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QThread %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QThread >( ( QThread * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QThread ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -141,7 +141,7 @@ HB_FUNC( QT_QTHREAD )
pObj = new QThread() ;
hb_retptrGC( hbqt_gcAllocate_QThread( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QThread( pObj, true ) );
}
/*
* void exit ( int returnCode = 0 )
@@ -212,7 +212,7 @@ HB_FUNC( QT_QTHREAD_WAIT )
*/
HB_FUNC( QT_QTHREAD_CURRENTTHREAD )
{
hb_retptr( ( QThread* ) hbqt_par_QThread( 1 )->currentThread() );
hb_retptrGC( hbqt_gcAllocate_QThread( hbqt_par_QThread( 1 )->currentThread(), false ) );
}
/*

53
harbour/contrib/hbqt/qtcore/QTime.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -75,32 +75,49 @@
* QTime ( int h, int m, int s = 0, int ms = 0 )
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QTime;
QT_G_FUNC( hbqt_gcRelease_QTime )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTime p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTime ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QTime * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QTime Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QTime * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTime ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTime Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTime Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTime Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTime( void * pObj )
void * hbqt_gcAllocate_QTime( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTime;
HB_TRACE( HB_TR_DEBUG, ( " new_QTime %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QTime ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -110,14 +127,14 @@ HB_FUNC( QT_QTIME )
pObj = new QTime() ;
hb_retptrGC( hbqt_gcAllocate_QTime( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTime( pObj, true ) );
}
/*
* QTime addMSecs ( int ms ) const
*/
HB_FUNC( QT_QTIME_ADDMSECS )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -125,7 +142,7 @@ HB_FUNC( QT_QTIME_ADDMSECS )
*/
HB_FUNC( QT_QTIME_ADDSECS )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ), true ) );
}
/*
@@ -245,7 +262,7 @@ HB_FUNC( QT_QTIME_TOSTRING_1 )
*/
HB_FUNC( QT_QTIME_CURRENTTIME )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->currentTime() ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->currentTime() ), true ) );
}
/*
@@ -253,7 +270,7 @@ HB_FUNC( QT_QTIME_CURRENTTIME )
*/
HB_FUNC( QT_QTIME_FROMSTRING )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ), true ) );
}
/*
@@ -261,7 +278,7 @@ HB_FUNC( QT_QTIME_FROMSTRING )
*/
HB_FUNC( QT_QTIME_FROMSTRING_1 )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), true ) );
}
/*

48
harbour/contrib/hbqt/qtcore/QTimer.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -79,6 +79,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QTimer > pq;
} QGC_POINTER_QTimer;
@@ -87,48 +88,47 @@ QT_G_FUNC( hbqt_gcRelease_QTimer )
{
QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTimer p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTimer ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QTimer * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QTimer * ) p->ph )->~QTimer();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QTimer * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTimer 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_QTimer ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTimer Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QTimer Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTimer Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTimer Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTimer Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTimer( void * pObj )
void * hbqt_gcAllocate_QTimer( void * pObj, bool bNew )
{
QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimer ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTimer;
new( & p->pq ) QPointer< QTimer >( ( QTimer * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QTimer %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QTimer >( ( QTimer * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QTimer ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -138,7 +138,7 @@ HB_FUNC( QT_QTIMER )
pObj = new QTimer( hbqt_par_QObject( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QTimer( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTimer( pObj, true ) );
}
/*
* int interval () const

48
harbour/contrib/hbqt/qtcore/QTranslator.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -78,6 +78,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QTranslator > pq;
} QGC_POINTER_QTranslator;
@@ -86,48 +87,47 @@ QT_G_FUNC( hbqt_gcRelease_QTranslator )
{
QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTranslator p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTranslator ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QTranslator * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QTranslator * ) p->ph )->~QTranslator();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QTranslator * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QTranslator 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_QTranslator ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QTranslator Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QTranslator Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QTranslator Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QTranslator Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QTranslator Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QTranslator( void * pObj )
void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew )
{
QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) hb_gcAllocate( sizeof( QGC_POINTER_QTranslator ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QTranslator;
new( & p->pq ) QPointer< QTranslator >( ( QTranslator * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QTranslator %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QTranslator >( ( QTranslator * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QTranslator ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -137,7 +137,7 @@ HB_FUNC( QT_QTRANSLATOR )
pObj = new QTranslator() ;
hb_retptrGC( hbqt_gcAllocate_QTranslator( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QTranslator( pObj, true ) );
}
/*
* virtual bool isEmpty () const

66
harbour/contrib/hbqt/qtcore/QUiLoader.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -80,6 +80,7 @@
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
QPointer< QUiLoader > pq;
} QGC_POINTER_QUiLoader;
@@ -88,48 +89,47 @@ QT_G_FUNC( hbqt_gcRelease_QUiLoader )
{
QGC_POINTER_QUiLoader * p = ( QGC_POINTER_QUiLoader * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QUiLoader p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QUiLoader ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
if( p && p->bNew )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
if( p->ph && p->pq )
{
switch( hbqt_get_object_release_method() )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QUiLoader * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QUiLoader * ) p->ph )->~QUiLoader();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QUiLoader * ) p->ph )->deleteLater();
break;
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QUiLoader 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_QUiLoader ph=%p pq=%p %i B %i KB", p->ph, (void *)(p->pq), ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QUiLoader Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QUiLoader Object Name Missing!" ) );
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QUiLoader Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QUiLoader Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QUiLoader Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QUiLoader( void * pObj )
void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew )
{
QGC_POINTER_QUiLoader * p = ( QGC_POINTER_QUiLoader * ) hb_gcAllocate( sizeof( QGC_POINTER_QUiLoader ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QUiLoader;
new( & p->pq ) QPointer< QUiLoader >( ( QUiLoader * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QUiLoader %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
new( & p->pq ) QPointer< QUiLoader >( ( QUiLoader * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " _new_QUiLoader ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -146,7 +146,7 @@ HB_FUNC( QT_QUILOADER )
pObj = new QUiLoader() ;
}
hb_retptrGC( hbqt_gcAllocate_QUiLoader( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QUiLoader( pObj, true ) );
}
/*
* void addPluginPath ( const QString & path )
@@ -161,7 +161,7 @@ HB_FUNC( QT_QUILOADER_ADDPLUGINPATH )
*/
HB_FUNC( QT_QUILOADER_AVAILABLELAYOUTS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableLayouts() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableLayouts() ), true ) );
}
/*
@@ -169,7 +169,7 @@ HB_FUNC( QT_QUILOADER_AVAILABLELAYOUTS )
*/
HB_FUNC( QT_QUILOADER_AVAILABLEWIDGETS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableWidgets() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableWidgets() ), true ) );
}
/*
@@ -185,7 +185,7 @@ HB_FUNC( QT_QUILOADER_CLEARPLUGINPATHS )
*/
HB_FUNC( QT_QUILOADER_CREATEACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QUiLoader( 1 )->createAction( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QAction( hbqt_par_QUiLoader( 1 )->createAction( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ), false ) );
}
/*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QUILOADER_CREATEACTION )
*/
HB_FUNC( QT_QUILOADER_CREATEACTIONGROUP )
{
hb_retptr( ( QActionGroup* ) hbqt_par_QUiLoader( 1 )->createActionGroup( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QActionGroup( hbqt_par_QUiLoader( 1 )->createActionGroup( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ), false ) );
}
/*
@@ -201,7 +201,7 @@ HB_FUNC( QT_QUILOADER_CREATEACTIONGROUP )
*/
HB_FUNC( QT_QUILOADER_CREATELAYOUT )
{
hb_retptr( ( QLayout* ) hbqt_par_QUiLoader( 1 )->createLayout( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QLayout( hbqt_par_QUiLoader( 1 )->createLayout( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ), false ) );
}
/*
@@ -209,7 +209,7 @@ HB_FUNC( QT_QUILOADER_CREATELAYOUT )
*/
HB_FUNC( QT_QUILOADER_CREATEWIDGET )
{
hb_retptr( ( QWidget* ) hbqt_par_QUiLoader( 1 )->createWidget( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QWidget( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QUiLoader( 1 )->createWidget( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QWidget( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ), false ) );
}
/*
@@ -225,7 +225,7 @@ HB_FUNC( QT_QUILOADER_ISLANGUAGECHANGEENABLED )
*/
HB_FUNC( QT_QUILOADER_LOAD )
{
hb_retptr( ( QWidget* ) hbqt_par_QUiLoader( 1 )->load( hbqt_par_QIODevice( 2 ), hbqt_par_QWidget( 3 ) ) );
hb_retptrGC( hbqt_gcAllocate_QWidget( hbqt_par_QUiLoader( 1 )->load( hbqt_par_QIODevice( 2 ), hbqt_par_QWidget( 3 ) ), false ) );
}
/*
@@ -233,7 +233,7 @@ HB_FUNC( QT_QUILOADER_LOAD )
*/
HB_FUNC( QT_QUILOADER_PLUGINPATHS )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->pluginPaths() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->pluginPaths() ), true ) );
}
/*
@@ -257,7 +257,7 @@ HB_FUNC( QT_QUILOADER_SETWORKINGDIRECTORY )
*/
HB_FUNC( QT_QUILOADER_WORKINGDIRECTORY )
{
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QUiLoader( 1 )->workingDirectory() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QUiLoader( 1 )->workingDirectory() ), true ) );
}

75
harbour/contrib/hbqt/qtcore/QUrl.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -110,32 +110,49 @@ HB_FUNC( QT_QURL_SETQUERYDELIMITERS )
hbqt_par_QUrl( 1 )->setQueryDelimiters( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) );
}
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QUrl;
QT_G_FUNC( hbqt_gcRelease_QUrl )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QUrl p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QUrl ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QUrl * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QUrl Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QUrl * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QUrl ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QUrl Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QUrl Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QUrl Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QUrl( void * pObj )
void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QUrl;
HB_TRACE( HB_TR_DEBUG, ( " new_QUrl %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QUrl ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -145,7 +162,7 @@ HB_FUNC( QT_QURL )
pObj = new QUrl( hbqt_par_QString( 1 ) ) ;
hb_retptrGC( hbqt_gcAllocate_QUrl( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( pObj, true ) );
}
/*
* void addEncodedQueryItem ( const QByteArray & key, const QByteArray & value )
@@ -168,7 +185,7 @@ HB_FUNC( QT_QURL_ADDQUERYITEM )
*/
HB_FUNC( QT_QURL_ALLQUERYITEMVALUES )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -192,7 +209,7 @@ HB_FUNC( QT_QURL_CLEAR )
*/
HB_FUNC( QT_QURL_ENCODEDFRAGMENT )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ), true ) );
}
/*
@@ -200,7 +217,7 @@ HB_FUNC( QT_QURL_ENCODEDFRAGMENT )
*/
HB_FUNC( QT_QURL_ENCODEDHOST )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ), true ) );
}
/*
@@ -208,7 +225,7 @@ HB_FUNC( QT_QURL_ENCODEDHOST )
*/
HB_FUNC( QT_QURL_ENCODEDPASSWORD )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ), true ) );
}
/*
@@ -216,7 +233,7 @@ HB_FUNC( QT_QURL_ENCODEDPASSWORD )
*/
HB_FUNC( QT_QURL_ENCODEDPATH )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ), true ) );
}
/*
@@ -224,7 +241,7 @@ HB_FUNC( QT_QURL_ENCODEDPATH )
*/
HB_FUNC( QT_QURL_ENCODEDQUERY )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ), true ) );
}
/*
@@ -232,7 +249,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERY )
*/
HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ), true ) );
}
/*
@@ -240,7 +257,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE )
*/
HB_FUNC( QT_QURL_ENCODEDUSERNAME )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ), true ) );
}
/*
@@ -424,7 +441,7 @@ HB_FUNC( QT_QURL_REMOVEQUERYITEM )
*/
HB_FUNC( QT_QURL_RESOLVED )
{
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ), true ) );
}
/*
@@ -592,7 +609,7 @@ HB_FUNC( QT_QURL_SETUSERNAME )
*/
HB_FUNC( QT_QURL_TOENCODED )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ), true ) );
}
/*
@@ -640,7 +657,7 @@ HB_FUNC( QT_QURL_FROMACE )
*/
HB_FUNC( QT_QURL_FROMENCODED )
{
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ), true ) );
}
/*
@@ -648,7 +665,7 @@ HB_FUNC( QT_QURL_FROMENCODED )
*/
HB_FUNC( QT_QURL_FROMENCODED_1 )
{
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ), true ) );
}
/*
@@ -656,7 +673,7 @@ HB_FUNC( QT_QURL_FROMENCODED_1 )
*/
HB_FUNC( QT_QURL_FROMLOCALFILE )
{
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -672,7 +689,7 @@ HB_FUNC( QT_QURL_FROMPERCENTENCODING )
*/
HB_FUNC( QT_QURL_IDNWHITELIST )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ), true ) );
}
/*
@@ -688,7 +705,7 @@ HB_FUNC( QT_QURL_SETIDNWHITELIST )
*/
HB_FUNC( QT_QURL_TOACE )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ), true ) );
}
/*
@@ -696,7 +713,7 @@ HB_FUNC( QT_QURL_TOACE )
*/
HB_FUNC( QT_QURL_TOPERCENTENCODING )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ), true ) );
}

79
harbour/contrib/hbqt/qtcore/QVariant.cpp
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org
@@ -139,32 +139,49 @@ QVariant ( const QRegExp & regExp )
~QVariant ()
*/
typedef struct
{
void * ph;
bool bNew;
QT_G_FUNC_PTR func;
} QGC_POINTER_QVariant;
QT_G_FUNC( hbqt_gcRelease_QVariant )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QVariant p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QVariant ph=%p", p->ph ) );
if( p && p->ph )
if( p && p->bNew )
{
delete ( ( QVariant * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_QVariant Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( p->ph )
{
delete ( ( QVariant * ) p->ph );
HB_TRACE( HB_TR_DEBUG, ( "YES_rel_QVariant ph=%p %i B %i KB", p->ph, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
p->ph = NULL;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL_rel_QVariant Object already deleted!" ) );
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QVariant Object Already deleted!" ) );
HB_TRACE( HB_TR_DEBUG, ( "PTR_rel_QVariant Object not created with - new" ) );
p->ph = NULL;
}
}
void * hbqt_gcAllocate_QVariant( void * pObj )
void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->bNew = bNew;
p->func = hbqt_gcRelease_QVariant;
HB_TRACE( HB_TR_DEBUG, ( " new_QVariant %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
if( bNew )
{
HB_TRACE( HB_TR_DEBUG, ( " _new_QVariant ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
return p;
}
@@ -174,7 +191,7 @@ HB_FUNC( QT_QVARIANT )
pObj = ( QVariant* ) new QVariant() ;
hb_retptrGC( hbqt_gcAllocate_QVariant( pObj ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( pObj, true ) );
}
/*
* bool canConvert ( Type t ) const
@@ -237,7 +254,7 @@ HB_FUNC( QT_QVARIANT_SETVALUE )
*/
HB_FUNC( QT_QVARIANT_TOBITARRAY )
{
hb_retptrGC( hbqt_gcAllocate_QBitArray( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ) );
hb_retptrGC( hbqt_gcAllocate_QBitArray( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ), true ) );
}
/*
@@ -253,7 +270,7 @@ HB_FUNC( QT_QVARIANT_TOBOOL )
*/
HB_FUNC( QT_QVARIANT_TOBYTEARRAY )
{
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ) );
hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ), true ) );
}
/*
@@ -261,7 +278,7 @@ HB_FUNC( QT_QVARIANT_TOBYTEARRAY )
*/
HB_FUNC( QT_QVARIANT_TODATE )
{
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QVariant( 1 )->toDate() ), true ) );
}
/*
@@ -269,7 +286,7 @@ HB_FUNC( QT_QVARIANT_TODATE )
*/
HB_FUNC( QT_QVARIANT_TODATETIME )
{
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ) );
hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ), true ) );
}
/*
@@ -301,7 +318,7 @@ HB_FUNC( QT_QVARIANT_TOINT )
*/
HB_FUNC( QT_QVARIANT_TOLINE )
{
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QVariant( 1 )->toLine() ), true ) );
}
/*
@@ -309,7 +326,7 @@ HB_FUNC( QT_QVARIANT_TOLINE )
*/
HB_FUNC( QT_QVARIANT_TOLINEF )
{
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ), true ) );
}
/*
@@ -317,7 +334,7 @@ HB_FUNC( QT_QVARIANT_TOLINEF )
*/
HB_FUNC( QT_QVARIANT_TOLOCALE )
{
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ) );
hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ), true ) );
}
/*
@@ -337,7 +354,7 @@ HB_FUNC( QT_QVARIANT_TOLONGLONG )
*/
HB_FUNC( QT_QVARIANT_TOPOINT )
{
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ), true ) );
}
/*
@@ -345,7 +362,7 @@ HB_FUNC( QT_QVARIANT_TOPOINT )
*/
HB_FUNC( QT_QVARIANT_TOPOINTF )
{
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ) );
hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ), true ) );
}
/*
@@ -353,7 +370,7 @@ HB_FUNC( QT_QVARIANT_TOPOINTF )
*/
HB_FUNC( QT_QVARIANT_TORECT )
{
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QVariant( 1 )->toRect() ), true ) );
}
/*
@@ -361,7 +378,7 @@ HB_FUNC( QT_QVARIANT_TORECT )
*/
HB_FUNC( QT_QVARIANT_TORECTF )
{
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ), true ) );
}
/*
@@ -369,7 +386,7 @@ HB_FUNC( QT_QVARIANT_TORECTF )
*/
HB_FUNC( QT_QVARIANT_TOREGEXP )
{
hb_retptrGC( hbqt_gcAllocate_QRegExp( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ) );
hb_retptrGC( hbqt_gcAllocate_QRegExp( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ), true ) );
}
/*
@@ -377,7 +394,7 @@ HB_FUNC( QT_QVARIANT_TOREGEXP )
*/
HB_FUNC( QT_QVARIANT_TOSIZE )
{
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ) );
hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QVariant( 1 )->toSize() ), true ) );
}
/*
@@ -385,7 +402,7 @@ HB_FUNC( QT_QVARIANT_TOSIZE )
*/
HB_FUNC( QT_QVARIANT_TOSIZEF )
{
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ) );
hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ), true ) );
}
/*
@@ -401,7 +418,7 @@ HB_FUNC( QT_QVARIANT_TOSTRING )
*/
HB_FUNC( QT_QVARIANT_TOSTRINGLIST )
{
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ) );
hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ), true ) );
}
/*
@@ -409,7 +426,7 @@ HB_FUNC( QT_QVARIANT_TOSTRINGLIST )
*/
HB_FUNC( QT_QVARIANT_TOTIME )
{
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ) );
hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QVariant( 1 )->toTime() ), true ) );
}
/*
@@ -441,7 +458,7 @@ HB_FUNC( QT_QVARIANT_TOULONGLONG )
*/
HB_FUNC( QT_QVARIANT_TOURL )
{
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ) );
hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ), true ) );
}
/*
@@ -465,7 +482,7 @@ HB_FUNC( QT_QVARIANT_USERTYPE )
*/
HB_FUNC( QT_QVARIANT_FROMVALUE )
{
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ) );
hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ), true ) );
}
/*

2
harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQBitArray.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQByteArray.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQCoreApplication.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQDataStream.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQDate.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQDateTime.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQDir.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQEvent.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQEventLoop.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQFile.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQFileInfo.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQIODevice.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQLatin1Char.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQLatin1String.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQLine.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQLineF.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQList.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQLocale.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQMimeData.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQModelIndex.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQObject.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQPoint.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQPointF.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQProcess.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQRect.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQRectF.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQRegExp.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQResource.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQSettings.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQSignalMapper.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQSize.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQSizeF.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQStringList.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQTextCodec.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

2
harbour/contrib/hbqt/qtcore/TQTextDecoder.prg
View File

@@ -12,7 +12,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* www - http://www.harbour-project.org

Some files were not shown because too many files have changed in this diff Show More