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

2012-06-07 20:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/hbmk2_qt.hb
  * contrib/hbqt/qtcore/hbqt.h
  * contrib/hbqt/qtcore/hbqt_bind.cpp
  * contrib/hbqt/qtcore/hbqt_hbqevents.cpp
  * contrib/hbqt/qtcore/hbqt_hbqslots.cpp
  * contrib/hbqt/qtcore/hbqt_init.cpp
  * contrib/hbqt/qtcore/qth/QLibraryInfo.qth
  * contrib/hbqt/qtcore/qth/QMimeData.qth
  * contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
  * contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
  * contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
  * contrib/hbqt/qtgui/hbqt_init.cpp
  * contrib/hbqt/qtgui/qth/QApplication.qth
  * contrib/hbqt/qtgui/qth/QClipboard.qth
  * contrib/hbqt/qtgui/qth/QDirModel.qth
  * contrib/hbqt/qtgui/qth/QDropEvent.qth
  * contrib/hbqt/qtgui/qth/QFileSystemModel.qth
  * contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth
    ! Changed:  
        PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassName, PHBQT_DEL_FUNC pDelFunc, int iFlags )
            =>
        PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, const char * szClassName, PHBQT_DEL_FUNC pDelFunc, int iFlags )

      This facilitates the easy manipulation of objects and also a central 
      point to scale its usage. It is much easier to recognize the non-QObject
      derived classes, which are in plenty, and hence take corrective actions 
      in case of some exceptions are buried inside descriptions instead of headers.
This commit is contained in:
Pritpal Bedi
2012-06-08 03:09:18 +00:00
parent 82ae26c290
commit 71ba24298a
20 changed files with 125 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -16,6 +16,36 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-07 20:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbmk2_qt.hb
* contrib/hbqt/qtcore/hbqt.h
* contrib/hbqt/qtcore/hbqt_bind.cpp
* contrib/hbqt/qtcore/hbqt_hbqevents.cpp
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
* contrib/hbqt/qtcore/hbqt_init.cpp
* contrib/hbqt/qtcore/qth/QLibraryInfo.qth
* contrib/hbqt/qtcore/qth/QMimeData.qth
* contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
* contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
* contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
* contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
* contrib/hbqt/qtgui/hbqt_init.cpp
* contrib/hbqt/qtgui/qth/QApplication.qth
* contrib/hbqt/qtgui/qth/QClipboard.qth
* contrib/hbqt/qtgui/qth/QDirModel.qth
* contrib/hbqt/qtgui/qth/QDropEvent.qth
* contrib/hbqt/qtgui/qth/QFileSystemModel.qth
* contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth
! Changed:
PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassName, PHBQT_DEL_FUNC pDelFunc, int iFlags )
=>
PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, const char * szClassName, PHBQT_DEL_FUNC pDelFunc, int iFlags )
This facilitates the easy manipulation of objects and also a central
point to scale its usage. It is much easier to recognize the non-QObject
derived classes, which are in plenty, and hence take corrective actions
in case of some exceptions are buried inside descriptions instead of headers.
2012-06-08 02:52 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbgd/gdbar.prg
* contrib/hbgd/gdbarcod.prg

14
harbour/contrib/hbqt/hbmk2_qt.hb
View File

