diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d3ce7a0b39..41fba8b4d0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,37 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-03 11:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/gtwvg/wvgwing.c + ! Fixed after prev. + Suggested by YD0DKL + + * contrib/hbqt/utils/hbqtgen.prg + + Added TOFIXes to some generated code lines. + (missing const, hb_retptr(), char vs uchar) + + * contrib/hbqt/utils/hbqtgen.prg + * contrib/hbqt/qtgui/qth/*.qth + * contrib/hbqt/qtwebkit/qth/*.qth + * contrib/hbqt/qtcore/qth/*.qth + * contrib/hbqt/qtnetwork/qth/*.qth + * contrib/hbqt/qscintilla/qth/*.qth + * contrib/hbqt/qtdesigner/qth/*.qth + * Changed to use '__HB_RETPTRGC__' macro instead of using + (valid function) 'hb_retptr()' as code generation marker. + + * contrib/hbqt/qtgui/g/* + * contrib/hbqt/qtwebkit/g/* + * contrib/hbqt/qtcore/g/* + * contrib/hbqt/qscintilla/g/* + * contrib/hbqt/qtdesigner/g/* + * Regenerated. + ; TOFIX: Why is commented code in .qth spilling into generated code? + + * contrib/hbqt/qtcore/g/filelist.hbm + * contrib/hbqt/qtcore/g/hbqtcore.h + * Regenerated after prev commit. + 2010-10-02 23:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/g/filelist.hbm * contrib/hbqt/utils/qtcore.qtp @@ -66,20 +97,20 @@ * contrib/hbxbp/xbptreeview.prg * contrib/hbqt/utils/hbqtgen.prg - ! Changed: massively to produce optimized and 0 fault + ! Changed: massively to produce optimized and 0 fault tolerant code. * contrib/hbqt/qt*/*.cpp, *.prg, *.txt * Re-generated, whichever fall into above changes. This commit addresses a lot of issues: - 1. Parameters checking is now mandatory. You have to supply + 1. Parameters checking is now mandatory. You have to supply the correct number of parameters. No defaults are assumed. PLUS you need to supply correct type of parameter. 2. PRG class representation is changed. - Now you can get fairly good documentation from looking - at the class declaration. You will never have to refer + Now you can get fairly good documentation from looking + at the class declaration. You will never have to refer the method body which has no meaning as such. Here is a snippet: @@ -93,14 +124,14 @@ The methods with variable number and type of parameters are shown beneth first call. - 3. Accordingly, class_*.txt documentation is also updated. + 3. Accordingly, class_*.txt documentation is also updated. 4. A method call now never accepts a pointer, only an hbQT object. This fixes one/half of the issue - one sided. TODO: fix sending raw pointers to PRG code from C++ code. :-)) hbIDE is up and running with all its glory, no GPFs. - Some regression would be possible but you will have + Some regression would be possible but you will have RTE popping up, so easily fixable. 2010-10-02 11:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 6cf6de89fe..0c69cfa69f 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -74,7 +74,7 @@ /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ -#if defined( __BORLANDC__ ) && ( __BORLANDC__ < 1552 ) +#if defined( __BORLANDC__ ) # if !defined( NONAMELESSUNION ) # define NONAMELESSUNION # endif @@ -100,6 +100,10 @@ #include +#if defined( __BORLANDC__ ) && ( __BORLANDC__ >= 1552 ) +# undef NONAMELESSUNION +#endif + #if defined( NONAMELESSUNION ) # define HB_WIN_V_UNION( x, z ) ((x).DUMMYUNIONNAME.z) #else diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp index 3432aa37e8..64734003f2 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QsciCommandSet( void * pObj, bool bNew ) HB_FUNC( QT_QSCICOMMANDSET ) { - //hb_retptr( new QsciCommandSet() ); + //__HB_RETPTRGC__( new QsciCommandSet() ); } /* diff --git a/harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth b/harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth index 92cf94363a..7a03d0ea48 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth @@ -72,7 +72,7 @@ Folder = qscintilla */ HB_FUNC( QT_HBQSCISCINTILLA ) { - hb_retptr( new HBQsciScintilla( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new HBQsciScintilla( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth index fbd0a15b0f..f8b4f5a517 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth @@ -79,7 +79,7 @@ Folder = hbqscintilla */ HB_FUNC( QT_QSCIAPIS ) { - hb_retptr( new QsciAPIs( hbqt_par_QsciLexer( 1 ) ) ); + __HB_RETPTRGC__( new QsciAPIs( hbqt_par_QsciLexer( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth index bca8d92e1d..1c8fe01ec8 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth @@ -78,7 +78,7 @@ Folder = hbqscintilla */ HB_FUNC( QT_QSCICOMMANDSET ) { - //hb_retptr( new QsciCommandSet() ); + //__HB_RETPTRGC__( new QsciCommandSet() ); } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth index 89e7cdd35e..eafc8dbfd9 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth @@ -81,11 +81,11 @@ HB_FUNC( QT_QSCIDOCUMENT ) { if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QsciDocument( *hbqt_par_QsciDocument( 1 ) ) ); + __HB_RETPTRGC__( new QsciDocument( *hbqt_par_QsciDocument( 1 ) ) ); } else { - hb_retptr( new QsciDocument() ); + __HB_RETPTRGC__( new QsciDocument() ); } } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth index b6fb2a480b..cc43d3c17f 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth @@ -81,19 +81,19 @@ HB_FUNC( QT_QSCILEXERCPP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QsciLexerCPP( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QsciLexerCPP( hbqt_par_QObject( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISLOG( 1 ) ) { - hb_retptr( new QsciLexerCPP( 0, hb_parl( 1 ) ) ); + __HB_RETPTRGC__( new QsciLexerCPP( 0, hb_parl( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISLOG( 2 ) ) { - hb_retptr( new QsciLexerCPP( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) ); + __HB_RETPTRGC__( new QsciLexerCPP( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) ); } else { - hb_retptr( new QsciLexerCPP() ); + __HB_RETPTRGC__( new QsciLexerCPP() ); } } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth index be51601aab..4e6ae9095d 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth @@ -81,19 +81,19 @@ HB_FUNC( QT_QSCILEXERFLAGSHIP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QsciLexerFlagship( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QsciLexerFlagship( hbqt_par_QObject( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISLOG( 1 ) ) { - hb_retptr( new QsciLexerFlagship( 0, hb_parl( 1 ) ) ); + __HB_RETPTRGC__( new QsciLexerFlagship( 0, hb_parl( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISLOG( 2 ) ) { - hb_retptr( new QsciLexerFlagship( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) ); + __HB_RETPTRGC__( new QsciLexerFlagship( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) ); } else { - hb_retptr( new QsciLexerFlagship() ); + __HB_RETPTRGC__( new QsciLexerFlagship() ); } } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth index 4551e39a11..7e87195010 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth @@ -75,11 +75,11 @@ HB_FUNC( QT_QSCISCINTILLA ) { if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QsciScintilla( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QsciScintilla( hbqt_par_QWidget( 1 ) ) ); } else { - hb_retptr( new QsciScintilla() ); + __HB_RETPTRGC__( new QsciScintilla() ); } } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth index 58f4471897..2742a57d6c 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth @@ -80,15 +80,15 @@ HB_FUNC( QT_QSCISTYLE ) { if( HB_ISNUMERIC( 1 ) ) { - hb_retptr( new QsciStyle( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new QsciStyle( hb_parni( 1 ) ) ); } else if( hb_pcount() >= 5 ) { - hb_retptr( new QsciStyle( hb_parni( 1 ), hbqt_par_QString( 2 ), *hbqt_par_QColor( 3 ), *hbqt_par_QColor( 4 ), * hbqt_par_QFont( 5 ), HB_ISLOG( 6 ) ? hb_parl( 6 ) : false ) ); + __HB_RETPTRGC__( new QsciStyle( hb_parni( 1 ), hbqt_par_QString( 2 ), *hbqt_par_QColor( 3 ), *hbqt_par_QColor( 4 ), * hbqt_par_QFont( 5 ), HB_ISLOG( 6 ) ? hb_parl( 6 ) : false ) ); } else { - hb_retptr( new QsciStyle() ); + __HB_RETPTRGC__( new QsciStyle() ); } } diff --git a/harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth index 0fc2b8c962..7deae869ef 100644 --- a/harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth +++ b/harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth @@ -81,11 +81,11 @@ HB_FUNC( QT_QSCISTYLEDTEXT ) { if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QsciStyledText( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QsciStyledText( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QsciStyledText( hbqt_par_QString( 1 ), *hbqt_par_QsciStyle( 2 ) ) ); + __HB_RETPTRGC__( new QsciStyledText( hbqt_par_QString( 1 ), *hbqt_par_QsciStyle( 2 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp index 40d0ea23e8..ea85712326 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTLISTMODEL ) { - //hb_retptr( ( QAbstractListModel* ) new QAbstractListModel() ); + //__HB_RETPTRGC__( ( QAbstractListModel* ) new QAbstractListModel() ); } /* diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp index daaec05f82..d0bccc1fde 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTTABLEMODEL ) { - // hb_retptr( ( QAbstractTableModel * ) new QAbstractTableModel() ); + // __HB_RETPTRGC__( ( QAbstractTableModel * ) new QAbstractTableModel() ); } /* diff --git a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp index 8146863fc8..ea1c59a0dc 100644 --- a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp @@ -161,7 +161,7 @@ HB_FUNC( QT_QIODEVICE ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - // hb_retptr( new QIODevice( hbqt_par_QObject( 1 ) ) ); + // __HB_RETPTRGC__( new QIODevice( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp index 67abe4b0f8..f5b7691c06 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp @@ -163,7 +163,7 @@ void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTCODEC ) { - //hb_retptr( ( QTextCodec* ) new QTextCodec() ); + //__HB_RETPTRGC__( ( QTextCodec* ) new QTextCodec() ); } /* diff --git a/harbour/contrib/hbqt/qtcore/g/filelist.hbm b/harbour/contrib/hbqt/qtcore/g/filelist.hbm index 5e471d972e..6f2d8ae463 100644 --- a/harbour/contrib/hbqt/qtcore/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/g/filelist.hbm @@ -35,7 +35,6 @@ QLine.cpp QLineF.cpp QList.cpp QLocale.cpp -QMimeData.cpp QModelIndex.cpp QObject.cpp QPoint.cpp @@ -90,7 +89,6 @@ TQLine.prg TQLineF.prg TQList.prg TQLocale.prg -TQMimeData.prg TQModelIndex.prg TQObject.prg TQPoint.prg diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h index 6167faacc8..33204a7a58 100644 --- a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h @@ -34,8 +34,6 @@ extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QEvent ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QEventLoop ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QFile ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QFileInfo ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QGenericArgument ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QGenericReturnArgument ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QIODevice ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLatin1Char ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLatin1String ); @@ -43,13 +41,6 @@ extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLine ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLineF ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QList ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLocale ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaClassInfo ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaEnum ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaMethod ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaObject ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaProperty ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMetaType ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMimeData ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QModelIndex ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QObject ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QPoint ); @@ -97,8 +88,6 @@ extern HB_EXPORT void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QFile( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QGenericArgument( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QGenericReturnArgument( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew ); @@ -106,13 +95,6 @@ extern HB_EXPORT void * hbqt_gcAllocate_QLine( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QList( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaClassInfo( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaEnum( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaMethod( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaObject( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaProperty( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMetaType( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QObject( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew ); @@ -162,8 +144,6 @@ HB_EXTERN_END #define hbqt_par_QEventLoop( n ) ( ( QEventLoop * ) hbqt_gcpointer( n ) ) #define hbqt_par_QFile( n ) ( ( QFile * ) hbqt_gcpointer( n ) ) #define hbqt_par_QFileInfo( n ) ( ( QFileInfo * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGenericArgument( n ) ( ( QGenericArgument * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGenericReturnArgument( n ) ( ( QGenericReturnArgument * ) hbqt_gcpointer( n ) ) #define hbqt_par_QIODevice( n ) ( ( QIODevice * ) hbqt_gcpointer( n ) ) #define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char * ) hbqt_gcpointer( n ) ) #define hbqt_par_QLatin1String( n ) ( ( QLatin1String * ) hbqt_gcpointer( n ) ) @@ -171,13 +151,6 @@ HB_EXTERN_END #define hbqt_par_QLineF( n ) ( ( QLineF * ) hbqt_gcpointer( n ) ) #define hbqt_par_QList( n ) ( ( QList< void * > * ) hbqt_gcpointer( n ) ) #define hbqt_par_QLocale( n ) ( ( QLocale * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaClassInfo( n ) ( ( QMetaClassInfo * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaEnum( n ) ( ( QMetaEnum * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaMethod( n ) ( ( QMetaMethod * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaObject( n ) ( ( QMetaObject * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaProperty( n ) ( ( QMetaProperty * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMetaType( n ) ( ( QMetaType * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMimeData( n ) ( ( QMimeData * ) hbqt_gcpointer( n ) ) #define hbqt_par_QModelIndex( n ) ( ( QModelIndex * ) hbqt_gcpointer( n ) ) #define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) ) #define hbqt_par_QPoint( n ) ( ( QPoint * ) hbqt_gcpointer( n ) ) @@ -225,8 +198,6 @@ HB_EXTERN_END #define HBQT_TYPE_QEventLoop 0xA79E78BB #define HBQT_TYPE_QFile 0x25776775 #define HBQT_TYPE_QFileInfo 0x51B82814 -#define HBQT_TYPE_QGenericArgument 0x7ED89228 -#define HBQT_TYPE_QGenericReturnArgument 0xFCA684A1 #define HBQT_TYPE_QIODevice 0xFFAF526C #define HBQT_TYPE_QLatin1Char 0x6E622038 #define HBQT_TYPE_QLatin1String 0xB1999E84 @@ -234,13 +205,6 @@ HB_EXTERN_END #define HBQT_TYPE_QLineF 0x24C33533 #define HBQT_TYPE_QList 0xED20A97D #define HBQT_TYPE_QLocale 0x456691F0 -#define HBQT_TYPE_QMetaClassInfo 0x33015F02 -#define HBQT_TYPE_QMetaEnum 0x1440E706 -#define HBQT_TYPE_QMetaMethod 0xA4A31239 -#define HBQT_TYPE_QMetaObject 0x525783B5 -#define HBQT_TYPE_QMetaProperty 0xD53EA8C3 -#define HBQT_TYPE_QMetaType 0x96201E7E -#define HBQT_TYPE_QMimeData 0xA1F425D3 #define HBQT_TYPE_QModelIndex 0xA9E86353 #define HBQT_TYPE_QObject 0xAC4BFC84 #define HBQT_TYPE_QPoint 0x8AD48EA2 diff --git a/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth b/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth index 1a064f4eeb..e75ffde98e 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth @@ -79,7 +79,7 @@ New = */ HB_FUNC( QT_HBQEVENTS ) { - hb_retptr( new HBQEvents() ); + __HB_RETPTRGC__( new HBQEvents() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth b/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth index 63d6263400..07943d046a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth @@ -78,7 +78,7 @@ New = */ HB_FUNC( QT_HBQSLOTS ) { - hb_retptr( new HBQSlots() ); + __HB_RETPTRGC__( new HBQSlots() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth index f4a523b43e..efb5551b2e 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth @@ -88,15 +88,15 @@ HB_FUNC( QT_HBQSTRING ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new HBQString( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new HBQString( hbqt_par_QString( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new HBQString( ( const char * ) hb_parptr( 1 ) ) ); + __HB_RETPTRGC__( new HBQString( ( const char * ) hb_parptr( 1 ) ) ); } else { - hb_retptr( new HBQString() ); + __HB_RETPTRGC__( new HBQString() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QAbstractEventDispatcher.qth b/harbour/contrib/hbqt/qtcore/qth/QAbstractEventDispatcher.qth index 6a214f29de..a435c19d57 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QAbstractEventDispatcher.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QAbstractEventDispatcher.qth @@ -72,11 +72,11 @@ HB_FUNC( QT_QABSTRACTEVENTDISPATCHER ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QAbstractEventDispatcher* ) new QAbstractEventDispatcher( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QAbstractEventDispatcher* ) new QAbstractEventDispatcher( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( ( QAbstractEventDispatcher* ) new QAbstractEventDispatcher() ); + __HB_RETPTRGC__( ( QAbstractEventDispatcher* ) new QAbstractEventDispatcher() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QAbstractListModel.qth b/harbour/contrib/hbqt/qtcore/qth/QAbstractListModel.qth index e38d34611f..fae8cdb1a0 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QAbstractListModel.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QAbstractListModel.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QABSTRACTLISTMODEL ) { - //hb_retptr( ( QAbstractListModel* ) new QAbstractListModel() ); + //__HB_RETPTRGC__( ( QAbstractListModel* ) new QAbstractListModel() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QAbstractTableModel.qth b/harbour/contrib/hbqt/qtcore/qth/QAbstractTableModel.qth index 2f826d4356..40498fe82f 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QAbstractTableModel.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QAbstractTableModel.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QABSTRACTTABLEMODEL ) { - // hb_retptr( ( QAbstractTableModel * ) new QAbstractTableModel() ); + // __HB_RETPTRGC__( ( QAbstractTableModel * ) new QAbstractTableModel() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QBitArray.qth b/harbour/contrib/hbqt/qtcore/qth/QBitArray.qth index f7461efd92..3bd2426442 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QBitArray.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QBitArray.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QBITARRAY ) { - hb_retptr( new QBitArray() ); + __HB_RETPTRGC__( new QBitArray() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth b/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth index fd7bd61f4e..3a1f5e34a0 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth @@ -78,7 +78,7 @@ New = */ HB_FUNC( QT_QBUFFER ) { - hb_retptr( new QBuffer() ); + __HB_RETPTRGC__( new QBuffer() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth b/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth index 3734359fb6..6dcfaea973 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth @@ -77,11 +77,11 @@ HB_FUNC( QT_QBYTEARRAY ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QByteArray( hb_parc( 1 ) ) ); + __HB_RETPTRGC__( new QByteArray( hb_parc( 1 ) ) ); } else { - hb_retptr( new QByteArray() ); + __HB_RETPTRGC__( new QByteArray() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QChar.qth b/harbour/contrib/hbqt/qtcore/qth/QChar.qth index 6568c82ad6..ba55bc58e4 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QChar.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QChar.qth @@ -86,7 +86,7 @@ Destructor = no */ HB_FUNC( QT_QCHAR ) { - hb_retptr( new QChar() ); + __HB_RETPTRGC__( new QChar() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QDataStream.qth b/harbour/contrib/hbqt/qtcore/qth/QDataStream.qth index bdb21acbfe..a2d1e5d844 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QDataStream.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QDataStream.qth @@ -74,7 +74,7 @@ Destructor = */ HB_FUNC( QT_QDATASTREAM ) { - hb_retptr( new QDataStream() ); + __HB_RETPTRGC__( new QDataStream() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QDate.qth b/harbour/contrib/hbqt/qtcore/qth/QDate.qth index 49392ac56a..9d95040862 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QDate.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QDate.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QDATE ) { - hb_retptr( new QDate() ); + __HB_RETPTRGC__( new QDate() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QDateTime.qth b/harbour/contrib/hbqt/qtcore/qth/QDateTime.qth index d147191e44..3bc162aa2f 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QDateTime.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QDateTime.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QDATETIME ) { - hb_retptr( ( QDateTime* ) new QDateTime() ); + __HB_RETPTRGC__( ( QDateTime* ) new QDateTime() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QDir.qth b/harbour/contrib/hbqt/qtcore/qth/QDir.qth index b57b361a12..ea8bb6d439 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QDir.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QDir.qth @@ -74,7 +74,7 @@ New = pParent */ HB_FUNC( QT_QDIR ) { - hb_retptr( new QDir( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new QDir( hbqt_par_QString( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QEvent.qth b/harbour/contrib/hbqt/qtcore/qth/QEvent.qth index c7adc70df8..731b08f27a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QEvent.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QEvent.qth @@ -70,7 +70,7 @@ New = nType */ HB_FUNC( QT_QEVENT ) { - hb_retptr( ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QEventLoop.qth b/harbour/contrib/hbqt/qtcore/qth/QEventLoop.qth index 3814a18e97..b5c05158e3 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QEventLoop.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QEventLoop.qth @@ -70,7 +70,7 @@ New = pObject */ HB_FUNC( QT_QEVENTLOOP ) { - hb_retptr( new QEventLoop( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QEventLoop( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QFile.qth b/harbour/contrib/hbqt/qtcore/qth/QFile.qth index 53e10b63d3..c1c6e3c337 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QFile.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QFile.qth @@ -75,7 +75,7 @@ HB_FUNC( QT_QFILE ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QFile( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new QFile( hbqt_par_QString( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QFileInfo.qth b/harbour/contrib/hbqt/qtcore/qth/QFileInfo.qth index 40cc9a8ffe..84a13f0764 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QFileInfo.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QFileInfo.qth @@ -77,7 +77,7 @@ Destructor = */ HB_FUNC( QT_QFILEINFO ) { - hb_retptr( new QFileInfo() ); + __HB_RETPTRGC__( new QFileInfo() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth b/harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth index 5922885c50..2e404db324 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth @@ -79,15 +79,15 @@ HB_FUNC( QT_QGENERICARGUMENT ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QGenericArgument( hb_parc( 1 ), 0 ) ); + __HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), 0 ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QGenericArgument( hb_parc( 1 ), hb_parptr( 2 ) ) ); + __HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), hb_parptr( 2 ) ) ); } else { - hb_retptr( new QGenericArgument() ); + __HB_RETPTRGC__( new QGenericArgument() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth b/harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth index edd6206c90..741bb63887 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth @@ -79,15 +79,15 @@ HB_FUNC( QT_QGENERICRETURNARGUMENT ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QGenericReturnArgument( hb_parc( 1 ), 0 ) ); + __HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), 0 ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QGenericReturnArgument( hb_parc( 1 ), hb_parptr( 2 ) ) ); + __HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), hb_parptr( 2 ) ) ); } else { - hb_retptr( new QGenericReturnArgument() ); + __HB_RETPTRGC__( new QGenericReturnArgument() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth b/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth index 0bb34e58ad..c38bd68a0d 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth @@ -73,7 +73,7 @@ HB_FUNC( QT_QIODEVICE ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - // hb_retptr( new QIODevice( hbqt_par_QObject( 1 ) ) ); + // __HB_RETPTRGC__( new QIODevice( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QLatin1Char.qth b/harbour/contrib/hbqt/qtcore/qth/QLatin1Char.qth index f90b0e42ca..8094a7ef61 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLatin1Char.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLatin1Char.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QLATIN1CHAR ) { - hb_retptr( ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ); + __HB_RETPTRGC__( ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QLatin1String.qth b/harbour/contrib/hbqt/qtcore/qth/QLatin1String.qth index 260d9cf41c..39438f56cd 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLatin1String.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLatin1String.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QLATIN1STRING ) { - hb_retptr( ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ); + __HB_RETPTRGC__( ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QLine.qth b/harbour/contrib/hbqt/qtcore/qth/QLine.qth index 6cf9d682c8..ddc1dd8cf1 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLine.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLine.qth @@ -81,19 +81,19 @@ HB_FUNC( QT_QLINE ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QLine* ) new QLine( *hbqt_par_QLine( 1 ) ) ); + __HB_RETPTRGC__( ( QLine* ) new QLine( *hbqt_par_QLine( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QLine* ) new QLine( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + __HB_RETPTRGC__( ( QLine* ) new QLine( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QLine* ) new QLine( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + __HB_RETPTRGC__( ( QLine* ) new QLine( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); } else { - hb_retptr( ( QLine* ) new QLine() ); + __HB_RETPTRGC__( ( QLine* ) new QLine() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QLineF.qth b/harbour/contrib/hbqt/qtcore/qth/QLineF.qth index af2e53e77d..b98e3fa53e 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLineF.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLineF.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QLINEF ) { - hb_retptr( new QLineF() ); + __HB_RETPTRGC__( new QLineF() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QList.qth b/harbour/contrib/hbqt/qtcore/qth/QList.qth index d4c78dc33a..461ec6873c 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QList.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QList.qth @@ -74,7 +74,7 @@ List = yes HB_FUNC( QT_QLIST ) { QList* list = NULL; - hb_retptr( ( QList* ) list ); + __HB_RETPTRGC__( ( QList* ) list ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QLocale.qth b/harbour/contrib/hbqt/qtcore/qth/QLocale.qth index 83a900f186..9820eea5d6 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QLocale.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QLocale.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QLOCALE ) { - hb_retptr( new QLocale() ); + __HB_RETPTRGC__( new QLocale() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaClassInfo.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaClassInfo.qth index 1d2f2251c9..1024c9f00a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaClassInfo.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaClassInfo.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETACLASSINFO ) { - // hb_retptr( new QMetaClassInfo() ); + // __HB_RETPTRGC__( new QMetaClassInfo() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaEnum.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaEnum.qth index 24652c836d..84736941a6 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaEnum.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaEnum.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETAENUM ) { - // hb_retptr( new QMetaEnum() ); + // __HB_RETPTRGC__( new QMetaEnum() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaMethod.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaMethod.qth index e41194e831..147df18080 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaMethod.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaMethod.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETAMETHOD ) { - hb_retptr( new QMetaMethod() ); + __HB_RETPTRGC__( new QMetaMethod() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaObject.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaObject.qth index 9c0fba1e6d..fdc89dd299 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaObject.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaObject.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETAOBJECT ) { - // hb_retptr( new QMetaObject() ); + // __HB_RETPTRGC__( new QMetaObject() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaProperty.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaProperty.qth index e26c6cf728..3fa0d304fd 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaProperty.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaProperty.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETAPROPERTY ) { - // hb_retptr( new QMetaProperty() ); + // __HB_RETPTRGC__( new QMetaProperty() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMetaType.qth b/harbour/contrib/hbqt/qtcore/qth/QMetaType.qth index 0ec21d4a2a..b2dd5f9591 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMetaType.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMetaType.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QMETATYPE ) { - // hb_retptr( new QMetaType() ); + // __HB_RETPTRGC__( new QMetaType() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QMimeData.qth b/harbour/contrib/hbqt/qtcore/qth/QMimeData.qth index c9d1e8056e..35a59b3bfc 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QMimeData.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QMimeData.qth @@ -72,7 +72,7 @@ Destructor = */ HB_FUNC( QT_QMIMEDATA ) { - hb_retptr( new QMimeData() ); + __HB_RETPTRGC__( new QMimeData() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QModelIndex.qth b/harbour/contrib/hbqt/qtcore/qth/QModelIndex.qth index 6a11660658..41ea6a1d69 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QModelIndex.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QModelIndex.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QMODELINDEX ) { - hb_retptr( new QModelIndex() ); + __HB_RETPTRGC__( new QModelIndex() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QObject.qth b/harbour/contrib/hbqt/qtcore/qth/QObject.qth index e63bf26e67..fe248e2e60 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QObject.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QObject.qth @@ -69,7 +69,7 @@ Calls = QT_Qbject */ HB_FUNC( QT_QOBJECT ) { - hb_retptr( ( QObject* ) new QObject( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QObject* ) new QObject( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QPoint.qth b/harbour/contrib/hbqt/qtcore/qth/QPoint.qth index 16ae3bbe52..93cd4edffb 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QPoint.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QPoint.qth @@ -79,15 +79,15 @@ HB_FUNC( QT_QPOINT ) { if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPoint* ) new QPoint( hb_parni( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QPoint* ) new QPoint( hb_parni( 1 ), hb_parni( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPoint* ) new QPoint( *hbqt_par_QPoint( 1 ) ) ); + __HB_RETPTRGC__( ( QPoint* ) new QPoint( *hbqt_par_QPoint( 1 ) ) ); } else { - hb_retptr( ( QPoint* ) new QPoint() ); + __HB_RETPTRGC__( ( QPoint* ) new QPoint() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QPointF.qth b/harbour/contrib/hbqt/qtcore/qth/QPointF.qth index ac46f7c838..17f071f79e 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QPointF.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QPointF.qth @@ -79,15 +79,15 @@ HB_FUNC( QT_QPOINTF ) { if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPointF* ) new QPointF( ( qreal ) hb_parnd( 1 ), ( qreal ) hb_parnd( 2 ) ) ); + __HB_RETPTRGC__( ( QPointF* ) new QPointF( ( qreal ) hb_parnd( 1 ), ( qreal ) hb_parnd( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPointF* ) new QPointF( *hbqt_par_QPoint( 1 ) ) ); + __HB_RETPTRGC__( ( QPointF* ) new QPointF( *hbqt_par_QPoint( 1 ) ) ); } else { - hb_retptr( ( QPointF* ) new QPointF() ); + __HB_RETPTRGC__( ( QPointF* ) new QPointF() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QProcess.qth b/harbour/contrib/hbqt/qtcore/qth/QProcess.qth index 915f7b7648..39cbbbc8c9 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QProcess.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QProcess.qth @@ -72,11 +72,11 @@ HB_FUNC( QT_QPROCESS ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QProcess* ) new QProcess( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QProcess* ) new QProcess( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( ( QProcess* ) new QProcess() ); + __HB_RETPTRGC__( ( QProcess* ) new QProcess() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QRect.qth b/harbour/contrib/hbqt/qtcore/qth/QRect.qth index 8c31f98321..d253c9e52d 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QRect.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QRect.qth @@ -87,19 +87,19 @@ HB_FUNC( QT_QRECT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRect* ) new QRect( *hbqt_par_QRect( 1 ) ) ); + __HB_RETPTRGC__( ( QRect* ) new QRect( *hbqt_par_QRect( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QRect* ) new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + __HB_RETPTRGC__( ( QRect* ) new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRect* ) new QRect( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + __HB_RETPTRGC__( ( QRect* ) new QRect( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); } else { - hb_retptr( ( QRect* ) new QRect() ); + __HB_RETPTRGC__( ( QRect* ) new QRect() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QRectF.qth b/harbour/contrib/hbqt/qtcore/qth/QRectF.qth index 7a142e19ae..69fd63e2d8 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QRectF.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QRectF.qth @@ -88,19 +88,19 @@ HB_FUNC( QT_QRECTF ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRectF* ) new QRectF( *hbqt_par_QRectF( 1 ) ) ); + __HB_RETPTRGC__( ( QRectF* ) new QRectF( *hbqt_par_QRectF( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QRectF* ) new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + __HB_RETPTRGC__( ( QRectF* ) new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRectF* ) new QRectF( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); + __HB_RETPTRGC__( ( QRectF* ) new QRectF( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); } else { - hb_retptr( ( QRectF* ) new QRectF() ); + __HB_RETPTRGC__( ( QRectF* ) new QRectF() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QRegExp.qth b/harbour/contrib/hbqt/qtcore/qth/QRegExp.qth index 729a1ff7ba..8e3c077809 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QRegExp.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QRegExp.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QREGEXP ) { - hb_retptr( new QRegExp() ); + __HB_RETPTRGC__( new QRegExp() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QResource.qth b/harbour/contrib/hbqt/qtcore/qth/QResource.qth index 4368b46838..faa45b25cd 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QResource.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QResource.qth @@ -72,7 +72,7 @@ ClubMethods = no */ HB_FUNC( QT_QRESOURCE ) { - hb_retptr( ( QResource* ) new QResource() ); + __HB_RETPTRGC__( ( QResource* ) new QResource() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QSettings.qth b/harbour/contrib/hbqt/qtcore/qth/QSettings.qth index e910ff3917..ac6add1fcc 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QSettings.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QSettings.qth @@ -76,15 +76,15 @@ HB_FUNC( QT_QSETTINGS ) { if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) ) { - hb_retptr( new QSettings( hbqt_par_QString( 1 ), hbqt_par_QString( 2 ), 0 ) ); + __HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), hbqt_par_QString( 2 ), 0 ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QSettings( hbqt_par_QString( 1 ), ( QSettings::Format ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), ( QSettings::Format ) hb_parni( 2 ) ) ); } else { - hb_retptr( new QSettings() ); + __HB_RETPTRGC__( new QSettings() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth b/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth index 7a0510eb15..a4dd062a52 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QSIGNALMAPPER ) { - hb_retptr( new QSignalMapper( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QSignalMapper( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QSize.qth b/harbour/contrib/hbqt/qtcore/qth/QSize.qth index 1f1dfbeb4c..b5f25b891a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QSize.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QSize.qth @@ -79,15 +79,15 @@ HB_FUNC( QT_QSIZE ) { if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QSize* ) new QSize( hb_parni( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QSize* ) new QSize( hb_parni( 1 ), hb_parni( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QSize* ) new QSize( *hbqt_par_QSize( 1 ) ) ); + __HB_RETPTRGC__( ( QSize* ) new QSize( *hbqt_par_QSize( 1 ) ) ); } else { - hb_retptr( ( QSize* ) new QSize() ); + __HB_RETPTRGC__( ( QSize* ) new QSize() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QSizeF.qth b/harbour/contrib/hbqt/qtcore/qth/QSizeF.qth index 83c000c3f8..c615eda37b 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QSizeF.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QSizeF.qth @@ -79,11 +79,11 @@ HB_FUNC( QT_QSIZEF ) { if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QSizeF* ) new QSizeF( hb_parnd( 1 ), hb_parnd( 2 ) ) ); + __HB_RETPTRGC__( ( QSizeF* ) new QSizeF( hb_parnd( 1 ), hb_parnd( 2 ) ) ); } else { - hb_retptr( ( QSizeF* ) new QSizeF() ); + __HB_RETPTRGC__( ( QSizeF* ) new QSizeF() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QStringList.qth b/harbour/contrib/hbqt/qtcore/qth/QStringList.qth index 4d8fcbe84f..bed73cddf3 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QStringList.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QStringList.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QSTRINGLIST ) { - hb_retptr( ( QStringList* ) new QStringList() ); + __HB_RETPTRGC__( ( QStringList* ) new QStringList() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QStringRef.qth b/harbour/contrib/hbqt/qtcore/qth/QStringRef.qth index b48ad8bb66..f2d317a536 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QStringRef.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QStringRef.qth @@ -76,19 +76,19 @@ HB_FUNC( QT_QSTRINGREF ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QStringRef( ( const QString *) hb_parcx( 1 ) ) ); + __HB_RETPTRGC__( new QStringRef( ( const QString *) hb_parcx( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QStringRef( * hbqt_par_QStringRef( 1 ) ) ); + __HB_RETPTRGC__( new QStringRef( * hbqt_par_QStringRef( 1 ) ) ); } else if( hb_pcount() == 3 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( new QStringRef( ( const QString *) hb_parcx( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ); + __HB_RETPTRGC__( new QStringRef( ( const QString *) hb_parcx( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ); } else { - hb_retptr( new QStringRef() ); + __HB_RETPTRGC__( new QStringRef() ); } } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth b/harbour/contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth index ba2e37e93f..8cd027ca45 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QTEXTBOUNDARYFINDER ) { - hb_retptr( ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ); + __HB_RETPTRGC__( ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTextCodec.qth b/harbour/contrib/hbqt/qtcore/qth/QTextCodec.qth index 3a47fb38c6..e3d63b6113 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTextCodec.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTextCodec.qth @@ -72,7 +72,7 @@ Destructor = no */ HB_FUNC( QT_QTEXTCODEC ) { - //hb_retptr( ( QTextCodec* ) new QTextCodec() ); + //__HB_RETPTRGC__( ( QTextCodec* ) new QTextCodec() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTextDecoder.qth b/harbour/contrib/hbqt/qtcore/qth/QTextDecoder.qth index e614e6d4e2..568561d82a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTextDecoder.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTextDecoder.qth @@ -71,7 +71,7 @@ New = pTextCodec */ HB_FUNC( QT_QTEXTDECODER ) { - hb_retptr( ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ); + __HB_RETPTRGC__( ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTextEncoder.qth b/harbour/contrib/hbqt/qtcore/qth/QTextEncoder.qth index c65926099f..2f2c7a76f9 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTextEncoder.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTextEncoder.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTENCODER ) { - hb_retptr( ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ); + __HB_RETPTRGC__( ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTextStream.qth b/harbour/contrib/hbqt/qtcore/qth/QTextStream.qth index 6a0d2f45a7..f2843ec457 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTextStream.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTextStream.qth @@ -75,7 +75,7 @@ New = cText, nIOMode */ HB_FUNC( QT_QTEXTSTREAM ) { - hb_retptr( new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ); + __HB_RETPTRGC__( new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QThread.qth b/harbour/contrib/hbqt/qtcore/qth/QThread.qth index 244b74500c..8c492ff289 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QThread.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QThread.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QTHREAD ) { - hb_retptr( new QThread() ); + __HB_RETPTRGC__( new QThread() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTime.qth b/harbour/contrib/hbqt/qtcore/qth/QTime.qth index 8651f0422a..ce7ea2c08b 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTime.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTime.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QTIME ) { - hb_retptr( new QTime() ); + __HB_RETPTRGC__( new QTime() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTimeLine.qth b/harbour/contrib/hbqt/qtcore/qth/QTimeLine.qth index 2e29448fa0..23f139e9ea 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTimeLine.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTimeLine.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTIMELINE ) { - hb_retptr( new QTimeLine() ); + __HB_RETPTRGC__( new QTimeLine() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTimer.qth b/harbour/contrib/hbqt/qtcore/qth/QTimer.qth index 44c5951cd7..99eecc2295 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTimer.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTimer.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTIMER ) { - hb_retptr( new QTimer( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QTimer( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QTranslator.qth b/harbour/contrib/hbqt/qtcore/qth/QTranslator.qth index 31069b853b..8aace1c375 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QTranslator.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QTranslator.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QTRANSLATOR ) { - hb_retptr( new QTranslator() ); + __HB_RETPTRGC__( new QTranslator() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/QUrl.qth b/harbour/contrib/hbqt/qtcore/qth/QUrl.qth index c5c8898f0b..1c61618baf 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QUrl.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QUrl.qth @@ -76,15 +76,15 @@ HB_FUNC( QT_QURL ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QUrl( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new QUrl( hbqt_par_QString( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QUrl( *hbqt_par_QUrl( 1 ) ) ); + __HB_RETPTRGC__( new QUrl( *hbqt_par_QUrl( 1 ) ) ); } else { - hb_retptr( new QUrl() ); + __HB_RETPTRGC__( new QUrl() ); } } /* diff --git a/harbour/contrib/hbqt/qtcore/qth/QVariant.qth b/harbour/contrib/hbqt/qtcore/qth/QVariant.qth index 83c055f059..48788abb2a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QVariant.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QVariant.qth @@ -112,7 +112,7 @@ QVariant ( const QRegExp & regExp ) */ HB_FUNC( QT_QVARIANT ) { - hb_retptr( ( QVariant* ) new QVariant() ); + __HB_RETPTRGC__( ( QVariant* ) new QVariant() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp index 59a884cd14..c774dd5595 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QDesignerActionEditorInterface( void * pObj, bool bNew ) HB_FUNC( QT_QDESIGNERACTIONEDITORINTERFACE ) { - //hb_retptr( new QDesignerActionEditorInterface() ); + //__HB_RETPTRGC__( new QDesignerActionEditorInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp index 237459eae7..a96ce011c1 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp @@ -161,7 +161,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowCursorInterface( void * pObj, bool bNe HB_FUNC( QT_QDESIGNERFORMWINDOWCURSORINTERFACE ) { - //hb_retptr( new QDesignerFormWindowCursorInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowCursorInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp index ca46f2deb1..1270f30fda 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp @@ -168,7 +168,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowInterface( void * pObj, bool bNew ) HB_FUNC( QT_QDESIGNERFORMWINDOWINTERFACE ) { - //hb_retptr( new QDesignerFormWindowInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp index 6fce4df899..e97cd9d2ae 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowManagerInterface( void * pObj, bool bN HB_FUNC( QT_QDESIGNERFORMWINDOWMANAGERINTERFACE ) { - //hb_retptr( new QDesignerFormWindowManagerInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowManagerInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp index fbaad602d3..9b1de0fc8a 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void * pObj, bool bNew HB_FUNC( QT_QDESIGNEROBJECTINSPECTORINTERFACE ) { - //hb_retptr( new QDesignerObjectInspectorInterface() ); + //__HB_RETPTRGC__( new QDesignerObjectInspectorInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp index 099941a0be..32fc7623fd 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew HB_FUNC( QT_QDESIGNERPROPERTYEDITORINTERFACE ) { - //hb_retptr( new QDesignerPropertyEditorInterface() ); + //__HB_RETPTRGC__( new QDesignerPropertyEditorInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp index 6b8da3c3d7..ec77f4f5dc 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew ) HB_FUNC( QT_QDESIGNERWIDGETBOXINTERFACE ) { - //hb_retptr( new QDesignerWidgetBoxInterface() ); + //__HB_RETPTRGC__( new QDesignerWidgetBoxInterface() ); } /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth index 71eadd7ba4..f26a11d553 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERACTIONEDITORINTERFACE ) { - //hb_retptr( new QDesignerActionEditorInterface() ); + //__HB_RETPTRGC__( new QDesignerActionEditorInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth index 6a1bb44f34..19167b4cb3 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth @@ -83,11 +83,11 @@ HB_FUNC( QT_QDESIGNERFORMEDITORINTERFACE ) { if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QDesignerFormEditorInterface( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QDesignerFormEditorInterface( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( new QDesignerFormEditorInterface() ); + __HB_RETPTRGC__( new QDesignerFormEditorInterface() ); } } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth index 90e0cc30f3..53a21256f7 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth @@ -80,7 +80,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERFORMWINDOWCURSORINTERFACE ) { - //hb_retptr( new QDesignerFormWindowCursorInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowCursorInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth index f59fc1642a..1049997f11 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERFORMWINDOWINTERFACE ) { - //hb_retptr( new QDesignerFormWindowInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth index f57750d714..e54da76483 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERFORMWINDOWMANAGERINTERFACE ) { - //hb_retptr( new QDesignerFormWindowManagerInterface() ); + //__HB_RETPTRGC__( new QDesignerFormWindowManagerInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth index 1e4e844841..8d7981dbb6 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNEROBJECTINSPECTORINTERFACE ) { - //hb_retptr( new QDesignerObjectInspectorInterface() ); + //__HB_RETPTRGC__( new QDesignerObjectInspectorInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth index 16eace9c47..e3627a6c7a 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERPROPERTYEDITORINTERFACE ) { - //hb_retptr( new QDesignerPropertyEditorInterface() ); + //__HB_RETPTRGC__( new QDesignerPropertyEditorInterface() ); } diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth index 67640a00a1..fa5c4328fb 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth @@ -81,7 +81,7 @@ folder = hbqtdesigner */ HB_FUNC( QT_QDESIGNERWIDGETBOXINTERFACE ) { - //hb_retptr( new QDesignerWidgetBoxInterface() ); + //__HB_RETPTRGC__( new QDesignerWidgetBoxInterface() ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp index 29201dbd07..4f6123aeda 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp @@ -156,7 +156,7 @@ void * hbqt_gcAllocate_QAbstractGraphicsShapeItem( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTGRAPHICSSHAPEITEM ) { - // hb_retptr( new QAbstractGraphicsShapeItem() ); + // __HB_RETPTRGC__( new QAbstractGraphicsShapeItem() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp index 393cbfeb29..c770a1aabd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp @@ -161,7 +161,7 @@ void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTITEMDELEGATE ) { - // hb_retptr( new QAbstractItemDelegate( 0 ) ); + // __HB_RETPTRGC__( new QAbstractItemDelegate( 0 ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp index ee53d0ec7c..7331a9ed8f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTPROXYMODEL ) { - // hb_retptr( new QAbstractProxyModel() ); + // __HB_RETPTRGC__( new QAbstractProxyModel() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp index eac4571b42..29fe101849 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp @@ -158,7 +158,7 @@ void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj, bool bNew ) HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT ) { - // hb_retptr( new QAbstractTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); + // __HB_RETPTRGC__( new QAbstractTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index f49ae5eda5..27286e00af 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -256,7 +256,7 @@ void * hbqt_gcAllocate_QApplication( void * pObj, bool bNew ) HB_FUNC( QT_QAPPLICATION ) { - //hb_retptr( ( QApplication * ) s_app ); + //__HB_RETPTRGC__( ( QApplication * ) s_app ); hb_retptr ( s_app ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp index d8ec658ae6..ae396196a8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDesktopServices.cpp @@ -158,7 +158,7 @@ void * hbqt_gcAllocate_QDesktopServices( void * pObj, bool bNew ) HB_FUNC( QT_QDESKTOPSERVICES ) { - //hb_retptr( QDesktopServices() ); + //__HB_RETPTRGC__( QDesktopServices() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp index ce13bdb201..ea1a6cf9a2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QDRAGLEAVEEVENT ) { - // hb_retptr( ( * ) new () ); + // __HB_RETPTRGC__( ( * ) new () ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp index b415e37e01..5deed9ae8c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QDragMoveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QDRAGMOVEEVENT ) { - // hb_retptr( ( * ) new () ); + // __HB_RETPTRGC__( ( * ) new () ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp index d21086f8aa..e445c10b66 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew ) HB_FUNC( QT_QDROPEVENT ) { - // hb_retptr( ( QDropEvent* ) new QDropEvent() ); + // __HB_RETPTRGC__( ( QDropEvent* ) new QDropEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp index efe5b3469f..7483f5a091 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew ) HB_FUNC( QT_QFOCUSEVENT ) { - // hb_retptr( ( QFocusEvent* ) new QFocusEvent() ); + // __HB_RETPTRGC__( ( QFocusEvent* ) new QFocusEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp index 4c2a5cf5bb..781a94dcff 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QGraphicsLayout( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSLAYOUT ) { - // hb_retptr( new QGraphicsLayout() ); + // __HB_RETPTRGC__( new QGraphicsLayout() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp index 2fd9e4c77b..63bb40c8eb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QGraphicsLayoutItem( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSLAYOUTITEM ) { - // hb_retptr( new QGraphicsLayoutItem() ); + // __HB_RETPTRGC__( new QGraphicsLayoutItem() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp index 839c129725..9822ee9eba 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp @@ -159,7 +159,7 @@ void * hbqt_gcAllocate_QGraphicsSceneContextMenuEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENECONTEXTMENUEVENT ) { - //hb_retptr( new QGraphicsSceneContextMenuEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneContextMenuEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp index df7a6ea03f..7dff0e0a03 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QGraphicsSceneDragDropEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEDRAGDROPEVENT ) { - //hb_retptr( new QGraphicsSceneDragDropEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneDragDropEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp index 987018025c..c4300b401a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QGraphicsSceneEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEEVENT ) { - //hb_retptr( new QGraphicsSceneEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp index 94dc3f6b63..1043bd94c6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp @@ -155,7 +155,7 @@ void * hbqt_gcAllocate_QGraphicsSceneHelpEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEHELPEVENT ) { - //hb_retptr( new QGraphicsSceneHelpEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneHelpEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp index 1e11bf0174..7fe7a6de60 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp @@ -155,7 +155,7 @@ void * hbqt_gcAllocate_QGraphicsSceneHoverEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEHOVEREVENT ) { - //hb_retptr( new QGraphicsSceneHoverEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneHoverEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp index b63bb4f188..6bd1b5445d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp @@ -155,7 +155,7 @@ void * hbqt_gcAllocate_QGraphicsSceneMouseEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEMOUSEEVENT ) { - //hb_retptr( new QGraphicsSceneMouseEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneMouseEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp index 18e0530163..23ec3b198e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp @@ -156,7 +156,7 @@ void * hbqt_gcAllocate_QGraphicsSceneMoveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEMOVEEVENT ) { - //hb_retptr( new QGraphicsSceneMoveEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneMoveEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp index 9e61db3f4a..776628fad6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp @@ -155,7 +155,7 @@ void * hbqt_gcAllocate_QGraphicsSceneResizeEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENERESIZEEVENT ) { - //hb_retptr( new QGraphicsSceneResizeEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneResizeEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp index 4818dace8e..8a744bfaf6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QGraphicsSceneWheelEvent( void * pObj, bool bNew ) HB_FUNC( QT_QGRAPHICSSCENEWHEELEVENT ) { - //hb_retptr( new QGraphicsSceneWheelEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneWheelEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp index a1f2118b08..e8cb1993dd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew ) HB_FUNC( QT_QHELPEVENT ) { - // hb_retptr( new QHelpEvent() ); + // __HB_RETPTRGC__( new QHelpEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp index d54529a23a..2df2dd1ac9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QHideEvent( void * pObj, bool bNew ) HB_FUNC( QT_QHIDEEVENT ) { - // hb_retptr( new QHideEvent() ); + // __HB_RETPTRGC__( new QHideEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp index fa8cdfeedd..1c80d7ac0f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew ) HB_FUNC( QT_QKEYEVENT ) { - //hb_retptr( ( QKeyEvent * ) new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) ); + //__HB_RETPTRGC__( ( QKeyEvent * ) new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp index 227df89d55..83f6e383da 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew ) HB_FUNC( QT_QMOVEEVENT ) { - // hb_retptr( ( QMoveEvent* ) new QMoveEvent() ); + // __HB_RETPTRGC__( ( QMoveEvent* ) new QMoveEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp index c0b0698124..a955770d5a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew ) HB_FUNC( QT_QRESIZEEVENT ) { - // hb_retptr( ( QResizeEvent* ) new QResizeEvent() ); + // __HB_RETPTRGC__( ( QResizeEvent* ) new QResizeEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp index cfacd4109b..7df9f8b99d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp @@ -157,7 +157,7 @@ void * hbqt_gcAllocate_QSessionManager( void * pObj, bool bNew ) HB_FUNC( QT_QSESSIONMANAGER ) { - // hb_retptr( new () ); + // __HB_RETPTRGC__( new () ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp index c4661b6163..7195f85b59 100644 --- a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QShowEvent( void * pObj, bool bNew ) HB_FUNC( QT_QSHOWEVENT ) { - // hb_retptr( new QShowEvent() ); + // __HB_RETPTRGC__( new QShowEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp index 23b61c9a50..0ab84d817a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp @@ -160,7 +160,7 @@ void * hbqt_gcAllocate_QTextBlockGroup( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTBLOCKGROUP ) { - //hb_retptr( ( QTextBlockGroup* ) new QTextBlockGroup( hbqt_par_QTextDocument( 1 ) ) ); + //__HB_RETPTRGC__( ( QTextBlockGroup* ) new QTextBlockGroup( hbqt_par_QTextDocument( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp index cac5e67e1b..0a3a96303b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QTextInlineObject( void * pObj, bool bNew ) HB_FUNC( QT_QTEXTINLINEOBJECT ) { - // hb_retptr( new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); + // __HB_RETPTRGC__( new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp index 37c070e305..e274962992 100644 --- a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp @@ -162,7 +162,7 @@ void * hbqt_gcAllocate_QValidator( void * pObj, bool bNew ) HB_FUNC( QT_QVALIDATOR ) { - // hb_retptr( new QValidator() ); + // __HB_RETPTRGC__( new QValidator() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp index c8bbad31c8..26badb597a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew ) HB_FUNC( QT_QWHEELEVENT ) { - // hb_retptr( ( QWheelEvent* ) new QWheelEvent() ); + // __HB_RETPTRGC__( ( QWheelEvent* ) new QWheelEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp index 1bf656e4db..c47786716a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QWindowStateChangeEvent( void * pObj, bool bNew ) HB_FUNC( QT_QWINDOWSTATECHANGEEVENT ) { - // hb_retptr( ( QWindowStateChangeEvent* ) new QWindowStateChangeEvent() ); + // __HB_RETPTRGC__( ( QWindowStateChangeEvent* ) new QWindowStateChangeEvent() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth b/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth index afd747a8e7..32adb21f75 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth @@ -78,7 +78,7 @@ New = */ HB_FUNC( QT_HBQABSTRACTITEMMODEL ) { - hb_retptr( new HBQAbstractItemModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ) ); + __HB_RETPTRGC__( new HBQAbstractItemModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsItem.qth b/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsItem.qth index fe8e582cb0..f30a8592bf 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsItem.qth @@ -74,14 +74,14 @@ HB_FUNC( QT_HBQGRAPHICSITEM ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( new HBQGraphicsItem( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new HBQGraphicsItem( hb_parni( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new HBQGraphicsItem( hb_parni( 1 ), hbqt_par_QGraphicsItem( 2 ) ) ); + __HB_RETPTRGC__( new HBQGraphicsItem( hb_parni( 1 ), hbqt_par_QGraphicsItem( 2 ) ) ); } else { - hb_retptr( new HBQGraphicsItem() ); + __HB_RETPTRGC__( new HBQGraphicsItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsScene.qth b/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsScene.qth index 8e8188ce2f..b8dbe5cf39 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsScene.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQGraphicsScene.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_HBQGRAPHICSSCENE ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new HBQGraphicsScene( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new HBQGraphicsScene( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( new HBQGraphicsScene() ); + __HB_RETPTRGC__( new HBQGraphicsScene() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth b/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth index 0bb9d9babe..902f1308be 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth @@ -78,15 +78,15 @@ HB_FUNC( QT_HBQPLAINTEXTEDIT ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new HBQPlainTextEdit() ); + __HB_RETPTRGC__( new HBQPlainTextEdit() ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new HBQPlainTextEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new HBQPlainTextEdit( hbqt_par_QWidget( 1 ) ) ); } else { - hb_retptr( new HBQPlainTextEdit() ); + __HB_RETPTRGC__( new HBQPlainTextEdit() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth b/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth index 35a3b1eafe..f66c07aa68 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER ) { - hb_retptr( new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ); + __HB_RETPTRGC__( new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth b/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth index 6a7f8cfc47..2f8523dbf7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth @@ -78,7 +78,7 @@ New = */ HB_FUNC( QT_HBQTABLEVIEW ) { - hb_retptr( new HBQTableView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new HBQTableView( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth b/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth index f141ba6c37..7d98f82fae 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_HBQTEXTBLOCKUSERDATA ) { - hb_retptr( new HBQTextBlockUserData() ); + __HB_RETPTRGC__( new HBQTextBlockUserData() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QAbstractGraphicsShapeItem.qth b/harbour/contrib/hbqt/qtgui/qth/QAbstractGraphicsShapeItem.qth index 4a453c5794..db459d0f94 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QAbstractGraphicsShapeItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QAbstractGraphicsShapeItem.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QABSTRACTGRAPHICSSHAPEITEM ) { - // hb_retptr( new QAbstractGraphicsShapeItem() ); + // __HB_RETPTRGC__( new QAbstractGraphicsShapeItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QAbstractItemDelegate.qth b/harbour/contrib/hbqt/qtgui/qth/QAbstractItemDelegate.qth index 42ae16e556..f4b346868e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QAbstractItemDelegate.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QAbstractItemDelegate.qth @@ -70,7 +70,7 @@ Destructor = no */ HB_FUNC( QT_QABSTRACTITEMDELEGATE ) { - // hb_retptr( new QAbstractItemDelegate( 0 ) ); + // __HB_RETPTRGC__( new QAbstractItemDelegate( 0 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QAbstractProxyModel.qth b/harbour/contrib/hbqt/qtgui/qth/QAbstractProxyModel.qth index 92a68f9122..fc40e04d05 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QAbstractProxyModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QAbstractProxyModel.qth @@ -69,7 +69,7 @@ New = */ HB_FUNC( QT_QABSTRACTPROXYMODEL ) { - // hb_retptr( new QAbstractProxyModel() ); + // __HB_RETPTRGC__( new QAbstractProxyModel() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QAbstractTextDocumentLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QAbstractTextDocumentLayout.qth index 59535be3c5..9eac8f4ecf 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QAbstractTextDocumentLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QAbstractTextDocumentLayout.qth @@ -69,7 +69,7 @@ New = */ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT ) { - // hb_retptr( new QAbstractTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); + // __HB_RETPTRGC__( new QAbstractTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QAction.qth b/harbour/contrib/hbqt/qtgui/qth/QAction.qth index 5e390fa01f..ded83d3f8d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QAction.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QAction.qth @@ -76,11 +76,11 @@ Calls = QT_QAction HB_FUNC( QT_QACTION ) { if( HB_ISPOINTER( 1 ) ) - hb_retptr( new QAction( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QAction( hbqt_par_QObject( 1 ) ) ); else if( HB_ISPOINTER( 2 ) ) - hb_retptr( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) ); + __HB_RETPTRGC__( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) ); else if( HB_ISPOINTER( 3 ) ) - hb_retptr( new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ); + __HB_RETPTRGC__( new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QActionGroup.qth b/harbour/contrib/hbqt/qtgui/qth/QActionGroup.qth index e4df05f850..60b18986ca 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QActionGroup.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QActionGroup.qth @@ -71,7 +71,7 @@ HB_FUNC( QT_QACTIONGROUP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QActionGroup( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QActionGroup( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth index bf87524ce1..e89fda9aca 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth @@ -101,7 +101,7 @@ HB_FUNC( HB_QT ) /* For compatibility */ HB_FUNC( QT_QAPPLICATION ) { - //hb_retptr( ( QApplication * ) s_app ); + //__HB_RETPTRGC__( ( QApplication * ) s_app ); hb_retptr ( s_app ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QBitmap.qth b/harbour/contrib/hbqt/qtgui/qth/QBitmap.qth index 8b2f9bad02..f6edaefceb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QBitmap.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QBitmap.qth @@ -86,38 +86,38 @@ HB_FUNC( QT_QBITMAP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QBitmap( 1 ) ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( *hbqt_par_QBitmap( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), hb_parc( 2 ) ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), hb_parc( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hb_parni( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( hb_parni( 1 ), hb_parni( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QPixmap" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QPixmap( 2 ) ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( *hbqt_par_QPixmap( 2 ) ) ); } else if( ( QString ) "QSize" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QSize( 2 ) ) ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap( *hbqt_par_QSize( 2 ) ) ); } else { - hb_retptr( ( QBitmap* ) new QBitmap() ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap() ); } } else { - hb_retptr( ( QBitmap* ) new QBitmap() ); + __HB_RETPTRGC__( ( QBitmap* ) new QBitmap() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth index 8f74d611af..33b1ea9998 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth @@ -69,7 +69,7 @@ New = nDirection, pParent */ HB_FUNC( QT_QBOXLAYOUT ) { - hb_retptr( ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QBrush.qth b/harbour/contrib/hbqt/qtgui/qth/QBrush.qth index c18499ea05..4d30f2392a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QBrush.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QBrush.qth @@ -101,49 +101,49 @@ HB_FUNC( QT_QBRUSH ) { if( q->type == HBQT_TYPE_QBrush ) { - hb_retptr( new QBrush( *hbqt_par_QBrush( 1 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QBrush( 1 ) ) ); } else if( q->type == HBQT_TYPE_QPixmap ) { - hb_retptr( new QBrush( *hbqt_par_QPixmap( 1 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QPixmap( 1 ) ) ); } else if( q->type == HBQT_TYPE_QImage ) { - hb_retptr( new QBrush( *hbqt_par_QImage( 1 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QImage( 1 ) ) ); } else if( q->type == HBQT_TYPE_QGradient ) { - hb_retptr( new QBrush( *hbqt_par_QGradient( 1 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QGradient( 1 ) ) ); } else if( q->type == HBQT_TYPE_QColor ) { - hb_retptr( new QBrush( *hbqt_par_QColor( 1 ), Qt::SolidPattern ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 1 ), Qt::SolidPattern ) ); } } else { - hb_retptr( new QBrush( *hbqt_par_QBrush( 1 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QBrush( 1 ) ) ); } } else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), Qt::SolidPattern ) ); + __HB_RETPTRGC__( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), Qt::SolidPattern ) ); } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QBrush( *hbqt_par_QColor( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QBrush( *hbqt_par_QColor( 1 ), *hbqt_par_QPixmap( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 1 ), *hbqt_par_QPixmap( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), *hbqt_par_QPixmap( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), *hbqt_par_QPixmap( 2 ) ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -151,28 +151,28 @@ HB_FUNC( QT_QBRUSH ) if( objName == ( QString ) "QPixmap" ) { - hb_retptr( new QBrush( *hbqt_par_QPixmap( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QPixmap( 2 ) ) ); } else if( objName == ( QString ) "QImage" ) { - hb_retptr( new QBrush( *hbqt_par_QImage( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QImage( 2 ) ) ); } else if( objName == ( QString ) "QGradient" ) { - hb_retptr( new QBrush( *hbqt_par_QGradient( 2 ) ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QGradient( 2 ) ) ); } else if( objName == ( QString ) "QColor" ) { - hb_retptr( new QBrush( *hbqt_par_QColor( 2 ), HB_ISNUM( 3 ) ? ( Qt::BrushStyle ) hb_parni( 3 ) : Qt::SolidPattern ) ); + __HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 2 ), HB_ISNUM( 3 ) ? ( Qt::BrushStyle ) hb_parni( 3 ) : Qt::SolidPattern ) ); } else { - hb_retptr( new QBrush() ); + __HB_RETPTRGC__( new QBrush() ); } } else { - hb_retptr( new QBrush() ); + __HB_RETPTRGC__( new QBrush() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QButtonGroup.qth b/harbour/contrib/hbqt/qtgui/qth/QButtonGroup.qth index d40284e7e0..1d7026bfb9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QButtonGroup.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QButtonGroup.qth @@ -72,11 +72,11 @@ HB_FUNC( QT_QBUTTONGROUP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QButtonGroup* ) new QButtonGroup( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QButtonGroup* ) new QButtonGroup( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( ( QButtonGroup* ) new QButtonGroup() ); + __HB_RETPTRGC__( ( QButtonGroup* ) new QButtonGroup() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCalendarWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QCalendarWidget.qth index 479ba31cfe..b542c4032f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCalendarWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCalendarWidget.qth @@ -73,7 +73,7 @@ Calls = QT_QCalendarWidget */ HB_FUNC( QT_QCALENDARWIDGET ) { - hb_retptr( ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCheckBox.qth b/harbour/contrib/hbqt/qtgui/qth/QCheckBox.qth index 9561414d69..5b40a4e860 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCheckBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCheckBox.qth @@ -75,11 +75,11 @@ HB_FUNC( QT_QCHECKBOX ) { if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QCheckBox* ) new QCheckBox( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); } else { - hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QClipboard.qth b/harbour/contrib/hbqt/qtgui/qth/QClipboard.qth index 840d7efa34..98f6c0fd64 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QClipboard.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QClipboard.qth @@ -73,7 +73,7 @@ Destructor = no */ HB_FUNC( QT_QCLIPBOARD ) { - hb_retptr( ( QClipboard* ) QApplication::clipboard() ); + __HB_RETPTRGC__( ( QClipboard* ) QApplication::clipboard() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QColor.qth b/harbour/contrib/hbqt/qtgui/qth/QColor.qth index 7e33a47e12..41f668c96c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QColor.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QColor.qth @@ -90,36 +90,36 @@ HB_FUNC( QT_QCOLOR ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) && hb_parni( 1 ) < 25 ) { - hb_retptr( new QColor( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new QColor( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( new QColor( ( QRgb ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new QColor( ( QRgb ) hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QColor( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new QColor( hbqt_par_QString( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QColor( *hbqt_par_QColor( 1 ) ) ); + __HB_RETPTRGC__( new QColor( *hbqt_par_QColor( 1 ) ) ); } else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( int ) 255 ) ); + __HB_RETPTRGC__( new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( int ) 255 ) ); } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + __HB_RETPTRGC__( new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); } else { - hb_retptr( new QColor() ); + __HB_RETPTRGC__( new QColor() ); } } else { - hb_retptr( new QColor() ); + __HB_RETPTRGC__( new QColor() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QColorDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QColorDialog.qth index a11a099342..d31dbdf517 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QColorDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QColorDialog.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QCOLORDIALOG ) { if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QColorDialog* ) new QColorDialog( hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QColorDialog* ) new QColorDialog( hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); } else { - hb_retptr( ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QComboBox.qth b/harbour/contrib/hbqt/qtgui/qth/QComboBox.qth index 4477579c5b..850beb19fd 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QComboBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QComboBox.qth @@ -73,7 +73,7 @@ Calls = QT_QComboBox */ HB_FUNC( QT_QCOMBOBOX ) { - hb_retptr( ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCommandLinkButton.qth b/harbour/contrib/hbqt/qtgui/qth/QCommandLinkButton.qth index ac943f41d9..f32e27268d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCommandLinkButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCommandLinkButton.qth @@ -74,7 +74,7 @@ Calls = QT_QCommandLinkButton */ HB_FUNC( QT_QCOMMANDLINKBUTTON ) { - hb_retptr( ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCommonStyle.qth b/harbour/contrib/hbqt/qtgui/qth/QCommonStyle.qth index 4394f5e43a..6fbd5b50b4 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCommonStyle.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCommonStyle.qth @@ -69,7 +69,7 @@ New = */ HB_FUNC( QT_QCOMMONSTYLE ) { - hb_retptr( ( QCommonStyle* ) new QCommonStyle() ); + __HB_RETPTRGC__( ( QCommonStyle* ) new QCommonStyle() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCompleter.qth b/harbour/contrib/hbqt/qtgui/qth/QCompleter.qth index d70ab99d32..b80a929a2b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCompleter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCompleter.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QCOMPLETER ) { - hb_retptr( new QCompleter() ); + __HB_RETPTRGC__( new QCompleter() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QConicalGradient.qth b/harbour/contrib/hbqt/qtgui/qth/QConicalGradient.qth index 8ffa3bd07a..d10f0032be 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QConicalGradient.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QConicalGradient.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QCONICALGRADIENT ) { - hb_retptr( ( QConicalGradient* ) new QConicalGradient() ); + __HB_RETPTRGC__( ( QConicalGradient* ) new QConicalGradient() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QContextMenuEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QContextMenuEvent.qth index b9f360d2d3..f2ddd74582 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QContextMenuEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QContextMenuEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QCONTEXTMENUEVENT ) { - hb_retptr( new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ) ) ); + __HB_RETPTRGC__( new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QCursor.qth b/harbour/contrib/hbqt/qtgui/qth/QCursor.qth index e288a8d4d3..a5e65509dc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QCursor.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QCursor.qth @@ -88,11 +88,11 @@ HB_FUNC( QT_QCURSOR ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QCursor* ) new QCursor( ( Qt::CursorShape ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor( ( Qt::CursorShape ) hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QCursor( 1 ) ) ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor( *hbqt_par_QCursor( 1 ) ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -100,20 +100,20 @@ HB_FUNC( QT_QCURSOR ) if( objName == ( QString ) "QPixmap" ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QPixmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor( *hbqt_par_QPixmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); } else { - hb_retptr( ( QCursor* ) new QCursor() ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor() ); } } else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QBitmap( 1 ), *hbqt_par_QBitmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor( *hbqt_par_QBitmap( 1 ), *hbqt_par_QBitmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); } else { - hb_retptr( ( QCursor* ) new QCursor() ); + __HB_RETPTRGC__( ( QCursor* ) new QCursor() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth index 188f8a3742..8395156c0b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDateEdit.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QDATEEDIT ) { - hb_retptr( ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth index b3668d40b0..18afe87aa2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDateTimeEdit.qth @@ -71,7 +71,7 @@ New = pParent */ HB_FUNC( QT_QDATETIMEEDIT ) { - hb_retptr( ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDesktopServices.qth b/harbour/contrib/hbqt/qtgui/qth/QDesktopServices.qth index 1018c4efcb..8e35cb76ca 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDesktopServices.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDesktopServices.qth @@ -77,7 +77,7 @@ New = */ HB_FUNC( QT_QDESKTOPSERVICES ) { - //hb_retptr( QDesktopServices() ); + //__HB_RETPTRGC__( QDesktopServices() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDesktopWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QDesktopWidget.qth index 3e46136f50..1fe9024fe0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDesktopWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDesktopWidget.qth @@ -72,7 +72,7 @@ New = pParent */ HB_FUNC( QT_QDESKTOPWIDGET ) { - hb_retptr( new QDesktopWidget() ); + __HB_RETPTRGC__( new QDesktopWidget() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDial.qth b/harbour/contrib/hbqt/qtgui/qth/QDial.qth index 2a84f21af5..5752b163aa 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDial.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDial.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QDIAL ) { - hb_retptr( ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QDialog.qth index 7482587d1a..be4c8e9482 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDialog.qth @@ -70,7 +70,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QDIALOG ) { - hb_retptr( new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDirModel.qth b/harbour/contrib/hbqt/qtgui/qth/QDirModel.qth index f4a0f94156..a510061baa 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDirModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDirModel.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QDIRMODEL ) { - hb_retptr( ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth index cfe3a8c691..69aebb2324 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDockWidget.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QDOCKWIDGET ) { - hb_retptr( new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDoubleSpinBox.qth b/harbour/contrib/hbqt/qtgui/qth/QDoubleSpinBox.qth index dc3eb81435..e6708db9d0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDoubleSpinBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDoubleSpinBox.qth @@ -68,7 +68,7 @@ New = pParent */ HB_FUNC( QT_QDOUBLESPINBOX ) { - hb_retptr( ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDoubleValidator.qth b/harbour/contrib/hbqt/qtgui/qth/QDoubleValidator.qth index add924a01e..56667deadb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDoubleValidator.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDoubleValidator.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QDOUBLEVALIDATOR ) { if( hb_pcount() >= 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( new QDoubleValidator( hb_parnd( 1 ), hb_parnd( 2 ), hb_parni( 3 ), HB_ISPOINTER( 4 ) ? hbqt_par_QObject( 4 ) : 0 ) ); + __HB_RETPTRGC__( new QDoubleValidator( hb_parnd( 1 ), hb_parnd( 2 ), hb_parni( 3 ), HB_ISPOINTER( 4 ) ? hbqt_par_QObject( 4 ) : 0 ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QDoubleValidator( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QDoubleValidator( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDrag.qth b/harbour/contrib/hbqt/qtgui/qth/QDrag.qth index fc908f4010..3e72dc46eb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDrag.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDrag.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QDRAG ) { - hb_retptr( new QDrag( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QDrag( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDragLeaveEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QDragLeaveEvent.qth index 55ee93f88e..e8b35cd105 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDragLeaveEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDragLeaveEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QDRAGLEAVEEVENT ) { - // hb_retptr( ( * ) new () ); + // __HB_RETPTRGC__( ( * ) new () ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDragMoveEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QDragMoveEvent.qth index 233d472d39..cea67f6d40 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDragMoveEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDragMoveEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QDRAGMOVEEVENT ) { - // hb_retptr( ( * ) new () ); + // __HB_RETPTRGC__( ( * ) new () ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth index 8eeeccb4b4..3d56b33a79 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QDROPEVENT ) { - // hb_retptr( ( QDropEvent* ) new QDropEvent() ); + // __HB_RETPTRGC__( ( QDropEvent* ) new QDropEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QErrorMessage.qth b/harbour/contrib/hbqt/qtgui/qth/QErrorMessage.qth index 61fea6a934..9a63ca723d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QErrorMessage.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QErrorMessage.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QERRORMESSAGE ) { - hb_retptr( ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth index 04b90faf90..a78fba0870 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth @@ -72,15 +72,15 @@ HB_FUNC( QT_QFILEDIALOG ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) 0 ) ); + __HB_RETPTRGC__( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) 0 ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } else { - hb_retptr( new QFileDialog() ); + __HB_RETPTRGC__( new QFileDialog() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFileIconProvider.qth b/harbour/contrib/hbqt/qtgui/qth/QFileIconProvider.qth index ac98aea7e9..0eb5feda3d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFileIconProvider.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFileIconProvider.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QFILEICONPROVIDER ) { - hb_retptr( new QFileIconProvider() ); + __HB_RETPTRGC__( new QFileIconProvider() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFileSystemModel.qth b/harbour/contrib/hbqt/qtgui/qth/QFileSystemModel.qth index e87104ffcf..022fe599a7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFileSystemModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFileSystemModel.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QFILESYSTEMMODEL ) { - hb_retptr( ( QFileSystemModel * ) new QFileSystemModel() ); + __HB_RETPTRGC__( ( QFileSystemModel * ) new QFileSystemModel() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFocusEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QFocusEvent.qth index 40a59fc0ff..39e9e5146b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFocusEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFocusEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QFOCUSEVENT ) { - // hb_retptr( ( QFocusEvent* ) new QFocusEvent() ); + // __HB_RETPTRGC__( ( QFocusEvent* ) new QFocusEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFocusFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QFocusFrame.qth index 60501f8115..8007ee94f6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFocusFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFocusFrame.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QFOCUSFRAME ) { - hb_retptr( ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFont.qth b/harbour/contrib/hbqt/qtgui/qth/QFont.qth index e58622063f..6e53ea8c3a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFont.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFont.qth @@ -84,31 +84,31 @@ HB_FUNC( QT_QFONT ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), -1, -1, false ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( hbqt_par_QString( 1 ), -1, -1, false ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), -1, false ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), -1, false ) ); } else if( hb_pcount() == 3 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), false ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), false ) ); } else if( hb_pcount() == 4 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISLOG( 4 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ) ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + __HB_RETPTRGC__( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); } else { - hb_retptr( ( QFont* ) new QFont() ); + __HB_RETPTRGC__( ( QFont* ) new QFont() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontComboBox.qth b/harbour/contrib/hbqt/qtgui/qth/QFontComboBox.qth index 11250fb572..ce01ac448c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontComboBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontComboBox.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QFONTCOMBOBOX ) { - hb_retptr( ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontDatabase.qth b/harbour/contrib/hbqt/qtgui/qth/QFontDatabase.qth index 8e170edf37..37c7ad6e51 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontDatabase.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontDatabase.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QFONTDATABASE ) { - hb_retptr( new QFontDatabase() ); + __HB_RETPTRGC__( new QFontDatabase() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QFontDialog.qth index 52ba27c8fc..9b6b0f1922 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontDialog.qth @@ -71,15 +71,15 @@ HB_FUNC( QT_QFONTDIALOG ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QFontDialog( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QFontDialog( hbqt_par_QWidget( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QFontDialog( *hbqt_par_QFont( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QFontDialog( *hbqt_par_QFont( 1 ), hbqt_par_QWidget( 2 ) ) ); } else { - hb_retptr( new QFontDialog( 0 ) ); + __HB_RETPTRGC__( new QFontDialog( 0 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontInfo.qth b/harbour/contrib/hbqt/qtgui/qth/QFontInfo.qth index ef2235603f..7bf9689b2f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontInfo.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontInfo.qth @@ -72,11 +72,11 @@ HB_FUNC( QT_QFONTINFO ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QFontInfo( *hbqt_par_QFontInfo( 1 ) ) ); + __HB_RETPTRGC__( new QFontInfo( *hbqt_par_QFontInfo( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QFontInfo( *hbqt_par_QFont( 2 ) ) ); + __HB_RETPTRGC__( new QFontInfo( *hbqt_par_QFont( 2 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontMetrics.qth b/harbour/contrib/hbqt/qtgui/qth/QFontMetrics.qth index 6b69adcf66..d92fe8148a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontMetrics.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontMetrics.qth @@ -81,18 +81,18 @@ HB_FUNC( QT_QFONTMETRICS ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QFontMetrics( *hbqt_par_QFontMetrics( 1 ) ) ); + __HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFontMetrics( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( hbqt_par_QString( 1 ) == ( QString ) "QFont" ) { - hb_retptr( new QFontMetrics( *hbqt_par_QFont( 2 ) ) ); + __HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFont( 2 ) ) ); } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + __HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFontMetricsF.qth b/harbour/contrib/hbqt/qtgui/qth/QFontMetricsF.qth index adb36bd740..f916b41082 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFontMetricsF.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFontMetricsF.qth @@ -83,22 +83,22 @@ HB_FUNC( QT_QFONTMETRICSF ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetricsF( 1 ) ) ); + __HB_RETPTRGC__( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetricsF( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( hbqt_par_QString( 1 ) == ( QString ) "QFont" ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 2 ) ) ); + __HB_RETPTRGC__( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 2 ) ) ); } else if( hbqt_par_QString( 1 ) == ( QString ) "QFontMetrics" ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetrics( 2 ) ) ); + __HB_RETPTRGC__( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetrics( 2 ) ) ); } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + __HB_RETPTRGC__( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth index e114705084..07d25bb572 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QFORMLAYOUT ) { - hb_retptr( ( QFormLayout * ) new QFormLayout( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QFormLayout * ) new QFormLayout( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QFrame.qth index 7280b1a6fc..d6fc86ea1d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFrame.qth @@ -69,7 +69,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QFRAME ) { - hb_retptr( new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth index 5a7ef55b1c..76ec26639f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth @@ -75,23 +75,23 @@ HB_FUNC( QT_QGRAPHICSELLIPSEITEM ) { if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QGraphicsEllipseItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsEllipseItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); } else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QRectF ) { - hb_retptr( new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsEllipseItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsEllipseItem() ); + __HB_RETPTRGC__( new QGraphicsEllipseItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsGridLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsGridLayout.qth index d14794c20a..6788b86a0c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsGridLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsGridLayout.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QGRAPHICSGRIDLAYOUT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsGridLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsGridLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsGridLayout() ); + __HB_RETPTRGC__( new QGraphicsGridLayout() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemAnimation.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemAnimation.qth index 381810de15..6e4cc9358c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemAnimation.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemAnimation.qth @@ -75,11 +75,11 @@ HB_FUNC( QT_QGRAPHICSITEMANIMATION ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsItemAnimation( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsItemAnimation( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( new QGraphicsItemAnimation() ); + __HB_RETPTRGC__( new QGraphicsItemAnimation() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemGroup.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemGroup.qth index 870632c1f2..67879f0a59 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemGroup.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsItemGroup.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QGRAPHICSITEMGROUP ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsItemGroup( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsItemGroup( hbqt_par_QGraphicsItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsItemGroup() ); + __HB_RETPTRGC__( new QGraphicsItemGroup() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayout.qth index 8ccd271209..9705419b57 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayout.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QGRAPHICSLAYOUT ) { - // hb_retptr( new QGraphicsLayout() ); + // __HB_RETPTRGC__( new QGraphicsLayout() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayoutItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayoutItem.qth index ac2a56bfba..47d95aa467 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayoutItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLayoutItem.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QGRAPHICSLAYOUTITEM ) { - // hb_retptr( new QGraphicsLayoutItem() ); + // __HB_RETPTRGC__( new QGraphicsLayoutItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth index d878a21121..bdd0ce0938 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth @@ -76,23 +76,23 @@ HB_FUNC( QT_QGRAPHICSLINEITEM ) { if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QGraphicsLineItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsLineItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); } else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QLineF ) { - hb_retptr( new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsLineItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsLineItem() ); + __HB_RETPTRGC__( new QGraphicsLineItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLinearLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLinearLayout.qth index 7466d4e275..6abffa6a0d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsLinearLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsLinearLayout.qth @@ -76,20 +76,20 @@ HB_FUNC( QT_QGRAPHICSLINEARLAYOUT ) { if( HB_ISNUM( 1 ) ) { - hb_retptr( new QGraphicsLinearLayout( ( Qt::Orientation ) hb_parni( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsLayoutItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsLinearLayout( ( Qt::Orientation ) hb_parni( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsLayoutItem( 2 ) : 0 ) ) ); } else if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsLinearLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsLinearLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsLinearLayout() ); + __HB_RETPTRGC__( new QGraphicsLinearLayout() ); } } else { - hb_retptr( new QGraphicsLinearLayout() ); + __HB_RETPTRGC__( new QGraphicsLinearLayout() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth index 67236a1ec2..93801f7cbb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth @@ -77,16 +77,16 @@ HB_FUNC( QT_QGRAPHICSPATHITEM ) HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QPainterPath ) { - hb_retptr( new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsPathItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsPathItem() ); + __HB_RETPTRGC__( new QGraphicsPathItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth index 782a3a73c5..c0aec88f2a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth @@ -77,16 +77,16 @@ HB_FUNC( QT_QGRAPHICSPIXMAPITEM ) HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QPixmap ) { - hb_retptr( new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsPixmapItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsPixmapItem() ); + __HB_RETPTRGC__( new QGraphicsPixmapItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth index d959e3d4c0..c27f80a0a2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth @@ -77,16 +77,16 @@ HB_FUNC( QT_QGRAPHICSPOLYGONITEM ) HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QPolygonF ) { - hb_retptr( new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsPolygonItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsPolygonItem() ); + __HB_RETPTRGC__( new QGraphicsPolygonItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsProxyWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsProxyWidget.qth index ebfc6cbd3e..97d0f30eb1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsProxyWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsProxyWidget.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QGRAPHICSPROXYWIDGET ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsProxyWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsProxyWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsProxyWidget() ); + __HB_RETPTRGC__( new QGraphicsProxyWidget() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth index afebd74019..93d0bf3747 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth @@ -75,23 +75,23 @@ HB_FUNC( QT_QGRAPHICSRECTITEM ) { if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QGraphicsRectItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsRectItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) ); } else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QRectF ) { - hb_retptr( new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsRectItem( hbqt_par_QGraphicsItem( 1 ) ) ); } } else { - hb_retptr( new QGraphicsRectItem() ); + __HB_RETPTRGC__( new QGraphicsRectItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsScene.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsScene.qth index 8f8bd9109e..107ac6328c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsScene.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsScene.qth @@ -75,23 +75,23 @@ HB_FUNC( QT_QGRAPHICSSCENE ) { if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QGraphicsScene( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QObject( 5 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsScene( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QObject( 5 ) : 0 ) ) ); } else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); if( p->type == HBQT_TYPE_QRectF ) { - hb_retptr( new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsScene( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsScene( hbqt_par_QObject( 1 ) ) ); } } else { - hb_retptr( new QGraphicsScene() ); + __HB_RETPTRGC__( new QGraphicsScene() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneContextMenuEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneContextMenuEvent.qth index 9ac7b4cce4..d16ad54434 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneContextMenuEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneContextMenuEvent.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENECONTEXTMENUEVENT ) { - //hb_retptr( new QGraphicsSceneContextMenuEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneContextMenuEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth index 2148847d02..862a1c7aa9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEDRAGDROPEVENT ) { - //hb_retptr( new QGraphicsSceneDragDropEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneDragDropEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneEvent.qth index 0e85eba03d..58c2a80641 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEEVENT ) { - //hb_retptr( new QGraphicsSceneEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHelpEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHelpEvent.qth index 5f814b7a35..a3e86032b2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHelpEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHelpEvent.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEHELPEVENT ) { - //hb_retptr( new QGraphicsSceneHelpEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneHelpEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHoverEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHoverEvent.qth index 8a6d78374f..b9aa4ee16c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHoverEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneHoverEvent.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEHOVEREVENT ) { - //hb_retptr( new QGraphicsSceneHoverEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneHoverEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMouseEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMouseEvent.qth index 8fafad3ac6..b732c23390 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMouseEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMouseEvent.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEMOUSEEVENT ) { - //hb_retptr( new QGraphicsSceneMouseEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneMouseEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMoveEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMoveEvent.qth index f2d542c0c7..15ec0359f2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMoveEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneMoveEvent.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEMOVEEVENT ) { - //hb_retptr( new QGraphicsSceneMoveEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneMoveEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneResizeEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneResizeEvent.qth index 9b3b1e17ef..947461e7ee 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneResizeEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneResizeEvent.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENERESIZEEVENT ) { - //hb_retptr( new QGraphicsSceneResizeEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneResizeEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneWheelEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneWheelEvent.qth index f627c8439e..c3e5a086af 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneWheelEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneWheelEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QGRAPHICSSCENEWHEELEVENT ) { - //hb_retptr( new QGraphicsSceneWheelEvent() ); + //__HB_RETPTRGC__( new QGraphicsSceneWheelEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth index 41bd4490f3..17a3c49a7c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth @@ -77,20 +77,20 @@ HB_FUNC( QT_QGRAPHICSSIMPLETEXTITEM ) { if( HB_ISCHAR( 1 ) ) { - hb_retptr( new QGraphicsSimpleTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsSimpleTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); } else if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsSimpleTextItem() ); + __HB_RETPTRGC__( new QGraphicsSimpleTextItem() ); } } else { - hb_retptr( new QGraphicsSimpleTextItem() ); + __HB_RETPTRGC__( new QGraphicsSimpleTextItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth index 811b58fa02..7d4d1a51a6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth @@ -75,20 +75,20 @@ HB_FUNC( QT_QGRAPHICSSVGITEM ) { if( HB_ISCHAR( 1 ) ) { - hb_retptr( new QGraphicsSvgItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsSvgItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); } else if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsSvgItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsSvgItem( hbqt_par_QGraphicsItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsSvgItem() ); + __HB_RETPTRGC__( new QGraphicsSvgItem() ); } } else { - hb_retptr( new QGraphicsSvgItem() ); + __HB_RETPTRGC__( new QGraphicsSvgItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth index 9681fc70eb..959a6fbc7f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth @@ -79,20 +79,20 @@ HB_FUNC( QT_QGRAPHICSTEXTITEM ) { if( HB_ISCHAR( 1 ) ) { - hb_retptr( new QGraphicsTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) ); } else if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) ); } else { - hb_retptr( new QGraphicsTextItem() ); + __HB_RETPTRGC__( new QGraphicsTextItem() ); } } else { - hb_retptr( new QGraphicsTextItem() ); + __HB_RETPTRGC__( new QGraphicsTextItem() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsView.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsView.qth index bcd3187a26..68056231a7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsView.qth @@ -74,22 +74,22 @@ HB_FUNC( QT_QGRAPHICSVIEW ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QGraphicsView( hbqt_par_QWidget( 1 ) ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QGraphicsScene" == hbqt_par_QString( 1 ) ) { - hb_retptr( new QGraphicsView( hbqt_par_QGraphicsScene( 2 ), ( HB_ISPOINTER( 3 ) ? hbqt_par_QWidget( 3 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsView( hbqt_par_QGraphicsScene( 2 ), ( HB_ISPOINTER( 3 ) ? hbqt_par_QWidget( 3 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsView() ); + __HB_RETPTRGC__( new QGraphicsView() ); } } else { - hb_retptr( new QGraphicsView() ); + __HB_RETPTRGC__( new QGraphicsView() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGraphicsWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QGraphicsWidget.qth index 801d3f13bc..4ce2744bec 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGraphicsWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGraphicsWidget.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QGRAPHICSWIDGET ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QGraphicsWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QGraphicsWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); } else { - hb_retptr( new QGraphicsWidget() ); + __HB_RETPTRGC__( new QGraphicsWidget() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGridLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QGridLayout.qth index f9e7a8684e..8775639a06 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGridLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGridLayout.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QGRIDLAYOUT ) { - hb_retptr( new QGridLayout( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QGridLayout( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QGroupBox.qth b/harbour/contrib/hbqt/qtgui/qth/QGroupBox.qth index d1717e4ba7..ec01ad91a8 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QGroupBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QGroupBox.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QGROUPBOX ) { - hb_retptr( ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QHBoxLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QHBoxLayout.qth index 668cdd11c3..adb0dbcf4f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QHBoxLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QHBoxLayout.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QHBOXLAYOUT ) { - hb_retptr( ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QHeaderView.qth b/harbour/contrib/hbqt/qtgui/qth/QHeaderView.qth index e4b7400c6b..0d839fbc8f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QHeaderView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QHeaderView.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QHEADERVIEW ) { - hb_retptr( new QHeaderView( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QHeaderView( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QHelpEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QHelpEvent.qth index 5044fee730..aeb19278c2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QHelpEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QHelpEvent.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QHELPEVENT ) { - // hb_retptr( new QHelpEvent() ); + // __HB_RETPTRGC__( new QHelpEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QHideEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QHideEvent.qth index adcc1b28cc..a54e5ec256 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QHideEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QHideEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QHIDEEVENT ) { - // hb_retptr( new QHideEvent() ); + // __HB_RETPTRGC__( new QHideEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth index d07a6142a2..a871a4cf77 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth @@ -83,7 +83,7 @@ HB_FUNC( QT_QICON ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QIcon( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( new QIcon( hbqt_par_QString( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { @@ -92,21 +92,21 @@ HB_FUNC( QT_QICON ) { if( q->type == HBQT_TYPE_QIcon ) { - hb_retptr( new QIcon( *hbqt_par_QIcon( 1 ) ) ); + __HB_RETPTRGC__( new QIcon( *hbqt_par_QIcon( 1 ) ) ); } else if( q->type == HBQT_TYPE_QPixmap ) { - hb_retptr( new QIcon( *hbqt_par_QPixmap( 1 ) ) ); + __HB_RETPTRGC__( new QIcon( *hbqt_par_QPixmap( 1 ) ) ); } } else { - hb_retptr( new QIcon( *hbqt_par_QIcon( 1 ) ) ); + __HB_RETPTRGC__( new QIcon( *hbqt_par_QIcon( 1 ) ) ); } } else { - hb_retptr( new QIcon() ); + __HB_RETPTRGC__( new QIcon() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QImage.qth b/harbour/contrib/hbqt/qtgui/qth/QImage.qth index b66c3ec099..1d9bb8a283 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QImage.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QImage.qth @@ -97,35 +97,35 @@ HB_FUNC( QT_QIMAGE ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QImage( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); + __HB_RETPTRGC__( new QImage( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QImage( *hbqt_par_QImage( 1 ) ) ); + __HB_RETPTRGC__( new QImage( *hbqt_par_QImage( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) ) { - hb_retptr( new QImage( hbqt_par_QString( 1 ), ( const char * ) hb_parcx( 2 ) ) ); + __HB_RETPTRGC__( new QImage( hbqt_par_QString( 1 ), ( const char * ) hb_parcx( 2 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QImage( *hbqt_par_QSize( 1 ), ( QImage::Format ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QImage( *hbqt_par_QSize( 1 ), ( QImage::Format ) hb_parni( 2 ) ) ); } else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( new QImage( hb_parni( 1 ), hb_parni( 2 ), ( QImage::Format ) hb_parni( 3 ) ) ); + __HB_RETPTRGC__( new QImage( hb_parni( 1 ), hb_parni( 2 ), ( QImage::Format ) hb_parni( 3 ) ) ); } else if( hb_pcount() == 4 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( QImage::Format ) hb_parni( 4 ) ) ); + __HB_RETPTRGC__( new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( QImage::Format ) hb_parni( 4 ) ) ); } else if( hb_pcount() == 5 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) ) { - hb_retptr( new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( QImage::Format ) hb_parni( 5 ) ) ); + __HB_RETPTRGC__( new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( QImage::Format ) hb_parni( 5 ) ) ); } else { - hb_retptr( new QImage() ); + __HB_RETPTRGC__( new QImage() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QImageReader.qth b/harbour/contrib/hbqt/qtgui/qth/QImageReader.qth index f4ac646438..2567612240 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QImageReader.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QImageReader.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QIMAGEREADER ) { - hb_retptr( ( QImageReader* ) new QImageReader() ); + __HB_RETPTRGC__( ( QImageReader* ) new QImageReader() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QImageWriter.qth b/harbour/contrib/hbqt/qtgui/qth/QImageWriter.qth index 770a24e6f4..a322697e96 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QImageWriter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QImageWriter.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QIMAGEWRITER ) { - hb_retptr( ( QImageWriter* ) new QImageWriter() ); + __HB_RETPTRGC__( ( QImageWriter* ) new QImageWriter() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QInputContext.qth b/harbour/contrib/hbqt/qtgui/qth/QInputContext.qth index ec1d5e9fd0..209bde3aab 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QInputContext.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QInputContext.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QINPUTCONTEXT ) { - // hb_retptr( new QInputContext() ); + // __HB_RETPTRGC__( new QInputContext() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QInputDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QInputDialog.qth index 50a75b442c..45a28a8ab9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QInputDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QInputDialog.qth @@ -69,7 +69,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QINPUTDIALOG ) { - hb_retptr( ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QInputEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QInputEvent.qth index b673ccbbe2..c13a2b69a6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QInputEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QInputEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QINPUTEVENT ) { - hb_retptr( ( QInputEvent* ) new QInputEvent( ( QEvent::Type ) hb_parni( 1 ), ( Qt::KeyboardModifiers ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QInputEvent* ) new QInputEvent( ( QEvent::Type ) hb_parni( 1 ), ( Qt::KeyboardModifiers ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QInputMethodEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QInputMethodEvent.qth index 74d087f8d0..2e2a8b2751 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QInputMethodEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QInputMethodEvent.qth @@ -72,7 +72,7 @@ Destructor = */ HB_FUNC( QT_QINPUTMETHODEVENT ) { - hb_retptr( new QInputMethodEvent() ); + __HB_RETPTRGC__( new QInputMethodEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QIntValidator.qth b/harbour/contrib/hbqt/qtgui/qth/QIntValidator.qth index 067a061f46..d0cb056a62 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QIntValidator.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QIntValidator.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QINTVALIDATOR ) { if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) { - hb_retptr( new QIntValidator( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QObject( 3 ) ) ); + __HB_RETPTRGC__( new QIntValidator( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QObject( 3 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QIntValidator( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QIntValidator( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QItemDelegate.qth b/harbour/contrib/hbqt/qtgui/qth/QItemDelegate.qth index 9ca226bd0d..de0a13a627 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QItemDelegate.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QItemDelegate.qth @@ -79,11 +79,11 @@ HB_FUNC( QT_QITEMDELEGATE ) { if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QItemDelegate( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QItemDelegate( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( new QItemDelegate() ); + __HB_RETPTRGC__( new QItemDelegate() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QItemEditorFactory.qth b/harbour/contrib/hbqt/qtgui/qth/QItemEditorFactory.qth index 7f863ba210..e76cdc980b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QItemEditorFactory.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QItemEditorFactory.qth @@ -80,11 +80,11 @@ HB_FUNC( QT_QITEMEDITORFACTORY ) { if( HB_ISPOINTER( 1 ) ) { - hb_retptr( new QItemEditorFactory() ); + __HB_RETPTRGC__( new QItemEditorFactory() ); } else { - hb_retptr( new QItemEditorFactory( *hbqt_par_QItemEditorFactory( 1 ) ) ); + __HB_RETPTRGC__( new QItemEditorFactory( *hbqt_par_QItemEditorFactory( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QItemSelection.qth b/harbour/contrib/hbqt/qtgui/qth/QItemSelection.qth index b1be5017bd..efa80f4eb7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QItemSelection.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QItemSelection.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QITEMSELECTION ) { - hb_retptr( new QItemSelection() ); + __HB_RETPTRGC__( new QItemSelection() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QItemSelectionModel.qth b/harbour/contrib/hbqt/qtgui/qth/QItemSelectionModel.qth index 2720fcbd4c..e802339011 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QItemSelectionModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QItemSelectionModel.qth @@ -74,7 +74,7 @@ HB_FUNC( QT_QITEMSELECTIONMODEL ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QItemSelectionModel( hbqt_par_QAbstractItemModel( 1 ) ) ); + __HB_RETPTRGC__( new QItemSelectionModel( hbqt_par_QAbstractItemModel( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QKeyEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QKeyEvent.qth index 41f269d872..7670045536 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QKeyEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QKeyEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QKEYEVENT ) { - //hb_retptr( ( QKeyEvent * ) new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) ); + //__HB_RETPTRGC__( ( QKeyEvent * ) new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QKeySequence.qth b/harbour/contrib/hbqt/qtgui/qth/QKeySequence.qth index 2193042da0..5d33ed75bd 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QKeySequence.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QKeySequence.qth @@ -76,13 +76,13 @@ New = HB_FUNC( QT_QKEYSEQUENCE ) { if( HB_ISPOINTER( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( *hbqt_par_QKeySequence( 1 ) ) ); + __HB_RETPTRGC__( ( QKeySequence * ) new QKeySequence( *hbqt_par_QKeySequence( 1 ) ) ); else if( HB_ISCHAR( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( ( QKeySequence * ) new QKeySequence( hbqt_par_QString( 1 ) ) ); else if( HB_ISNUM( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QKeySequence * ) new QKeySequence( hb_parni( 1 ) ) ); else - hb_retptr( ( QKeySequence * ) new QKeySequence() ); + __HB_RETPTRGC__( ( QKeySequence * ) new QKeySequence() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QLCDNumber.qth b/harbour/contrib/hbqt/qtgui/qth/QLCDNumber.qth index 2416edf2cc..9d9f41d821 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLCDNumber.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLCDNumber.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QLCDNUMBER ) { - hb_retptr( ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QLabel.qth b/harbour/contrib/hbqt/qtgui/qth/QLabel.qth index fc7cc186f6..a19e0abd78 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLabel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLabel.qth @@ -71,7 +71,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QLABEL ) { - hb_retptr( new QLabel( hbqt_par_QWidget( 1 ), HB_ISNUM( 2 ) ? ( Qt::WindowFlags ) hb_parni( 2 ) : ( Qt::WindowFlags ) 0 ) ); + __HB_RETPTRGC__( new QLabel( hbqt_par_QWidget( 1 ), HB_ISNUM( 2 ) ? ( Qt::WindowFlags ) hb_parni( 2 ) : ( Qt::WindowFlags ) 0 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QLineEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QLineEdit.qth index 385e5da05e..3179512b77 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLineEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLineEdit.qth @@ -71,7 +71,7 @@ New = pParent */ HB_FUNC( QT_QLINEEDIT ) { - hb_retptr( ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QLinearGradient.qth b/harbour/contrib/hbqt/qtgui/qth/QLinearGradient.qth index 4b35075901..d21d92d896 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLinearGradient.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLinearGradient.qth @@ -81,19 +81,19 @@ HB_FUNC( QT_QLINEARGRADIENT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QLinearGradient( 1 ) ) ); + __HB_RETPTRGC__( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QLinearGradient( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QPointF( 1 ), *hbqt_par_QPointF( 2 ) ) ); + __HB_RETPTRGC__( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QPointF( 1 ), *hbqt_par_QPointF( 2 ) ) ); } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); + __HB_RETPTRGC__( ( QLinearGradient* ) new QLinearGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); } else { - hb_retptr( ( QLinearGradient* ) new QLinearGradient() ); + __HB_RETPTRGC__( ( QLinearGradient* ) new QLinearGradient() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QListView.qth b/harbour/contrib/hbqt/qtgui/qth/QListView.qth index aef7877bd8..9ae4eb53dd 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QListView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QListView.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QLISTVIEW ) { - hb_retptr( ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QListWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QListWidget.qth index 5ebd617135..4a2ce80b50 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QListWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QListWidget.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QLISTWIDGET ) { - hb_retptr( new QListWidget( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); + __HB_RETPTRGC__( new QListWidget( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QListWidgetItem.qth b/harbour/contrib/hbqt/qtgui/qth/QListWidgetItem.qth index 23c7e48a80..2be54dad7a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QListWidgetItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QListWidgetItem.qth @@ -73,7 +73,7 @@ New = pParent */ HB_FUNC( QT_QLISTWIDGETITEM ) { - hb_retptr( new QListWidgetItem( hbqt_par_QListWidget( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QListWidgetItem( hbqt_par_QListWidget( 1 ), hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth index 3833251d4c..ce0e4951fb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth @@ -70,7 +70,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QMAINWINDOW ) { - hb_retptr( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } HB_FUNC( HBQT_QMAINWINDOW_SAVESETTINGS ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QMatrix.qth b/harbour/contrib/hbqt/qtgui/qth/QMatrix.qth index 78ae525b0c..a88851c257 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMatrix.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMatrix.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QMATRIX ) { - hb_retptr( new QMatrix() ); + __HB_RETPTRGC__( new QMatrix() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMdiArea.qth b/harbour/contrib/hbqt/qtgui/qth/QMdiArea.qth index c312731003..4159371f1e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMdiArea.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMdiArea.qth @@ -77,11 +77,11 @@ HB_FUNC( QT_QMDIAREA ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QMdiArea( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QMdiArea( hbqt_par_QWidget( 1 ) ) ); } else { - hb_retptr( new QMdiArea() ); + __HB_RETPTRGC__( new QMdiArea() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMdiSubWindow.qth b/harbour/contrib/hbqt/qtgui/qth/QMdiSubWindow.qth index d65136c45f..a4305c16e9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMdiSubWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMdiSubWindow.qth @@ -77,11 +77,11 @@ HB_FUNC( QT_QMDISUBWINDOW ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QMdiSubWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QMdiSubWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } else { - hb_retptr( new QMdiSubWindow() ); + __HB_RETPTRGC__( new QMdiSubWindow() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth index 2782a80f4e..02f7224117 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth @@ -72,11 +72,11 @@ HB_FUNC( QT_QMENU ) { if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QMenu( hbqt_par_QString( 1 ), HB_ISPOINTER( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ) ); + __HB_RETPTRGC__( new QMenu( hbqt_par_QString( 1 ), HB_ISPOINTER( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ) ); } else { - hb_retptr( new QMenu( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); + __HB_RETPTRGC__( new QMenu( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth b/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth index a55439fdb4..a90ae460f9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QMENUBAR ) { - hb_retptr( new QMenuBar( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); + __HB_RETPTRGC__( new QMenuBar( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMessageBox.qth b/harbour/contrib/hbqt/qtgui/qth/QMessageBox.qth index bef41c54c7..9069f77335 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMessageBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMessageBox.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QMESSAGEBOX ) { - hb_retptr( ( QMessageBox* ) new QMessageBox() ); + __HB_RETPTRGC__( ( QMessageBox* ) new QMessageBox() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMouseEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QMouseEvent.qth index 51913749ae..755a5ae5d5 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMouseEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMouseEvent.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QMOUSEEVENT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) ); + __HB_RETPTRGC__( new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) ); } else if( hb_pcount() == 5 ) { - hb_retptr( new QMouseEvent( ( QEvent::Type ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ), ( Qt::MouseButton ) hb_parni( 3 ), ( Qt::MouseButtons ) hb_parni( 4 ), ( Qt::KeyboardModifiers ) hb_parni( 5 ) ) ); + __HB_RETPTRGC__( new QMouseEvent( ( QEvent::Type ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ), ( Qt::MouseButton ) hb_parni( 3 ), ( Qt::MouseButtons ) hb_parni( 4 ), ( Qt::KeyboardModifiers ) hb_parni( 5 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMoveEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QMoveEvent.qth index 921e4f2fe4..34d33ab264 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMoveEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMoveEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QMOVEEVENT ) { - // hb_retptr( ( QMoveEvent* ) new QMoveEvent() ); + // __HB_RETPTRGC__( ( QMoveEvent* ) new QMoveEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QMovie.qth b/harbour/contrib/hbqt/qtgui/qth/QMovie.qth index 8fad5601b4..bb2551e094 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMovie.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMovie.qth @@ -75,7 +75,7 @@ Destructor = */ HB_FUNC( QT_QMOVIE ) { - hb_retptr( new QMovie() ); + __HB_RETPTRGC__( new QMovie() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPageSetupDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QPageSetupDialog.qth index a09f3e21f0..01bb65f4ba 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPageSetupDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPageSetupDialog.qth @@ -70,9 +70,9 @@ New = pParent HB_FUNC( QT_QPAGESETUPDIALOG ) { if( hb_pcount() >= 2 ) - hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) ); else - hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPaintEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QPaintEvent.qth index a61e98c3dd..c4aef3643f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPaintEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPaintEvent.qth @@ -77,11 +77,11 @@ HB_FUNC( QT_QPAINTEVENT ) if( objName == ( QString ) "QRect" ) { - hb_retptr( new QPaintEvent( *hbqt_par_QRect( 1 ) ) ); + __HB_RETPTRGC__( new QPaintEvent( *hbqt_par_QRect( 1 ) ) ); } else if( objName == ( QString ) "QRegion" ) { - hb_retptr( new QPaintEvent( *hbqt_par_QRegion( 1 ) ) ); + __HB_RETPTRGC__( new QPaintEvent( *hbqt_par_QRegion( 1 ) ) ); } } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth index 06c17d42f3..310b6e0649 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth @@ -71,11 +71,11 @@ HB_FUNC( QT_QPAINTER ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPainter( hbqt_par_QPaintDevice( 1 ) ) ); + __HB_RETPTRGC__( new QPainter( hbqt_par_QPaintDevice( 1 ) ) ); } else { - hb_retptr( new QPainter() ); + __HB_RETPTRGC__( new QPainter() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth index e3001779fc..ddb4a9cbde 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QPAINTERPATH ) { - hb_retptr( new QPainterPath() ); + __HB_RETPTRGC__( new QPainterPath() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPalette.qth b/harbour/contrib/hbqt/qtgui/qth/QPalette.qth index 70e35af758..24577a2779 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPalette.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPalette.qth @@ -91,19 +91,19 @@ HB_FUNC( QT_QPALETTE ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QPalette* ) new QPalette( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QPalette* ) new QPalette( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPalette* ) new QPalette( *hbqt_par_QPalette( 1 ) ) ); + __HB_RETPTRGC__( ( QPalette* ) new QPalette( *hbqt_par_QPalette( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QPalette* ) new QPalette( *hbqt_par_QColor( 1 ), *hbqt_par_QColor( 2 ) ) ); + __HB_RETPTRGC__( ( QPalette* ) new QPalette( *hbqt_par_QColor( 1 ), *hbqt_par_QColor( 2 ) ) ); } else { - hb_retptr( ( QPalette* ) new QPalette() ); + __HB_RETPTRGC__( ( QPalette* ) new QPalette() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPen.qth b/harbour/contrib/hbqt/qtgui/qth/QPen.qth index b50941a934..0df3989f16 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPen.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPen.qth @@ -90,11 +90,11 @@ HB_FUNC( QT_QPEN ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QPen* ) new QPen( ( Qt::PenStyle ) hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QPen* ) new QPen( ( Qt::PenStyle ) hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QPen( 1 ) ) ); + __HB_RETPTRGC__( ( QPen* ) new QPen( *hbqt_par_QPen( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -102,11 +102,11 @@ HB_FUNC( QT_QPEN ) if( objName == ( QString ) "QColor" ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QColor( 2 ) ) ); + __HB_RETPTRGC__( ( QPen* ) new QPen( *hbqt_par_QColor( 2 ) ) ); } else { - hb_retptr( ( QPen* ) new QPen() ); + __HB_RETPTRGC__( ( QPen* ) new QPen() ); } } else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) @@ -115,11 +115,11 @@ HB_FUNC( QT_QPEN ) Qt::PenCapStyle iCap = HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap; Qt::PenJoinStyle iJoin = HB_ISNUM( 5 ) ? ( Qt::PenJoinStyle ) hb_parni( 5 ) : Qt::BevelJoin; - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), iStyle, iCap, iJoin ) ); + __HB_RETPTRGC__( ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), iStyle, iCap, iJoin ) ); } else { - hb_retptr( ( QPen* ) new QPen() ); + __HB_RETPTRGC__( ( QPen* ) new QPen() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPicture.qth b/harbour/contrib/hbqt/qtgui/qth/QPicture.qth index 185652a021..4304c131cb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPicture.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPicture.qth @@ -80,15 +80,15 @@ HB_FUNC( QT_QPICTURE ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( new QPicture( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new QPicture( hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPicture( *hbqt_par_QPicture( 1 ) ) ); + __HB_RETPTRGC__( new QPicture( *hbqt_par_QPicture( 1 ) ) ); } else { - hb_retptr( new QPicture() ); + __HB_RETPTRGC__( new QPicture() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth b/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth index 6328d18192..f4fd7fca92 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth @@ -85,7 +85,7 @@ HB_FUNC( QT_QPIXMAP ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ); + __HB_RETPTRGC__( new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { @@ -94,25 +94,25 @@ HB_FUNC( QT_QPIXMAP ) { if( q->type == HBQT_TYPE_QPixmap ) { - hb_retptr( new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); + __HB_RETPTRGC__( new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); } if( q->type == HBQT_TYPE_QSize ) { - hb_retptr( new QPixmap( *hbqt_par_QSize( 1 ) ) ); + __HB_RETPTRGC__( new QPixmap( *hbqt_par_QSize( 1 ) ) ); } } else { - hb_retptr( new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); + __HB_RETPTRGC__( new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); } } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QPixmap( hb_parni( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QPixmap( hb_parni( 1 ), hb_parni( 2 ) ) ); } else { - hb_retptr( new QPixmap() ); + __HB_RETPTRGC__( new QPixmap() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPlainTextDocumentLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QPlainTextDocumentLayout.qth index df6f04c1d7..1c8aaeba10 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPlainTextDocumentLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPlainTextDocumentLayout.qth @@ -73,7 +73,7 @@ HB_FUNC( QT_QPLAINTEXTDOCUMENTLAYOUT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPlainTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); + __HB_RETPTRGC__( new QPlainTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPlainTextEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QPlainTextEdit.qth index cbc8b5defb..ab928f3f60 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPlainTextEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPlainTextEdit.qth @@ -77,19 +77,19 @@ HB_FUNC( QT_QPLAINTEXTEDIT ) { if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( new QPlainTextEdit() ); + __HB_RETPTRGC__( new QPlainTextEdit() ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPlainTextEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QPlainTextEdit( hbqt_par_QWidget( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QPlainTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QPlainTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); } else { - hb_retptr( new QPlainTextEdit() ); + __HB_RETPTRGC__( new QPlainTextEdit() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPolygon.qth b/harbour/contrib/hbqt/qtgui/qth/QPolygon.qth index d5d0e9a235..5545c67fdc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPolygon.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPolygon.qth @@ -75,7 +75,7 @@ Destructor = */ HB_FUNC( QT_QPOLYGON ) { - hb_retptr( new QPolygon() ); + __HB_RETPTRGC__( new QPolygon() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPolygonF.qth b/harbour/contrib/hbqt/qtgui/qth/QPolygonF.qth index 95936ff933..8305a62386 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPolygonF.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPolygonF.qth @@ -76,7 +76,7 @@ Destructor = */ HB_FUNC( QT_QPOLYGONF ) { - hb_retptr( new QPolygonF() ); + __HB_RETPTRGC__( new QPolygonF() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth index a0710333f7..eba27272ce 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QPRINTDIALOG ) { - hb_retptr( ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPrintPreviewDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QPrintPreviewDialog.qth index 36743ce2f0..0d816b767d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPrintPreviewDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPrintPreviewDialog.qth @@ -71,9 +71,9 @@ New = pParent, nFlags HB_FUNC( QT_QPRINTPREVIEWDIALOG ) { if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - hb_retptr( new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ); + __HB_RETPTRGC__( new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ); else - hb_retptr( new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPrinter.qth b/harbour/contrib/hbqt/qtgui/qth/QPrinter.qth index ae64aa9139..1014e91cdc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPrinter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPrinter.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QPRINTER ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPrinter( *hbqt_par_QPrinterInfo( 1 ), ( QPrinter::PrinterMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QPrinter::ScreenResolution ) ) ); + __HB_RETPTRGC__( new QPrinter( *hbqt_par_QPrinterInfo( 1 ), ( QPrinter::PrinterMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QPrinter::ScreenResolution ) ) ); } else { - hb_retptr( new QPrinter() ); + __HB_RETPTRGC__( new QPrinter() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth b/harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth index 5e49dff60c..8b3ef82718 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth @@ -75,15 +75,15 @@ HB_FUNC( QT_QPRINTERINFO ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QPrinterInfo( *hbqt_par_QPrinterInfo( 1 ) ) ); + __HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinterInfo( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QPrinterInfo( *hbqt_par_QPrinter( 2 ) ) ); + __HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinter( 2 ) ) ); } else { - hb_retptr( new QPrinterInfo() ); + __HB_RETPTRGC__( new QPrinterInfo() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QProgressBar.qth b/harbour/contrib/hbqt/qtgui/qth/QProgressBar.qth index e951a34c00..f5a4c3882d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QProgressBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QProgressBar.qth @@ -68,7 +68,7 @@ New = pParent */ HB_FUNC( QT_QPROGRESSBAR ) { - hb_retptr( ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QProgressDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QProgressDialog.qth index 7d5ec8c3ca..f64c3d39e9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QProgressDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QProgressDialog.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QPROGRESSDIALOG ) { - hb_retptr( new QProgressDialog( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QProgressDialog( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPushButton.qth b/harbour/contrib/hbqt/qtgui/qth/QPushButton.qth index 60ff79cf7a..3f152660b5 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPushButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPushButton.qth @@ -71,7 +71,7 @@ New = pParent */ HB_FUNC( QT_QPUSHBUTTON ) { - hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QRadialGradient.qth b/harbour/contrib/hbqt/qtgui/qth/QRadialGradient.qth index 881b234839..a9faeb1dcc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QRadialGradient.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QRadialGradient.qth @@ -84,23 +84,23 @@ HB_FUNC( QT_QRADIALGRADIENT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QRadialGradient( 1 ) ) ); + __HB_RETPTRGC__( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QRadialGradient( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ) ) ); + __HB_RETPTRGC__( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ) ) ); } else if( hb_pcount() == 3 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ), *hbqt_par_QPointF( 3 ) ) ); + __HB_RETPTRGC__( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ), *hbqt_par_QPointF( 3 ) ) ); } else if( hb_pcount() == 5 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ); + __HB_RETPTRGC__( ( QRadialGradient* ) new QRadialGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ); } else { - hb_retptr( ( QRadialGradient* ) new QRadialGradient() ); + __HB_RETPTRGC__( ( QRadialGradient* ) new QRadialGradient() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QRadioButton.qth b/harbour/contrib/hbqt/qtgui/qth/QRadioButton.qth index fb70346119..7704007a9f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QRadioButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QRadioButton.qth @@ -70,8 +70,8 @@ New = pParent HB_FUNC( QT_QRADIOBUTTON ) { if( HB_ISCHAR( 1 ) ) - hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); else - hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QRegExpValidator.qth b/harbour/contrib/hbqt/qtgui/qth/QRegExpValidator.qth index 29dfb77e09..acff1592d9 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QRegExpValidator.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QRegExpValidator.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QREGEXPVALIDATOR ) { if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( new QRegExpValidator( *hbqt_par_QRegExp( 1 ), hbqt_par_QObject( 2 ) ) ); + __HB_RETPTRGC__( new QRegExpValidator( *hbqt_par_QRegExp( 1 ), hbqt_par_QObject( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QRegExpValidator( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QRegExpValidator( hbqt_par_QObject( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QRegion.qth b/harbour/contrib/hbqt/qtgui/qth/QRegion.qth index a91cbf8b08..32a8d61c94 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QRegion.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QRegion.qth @@ -87,38 +87,38 @@ HB_FUNC( QT_QREGION ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRegion( 1 ) ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( *hbqt_par_QRegion( 1 ) ) ); } else if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QPolygon" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ); } else if( ( QString ) "QBitmap" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QBitmap( 2 ) ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( *hbqt_par_QBitmap( 2 ) ) ); } else if( ( QString ) "QRect" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ); } else { - hb_retptr( ( QRegion* ) new QRegion() ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion() ); } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 1 ), ( QRegion::RegionType ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion( *hbqt_par_QRect( 1 ), ( QRegion::RegionType ) hb_parni( 2 ) ) ); } else { - hb_retptr( ( QRegion* ) new QRegion() ); + __HB_RETPTRGC__( ( QRegion* ) new QRegion() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QResizeEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QResizeEvent.qth index 075d8b1934..4b2d7f96cb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QResizeEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QResizeEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QRESIZEEVENT ) { - // hb_retptr( ( QResizeEvent* ) new QResizeEvent() ); + // __HB_RETPTRGC__( ( QResizeEvent* ) new QResizeEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QScrollArea.qth b/harbour/contrib/hbqt/qtgui/qth/QScrollArea.qth index 69410a2e52..fd8f4272ff 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QScrollArea.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QScrollArea.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QSCROLLAREA ) { - hb_retptr( ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QScrollBar.qth b/harbour/contrib/hbqt/qtgui/qth/QScrollBar.qth index c6c96e465c..2841ddfcb1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QScrollBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QScrollBar.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QSCROLLBAR ) { - hb_retptr( ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSessionManager.qth b/harbour/contrib/hbqt/qtgui/qth/QSessionManager.qth index 7d6a6e9641..45929290de 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSessionManager.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSessionManager.qth @@ -71,7 +71,7 @@ Destructor = no */ HB_FUNC( QT_QSESSIONMANAGER ) { - // hb_retptr( new () ); + // __HB_RETPTRGC__( new () ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QShowEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QShowEvent.qth index 5926b4e506..18a595ede8 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QShowEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QShowEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSHOWEVENT ) { - // hb_retptr( new QShowEvent() ); + // __HB_RETPTRGC__( new QShowEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSizeGrip.qth b/harbour/contrib/hbqt/qtgui/qth/QSizeGrip.qth index d17a1005bf..8e70998c32 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSizeGrip.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSizeGrip.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QSIZEGRIP ) { - hb_retptr( ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSizePolicy.qth b/harbour/contrib/hbqt/qtgui/qth/QSizePolicy.qth index 4c5532a197..55361cb88a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSizePolicy.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSizePolicy.qth @@ -74,15 +74,15 @@ HB_FUNC( QT_QSIZEPOLICY ) { if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QSizePolicy( ( QSizePolicy::Policy ) hb_parni( 1 ), ( QSizePolicy::Policy ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QSizePolicy( ( QSizePolicy::Policy ) hb_parni( 1 ), ( QSizePolicy::Policy ) hb_parni( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QSizePolicy( *hbqt_par_QSizePolicy( 1 ) ) ); + __HB_RETPTRGC__( new QSizePolicy( *hbqt_par_QSizePolicy( 1 ) ) ); } else { - hb_retptr( new QSizePolicy() ); + __HB_RETPTRGC__( new QSizePolicy() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSlider.qth b/harbour/contrib/hbqt/qtgui/qth/QSlider.qth index 1da6185a1f..c508cb8fa0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSlider.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSlider.qth @@ -71,9 +71,9 @@ New = pParent HB_FUNC( QT_QSLIDER ) { if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) - hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); else - hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSound.qth b/harbour/contrib/hbqt/qtgui/qth/QSound.qth index 2af5ca56ef..66d58f4e91 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSound.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSound.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSOUND ) { - hb_retptr( ( QSound* ) new QSound( hbqt_par_QString( 1 ) ) ); + __HB_RETPTRGC__( ( QSound* ) new QSound( hbqt_par_QString( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSpacerItem.qth b/harbour/contrib/hbqt/qtgui/qth/QSpacerItem.qth index 0d4c9d9c90..d9c931ab73 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSpacerItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSpacerItem.qth @@ -73,13 +73,13 @@ HB_FUNC( QT_QSPACERITEM ) { if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QSpacerItem( hb_parni( 1 ), hb_parni( 2 ), + __HB_RETPTRGC__( new QSpacerItem( hb_parni( 1 ), hb_parni( 2 ), HB_ISNUM( 3 ) ? ( QSizePolicy::Policy ) hb_parni( 3 ) : QSizePolicy::Minimum, HB_ISNUM( 4 ) ? ( QSizePolicy::Policy ) hb_parni( 4 ) : QSizePolicy::Minimum ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QSpacerItem( *hbqt_par_QSpacerItem( 1 ) ) ); + __HB_RETPTRGC__( new QSpacerItem( *hbqt_par_QSpacerItem( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSpinBox.qth b/harbour/contrib/hbqt/qtgui/qth/QSpinBox.qth index 40930ff965..bbae0a2cd0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSpinBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSpinBox.qth @@ -68,7 +68,7 @@ New = pParent */ HB_FUNC( QT_QSPINBOX ) { - hb_retptr( ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSplashScreen.qth b/harbour/contrib/hbqt/qtgui/qth/QSplashScreen.qth index 2100a37a56..d8da1762e0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSplashScreen.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSplashScreen.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QSPLASHSCREEN ) { - hb_retptr( new QSplashScreen( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QSplashScreen( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSplitter.qth b/harbour/contrib/hbqt/qtgui/qth/QSplitter.qth index a8822f6f08..ec39f61360 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSplitter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSplitter.qth @@ -71,9 +71,9 @@ New = pParent HB_FUNC( QT_QSPLITTER ) { if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) - hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); else - hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStackedWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QStackedWidget.qth index 1af5cbad77..5758111a26 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStackedWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStackedWidget.qth @@ -78,7 +78,7 @@ New = */ HB_FUNC( QT_QSTACKEDWIDGET ) { - hb_retptr( new QStackedWidget( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QStackedWidget( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStandardItem.qth b/harbour/contrib/hbqt/qtgui/qth/QStandardItem.qth index e9c83b94a4..77b8bd7bdc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStandardItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStandardItem.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QSTANDARDITEM ) { - hb_retptr( ( QStandardItem* ) new QStandardItem() ); + __HB_RETPTRGC__( ( QStandardItem* ) new QStandardItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStandardItemModel.qth b/harbour/contrib/hbqt/qtgui/qth/QStandardItemModel.qth index 53f9ff7705..713293bc7e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStandardItemModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStandardItemModel.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTANDARDITEMMODEL ) { - hb_retptr( ( QStandardItemModel* ) new QStandardItemModel( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QStandardItemModel* ) new QStandardItemModel( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStatusBar.qth b/harbour/contrib/hbqt/qtgui/qth/QStatusBar.qth index 83d12a1eeb..8401f0d454 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStatusBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStatusBar.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSTATUSBAR ) { - hb_retptr( ( QStatusBar* ) new QStatusBar( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QStatusBar* ) new QStatusBar( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStringListModel.qth b/harbour/contrib/hbqt/qtgui/qth/QStringListModel.qth index 2985f8a0fd..7201ed362f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStringListModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStringListModel.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSTRINGLISTMODEL ) { - hb_retptr( ( QStringListModel* ) new QStringListModel() ); + __HB_RETPTRGC__( ( QStringListModel* ) new QStringListModel() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleFactory.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleFactory.qth index 1c6d843fdb..87e78405d7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleFactory.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleFactory.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSTYLEFACTORY ) { - hb_retptr( new QStyleFactory() ); + __HB_RETPTRGC__( new QStyleFactory() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOption.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOption.qth index a9062c5b92..47cdfbe05c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOption.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOption.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTION ) { - hb_retptr( ( QStyleOption* ) new QStyleOption() ); + __HB_RETPTRGC__( ( QStyleOption* ) new QStyleOption() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionButton.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionButton.qth index eae642aa00..ce4a2a2c52 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionButton.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONBUTTON ) { - hb_retptr( ( QStyleOptionButton* ) new QStyleOptionButton() ); + __HB_RETPTRGC__( ( QStyleOptionButton* ) new QStyleOptionButton() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComboBox.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComboBox.qth index 401aeb2945..fb66d9f831 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComboBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComboBox.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX ) { - hb_retptr( ( QStyleOptionComboBox* ) new QStyleOptionComboBox() ); + __HB_RETPTRGC__( ( QStyleOptionComboBox* ) new QStyleOptionComboBox() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComplex.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComplex.qth index 8efc618c63..45bfb8c63d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComplex.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionComplex.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX ) { - hb_retptr( ( QStyleOptionComplex* ) new QStyleOptionComplex() ); + __HB_RETPTRGC__( ( QStyleOptionComplex* ) new QStyleOptionComplex() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionDockWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionDockWidget.qth index 2aacc95807..a17846c209 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionDockWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionDockWidget.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET ) { - hb_retptr( ( QStyleOptionDockWidget* ) new QStyleOptionDockWidget() ); + __HB_RETPTRGC__( ( QStyleOptionDockWidget* ) new QStyleOptionDockWidget() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFocusRect.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFocusRect.qth index e758029a88..c8966670e7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFocusRect.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFocusRect.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT ) { - hb_retptr( ( QStyleOptionFocusRect* ) new QStyleOptionFocusRect() ); + __HB_RETPTRGC__( ( QStyleOptionFocusRect* ) new QStyleOptionFocusRect() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth index b130e4d735..2e0a0f1d26 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionFrame.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONFRAME ) { - hb_retptr( ( QStyleOptionFrame* ) new QStyleOptionFrame() ); + __HB_RETPTRGC__( ( QStyleOptionFrame* ) new QStyleOptionFrame() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGraphicsItem.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGraphicsItem.qth index 503fcc073b..91e798240f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGraphicsItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGraphicsItem.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM ) { - hb_retptr( new QStyleOptionGraphicsItem() ); + __HB_RETPTRGC__( new QStyleOptionGraphicsItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGroupBox.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGroupBox.qth index f64fdc7220..e6f44a531a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGroupBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionGroupBox.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX ) { - hb_retptr( ( QStyleOptionGroupBox* ) new QStyleOptionGroupBox() ); + __HB_RETPTRGC__( ( QStyleOptionGroupBox* ) new QStyleOptionGroupBox() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionHeader.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionHeader.qth index ba4c794312..04d00aea12 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionHeader.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionHeader.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONHEADER ) { - hb_retptr( ( QStyleOptionHeader* ) new QStyleOptionHeader() ); + __HB_RETPTRGC__( ( QStyleOptionHeader* ) new QStyleOptionHeader() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionMenuItem.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionMenuItem.qth index e4f142aa2e..55c00b2922 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionMenuItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionMenuItem.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM ) { - hb_retptr( ( QStyleOptionMenuItem* ) new QStyleOptionMenuItem() ); + __HB_RETPTRGC__( ( QStyleOptionMenuItem* ) new QStyleOptionMenuItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionProgressBar.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionProgressBar.qth index 787cd00a66..31aad458b6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionProgressBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionProgressBar.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR ) { - hb_retptr( ( QStyleOptionProgressBar* ) new QStyleOptionProgressBar() ); + __HB_RETPTRGC__( ( QStyleOptionProgressBar* ) new QStyleOptionProgressBar() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSizeGrip.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSizeGrip.qth index 67e3191223..1c03b51500 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSizeGrip.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSizeGrip.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP ) { - hb_retptr( ( QStyleOptionSizeGrip* ) new QStyleOptionSizeGrip() ); + __HB_RETPTRGC__( ( QStyleOptionSizeGrip* ) new QStyleOptionSizeGrip() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSlider.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSlider.qth index 9643f77efe..3a0eb07958 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSlider.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSlider.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONSLIDER ) { - hb_retptr( ( QStyleOptionSlider* ) new QStyleOptionSlider() ); + __HB_RETPTRGC__( ( QStyleOptionSlider* ) new QStyleOptionSlider() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSpinBox.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSpinBox.qth index 9fd0837057..f3cabd71a3 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSpinBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionSpinBox.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONSPINBOX ) { - hb_retptr( ( QStyleOptionSpinBox* ) new QStyleOptionSpinBox() ); + __HB_RETPTRGC__( ( QStyleOptionSpinBox* ) new QStyleOptionSpinBox() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTab.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTab.qth index 347e7e55e5..5a2fb9f17b 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTab.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTab.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTAB ) { - hb_retptr( ( QStyleOptionTab* ) new QStyleOptionTab() ); + __HB_RETPTRGC__( ( QStyleOptionTab* ) new QStyleOptionTab() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabBarBase.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabBarBase.qth index 639737ab31..e506835eb6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabBarBase.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabBarBase.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE ) { - hb_retptr( ( QStyleOptionTabBarBase* ) new QStyleOptionTabBarBase() ); + __HB_RETPTRGC__( ( QStyleOptionTabBarBase* ) new QStyleOptionTabBarBase() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabWidgetFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabWidgetFrame.qth index d38601d826..d30e735a2c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabWidgetFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTabWidgetFrame.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME ) { - hb_retptr( ( QStyleOptionTabWidgetFrame* ) new QStyleOptionTabWidgetFrame() ); + __HB_RETPTRGC__( ( QStyleOptionTabWidgetFrame* ) new QStyleOptionTabWidgetFrame() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTitleBar.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTitleBar.qth index 929ed9413c..dc5caf99eb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTitleBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionTitleBar.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR ) { - hb_retptr( ( QStyleOptionTitleBar* ) new QStyleOptionTitleBar() ); + __HB_RETPTRGC__( ( QStyleOptionTitleBar* ) new QStyleOptionTitleBar() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBar.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBar.qth index 34836d0afc..c9a4410c26 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBar.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR ) { - hb_retptr( ( QStyleOptionToolBar* ) new QStyleOptionToolBar() ); + __HB_RETPTRGC__( ( QStyleOptionToolBar* ) new QStyleOptionToolBar() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBox.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBox.qth index 95026ae205..b53e3fcbce 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolBox.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX ) { - hb_retptr( ( QStyleOptionToolBox* ) new QStyleOptionToolBox() ); + __HB_RETPTRGC__( ( QStyleOptionToolBox* ) new QStyleOptionToolBox() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolButton.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolButton.qth index 3f7f848cdd..bddcb2787a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionToolButton.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON ) { - hb_retptr( ( QStyleOptionToolButton* ) new QStyleOptionToolButton() ); + __HB_RETPTRGC__( ( QStyleOptionToolButton* ) new QStyleOptionToolButton() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionViewItem.qth b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionViewItem.qth index 8a48c5a61d..d71d557b57 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyleOptionViewItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyleOptionViewItem.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM ) { - hb_retptr( ( QStyleOptionViewItem* ) new QStyleOptionViewItem() ); + __HB_RETPTRGC__( ( QStyleOptionViewItem* ) new QStyleOptionViewItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStylePainter.qth b/harbour/contrib/hbqt/qtgui/qth/QStylePainter.qth index 7920a2ca31..5b142c7769 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStylePainter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStylePainter.qth @@ -72,7 +72,7 @@ New = */ HB_FUNC( QT_QSTYLEPAINTER ) { - hb_retptr( ( QStylePainter* ) new QStylePainter() ); + __HB_RETPTRGC__( ( QStylePainter* ) new QStylePainter() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QStyledItemDelegate.qth b/harbour/contrib/hbqt/qtgui/qth/QStyledItemDelegate.qth index 46fbf83b82..5420c8bc8e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QStyledItemDelegate.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QStyledItemDelegate.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QSTYLEDITEMDELEGATE ) { - hb_retptr( ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QSystemTrayIcon.qth b/harbour/contrib/hbqt/qtgui/qth/QSystemTrayIcon.qth index 0ea5ee20bb..8adcdcfede 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSystemTrayIcon.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSystemTrayIcon.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QSYSTEMTRAYICON ) { - hb_retptr( ( QSystemTrayIcon* ) new QSystemTrayIcon( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QSystemTrayIcon* ) new QSystemTrayIcon( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTabBar.qth b/harbour/contrib/hbqt/qtgui/qth/QTabBar.qth index 736123c331..5f227d7878 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTabBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTabBar.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QTABBAR ) { - hb_retptr( ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTabWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QTabWidget.qth index b09fdf33ce..c6ac5af9a2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTabWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTabWidget.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTABWIDGET ) { - hb_retptr( ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTableView.qth b/harbour/contrib/hbqt/qtgui/qth/QTableView.qth index 1ead1325e0..4a3a5e6deb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTableView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTableView.qth @@ -71,7 +71,7 @@ New = pParent */ HB_FUNC( QT_QTABLEVIEW ) { - hb_retptr( ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth index c745edf0ff..fdb84cc8fc 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth @@ -71,9 +71,9 @@ New = pParent HB_FUNC( QT_QTABLEWIDGET ) { if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) - hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) ); + __HB_RETPTRGC__( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) ); else - hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTableWidgetItem.qth b/harbour/contrib/hbqt/qtgui/qth/QTableWidgetItem.qth index bf7661a45e..b1ad0d351e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTableWidgetItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTableWidgetItem.qth @@ -74,19 +74,19 @@ HB_FUNC( QT_QTABLEWIDGETITEM ) { if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ); } else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( new QTableWidgetItem( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( new QTableWidgetItem( hb_parni( 1 ) ) ); } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QTableWidgetItem( *hbqt_par_QTableWidgetItem( 1 ) ) ); + __HB_RETPTRGC__( new QTableWidgetItem( *hbqt_par_QTableWidgetItem( 1 ) ) ); } else { - hb_retptr( new QTableWidgetItem( 0 ) ); + __HB_RETPTRGC__( new QTableWidgetItem( 0 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTableWidgetSelectionRange.qth b/harbour/contrib/hbqt/qtgui/qth/QTableWidgetSelectionRange.qth index 848bb1c0fd..af58bc9fcd 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTableWidgetSelectionRange.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTableWidgetSelectionRange.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QTABLEWIDGETSELECTIONRANGE ) { - hb_retptr( new QTableWidgetSelectionRange() ); + __HB_RETPTRGC__( new QTableWidgetSelectionRange() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth b/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth index 2c32ae23e2..4bc4fd21c7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QTEXTBLOCK ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QTextBlock( *hbqt_par_QTextBlock( 1 ) ) ); + __HB_RETPTRGC__( new QTextBlock( *hbqt_par_QTextBlock( 1 ) ) ); } else { - hb_retptr( new QTextBlock() ); + __HB_RETPTRGC__( new QTextBlock() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextBlockFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextBlockFormat.qth index 97461d37dd..352be032f1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextBlockFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextBlockFormat.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QTEXTBLOCKFORMAT ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QTextBlockFormat* ) new QTextBlockFormat( *hbqt_par_QTextBlockFormat( 1 ) ) ); + __HB_RETPTRGC__( ( QTextBlockFormat* ) new QTextBlockFormat( *hbqt_par_QTextBlockFormat( 1 ) ) ); } else { - hb_retptr( ( QTextBlockFormat* ) new QTextBlockFormat() ); + __HB_RETPTRGC__( ( QTextBlockFormat* ) new QTextBlockFormat() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextBlockGroup.qth b/harbour/contrib/hbqt/qtgui/qth/QTextBlockGroup.qth index 7951ce17f3..3c7cf92ebe 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextBlockGroup.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextBlockGroup.qth @@ -70,7 +70,7 @@ Destructor = no */ HB_FUNC( QT_QTEXTBLOCKGROUP ) { - //hb_retptr( ( QTextBlockGroup* ) new QTextBlockGroup( hbqt_par_QTextDocument( 1 ) ) ); + //__HB_RETPTRGC__( ( QTextBlockGroup* ) new QTextBlockGroup( hbqt_par_QTextDocument( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextBrowser.qth b/harbour/contrib/hbqt/qtgui/qth/QTextBrowser.qth index 64280dbae3..2c587f41a5 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextBrowser.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextBrowser.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTEXTBROWSER ) { - hb_retptr( ( QTextBrowser* ) new QTextBrowser( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTextBrowser* ) new QTextBrowser( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextCharFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextCharFormat.qth index 6c1114576b..9417df0ab1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextCharFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextCharFormat.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTCHARFORMAT ) { - hb_retptr( ( QTextCharFormat* ) new QTextCharFormat() ); + __HB_RETPTRGC__( ( QTextCharFormat* ) new QTextCharFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextCursor.qth b/harbour/contrib/hbqt/qtgui/qth/QTextCursor.qth index 97624c40a4..1db7c02f86 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextCursor.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextCursor.qth @@ -87,7 +87,7 @@ HB_FUNC( QT_QTEXTCURSOR ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextCursor( 1 ) ) ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextCursor( 1 ) ) ); } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -95,24 +95,24 @@ HB_FUNC( QT_QTEXTCURSOR ) if( object == ( QString ) "QTextDocument" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextDocument( 2 ) ) ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextDocument( 2 ) ) ); } if( object == ( QString ) "QTextBlock" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextBlock( 2 ) ) ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextBlock( 2 ) ) ); } if( object == ( QString ) "QTextFrame" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextFrame( 2 ) ) ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextFrame( 2 ) ) ); } else { - hb_retptr( ( QTextCursor* ) new QTextCursor() ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor() ); } } else { - hb_retptr( ( QTextCursor* ) new QTextCursor() ); + __HB_RETPTRGC__( ( QTextCursor* ) new QTextCursor() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextDocument.qth b/harbour/contrib/hbqt/qtgui/qth/QTextDocument.qth index ba2ecfa731..f5afb48846 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextDocument.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextDocument.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QTEXTDOCUMENT ) { - hb_retptr( ( QTextDocument* ) new QTextDocument( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QTextDocument* ) new QTextDocument( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextDocumentFragment.qth b/harbour/contrib/hbqt/qtgui/qth/QTextDocumentFragment.qth index ce6ecc09c3..f4984ea6a1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextDocumentFragment.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextDocumentFragment.qth @@ -74,7 +74,7 @@ New = */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT ) { - hb_retptr( ( QTextDocumentFragment* ) new QTextDocumentFragment() ); + __HB_RETPTRGC__( ( QTextDocumentFragment* ) new QTextDocumentFragment() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextDocumentWriter.qth b/harbour/contrib/hbqt/qtgui/qth/QTextDocumentWriter.qth index 9ee6b2127f..0480a7e6d6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextDocumentWriter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextDocumentWriter.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QTEXTDOCUMENTWRITER ) { - hb_retptr( ( QTextDocumentWriter* ) new QTextDocumentWriter() ); + __HB_RETPTRGC__( ( QTextDocumentWriter* ) new QTextDocumentWriter() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QTextEdit.qth index 5685abdc6e..9735e8a531 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextEdit.qth @@ -70,9 +70,9 @@ New = pParent HB_FUNC( QT_QTEXTEDIT ) { if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) - hb_retptr( new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); else - hb_retptr( new QTextEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QTextEdit( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextFormat.qth index 8ab5d2fba4..e8b783f8db 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextFormat.qth @@ -73,7 +73,7 @@ New = pParent */ HB_FUNC( QT_QTEXTFORMAT ) { - hb_retptr( ( QTextFormat* ) new QTextFormat() ); + __HB_RETPTRGC__( ( QTextFormat* ) new QTextFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextFragment.qth b/harbour/contrib/hbqt/qtgui/qth/QTextFragment.qth index 11df252087..cc5816d0dd 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextFragment.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextFragment.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTFRAGMENT ) { - hb_retptr( ( QTextFragment* ) new QTextFragment() ); + __HB_RETPTRGC__( ( QTextFragment* ) new QTextFragment() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextFrame.qth b/harbour/contrib/hbqt/qtgui/qth/QTextFrame.qth index 0b515e7566..bfcaaaa4d4 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextFrame.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextFrame.qth @@ -71,7 +71,7 @@ New = pDocument */ HB_FUNC( QT_QTEXTFRAME ) { - hb_retptr( ( QTextFrame* ) new QTextFrame( hbqt_par_QTextDocument( 1 ) ) ); + __HB_RETPTRGC__( ( QTextFrame* ) new QTextFrame( hbqt_par_QTextDocument( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextFrameFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextFrameFormat.qth index 1332b60bd8..ae781e963c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextFrameFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextFrameFormat.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QTEXTFRAMEFORMAT ) { - hb_retptr( ( QTextFrameFormat* ) new QTextFrameFormat() ); + __HB_RETPTRGC__( ( QTextFrameFormat* ) new QTextFrameFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextImageFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextImageFormat.qth index e4a706c64a..66acfaf179 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextImageFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextImageFormat.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTIMAGEFORMAT ) { - hb_retptr( ( QTextImageFormat* ) new QTextImageFormat() ); + __HB_RETPTRGC__( ( QTextImageFormat* ) new QTextImageFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextInlineObject.qth b/harbour/contrib/hbqt/qtgui/qth/QTextInlineObject.qth index 55aa365d33..d9f28d6319 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextInlineObject.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextInlineObject.qth @@ -71,7 +71,7 @@ New = iInt, pEngine */ HB_FUNC( QT_QTEXTINLINEOBJECT ) { - // hb_retptr( new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); + // __HB_RETPTRGC__( new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextItem.qth b/harbour/contrib/hbqt/qtgui/qth/QTextItem.qth index 170d31a941..e62e8d783a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextItem.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTITEM ) { - hb_retptr( ( QTextItem* ) new QTextItem() ); + __HB_RETPTRGC__( ( QTextItem* ) new QTextItem() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QTextLayout.qth index ebda7ef8b7..667d15d9f0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextLayout.qth @@ -73,7 +73,7 @@ New = */ HB_FUNC( QT_QTEXTLAYOUT ) { - hb_retptr( ( QTextLayout* ) new QTextLayout() ); + __HB_RETPTRGC__( ( QTextLayout* ) new QTextLayout() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextLength.qth b/harbour/contrib/hbqt/qtgui/qth/QTextLength.qth index 382a0c1535..1290f07398 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextLength.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextLength.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QTEXTLENGTH ) { - hb_retptr( ( QTextLength* ) new QTextLength() ); + __HB_RETPTRGC__( ( QTextLength* ) new QTextLength() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextLine.qth b/harbour/contrib/hbqt/qtgui/qth/QTextLine.qth index dbc6e9de3e..d1a2d86199 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextLine.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextLine.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QTEXTLINE ) { - hb_retptr( ( QTextLine* ) new QTextLine() ); + __HB_RETPTRGC__( ( QTextLine* ) new QTextLine() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextListFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextListFormat.qth index 3d4e8be7a8..51659b336a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextListFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextListFormat.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QTEXTLISTFORMAT ) { - hb_retptr( new QTextListFormat() ); + __HB_RETPTRGC__( new QTextListFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextOption.qth b/harbour/contrib/hbqt/qtgui/qth/QTextOption.qth index a40a2e615b..3025342e73 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextOption.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextOption.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QTEXTOPTION ) { - hb_retptr( new QTextOption() ); + __HB_RETPTRGC__( new QTextOption() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextTableFormat.qth b/harbour/contrib/hbqt/qtgui/qth/QTextTableFormat.qth index d36d399164..575062444e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextTableFormat.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextTableFormat.qth @@ -70,7 +70,7 @@ Destructor = */ HB_FUNC( QT_QTEXTTABLEFORMAT ) { - hb_retptr( new QTextTableFormat() ); + __HB_RETPTRGC__( new QTextTableFormat() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth b/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth index ea2bce7695..77c43032bf 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTimeEdit.qth @@ -69,9 +69,9 @@ New = pParent */ HB_FUNC( QT_QTIMEEDIT ) { - hb_retptr( ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) ); #if 0 - hb_retptr( (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) ); #endif } diff --git a/harbour/contrib/hbqt/qtgui/qth/QToolBar.qth b/harbour/contrib/hbqt/qtgui/qth/QToolBar.qth index 1395ead4fa..ab443d1e8f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QToolBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QToolBar.qth @@ -71,9 +71,9 @@ New = pParent HB_FUNC( QT_QTOOLBAR ) { if( hb_param( 1, HB_IT_STRING ) ) - hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); else - hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QToolBox.qth b/harbour/contrib/hbqt/qtgui/qth/QToolBox.qth index 8571fcc9a5..a9cc227fcb 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QToolBox.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QToolBox.qth @@ -69,7 +69,7 @@ New = pParent, nFlags */ HB_FUNC( QT_QTOOLBOX ) { - hb_retptr( ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QToolButton.qth b/harbour/contrib/hbqt/qtgui/qth/QToolButton.qth index 1143769b8b..5bcf883071 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QToolButton.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QToolButton.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTOOLBUTTON ) { - hb_retptr( ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTransform.qth b/harbour/contrib/hbqt/qtgui/qth/QTransform.qth index 3adeb482e3..2f8dedf505 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTransform.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTransform.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QTRANSFORM ) { - hb_retptr( new QTransform() ); + __HB_RETPTRGC__( new QTransform() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTreeView.qth b/harbour/contrib/hbqt/qtgui/qth/QTreeView.qth index c4bc68d94c..4c700ca4a1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTreeView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTreeView.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTREEVIEW ) { - hb_retptr( ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth index a600b59fe6..562c63bb9e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QTREEWIDGET ) { - hb_retptr( ( QTreeWidget* ) new QTreeWidget( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QTreeWidget* ) new QTreeWidget( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QTreeWidgetItem.qth b/harbour/contrib/hbqt/qtgui/qth/QTreeWidgetItem.qth index c986ce204d..de54c97be3 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTreeWidgetItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTreeWidgetItem.qth @@ -79,11 +79,11 @@ HB_FUNC( QT_QTREEWIDGETITEM ) { if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QTreeWidgetItem* ) new QTreeWidgetItem( hb_parni( 1 ) ) ); + __HB_RETPTRGC__( ( QTreeWidgetItem* ) new QTreeWidgetItem( hb_parni( 1 ) ) ); } else { - hb_retptr( ( QTreeWidgetItem* ) new QTreeWidgetItem( hbqt_par_QTreeWidget( 1 ), hb_parni( 2 ) ) ); + __HB_RETPTRGC__( ( QTreeWidgetItem* ) new QTreeWidgetItem( hbqt_par_QTreeWidget( 1 ), hb_parni( 2 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QUiLoader.qth b/harbour/contrib/hbqt/qtgui/qth/QUiLoader.qth index d050ceca12..ffacaabfa0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QUiLoader.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QUiLoader.qth @@ -73,11 +73,11 @@ HB_FUNC( QT_QUILOADER ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QUiLoader( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QUiLoader( hbqt_par_QObject( 1 ) ) ); } else { - hb_retptr( new QUiLoader() ); + __HB_RETPTRGC__( new QUiLoader() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QVBoxLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QVBoxLayout.qth index d106b4dc1e..b5d29694ab 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QVBoxLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QVBoxLayout.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QVBOXLAYOUT ) { - hb_retptr( ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QValidator.qth b/harbour/contrib/hbqt/qtgui/qth/QValidator.qth index 891c47a18b..c8d8fbcf76 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QValidator.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QValidator.qth @@ -71,7 +71,7 @@ Destructor = */ HB_FUNC( QT_QVALIDATOR ) { - // hb_retptr( new QValidator() ); + // __HB_RETPTRGC__( new QValidator() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWheelEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QWheelEvent.qth index 781e9e81eb..d42eb92a9e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWheelEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWheelEvent.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QWHEELEVENT ) { - // hb_retptr( ( QWheelEvent* ) new QWheelEvent() ); + // __HB_RETPTRGC__( ( QWheelEvent* ) new QWheelEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth index b35942d65c..3951f87cd1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth @@ -74,11 +74,11 @@ HB_FUNC( QT_QWIDGET ) { if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); + __HB_RETPTRGC__( new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) ); } else { - hb_retptr( new QWidget() ); + __HB_RETPTRGC__( new QWidget() ); } } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidgetAction.qth b/harbour/contrib/hbqt/qtgui/qth/QWidgetAction.qth index 43713738a5..a580438240 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidgetAction.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidgetAction.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QWIDGETACTION ) { - hb_retptr( ( QWidgetAction* ) new QWidgetAction( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( ( QWidgetAction* ) new QWidgetAction( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidgetItem.qth b/harbour/contrib/hbqt/qtgui/qth/QWidgetItem.qth index a6266bac83..fa99c091e3 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidgetItem.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidgetItem.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QWIDGETITEM ) { - hb_retptr( ( QWidgetItem* ) new QWidgetItem( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( ( QWidgetItem* ) new QWidgetItem( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWindowStateChangeEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QWindowStateChangeEvent.qth index f5426e42d6..500c6aea9f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWindowStateChangeEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWindowStateChangeEvent.qth @@ -70,7 +70,7 @@ New = */ HB_FUNC( QT_QWINDOWSTATECHANGEEVENT ) { - // hb_retptr( ( QWindowStateChangeEvent* ) new QWindowStateChangeEvent() ); + // __HB_RETPTRGC__( ( QWindowStateChangeEvent* ) new QWindowStateChangeEvent() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWindowsStyle.qth b/harbour/contrib/hbqt/qtgui/qth/QWindowsStyle.qth index 7d0e17f804..f7271fbfe2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWindowsStyle.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWindowsStyle.qth @@ -71,7 +71,7 @@ New = */ HB_FUNC( QT_QWINDOWSSTYLE ) { - hb_retptr( ( QWindowsStyle* ) new QWindowsStyle() ); + __HB_RETPTRGC__( ( QWindowsStyle* ) new QWindowsStyle() ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWizard.qth b/harbour/contrib/hbqt/qtgui/qth/QWizard.qth index 45e8659eac..6a2a2c62b1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWizard.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWizard.qth @@ -70,7 +70,7 @@ New = pParent */ HB_FUNC( QT_QWIZARD ) { - hb_retptr( new QWizard( hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QWizard( hbqt_par_QWidget( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QWizardPage.qth b/harbour/contrib/hbqt/qtgui/qth/QWizardPage.qth index cad7412310..b786445ac6 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWizardPage.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWizardPage.qth @@ -70,7 +70,7 @@ Destructor = */ HB_FUNC( QT_QWIZARDPAGE ) { - hb_retptr( new QWizardPage() ); + __HB_RETPTRGC__( new QWizardPage() ); } diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QFtp.qth b/harbour/contrib/hbqt/qtnetwork/qth/QFtp.qth index 47e8b3284e..a5213699ec 100644 --- a/harbour/contrib/hbqt/qtnetwork/qth/QFtp.qth +++ b/harbour/contrib/hbqt/qtnetwork/qth/QFtp.qth @@ -72,7 +72,7 @@ New = pParent */ HB_FUNC( QT_QFTP ) { - hb_retptr( new QFtp( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QFtp( hbqt_par_QObject( 1 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QHttp.qth b/harbour/contrib/hbqt/qtnetwork/qth/QHttp.qth index 5d7114f3b9..1afcc5183f 100644 --- a/harbour/contrib/hbqt/qtnetwork/qth/QHttp.qth +++ b/harbour/contrib/hbqt/qtnetwork/qth/QHttp.qth @@ -74,7 +74,7 @@ New = pParent */ HB_FUNC( QT_QHTTP ) { - hb_retptr( new QHttp( hbqt_par_QObject( 1 ) ) ); + __HB_RETPTRGC__( new QHttp( hbqt_par_QObject( 1 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QHttpRequestHeader.qth b/harbour/contrib/hbqt/qtnetwork/qth/QHttpRequestHeader.qth index 0472cfe099..541dc614fa 100644 --- a/harbour/contrib/hbqt/qtnetwork/qth/QHttpRequestHeader.qth +++ b/harbour/contrib/hbqt/qtnetwork/qth/QHttpRequestHeader.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QHTTPREQUESTHEADER ) { - hb_retptr( new QHttpRequestHeader() ); + __HB_RETPTRGC__( new QHttpRequestHeader() ); } diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QHttpResponseHeader.qth b/harbour/contrib/hbqt/qtnetwork/qth/QHttpResponseHeader.qth index f778558233..70995b8aa7 100644 --- a/harbour/contrib/hbqt/qtnetwork/qth/QHttpResponseHeader.qth +++ b/harbour/contrib/hbqt/qtnetwork/qth/QHttpResponseHeader.qth @@ -73,7 +73,7 @@ Destructor = */ HB_FUNC( QT_QHTTPRESPONSEHEADER ) { - hb_retptr( new QHttpResponseHeader() ); + __HB_RETPTRGC__( new QHttpResponseHeader() ); } diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QNetworkRequest.qth b/harbour/contrib/hbqt/qtnetwork/qth/QNetworkRequest.qth index 8a90cf7a3f..6d2b83d13b 100644 --- a/harbour/contrib/hbqt/qtnetwork/qth/QNetworkRequest.qth +++ b/harbour/contrib/hbqt/qtnetwork/qth/QNetworkRequest.qth @@ -72,7 +72,7 @@ Destructor = */ HB_FUNC( QT_QNETWORKREQUEST ) { - hb_retptr( new QNetworkRequest() ); + __HB_RETPTRGC__( new QNetworkRequest() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index 4a387b39dd..d7506b91bd 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -162,7 +162,7 @@ void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ) HB_FUNC( QT_QWEBFRAME ) { - // hb_retptr( ( QWebFrame* ) new QWebFrame() ); + // __HB_RETPTRGC__( ( QWebFrame* ) new QWebFrame() ); } /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp index a010ef9b60..a1b5926eaa 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp @@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ) HB_FUNC( QT_QWEBHISTORY ) { - //hb_retptr( ( * ) new () ); + //__HB_RETPTRGC__( ( * ) new () ); } /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp index 2407414c9b..f6065b045c 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp @@ -154,7 +154,7 @@ void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ) HB_FUNC( QT_QWEBHISTORYINTERFACE ) { - //hb_retptr( ( QWebHistoryInterface* ) new QWebHistoryInterface( hbqt_par_QObject( 1 ) ) ); + //__HB_RETPTRGC__( ( QWebHistoryInterface* ) new QWebHistoryInterface( hbqt_par_QObject( 1 ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp index 2c65bf8f82..7e5154d268 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp @@ -166,7 +166,7 @@ void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ) HB_FUNC( QT_QWEBPLUGINFACTORY ) { - //hb_retptr( ( QWebPluginFactory* ) new QWebPluginFactory() ); + //__HB_RETPTRGC__( ( QWebPluginFactory* ) new QWebPluginFactory() ); } /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp index 8f87ee8820..98f3706346 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp @@ -163,7 +163,7 @@ void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ) HB_FUNC( QT_QWEBSETTINGS ) { - //hb_retptr( ( QWebSettings* ) new QWebSettings() ); + //__HB_RETPTRGC__( ( QWebSettings* ) new QWebSettings() ); } /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth index 3aec71e81a..a9d9417355 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth @@ -73,7 +73,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBFRAME ) { - // hb_retptr( ( QWebFrame* ) new QWebFrame() ); + // __HB_RETPTRGC__( ( QWebFrame* ) new QWebFrame() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth index f19c8a4e75..50991cfb22 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth @@ -72,7 +72,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBHISTORY ) { - //hb_retptr( ( * ) new () ); + //__HB_RETPTRGC__( ( * ) new () ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth index b017f913d0..7c4b80ef80 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth @@ -71,7 +71,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBHISTORYINTERFACE ) { - //hb_retptr( ( QWebHistoryInterface* ) new QWebHistoryInterface( hbqt_par_QObject( 1 ) ) ); + //__HB_RETPTRGC__( ( QWebHistoryInterface* ) new QWebHistoryInterface( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth index 93af993938..872c8d5e89 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth @@ -77,7 +77,7 @@ HB_FUNC( QT_QWEBHISTORYITEM ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QWebHistoryItem( *hbqt_par_QWebHistoryItem( 1 ) ) ); + __HB_RETPTRGC__( new QWebHistoryItem( *hbqt_par_QWebHistoryItem( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth index de506b6516..330e80f903 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth @@ -75,7 +75,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBHITTESTRESULT ) { - hb_retptr( ( QWebHitTestResult* ) new QWebHitTestResult() ); + __HB_RETPTRGC__( ( QWebHitTestResult* ) new QWebHitTestResult() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth index 47800cdd98..3325f29faf 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth @@ -73,7 +73,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBPAGE ) { - hb_retptr( new QWebPage( hbqt_par_QWidget( 2 ) ) ); + __HB_RETPTRGC__( new QWebPage( hbqt_par_QWidget( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth index 82a5363cf7..6bc1301d1d 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth @@ -73,7 +73,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBPLUGINFACTORY ) { - //hb_retptr( ( QWebPluginFactory* ) new QWebPluginFactory() ); + //__HB_RETPTRGC__( ( QWebPluginFactory* ) new QWebPluginFactory() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth index 4b4ad3879e..ead09afaa3 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth @@ -74,7 +74,7 @@ HB_FUNC( QT_QWEBSECURITYORIGIN ) { if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( new QWebSecurityOrigin( *hbqt_par_QWebSecurityOrigin( 1 ) ) ); + __HB_RETPTRGC__( new QWebSecurityOrigin( *hbqt_par_QWebSecurityOrigin( 1 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth index cf81bf323a..3da71c3855 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth @@ -75,7 +75,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBSETTINGS ) { - //hb_retptr( ( QWebSettings* ) new QWebSettings() ); + //__HB_RETPTRGC__( ( QWebSettings* ) new QWebSettings() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index 20a2c341db..fd67e04414 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -73,7 +73,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBVIEW ) { - hb_retptr( new QWebView( hbqt_par_QWidget( 1 ) ) ); + __HB_RETPTRGC__( new QWebView( hbqt_par_QWidget( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index 885a376c2b..78b4fb34a6 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -610,8 +610,8 @@ METHOD HbQtSource:new( oGen, cFileQth, cPathOut, cPathDoc, cProject ) ::areMethodsClubbed := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "clubmethods" .AND. lower( e_[ 2 ] ) == "no" } ) == 0 /* Determine Constructor - but this is hacky a bit. What could be easiest ? */ FOR i := 3 TO len( ::new_ ) - 1 - IF left( ltrim( ::new_[ i ] ), 2 ) != "//" - IF "hb_retptr(" $ ::new_[ i ] + IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" ) + IF "__HB_RETPTRGC__(" $ ::new_[ i ] ::isConstructor := .t. EXIT ENDIF @@ -860,10 +860,10 @@ METHOD HbQtSource:build() endif aadd( ::cpp_, " " ) FOR i := 3 TO len( ::new_ ) - 1 - IF left( ltrim( ::new_[ i ] ), 2 ) != "//" - IF "hb_retptr(" $ ::new_[ i ] + IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" ) + IF "__HB_RETPTRGC__(" $ ::new_[ i ] s := ::new_[ i ] - s := trim( strtran( s, "hb_retptr(", "pObj =" ) ) + s := trim( strtran( s, "__HB_RETPTRGC__(", "pObj =" ) ) s := strtran( s, ");", ";" ) s := strtran( s, "( "+ ::cWidget + "* )", "" ) aadd( ::cpp_, s ) @@ -1681,16 +1681,20 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) oArg:cTypeHB := "N" CASE oArg:cCast == "uchar" .and. oArg:lFar .and. !( oArg:lConst ) + /* TOFIX: Such code is not valid and should never be generated (const->non-const) [vszakats] */ + /* TOFIX: uchar is needed by QT, char is passed [vszakats] */ oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" oArg:cDoc := "c" + oMtd:cDocNM oArg:cTypeHB := "C" CASE oArg:cCast == "uchar" .and. !( oArg:lFar ) .and. !( oArg:lConst ) + /* TOFIX: uchar is needed by QT, char is passed [vszakats] */ oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )" oArg:cDoc := "n" + oMtd:cDocNM oArg:cTypeHB := "N" CASE oArg:cCast == "char" .and. oArg:lFar .and. !( oArg:lConst ) + /* TOFIX: Such code is not valid and should never be generated (const->non-const) [vszakats] */ oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" oArg:cDoc := "c" + oMtd:cDocNM oArg:cTypeHB := "C" @@ -1854,6 +1858,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) ENDCASE CASE oRet:cCast == "T" + /* TOFIX: Such code is not valid and should never be generated [vszakats] */ oMtd:cCmd := "hb_retptr( " + oMtd:cCmn + " )" oMtd:cPrgRet := "p" + oMtd:cDocNMRet @@ -1909,6 +1914,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) IF ( isAqtObject( oRet:cCast ) ) oMtd:cCmd := Get_Command( oRet:cCast, oMtd:cCmn, .F. ) ELSE + /* TOFIX: Such code is not valid and should never be generated [vszakats] */ oMtd:cCmd := "hb_retptr( ( " + oRet:cCast + "* ) " + oMtd:cCmn + " )" ENDIF oMtd:cPrgRet := "o" + oMtd:cDocNMRet