From 0536e7526e550b64cf2d4e12b8ce8f03749898b4 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 7 Jun 2012 23:57:53 +0000 Subject: [PATCH] 2012-06-07 16:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbqtoolbar.prg * contrib/hbide/ideedit.prg * contrib/hbide/idefindreplace.prg ! Minor. * contrib/hbqt/qtcore/hbqt_bind.cpp * Refined: deletion of objects handelling. * contrib/hbqt/qtcore/hbqt_init.cpp * contrib/hbqt/qtgui/hbqt_init.cpp + Added: destructors to objects created under __HBQT_REVAMP__. --- harbour/ChangeLog | 13 ++ harbour/contrib/hbide/hbqtoolbar.prg | 2 +- harbour/contrib/hbide/ideedit.prg | 9 +- harbour/contrib/hbide/idefindreplace.prg | 114 +++++++----- harbour/contrib/hbqt/qtcore/hbqt_bind.cpp | 47 +++-- harbour/contrib/hbqt/qtcore/hbqt_init.cpp | 115 ++++++++++-- harbour/contrib/hbqt/qtgui/hbqt_init.cpp | 208 +++++++++++++++++++--- 7 files changed, 401 insertions(+), 107 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7eda3b169b..d68b557a90 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-07 16:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbqtoolbar.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/idefindreplace.prg + ! Minor. + + * contrib/hbqt/qtcore/hbqt_bind.cpp + * Refined: deletion of objects handelling. + + * contrib/hbqt/qtcore/hbqt_init.cpp + * contrib/hbqt/qtgui/hbqt_init.cpp + + Added: destructors to objects created under __HBQT_REVAMP__. + 2012-06-08 01:14 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbct/getsecrt.prg * contrib/hbgd/gdbar.prg diff --git a/harbour/contrib/hbide/hbqtoolbar.prg b/harbour/contrib/hbide/hbqtoolbar.prg index 98180ae635..4b4703aaea 100644 --- a/harbour/contrib/hbide/hbqtoolbar.prg +++ b/harbour/contrib/hbide/hbqtoolbar.prg @@ -149,7 +149,7 @@ METHOD HbqToolbar:create( cName, oParent ) METHOD HbqToolbar:onError( ... ) LOCAL cMsg := __GetMessage() -HB_TRACE( HB_TR_ALWAYS, cMsg ) + IF SubStr( cMsg, 1, 1 ) == "_" cMsg := SubStr( cMsg, 2 ) ENDIF diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index b455e01356..c36683c018 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -400,7 +400,7 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) IF ::lQuitting RETURN NIL ENDIF - + qCursor := ::qEdit:textCursor() ::nCurLineNo := qCursor:blockNumber() @@ -415,10 +415,15 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) ::oEM:aActions[ 19, 2 ]:setEnabled( len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 2 ) ::oEM:aActions[ 21, 2 ]:setEnabled( n > 0 ) +#ifdef __HBQT_REVAMP__ + IF empty( qAct := ::oEM:qContextMenu:exec( ::qEdit:mapToGlobal( p ) ) ) + RETURN Self + ENDIF +#else IF ! ( qAct := ::oEM:qContextMenu:exec( ::qEdit:mapToGlobal( p ) ) ):hasValidPointer() RETURN Self ENDIF - +#endif cAct := strtran( qAct:text(), "&", "" ) SWITCH cAct CASE "Split Horizontally" diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index 7f1674e5c5..e71486024a 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -798,7 +798,7 @@ METHOD IdeFindInFiles:buildUI() ::oFindDock:oWidget:setWidget( ::oUI:oWidget ) - ::oUI:q_buttonFolder:setIcon( ::resPath + "folder.png" ) + ::oUI:q_buttonFolder:setIcon( QIcon( ::resPath + "folder.png" ) ) aeval( ::oINI:aFind , {|e| ::oUI:q_comboExpr:addItem( e ) } ) aeval( ::oINI:aReplace, {|e| ::oUI:q_comboRepl:addItem( e ) } ) @@ -1016,13 +1016,37 @@ METHOD IdeFindInFiles:replaceAll() /*----------------------------------------------------------------------*/ METHOD IdeFindInFiles:execContextMenu( p ) - LOCAL nLine, qCursor, qMenu, qAct, cAct, cFind, aAct := {} + LOCAL nLine, qCursor, qMenu, qAct, cAct, cFind +#ifndef __HBQT_REVAMP__ + LOCAL aAct := {} +#endif qCursor := ::oUI:q_editResults:textCursor() nLine := qCursor:blockNumber() + 1 IF nLine <= len( ::aInfo ) - qMenu := QMenu( ::oUI:q_editResults ) + qMenu := QMenu() // ::oUI:q_editResults ) + +#ifdef __HBQT_REVAMP__ + qMenu:addAction( "Copy" ) + qMenu:addAction( "Select All" ) + qMenu:addAction( "Clear" ) + qMenu:addAction( "Print" ) + qMenu:addAction( "Save as..." ) + qMenu:addSeparator() + qMenu:addAction( "Find" ) + qMenu:addSeparator() + IF ::aInfo[ nLine, 1 ] == -2 /* Found Line */ + qMenu:addAction( "Replace Line" ) + ELSEIF ::aInfo[ nLine, 1 ] == -1 /* Source File */ + qMenu:addAction( "Open" ) + qMenu:addAction( "Replace All" ) + ENDIF + qMenu:addSeparator() + qMenu:addAction( "Zom In" ) + qMenu:addAction( "Zoom Out" ) + +#else aadd( aAct, qMenu:addAction( "Copy" ) ) aadd( aAct, qMenu:addAction( "Select All" ) ) aadd( aAct, qMenu:addAction( "Clear" ) ) @@ -1040,50 +1064,53 @@ METHOD IdeFindInFiles:execContextMenu( p ) aadd( aAct, qMenu:addSeparator() ) aadd( aAct, qMenu:addAction( "Zoom In" ) ) aadd( aAct, qMenu:addAction( "Zoom Out" ) ) - - IF ( qAct := qMenu:exec( ::oUI:q_editResults:mapToGlobal( QPoint( p ) ) ) ):hasValidPointer() - cAct := qAct:text() - - SWITCH cAct - CASE "Save as..." - EXIT - CASE "Find" - IF !empty( cFind := hbide_fetchAString( ::oUI:q_editResults, , "Find what?", "Find" ) ) - ::lNotDblClick := .T. - IF !( ::oUI:q_editResults:find( cFind, 0 ) ) - MsgBox( "Not Found" ) + +#endif + + IF __objGetClsName( qAct := qMenu:exec( ::oUI:q_editResults:mapToGlobal( p ) ) ) == "QACTION" + IF valtype( cAct := qAct:text() ) == "C" + + SWITCH cAct + CASE "Save as..." + EXIT + CASE "Find" + IF !empty( cFind := hbide_fetchAString( ::oUI:q_editResults, , "Find what?", "Find" ) ) + ::lNotDblClick := .T. + IF !( ::oUI:q_editResults:find( cFind, 0 ) ) + MsgBox( "Not Found" ) + ENDIF ENDIF - ENDIF - EXIT - CASE "Print" - ::print() - EXIT - CASE "Clear" - ::oUI:q_editResults:clear() - ::aInfo := {} - EXIT - CASE "Copy" - ::lNotDblClick := .T. - ::oUI:q_editResults:copy() - EXIT - CASE "Select All" - ::oUI:q_editResults:selectAll() - EXIT - CASE "Replace Line" - EXIT - CASE "Replace Source" - EXIT - CASE "Zoom In" - ::oUI:q_editResults:zoomIn() - EXIT - CASE "Zoom Out" - ::oUI:q_editResults:zoomOut() - EXIT - ENDSWITCH + EXIT + CASE "Print" + ::print() + EXIT + CASE "Clear" + ::oUI:q_editResults:clear() + ::aInfo := {} + EXIT + CASE "Copy" + ::lNotDblClick := .T. + ::oUI:q_editResults:copy() + EXIT + CASE "Select All" + ::oUI:q_editResults:selectAll() + EXIT + CASE "Replace Line" + EXIT + CASE "Replace Source" + EXIT + CASE "Zoom In" + ::oUI:q_editResults:zoomIn() + EXIT + CASE "Zoom Out" + ::oUI:q_editResults:zoomOut() + EXIT + ENDSWITCH + ENDIF ENDIF ENDIF - RETURN Self + RETURN NIL /*----------------------------------------------------------------------*/ @@ -1536,3 +1563,4 @@ STATIC FUNCTION hbide_isSourceOfType( cSource, aFilter ) RETURN ascan( aFilter, {|e| cExt $ e } ) > 0 /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/qtcore/hbqt_bind.cpp b/harbour/contrib/hbqt/qtcore/hbqt_bind.cpp index c4eece35b2..126a9eb16f 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_bind.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_bind.cpp @@ -124,14 +124,21 @@ static PHB_ITEM hb_arrayCreateClone( PHB_ITEM pItem, PHB_BASEARRAY pBaseArray ) PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassFunc, PHBQT_DEL_FUNC pDelFunc, int iFlags ) { - HB_TRACE( HB_TR_DEBUG, ( ".................HARBOUR_REQUEST_BIND_OBJECT( %p, %i ).................", qtObject, iFlags ) ); - - PHBQT_BIND bind; + #if 0 + char * pname = ( char* ) hb_xgrab( 200 ); + char * pname1 = ( char* ) hb_xgrab( 200 ); + HB_TRACE( HB_TR_DEBUG, ( ".................HARBOUR_REQUEST_BIND_OBJECT( %p, %i, %s : %s ).................", qtObject, iFlags, hb_procname( 0, pname, HB_TRUE ), hb_procname( 1, pname1, HB_TRUE ) ) ); + hb_xfree( pname ); + hb_xfree( pname1 ); + #endif + PHB_ITEM pObject = NULL; if( qtObject == NULL ) return pObject; - + + PHBQT_BIND bind; + HBQT_BIND_LOCK bind = s_hbqt_binds; while( bind ) @@ -179,11 +186,9 @@ PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassF { if( s_destroyer == NULL ) s_destroyer = new HBQDestroyer(); - if( qtObject != NULL ) - { - QObject::connect( ( QObject * ) qtObject, SIGNAL(destroyed(QObject*)), s_destroyer, SLOT(destroyer()) ); - HB_TRACE( HB_TR_DEBUG, ( "hbqt_bindGetHbObject( %p )...%s", qtObject, ( ( QObject * ) qtObject )->metaObject()->className() ) ); - } + + QObject::connect( ( QObject * ) qtObject, SIGNAL(destroyed(QObject*)), s_destroyer, SLOT(destroyer()) ); + HB_TRACE( HB_TR_DEBUG, ( "hbqt_bindGetHbObject( %p )...%s", qtObject, ( ( QObject * ) qtObject )->metaObject()->className() ) ); } else { @@ -228,8 +233,6 @@ void * hbqt_bindGetQtObject( PHB_ITEM pObject ) void hbqt_bindDestroyHbObject( PHB_ITEM pObject ) { - HB_TRACE( HB_TR_DEBUG, ( "..............HARBOUR_DESTROY_BEGINS.............." ) ); - void * hbObject = hb_arrayId( pObject ); bool found = HB_FALSE; @@ -243,6 +246,8 @@ void hbqt_bindDestroyHbObject( PHB_ITEM pObject ) { if( bind->hbObject == hbObject ) { + HB_TRACE( HB_TR_DEBUG, ( "..............HARBOUR_DESTROY_BEGINS( %p, %i )..............", bind->qtObject, bind->iFlags ) ); + found = HB_TRUE; bool fObject = bind->iFlags & HBQT_BIT_QOBJECT; QObject * obj = NULL; @@ -264,9 +269,10 @@ void hbqt_bindDestroyHbObject( PHB_ITEM pObject ) { if( obj->parent() == NULL ) { + * bind_ptr = bind->next; bind->fDeleting = true; bind->pDelFunc( obj, bind->iFlags ); - * bind_ptr = bind->next; + bind->fDeleting = false; hb_xfree( bind ); HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED_%s( %p )", classname, obj ) ); } @@ -282,10 +288,16 @@ void hbqt_bindDestroyHbObject( PHB_ITEM pObject ) else { void * oobj = bind->qtObject; + HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROY_ABOUT_TO..........( %p )", oobj ) ); * bind_ptr = bind->next; - bind->pDelFunc( bind->qtObject, bind->iFlags ); + if( bind->pDelFunc != NULL ) + { + bind->fDeleting = true; + bind->pDelFunc( bind->qtObject, bind->iFlags ); + bind->fDeleting = false; + } hb_xfree( bind ); - HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED( %p )", oobj ) ); + HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED.........( %p )", oobj ) ); Q_UNUSED( oobj ); } } @@ -293,11 +305,11 @@ void hbqt_bindDestroyHbObject( PHB_ITEM pObject ) { if( fObject ) { - HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED_NOT_OWNED_BY_HHARBOUR( %p )...%s", bind->qtObject, obj->metaObject()->className() ) ); + HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED_NOT_OWNED_BY_HARBOUR( %p )...%s", bind->qtObject, obj->metaObject()->className() ) ); } else { - HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED_NOT_OWNED_BY_HHARBOUR( %p )", bind->qtObject ) ); + HB_TRACE( HB_TR_DEBUG, ( "HARBOUR_DESTROYED_NOT_OWNED_BY_HARBOUR( %p )", bind->qtObject ) ); } * bind_ptr = bind->next; hb_xfree( bind ); @@ -339,7 +351,8 @@ void hbqt_bindDestroyQtObject( void * qtObject ) HB_TRACE( HB_TR_DEBUG, ( "QT_DESTROYED( %p )", bind->qtObject ) ); } hb_xfree( bind ); - } + } + bind->fDeleting = false; break; } bind_ptr = &bind->next; diff --git a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp index e732abd815..ef0fb44ad9 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp @@ -98,6 +98,29 @@ extern void * hbqt_gcAllocate_QList( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew ); HB_EXTERN_END +#ifdef __HBQT_REVAMP__ +HB_EXTERN_BEGIN + +extern void hbqt_del_QObject( void * pObj, int iFlags ); +extern void hbqt_del_QTime( void * pObj, int iFlags ); +extern void hbqt_del_QSize( void * pObj, int iFlags ); +extern void hbqt_del_QSizeF( void * pObj, int iFlags ); +extern void hbqt_del_QPoint( void * pObj, int iFlags ); +extern void hbqt_del_QRect( void * pObj, int iFlags ); +extern void hbqt_del_QRectF( void * pObj, int iFlags ); +extern void hbqt_del_QUrl( void * pObj, int iFlags ); +extern void hbqt_del_QDate( void * pObj, int iFlags ); +extern void hbqt_del_QDateTime( void * pObj, int iFlags ); +extern void hbqt_del_QTime( void * pObj, int iFlags ); +extern void hbqt_del_QModelIndex( void * pObj, int iFlags ); +extern void hbqt_del_QStringList( void * pObj, int iFlags ); +extern void hbqt_del_QList( void * pObj, int iFlags ); + +extern void hbqt_del_QEvent( void * pObj, int iFlags ); + +HB_EXTERN_END +#endif + /*----------------------------------------------------------------------*/ static void hbqt_SlotsExecPointer( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -229,11 +252,15 @@ static void hbqt_SlotsExecModel( PHB_ITEM * codeBlock, void ** arguments, QStrin hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QModelIndex" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecModelModel( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -243,13 +270,19 @@ static void hbqt_SlotsExecModelModel( PHB_ITEM * codeBlock, void ** arguments, Q hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), NULL, 1 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 2 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 ); + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QModelIndex" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 2 ] ) ) ), true ), "hb_QModelIndex" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecStringList( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -259,11 +292,15 @@ static void hbqt_SlotsExecStringList( PHB_ITEM * codeBlock, void ** arguments, Q hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QStringList( ( *reinterpret_cast< QStringList( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSTRINGLIST" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QStringList( ( *reinterpret_cast< QStringList( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSTRINGLIST" ), hbqt_del_QStringList, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QStringList( new QStringList( ( *reinterpret_cast< QStringList( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QStringList" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQPoint( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -273,11 +310,15 @@ static void hbqt_SlotsExecQPoint( PHB_ITEM * codeBlock, void ** arguments, QStri hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QPoint( ( *reinterpret_cast< QPoint( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QPOINT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QPoint( ( *reinterpret_cast< QPoint( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QPOINT" ), hbqt_del_QPoint, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QPoint( new QPoint( ( *reinterpret_cast< QPoint( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QPoint" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQUrl( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -287,11 +328,15 @@ static void hbqt_SlotsExecQUrl( PHB_ITEM * codeBlock, void ** arguments, QString hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QUrl( ( *reinterpret_cast< QUrl( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QURL" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QUrl( ( *reinterpret_cast< QUrl( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QURL" ), hbqt_del_QUrl, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QUrl( new QUrl( ( *reinterpret_cast< QUrl( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QUrl" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQDate( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -301,11 +346,15 @@ static void hbqt_SlotsExecQDate( PHB_ITEM * codeBlock, void ** arguments, QStrin hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATE" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATE" ), hbqt_del_QDate, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QDate( new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QDate" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQDateTime( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -315,11 +364,15 @@ static void hbqt_SlotsExecQDateTime( PHB_ITEM * codeBlock, void ** arguments, QS hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATETIME" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATETIME" ), hbqt_del_QDateTime, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QDateTime( new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QDateTime" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTime( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -329,11 +382,15 @@ static void hbqt_SlotsExecQTime( PHB_ITEM * codeBlock, void ** arguments, QStrin hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTIME" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTIME" ), hbqt_del_QTime, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTime( new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QTime" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQRectF( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -342,8 +399,16 @@ static void hbqt_SlotsExecQRectF( PHB_ITEM * codeBlock, void ** arguments, QStri hb_vmPushEvalSym(); hb_vmPush( codeBlock ); +#ifdef __HBQT_REVAMP__ + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRectF( ( *reinterpret_cast< QRectF( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECTF" ), hbqt_del_QRectF, 1 ); + hb_vmPush( p0 ); +#else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QRectF( new QRectF( ( *reinterpret_cast< QRectF( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QRectF" ) ); +#endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -353,12 +418,16 @@ static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments, QSt hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QRect( new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QRect" ) ); #endif hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQRect( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -368,11 +437,15 @@ static void hbqt_SlotsExecQRect( PHB_ITEM * codeBlock, void ** arguments, QStrin hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QRect( new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QRect" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQSizeF( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -382,11 +455,15 @@ static void hbqt_SlotsExecQSizeF( PHB_ITEM * codeBlock, void ** arguments, QStri hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QSizeF( ( *reinterpret_cast< QSizeF( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSIZEF" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QSizeF( ( *reinterpret_cast< QSizeF( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSIZEF" ), hbqt_del_QSizeF, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QSizeF( new QSizeF( ( *reinterpret_cast< QSizeF( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QSizeF" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecModelIndexIntInt( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -396,13 +473,17 @@ static void hbqt_SlotsExecModelIndexIntInt( PHB_ITEM * codeBlock, void ** argume hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QModelIndex" ) ); #endif hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 3 ] ) ); hb_vmSend( 3 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -412,11 +493,15 @@ static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** argument hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEXLIST" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEXLIST" ), hbqt_del_QList, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QList( new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), true ), "hb_QModelIndexList" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQObject( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -426,7 +511,7 @@ static void hbqt_SlotsExecQObject( PHB_ITEM * codeBlock, void ** arguments, QStr hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QOBJECT" ), NULL, 2 ) ); + hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QOBJECT" ), hbqt_del_QObject, 2 ) ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QObject" ) ); #endif diff --git a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp index cb117bed56..dbd524af4d 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_init.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp @@ -134,6 +134,59 @@ extern void * hbqt_gcAllocate_QCloseEvent( void * pObj, bool bNew ); HB_EXTERN_END +#ifdef __HBQT_REVAMP__ +HB_EXTERN_BEGIN + +extern void hbqt_del_QObject( void * pObj, int iFlags ); +extern void hbqt_del_QColor( void * pObj, int iFlags ); +extern void hbqt_del_QItemSelection( void * pObj, int iFlags ); +extern void hbqt_del_QTextCharFormat( void * pObj, int iFlags ); +extern void hbqt_del_QFont( void * pObj, int iFlags ); +extern void hbqt_del_QTextCursor( void * pObj, int iFlags ); +extern void hbqt_del_QTextBlock( void * pObj, int iFlags ); +extern void hbqt_del_QAbstractButton( void * pObj, int iFlags ); +extern void hbqt_del_QAction( void * pObj, int iFlags ); +extern void hbqt_del_QMdiSubWindow( void * pObj, int iFlags ); +extern void hbqt_del_QPrinter( void * pObj, int iFlags ); +extern void hbqt_del_QStandardItem( void * pObj, int iFlags ); +extern void hbqt_del_QListWidgetItem( void * pObj, int iFlags ); +extern void hbqt_del_QTreeWidgetItem( void * pObj, int iFlags ); +extern void hbqt_del_QTableWidgetItem( void * pObj, int iFlags ); +extern void hbqt_del_QWidget( void * pObj, int iFlags ); +extern void hbqt_del_QRect( void * pObj, int iFlags ); +// +extern void hbqt_del_QActionEvent( void * pObj, int iFlags ); +extern void hbqt_del_QContextMenuEvent( void * pObj, int iFlags ); +extern void hbqt_del_QDragEnterEvent( void * pObj, int iFlags ); +extern void hbqt_del_QDragLeaveEvent( void * pObj, int iFlags ); +extern void hbqt_del_QDropEvent( void * pObj, int iFlags ); +extern void hbqt_del_QEvent( void * pObj, int iFlags ); +extern void hbqt_del_QFocusEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneContextMenuEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneMouseEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneDragDropEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneHoverEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneMoveEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneResizeEvent( void * pObj, int iFlags ); +extern void hbqt_del_QGraphicsSceneWheelEvent( void * pObj, int iFlags ); +extern void hbqt_del_QHelpEvent( void * pObj, int iFlags ); +extern void hbqt_del_QHideEvent( void * pObj, int iFlags ); +extern void hbqt_del_QHoverEvent( void * pObj, int iFlags ); +extern void hbqt_del_QInputMethodEvent( void * pObj, int iFlags ); +extern void hbqt_del_QKeyEvent( void * pObj, int iFlags ); +extern void hbqt_del_QMouseEvent( void * pObj, int iFlags ); +extern void hbqt_del_QMoveEvent( void * pObj, int iFlags ); +extern void hbqt_del_QPaintEvent( void * pObj, int iFlags ); +extern void hbqt_del_QResizeEvent( void * pObj, int iFlags ); +extern void hbqt_del_QShortcutEvent( void * pObj, int iFlags ); +extern void hbqt_del_QShowEvent( void * pObj, int iFlags ); +extern void hbqt_del_QWheelEvent( void * pObj, int iFlags ); +extern void hbqt_del_QWindowStateChangeEvent( void * pObj, int iFlags ); +extern void hbqt_del_QCloseEvent( void * pObj, int iFlags ); + +HB_EXTERN_END +#endif + /*----------------------------------------------------------------------*/ static void hbqt_SlotsExecQColor( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -143,11 +196,15 @@ static void hbqt_SlotsExecQColor( PHB_ITEM * codeBlock, void ** arguments, QStri hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QColor( ( *reinterpret_cast< QColor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QCOLOR" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QColor( ( *reinterpret_cast< QColor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QCOLOR" ), hbqt_del_QColor, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QColor( new QColor( ( *reinterpret_cast< QColor( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QColor" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecItemSelItemSel( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -157,13 +214,19 @@ static void hbqt_SlotsExecItemSelItemSel( PHB_ITEM * codeBlock, void ** argument hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QITEMSELECTION" ), NULL, 1 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 2 ] ) ) ), hb_dynsymGetSymbol( "HB_QITEMSELECTION" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QITEMSELECTION" ), hbqt_del_QObject, 1 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 2 ] ) ) ), hb_dynsymGetSymbol( "HB_QITEMSELECTION" ), hbqt_del_QObject, 1 ) ; + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QItemSelection( new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QItemSelection" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QItemSelection( new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 2 ] ) ) ), true ), "hb_QItemSelection" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecQTextCharFormat( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -173,11 +236,15 @@ static void hbqt_SlotsExecQTextCharFormat( PHB_ITEM * codeBlock, void ** argumen hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QTextCharFormat( ( *reinterpret_cast< QTextCharFormat( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCHARFORMAT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCharFormat( ( *reinterpret_cast< QTextCharFormat( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCHARFORMAT" ), hbqt_del_QTextCharFormat, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( ( *reinterpret_cast< QTextCharFormat( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QTextCharFormat" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQFont( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -187,11 +254,15 @@ static void hbqt_SlotsExecQFont( PHB_ITEM * codeBlock, void ** arguments, QStrin hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QFont( ( *reinterpret_cast< QFont( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QFONT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QFont( ( *reinterpret_cast< QFont( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QFONT" ), hbqt_del_QFont, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QFont( new QFont( ( *reinterpret_cast< QFont( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QFont" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTextCursor( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -201,11 +272,15 @@ static void hbqt_SlotsExecQTextCursor( PHB_ITEM * codeBlock, void ** arguments, hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QTextCursor( ( *reinterpret_cast< QTextCursor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCURSOR" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCursor( ( *reinterpret_cast< QTextCursor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCURSOR" ), hbqt_del_QTextCursor, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( ( *reinterpret_cast< QTextCursor( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QTextCursor" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTextBlock( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -215,11 +290,15 @@ static void hbqt_SlotsExecQTextBlock( PHB_ITEM * codeBlock, void ** arguments, Q hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QTextBlock( ( *reinterpret_cast< QTextBlock( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTBLOCK" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextBlock( ( *reinterpret_cast< QTextBlock( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTBLOCK" ), hbqt_del_QTextBlock, 1 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( ( *reinterpret_cast< QTextBlock( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QTextBlock" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQAbstractButton( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -229,11 +308,15 @@ static void hbqt_SlotsExecQAbstractButton( PHB_ITEM * codeBlock, void ** argumen hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QWidget( ( QAbstractButton * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QABSTRACTBUTTON" ), NULL, 3 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QWidget( ( QAbstractButton * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QABSTRACTBUTTON" ), hbqt_del_QWidget, 3 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QAbstractButton( new QWidget( ( QAbstractButton * ) ( arguments[ 1 ] ) ) , true ), "hb_QAbstractButton" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQAction( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -243,11 +326,15 @@ static void hbqt_SlotsExecQAction( PHB_ITEM * codeBlock, void ** arguments, QStr hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QAction( ( QAction * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QACTION" ), NULL, 3 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QAction( ( QAction * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QACTION" ), hbqt_del_QAction, 3 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QAction( new QAction( ( QAction * ) ( arguments[ 1 ] ) ), true ), "hb_QAction" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQMdiSubWindow( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -257,11 +344,15 @@ static void hbqt_SlotsExecQMdiSubWindow( PHB_ITEM * codeBlock, void ** arguments hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QMDISUBWINDOW" ), NULL, 2 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QMDISUBWINDOW" ), hbqt_del_QMdiSubWindow, 2 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QMdiSubWindow( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QMdiSubWindow" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTreeWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -271,11 +362,15 @@ static void hbqt_SlotsExecQTreeWidgetItem( PHB_ITEM * codeBlock, void ** argumen hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTreeWidgetItem( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QTreeWidgetItem" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTreeWidgetItemInt( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -285,12 +380,16 @@ static void hbqt_SlotsExecQTreeWidgetItemInt( PHB_ITEM * codeBlock, void ** argu hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTreeWidgetItem( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QTreeWidgetItem" ) ); #endif hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQPrinter( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -300,11 +399,15 @@ static void hbqt_SlotsExecQPrinter( PHB_ITEM * codeBlock, void ** arguments, QSt hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QPRINTER" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QPRINTER" ), hbqt_del_QPrinter, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QPrinter( ( *reinterpret_cast< void*(*)> ( arguments[ 1 ] ) ), false ), "hb_QPrinter" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQStandardItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -314,11 +417,15 @@ static void hbqt_SlotsExecQStandardItem( PHB_ITEM * codeBlock, void ** arguments hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QSTANDARDITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QSTANDARDITEM" ), hbqt_del_QStandardItem, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QStandardItem( ( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ), false ), "hb_QStandardItem" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQListWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -328,11 +435,15 @@ static void hbqt_SlotsExecQListWidgetItem( PHB_ITEM * codeBlock, void ** argumen hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QListWidgetItem( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QListWidgetItem" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQListWidgetItemQListWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -342,13 +453,19 @@ static void hbqt_SlotsExecQListWidgetItemQListWidgetItem( PHB_ITEM * codeBlock, hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), NULL, 0 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 ); + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QListWidgetItem( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QListWidgetItem" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QListWidgetItem( ( *reinterpret_cast( arguments[ 2 ] ) ), false ), "hb_QListWidgetItem" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecQTableWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -358,11 +475,15 @@ static void hbqt_SlotsExecQTableWidgetItem( PHB_ITEM * codeBlock, void ** argume hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTableWidgetItem( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QTableWidgetItem" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQTableWidgetItemQTableWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -372,13 +493,19 @@ static void hbqt_SlotsExecQTableWidgetItemQTableWidgetItem( PHB_ITEM * codeBlock hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), NULL, 0 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 ); + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTableWidgetItem( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QTableWidgetItem" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTableWidgetItem( ( *reinterpret_cast( arguments[ 2 ] ) ), false ), "hb_QTableWidgetItem" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecQTreeWidgetItemQTreeWidgetItem( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -388,13 +515,19 @@ static void hbqt_SlotsExecQTreeWidgetItemQTreeWidgetItem( PHB_ITEM * codeBlock, hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), NULL, 0 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), NULL, 0 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 ); + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTreeWidgetItem( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QTreeWidgetItem" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTreeWidgetItem( ( *reinterpret_cast( arguments[ 2 ] ) ), false ), "hb_QTreeWidgetItem" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecQWidget( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -404,11 +537,15 @@ static void hbqt_SlotsExecQWidget( PHB_ITEM * codeBlock, void ** arguments, QStr hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), NULL, 2 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QWidget" ) ); #endif hb_vmSend( 1 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQWidgetQWidget( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -418,13 +555,19 @@ static void hbqt_SlotsExecQWidgetQWidget( PHB_ITEM * codeBlock, void ** argument hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), NULL, 2 ) ); - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), NULL, 2 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 ); + PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 ); + hb_vmPush( p0 ); + hb_vmPush( p1 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast( arguments[ 1 ] ) ), false ), "hb_QWidget" ) ); hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast( arguments[ 2 ] ) ), false ), "hb_QWidget" ) ); #endif hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); +#endif } static void hbqt_SlotsExecQWidgetInt( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) @@ -434,27 +577,34 @@ static void hbqt_SlotsExecQWidgetInt( PHB_ITEM * codeBlock, void ** arguments, Q hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), NULL, 2 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 ); + hb_vmPush( p0 ); #else hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QWidget" ) ); #endif hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif } static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments, QStringList pList ) { Q_UNUSED( pList ); - hb_vmPushEvalSym(); hb_vmPush( codeBlock ); #ifdef __HBQT_REVAMP__ - hb_vmPush( hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), NULL, 1 ) ); + PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 ); + hb_vmPush( p0 ); #else - hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QRect( new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QRect" ) ); + hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QRect( new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QRect" ) ); #endif hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmSend( 2 ); +#ifdef __HBQT_REVAMP__ + hb_itemRelease( p0 ); +#endif }