@@ -1996,7 +1996,8 @@ METHOD HbQtSource:getConstructor()
NEXT
AAdd( aLine, " " )
#ifdef __HBQT_REVAMP__
AAdd( aLine, ' hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, pObj, hb_dynsymGetSymbol( "' + 'HB_' + upper( ::cQtObject ) +'" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .t. ) + ' ) );' )
// AAdd( aLine, ' hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, pObj, hb_dynsymGetSymbol( "' + 'HB_' + upper( ::cQtObject ) +'" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .t. ) + ' ) );' )
AAdd( aLine, ' hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, pObj, ( "' + 'HB_' + upper( ::cQtObject ) +'" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .t. ) + ' ) );' )
#else
AAdd( aLine, " hbqt_itemPushReturn( hbqt_gcAllocate_" + ::cQtObject + "( ( void * ) pObj, " + iif( ::isDetached, "false", "true" ) + " ), hb_stackSelfItem() );" )
#endif
@@ -2979,7 +2980,7 @@ METHOD HbQtSource:buildCppCode( oMtd )
"Abstract" $ oRet:cCast
cRef := oRet:cCast
#ifdef __HBQT_REVAMP__
oMtd:cCmd := 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + "( void * ) " + oMtd:cCmn + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( ::cQtObject ) + '" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .f. ) + ' ) )'
oMtd:cCmd := 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + "( void * ) " + oMtd:cCmn + ', ( "' + 'HB_' + Upper( ::cQtObject ) + '" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .f. ) + ' ) )'
#else
oMtd:cCmd := "hbqt_create_objectGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) " + ', "HB_' + Upper( ::cQtObject ) + '" )'
#endif
@@ -2991,7 +2992,7 @@ METHOD HbQtSource:buildCppCode( oMtd )
oRet:lVirt
cRef := oRet:cCast
#ifdef __HBQT_REVAMP__
oMtd:cCmd := 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + "( void * ) " + oMtd:cCmn + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( ::cQtObject ) + '" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .f. ) + ' ) )'
oMtd:cCmd := 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + "( void * ) " + oMtd:cCmn + ', ( "' + 'HB_' + Upper( ::cQtObject ) + '" ), hbqt_del_' + ::cQtObject + ', ' + qth_get_bits( ::cQtObject, .f. ) + ' ) )'
#else
oMtd:cCmd := "hbqt_create_objectGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) " + ', "HB_' + Upper( ::cQtObject ) + '" )'
#endif
@@ -3217,7 +3218,8 @@ METHOD HbqtArgument:new( cTxt, cQtObject, enum_, lConstL, lIsRetArg )
STATIC FUNCTION hbqtgen_Get_Command_1( cWgt, cCmn )
#ifdef __HBQT_REVAMP__
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + 'new ' + cWgt + '( *( ' + cCmn + ' ) )' + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, .t. ) + ' ) )'
// RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + 'new ' + cWgt + '( *( ' + cCmn + ' ) )' + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, .t. ) + ' ) )'
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + 'new ' + cWgt + '( *( ' + cCmn + ' ) )' + ', ( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, .t. ) + ' ) )'
#else
RETURN "hbqt_create_objectGC( hbqt_gcAllocate_" + cWgt + "( new " + cWgt + "( *( " + cCmn + " ) ), true ), " + '"HB_' + Upper( cWgt ) + '")'
#endif
@@ -3234,9 +3236,9 @@ STATIC FUNCTION hbqtgen_Get_Command( cWgt, cCmn, lNew, isRetDetached )
#ifdef __HBQT_REVAMP__
IF lNew
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + 'new ' + cWgt + '( ' + cCmn + ' )' + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, .t. ) + ' ) )'
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + 'new ' + cWgt + '( ' + cCmn + ' )' + ', ( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, .t. ) + ' ) )'
ELSE
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + cCmn + ', hb_dynsymGetSymbol( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, isRetDetached ) + ' ) )'
RETURN 'hb_itemReturn( hbqt_bindGetHbObject( NULL, ' + cCmn + ', ( "' + 'HB_' + Upper( cWgt ) + '" ), hbqt_del_' + cWgt + ', ' + qth_get_bits( cWgt, isRetDetached ) + ' ) )'
ENDIF
#else
IF lNew

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

@@ -122,7 +122,7 @@ extern HB_EXPORT PHB_ITEM hbqt_create_object( void * pObject, const char * pszOb
extern HB_EXPORT PHB_ITEM hbqt_create_objectGC( void * pObject, const char * pszObjectName );
extern HB_EXPORT void hbqt_addDeleteList( PHB_ITEM item ); /* populate a list of PHB_ITEM to delete at exit time */
HB_EXPORT PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassFunc, PHBQT_DEL_FUNC pDelete, int iFlags );
HB_EXPORT PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, const char * szClassFunc, PHBQT_DEL_FUNC pDelete, int iFlags );
HB_EXPORT void * hbqt_bindGetQtObject( PHB_ITEM pObject );
HB_EXPORT void hbqt_bindSetOwner( void * qtObject, HB_BOOL fOwner );
HB_EXPORT void hbqt_bindDestroyHbObject( PHB_ITEM pObject );

8
harbour/contrib/hbqt/qtcore/hbqt_bind.cpp
View File

@@ -122,12 +122,12 @@ static PHB_ITEM hb_arrayCreateClone( PHB_ITEM pItem, PHB_BASEARRAY pBaseArray )
return pItem;
}
PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassFunc, PHBQT_DEL_FUNC pDelFunc, int iFlags )
PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, const char * szClassName, PHBQT_DEL_FUNC pDelFunc, int iFlags )
{
#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_TRACE( HB_TR_DEBUG, ( ".................HARBOUR_REQUEST_BIND_OBJECT( %p, %i, %s, %s, %s ).................", qtObject, iFlags, szClassName, hb_procname( 0, pname, HB_TRUE ), hb_procname( 1, pname1, HB_TRUE ) ) );
hb_xfree( pname );
hb_xfree( pname1 );
#endif
@@ -137,6 +137,10 @@ PHB_ITEM hbqt_bindGetHbObject( PHB_ITEM pItem, void * qtObject, PHB_SYMB pClassF
if( qtObject == NULL )
return pObject;
PHB_SYMB pClassFunc = hb_dynsymGetSymbol( szClassName );
if( pClassFunc == NULL )
return pObject;
PHBQT_BIND bind;
HBQT_BIND_LOCK

2
harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp
View File

@@ -245,7 +245,7 @@ bool HBQEvents::eventFilter( QObject * object, QEvent * event )
if( hb_vmRequestReenter() )
{
#ifdef __HBQT_REVAMP__
PHB_ITEM pItem = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( s_lstCreateObj.at( eventId ) ), NULL, 0 );
PHB_ITEM pItem = hbqt_bindGetHbObject( NULL, ( void * ) event, ( s_lstCreateObj.at( eventId ) ), NULL, 0 );
#else
PHB_ITEM pItem = hb_itemNew( hbqt_create_objectGC( ( * pCallback )( event, false ), s_lstCreateObj.at( eventId ) ) );
#endif

8
harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp
View File

@@ -137,7 +137,7 @@ HBQSlots::~HBQSlots()
int HBQSlots::hbConnect( PHB_ITEM pObj, char * pszSignal, PHB_ITEM bBlock )
{
//HB_TRACE( HB_TR_DEBUG, ( "HBQSlots::hbConnect( %s )", pszSignal ) );
HB_TRACE( HB_TR_DEBUG, ( "HBQSlots::hbConnect( %s )", pszSignal ) );
int nResult = 1;
@@ -331,17 +331,19 @@ int HBQSlots::qt_metacall( QMetaObject::Call c, int id, void ** arguments )
if( hb_vmRequestReenter() )
{
if( parameterCount == 0 )
{
hb_evalBlock0( this->listBlock.at( i - 1 ) );
}
else
{
int paramId = s_argCombinations.indexOf( paramString );
PHBQT_SLOT_FUNC pCallback;
HB_TRACE( HB_TR_DEBUG, ( " params=%s, paramId=%d", ( char * ) paramString.data(), paramId ) );
pCallback = s_pCallback.at( paramId );
if( pCallback )
{
pCallback( ( PHB_ITEM * ) this->listBlock.at( i - 1 ), arguments, pList );
}
}
hb_vmRequestRestore();
}

44
harbour/contrib/hbqt/qtcore/hbqt_init.cpp
View File

@@ -130,7 +130,7 @@ static void hbqt_SlotsExecPointer( 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( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), ( const char * ) pList.at( 0 ).data() ) );
#endif
@@ -144,8 +144,8 @@ static void hbqt_SlotsExecPointerPointer( 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( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , hb_dynsymGetSymbol( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , ( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), ( const char * ) pList.at( 0 ).data() ) );
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) ), false ), ( const char * ) pList.at( 1 ).data() ) );
@@ -160,7 +160,7 @@ static void hbqt_SlotsExecPointerInt( 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( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
hb_vmPush( hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( ( const char * ) pList.at( 0 ).data() ), NULL, 2 ) );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), ( const char * ) pList.at( 0 ).data() ) );
#endif
@@ -252,7 +252,7 @@ static void hbqt_SlotsExecModel( PHB_ITEM * codeBlock, void ** arguments, QStrin
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -270,8 +270,8 @@ static void hbqt_SlotsExecModelModel( PHB_ITEM * codeBlock, void ** arguments, Q
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), ( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), ( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 );
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -292,7 +292,7 @@ static void hbqt_SlotsExecStringList( PHB_ITEM * codeBlock, void ** arguments, Q
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QStringList( ( *reinterpret_cast< QStringList( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSTRINGLIST" ), hbqt_del_QStringList, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QStringList( ( *reinterpret_cast< QStringList( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -310,7 +310,7 @@ static void hbqt_SlotsExecQPoint( PHB_ITEM * codeBlock, void ** arguments, QStri
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QPoint( ( *reinterpret_cast< QPoint( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QPOINT" ), hbqt_del_QPoint, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QPoint( ( *reinterpret_cast< QPoint( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -328,7 +328,7 @@ static void hbqt_SlotsExecQUrl( PHB_ITEM * codeBlock, void ** arguments, QString
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QUrl( ( *reinterpret_cast< QUrl( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QURL" ), hbqt_del_QUrl, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QUrl( ( *reinterpret_cast< QUrl( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -346,7 +346,7 @@ static void hbqt_SlotsExecQDate( PHB_ITEM * codeBlock, void ** arguments, QStrin
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATE" ), hbqt_del_QDate, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -364,7 +364,7 @@ static void hbqt_SlotsExecQDateTime( PHB_ITEM * codeBlock, void ** arguments, QS
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QDATETIME" ), hbqt_del_QDateTime, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -382,7 +382,7 @@ static void hbqt_SlotsExecQTime( PHB_ITEM * codeBlock, void ** arguments, QStrin
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTIME" ), hbqt_del_QTime, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -400,7 +400,7 @@ 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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRectF( ( *reinterpret_cast< QRectF( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -418,7 +418,7 @@ static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments, QSt
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -437,7 +437,7 @@ static void hbqt_SlotsExecQRect( PHB_ITEM * codeBlock, void ** arguments, QStrin
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -455,7 +455,7 @@ static void hbqt_SlotsExecQSizeF( PHB_ITEM * codeBlock, void ** arguments, QStri
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QSizeF( ( *reinterpret_cast< QSizeF( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QSIZEF" ), hbqt_del_QSizeF, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QSizeF( ( *reinterpret_cast< QSizeF( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -473,7 +473,7 @@ static void hbqt_SlotsExecModelIndexIntInt( PHB_ITEM * codeBlock, void ** argume
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEX" ), hbqt_del_QModelIndex, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -493,7 +493,7 @@ static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** argument
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QMODELINDEXLIST" ), hbqt_del_QList, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -511,11 +511,15 @@ 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" ), hbqt_del_QObject, 2 ) );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QOBJECT" ), hbqt_del_QObject, 2 );
hb_vmPush( p0 );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QObject( ( *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) ), false ), "hb_QObject" ) );
#endif
hb_vmSend( 1 );
#ifdef __HBQT_REVAMP__
hb_itemRelease( p0 );
#endif
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/qtcore/qth/QLibraryInfo.qth
View File

@@ -48,7 +48,7 @@ enum LibraryLocation { PrefixPath, DocumentationPath, HeadersPath, LibrariesPath
QDate buildDate (){
#if QT_VERSION >= 0x040600
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, new QDate( QLibraryInfo::buildDate() ), hb_dynsymGetSymbol( "HB_QDATE" ), NULL, 1 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, new QDate( QLibraryInfo::buildDate() ), ( "HB_QDATE" ), NULL, 1 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QDate( new QDate( QLibraryInfo::buildDate() ), true ) , "HB_QDATE" );
#endif

2
harbour/contrib/hbqt/qtcore/qth/QMimeData.qth
View File

@@ -71,7 +71,7 @@ QStringList * hbUrlList() const{
strList << ( QString ) url.toString().toAscii().data();
}
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, new QStringList( strList ), hb_dynsymGetSymbol( "HB_QSTRINGLIST" ), NULL, 1 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, new QStringList( strList ), ( "HB_QSTRINGLIST" ), NULL, 1 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QStringList( new QStringList( strList ), true ), "hb_QStringList" );
#endif

8
harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
View File

@@ -491,7 +491,7 @@ void HBQGraphicsItem::contextMenuEvent( QGraphicsSceneContextMenuEvent * event )
if( block ){
PHB_ITEM p1 = hb_itemPutNI( NULL, QEvent::GraphicsSceneContextMenu );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENECONTEXTMENUEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENECONTEXTMENUEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneContextMenuEvent( event, false ), "hb_QGraphicsSceneContextMenuEvent" );
#endif
@@ -641,7 +641,7 @@ int HBQGraphicsItem::determineResizeMode( const QPointF & pos )
void HBQGraphicsItem::dragEnterEvent( QGraphicsSceneDragDropEvent * event )
{
HB_TRACE( HB_TR_DEBUG, ( "dragEnterEvent( QGraphicsSceneDragDropEvent * event )" ) );
HB_TRACE( HB_TR_DEBUG, ( "dragEnterEvent( QGraphicsSceneDragDropEvent * event )" ) );
if( block )
{
#if 0
@@ -784,8 +784,8 @@ void HBQGraphicsItem::paint( QPainter * painter, const QStyleOptionGraphicsItem
PHB_ITEM p1 = hb_itemPutNI( NULL, 21017 );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) painter, hb_dynsymGetSymbol( "HB_QPAINTER" ), NULL, 0 );
PHB_ITEM p3 = hbqt_bindGetHbObject( NULL, ( void * ) &rect, hb_dynsymGetSymbol( "HB_QRECTF" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) painter, ( "HB_QPAINTER" ), NULL, 0 );
PHB_ITEM p3 = hbqt_bindGetHbObject( NULL, ( void * ) &rect, ( "HB_QRECTF" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QPainter( painter, false ), "hb_QPainter" ) );
PHB_ITEM p3 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QRectF( &rect, false ), "hb_QRectF" ) );

12
harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
View File

@@ -415,7 +415,7 @@ void HBQGraphicsScene::contextMenuEvent( QGraphicsSceneContextMenuEvent * event
if( block ){
PHB_ITEM p1 = hb_itemPutNI( NULL, QEvent::GraphicsSceneContextMenu );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENECONTEXTMENUEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENECONTEXTMENUEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneContextMenuEvent( event, false ), "hb_QGraphicsSceneContextMenuEvent" ) );
#endif
@@ -433,7 +433,7 @@ void HBQGraphicsScene::dragEnterEvent( QGraphicsSceneDragDropEvent * event )
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragEnter );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneDragDropEvent( event, false ), "hb_QGraphicsSceneDragDropEvent" ) );
#endif
@@ -452,7 +452,7 @@ void HBQGraphicsScene::dragLeaveEvent( QGraphicsSceneDragDropEvent * event )
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragLeave );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneDragDropEvent( event, false ), "hb_QGraphicsSceneDragDropEvent" ) );
#endif
@@ -471,7 +471,7 @@ void HBQGraphicsScene::dragMoveEvent( QGraphicsSceneDragDropEvent * event )
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDragMove );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneDragDropEvent( event, false ), "hb_QGraphicsSceneDragDropEvent" ) );
#endif
@@ -494,7 +494,7 @@ void HBQGraphicsScene::dropEvent( QGraphicsSceneDragDropEvent * event )
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDrop );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneDragDropEvent( event, false ), "hb_QGraphicsSceneDragDropEvent" ) );
#endif
@@ -525,7 +525,7 @@ void HBQGraphicsScene::dropEvent( QGraphicsSceneDragDropEvent * event )
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDrop );
#ifdef __HBQT_REVAMP__
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QGRAPHICSSCENEDRAGDROPEVENT" ), NULL, 0 );
#else
PHB_ITEM p2 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QGraphicsSceneDragDropEvent( event, false ), "hb_QGraphicsSceneDragDropEvent" ) );
#endif

2
harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
View File

@@ -1385,7 +1385,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
hb_arraySetNI( p2, 5, selectionMode );
hb_arraySetNI( p2, 6, selectionState );
#ifdef __HBQT_REVAMP__
hb_arraySet( p2, 7, hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QKEYEVENT" ), NULL, 0 ) );
hb_arraySet( p2, 7, hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QKEYEVENT" ), NULL, 0 ) );
#else
hb_arraySet( p2, 7, hbqt_create_objectGC( hbqt_gcAllocate_QKeyEvent( event, false ), "hb_QKeyEvent" ) );
#endif

6
harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
View File

@@ -100,7 +100,7 @@ void HBQTableView::mousePressEvent( QMouseEvent * event )
{
PHB_ITEM p0 = hb_itemPutNI( NULL, QEvent::MouseButtonPress );
#ifdef __HBQT_REVAMP__
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QMOUSEEVENT" ), NULL, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QMOUSEEVENT" ), NULL, 0 );
#else
PHB_ITEM p1 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QMouseEvent( event, false ), "hb_QMouseEvent" ) );
#endif
@@ -117,7 +117,7 @@ void HBQTableView::mouseDoubleClickEvent( QMouseEvent * event )
{
PHB_ITEM p0 = hb_itemPutNI( NULL, QEvent::MouseButtonDblClick );
#ifdef __HBQT_REVAMP__
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QMOUSEEVENT" ), NULL, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QMOUSEEVENT" ), NULL, 0 );
#else
PHB_ITEM p1 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QMouseEvent( event, false ), "hb_QMouseEvent" ) );
#endif
@@ -134,7 +134,7 @@ void HBQTableView::wheelEvent( QWheelEvent * event )
{
PHB_ITEM p0 = hb_itemPutNI( NULL, QEvent::Wheel );
#ifdef __HBQT_REVAMP__
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, hb_dynsymGetSymbol( "HB_QWHEELEVENT" ), NULL, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, ( void * ) event, ( "HB_QWHEELEVENT" ), NULL, 0 );
#else
PHB_ITEM p1 = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QWheelEvent( event, false ), "hb_QWheelEvent" ) );
#endif

54
harbour/contrib/hbqt/qtgui/hbqt_init.cpp
View File

@@ -196,7 +196,7 @@ static void hbqt_SlotsExecQColor( PHB_ITEM * codeBlock, void ** arguments, QStri
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QColor( ( *reinterpret_cast< QColor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QCOLOR" ), hbqt_del_QColor, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QColor( ( *reinterpret_cast< QColor( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -214,8 +214,8 @@ static void hbqt_SlotsExecItemSelItemSel( PHB_ITEM * codeBlock, void ** argument
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 ) ;
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 1 ] ) ) ), ( "HB_QITEMSELECTION" ), hbqt_del_QObject, 1 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, new QItemSelection( ( *reinterpret_cast< QItemSelection( * ) >( arguments[ 2 ] ) ) ), ( "HB_QITEMSELECTION" ), hbqt_del_QObject, 1 ) ;
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -236,7 +236,7 @@ static void hbqt_SlotsExecQTextCharFormat( PHB_ITEM * codeBlock, void ** argumen
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCharFormat( ( *reinterpret_cast< QTextCharFormat( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCHARFORMAT" ), hbqt_del_QTextCharFormat, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCharFormat( ( *reinterpret_cast< QTextCharFormat( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -254,7 +254,7 @@ static void hbqt_SlotsExecQFont( PHB_ITEM * codeBlock, void ** arguments, QStrin
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QFont( ( *reinterpret_cast< QFont( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QFONT" ), hbqt_del_QFont, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QFont( ( *reinterpret_cast< QFont( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -272,7 +272,7 @@ static void hbqt_SlotsExecQTextCursor( PHB_ITEM * codeBlock, void ** arguments,
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCursor( ( *reinterpret_cast< QTextCursor( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTCURSOR" ), hbqt_del_QTextCursor, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextCursor( ( *reinterpret_cast< QTextCursor( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -290,7 +290,7 @@ static void hbqt_SlotsExecQTextBlock( PHB_ITEM * codeBlock, void ** arguments, Q
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextBlock( ( *reinterpret_cast< QTextBlock( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QTEXTBLOCK" ), hbqt_del_QTextBlock, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QTextBlock( ( *reinterpret_cast< QTextBlock( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );
@@ -308,7 +308,7 @@ static void hbqt_SlotsExecQAbstractButton( PHB_ITEM * codeBlock, void ** argumen
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QWidget( ( QAbstractButton * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QABSTRACTBUTTON" ), hbqt_del_QWidget, 3 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QWidget( ( QAbstractButton * ) ( arguments[ 1 ] ) ), ( "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" ) );
@@ -326,7 +326,7 @@ static void hbqt_SlotsExecQAction( PHB_ITEM * codeBlock, void ** arguments, QStr
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QAction( ( QAction * ) ( arguments[ 1 ] ) ), hb_dynsymGetSymbol( "HB_QACTION" ), hbqt_del_QAction, 3 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QAction( ( QAction * ) ( arguments[ 1 ] ) ), ( "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" ) );
@@ -344,7 +344,7 @@ static void hbqt_SlotsExecQMdiSubWindow( PHB_ITEM * codeBlock, void ** arguments
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QMDISUBWINDOW" ), hbqt_del_QMdiSubWindow, 2 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -362,7 +362,7 @@ static void hbqt_SlotsExecQTreeWidgetItem( PHB_ITEM * codeBlock, void ** argumen
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -380,7 +380,7 @@ static void hbqt_SlotsExecQTreeWidgetItemInt( PHB_ITEM * codeBlock, void ** argu
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -399,7 +399,7 @@ static void hbqt_SlotsExecQPrinter( PHB_ITEM * codeBlock, void ** arguments, QSt
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QPRINTER" ), hbqt_del_QPrinter, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -417,7 +417,7 @@ static void hbqt_SlotsExecQStandardItem( PHB_ITEM * codeBlock, void ** arguments
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QSTANDARDITEM" ), hbqt_del_QStandardItem, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -435,7 +435,7 @@ static void hbqt_SlotsExecQListWidgetItem( PHB_ITEM * codeBlock, void ** argumen
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 );
hb_vmPush( p0 );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QListWidgetItem( ( *reinterpret_cast<void*( * )>( arguments[ 1 ] ) ), false ), "hb_QListWidgetItem" ) );
@@ -453,8 +453,8 @@ static void hbqt_SlotsExecQListWidgetItemQListWidgetItem( PHB_ITEM * codeBlock,
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , ( "HB_QLISTWIDGETITEM" ), hbqt_del_QListWidgetItem, 0 );
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -475,7 +475,7 @@ static void hbqt_SlotsExecQTableWidgetItem( PHB_ITEM * codeBlock, void ** argume
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 );
hb_vmPush( p0 );
#else
hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QTableWidgetItem( ( *reinterpret_cast<void*( * )>( arguments[ 1 ] ) ), false ), "hb_QTableWidgetItem" ) );
@@ -493,8 +493,8 @@ static void hbqt_SlotsExecQTableWidgetItemQTableWidgetItem( PHB_ITEM * codeBlock
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , ( "HB_QTABLEWIDGETITEM" ), hbqt_del_QTableWidgetItem, 0 );
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -515,8 +515,8 @@ static void hbqt_SlotsExecQTreeWidgetItemQTreeWidgetItem( PHB_ITEM * codeBlock,
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , ( "HB_QTREEWIDGETITEM" ), hbqt_del_QTreeWidgetItem, 0 );
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -537,7 +537,7 @@ static void hbqt_SlotsExecQWidget( PHB_ITEM * codeBlock, void ** arguments, QStr
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -555,8 +555,8 @@ static void hbqt_SlotsExecQWidgetQWidget( PHB_ITEM * codeBlock, void ** argument
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
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 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "HB_QWIDGET" ), hbqt_del_QWidget, 2 );
PHB_ITEM p1 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 2 ] ) , ( "HB_QWIDGET" ), hbqt_del_QWidget, 2 );
hb_vmPush( p0 );
hb_vmPush( p1 );
#else
@@ -577,7 +577,7 @@ static void hbqt_SlotsExecQWidgetInt( PHB_ITEM * codeBlock, void ** arguments, Q
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , hb_dynsymGetSymbol( "HB_QWIDGET" ), hbqt_del_QWidget, 2 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, *reinterpret_cast< void*( * ) >( arguments[ 1 ] ) , ( "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" ) );
@@ -595,7 +595,7 @@ static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments, QSt
hb_vmPushEvalSym();
hb_vmPush( codeBlock );
#ifdef __HBQT_REVAMP__
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), hb_dynsymGetSymbol( "HB_QRECT" ), hbqt_del_QRect, 1 );
PHB_ITEM p0 = hbqt_bindGetHbObject( NULL, new QRect( ( *reinterpret_cast< QRect( * ) >( arguments[ 1 ] ) ) ), ( "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" ) );

2
harbour/contrib/hbqt/qtgui/qth/QApplication.qth
View File

@@ -46,7 +46,7 @@ HB_FUNC( QT_QAPPLICATION )
//__HB_RETPTRGC__( ( QApplication * ) __hbqtgui_app() );
#ifdef __HBQT_REVAMP__
hb_itemReturn( hbqt_bindGetHbObject( NULL, ( void * ) __hbqtgui_app(), hb_dynsymGetSymbol( "HB_QAPPLICATION" ), hbqt_del_QApplication, 2 ) );
hb_itemReturn( hbqt_bindGetHbObject( NULL, ( void * ) __hbqtgui_app(), ( "HB_QAPPLICATION" ), hbqt_del_QApplication, 2 ) );
#else
hbqt_itemPushReturn( hbqt_gcAllocate_QApplication( (void *) __hbqtgui_app(), false) , hb_stackSelfItem() );
#endif

2
harbour/contrib/hbqt/qtgui/qth/QClipboard.qth
View File

@@ -48,7 +48,7 @@ const QMimeData * mimeData ( Mode mode = Clipboard ) const{
if( p )
{
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( ( QClipboard::Mode ) hb_parni( 1 ) ), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( ( QClipboard::Mode ) hb_parni( 1 ) ), ( "HB_QMIMEDATA" ), NULL, 0 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData( ( QClipboard::Mode ) hb_parni( 1 ) ), false ), "hb_QMimeData" );
#endif

2
harbour/contrib/hbqt/qtgui/qth/QDirModel.qth
View File

@@ -66,7 +66,7 @@ virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const{
if( p )
{
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), ( "HB_QMIMEDATA" ), NULL, 0 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), false ), "hb_QMimeData" );
#endif

2
harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth
View File

@@ -60,7 +60,7 @@ const QMimeData * mimeData () const{
if( p )
{
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData(), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData(), ( "HB_QMIMEDATA" ), NULL, 0 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData(), false ), "hb_QMimeData" );
#endif

2
harbour/contrib/hbqt/qtgui/qth/QFileSystemModel.qth
View File

@@ -59,7 +59,7 @@ virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const{
if( p )
{
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), ( "HB_QMIMEDATA" ), NULL, 0 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData( *hbqt_par_QModelIndexList( 1 ) ), false ), "hb_QMimeData" );
#endif

3
harbour/contrib/hbqt/qtgui/qth/QGraphicsSceneDragDropEvent.qth
View File

@@ -49,7 +49,8 @@ const QMimeData * mimeData () const{
if( p )
{
#ifdef __HBQT_REVAMP__
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData(), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
//hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData(), hb_dynsymGetSymbol( "HB_QMIMEDATA" ), NULL, 0 ) );
hb_itemReturnRelease( hbqt_bindGetHbObject( NULL, ( void* ) p->mimeData(), ( "HB_QMIMEDATA" ), NULL, 0 ) );
#else
hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData(), false ), "hb_QMimeData" );
#endif