From 421ee95b4fbe3d2526932855e55f87613f6f60f9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Oct 2010 11:31:46 +0000 Subject: [PATCH] 2010-10-25 13:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqt_registersignals.cpp * contrib/hbqt/qtcore/hbqt_registersignals.cpp * contrib/hbqt/qtnetwork/hbqt_registersignals.cpp + Added TOFIX notes to each hb_vmPushPointer() calls. --- harbour/ChangeLog | 6 +++ .../hbqt/qtcore/hbqt_registersignals.cpp | 40 +++++++++---------- .../hbqt/qtgui/hbqt_registersignals.cpp | 14 +++---- .../hbqt/qtnetwork/hbqt_registersignals.cpp | 10 ++--- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aff88d0800..ed0b372f4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-25 13:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqt_registersignals.cpp + * contrib/hbqt/qtcore/hbqt_registersignals.cpp + * contrib/hbqt/qtnetwork/hbqt_registersignals.cpp + + Added TOFIX notes to each hb_vmPushPointer() calls. + 2010-10-25 12:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqt_hbqevents.cpp * contrib/hbqt/qtcore/hbqt_hbqslots.cpp diff --git a/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp index cfc3e8eee7..6d65f06f56 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp @@ -79,7 +79,7 @@ static void hbqt_SlotsExecPointer( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); + hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -87,8 +87,8 @@ static void hbqt_SlotsExecPointerPointer( PHB_ITEM * codeBlock, void ** argument { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); - hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 2 ] ) ); + hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); /* TOFIX: Pass .prg level object to callback */ + hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 2 ] ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 2 ); } @@ -96,8 +96,8 @@ static void hbqt_SlotsExecPointerInt( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); - hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); + hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 1 ] ) ); /* TOFIX: Pass .prg level object to callback */ + hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 2 ); } @@ -168,7 +168,7 @@ static void hbqt_SlotsExecModel( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -176,8 +176,8 @@ static void hbqt_SlotsExecModelModel( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); - hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 2 ] ) ) ) ); + hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ + hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 2 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 2 ); } @@ -185,7 +185,7 @@ static void hbqt_SlotsExecStringList( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QStringList( ( *reinterpret_cast( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QStringList( ( *reinterpret_cast( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -193,7 +193,7 @@ static void hbqt_SlotsExecQPoint( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QPoint( ( *reinterpret_cast< QPoint( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QPoint( ( *reinterpret_cast< QPoint( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -201,7 +201,7 @@ static void hbqt_SlotsExecQUrl( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QUrl( ( *reinterpret_cast< QUrl( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QUrl( ( *reinterpret_cast< QUrl( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -209,7 +209,7 @@ static void hbqt_SlotsExecQDate( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QDate( ( *reinterpret_cast< QDate( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -217,7 +217,7 @@ static void hbqt_SlotsExecQDateTime( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QDateTime( ( *reinterpret_cast< QDateTime( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -225,7 +225,7 @@ static void hbqt_SlotsExecQTime( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QTime( ( *reinterpret_cast< QTime( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -233,7 +233,7 @@ static void hbqt_SlotsExecQRectF( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QRectF( ( *reinterpret_cast< QRectF( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QRectF( ( *reinterpret_cast< QRectF( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -241,7 +241,7 @@ static void hbqt_SlotsExecQRectInt( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QRect( ( *reinterpret_cast< QRect( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QRect( ( *reinterpret_cast< QRect( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmSend( 2 ); } @@ -250,7 +250,7 @@ static void hbqt_SlotsExecQRect( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QRect( ( *reinterpret_cast< QRect( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QRect( ( *reinterpret_cast< QRect( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -258,7 +258,7 @@ static void hbqt_SlotsExecQSizeF( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QSizeF( ( *reinterpret_cast< QSizeF( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QSizeF( ( *reinterpret_cast< QSizeF( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -266,7 +266,7 @@ static void hbqt_SlotsExecModelIndexIntInt( PHB_ITEM * codeBlock, void ** argume { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QModelIndex( ( *reinterpret_cast< QModelIndex( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 2 ] ) ); hb_vmPushInteger( *reinterpret_cast< int( * ) >( arguments[ 3 ] ) ); hb_vmSend( 3 ); @@ -276,7 +276,7 @@ static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** argument { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QModelIndexList( ( *reinterpret_cast< QModelIndexList( * ) >( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QModelIndexList( ( *reinterpret_cast< QModelIndexList( * ) >( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } diff --git a/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp index 531fe443b4..7fb18bb656 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp @@ -76,7 +76,7 @@ static void hbqt_SlotsExecQColor( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QColor( ( *reinterpret_cast< QColor( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QColor( ( *reinterpret_cast< QColor( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -84,8 +84,8 @@ static void hbqt_SlotsExecItemSelItemSel( PHB_ITEM * codeBlock, void ** argument { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QItemSelection( ( *reinterpret_cast< QItemSelection( * )>( arguments[ 1 ] ) ) ) ); - hb_vmPushPointer( new QItemSelection( ( *reinterpret_cast< QItemSelection( * )>( arguments[ 2 ] ) ) ) ); + hb_vmPushPointer( new QItemSelection( ( *reinterpret_cast< QItemSelection( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ + hb_vmPushPointer( new QItemSelection( ( *reinterpret_cast< QItemSelection( * )>( arguments[ 2 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 2 ); } @@ -93,7 +93,7 @@ static void hbqt_SlotsExecQTextCharFormat( PHB_ITEM * codeBlock, void ** argumen { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QTextCharFormat( ( *reinterpret_cast( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QTextCharFormat( ( *reinterpret_cast( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -101,7 +101,7 @@ static void hbqt_SlotsExecQFont( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QFont( ( *reinterpret_cast< QFont( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QFont( ( *reinterpret_cast< QFont( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -109,7 +109,7 @@ static void hbqt_SlotsExecQTextCursor( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QTextCursor( ( *reinterpret_cast< QTextCursor( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QTextCursor( ( *reinterpret_cast< QTextCursor( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -117,7 +117,7 @@ static void hbqt_SlotsExecQTextBlock( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QTextBlock( ( *reinterpret_cast< QTextBlock( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QTextBlock( ( *reinterpret_cast< QTextBlock( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } diff --git a/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp index 196fc95cfe..a83c81bc4e 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp @@ -74,7 +74,7 @@ static void hbqt_SlotsExecQHttpResponseHeader( PHB_ITEM * codeBlock, void ** arg { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QHttpResponseHeader( ( *reinterpret_cast< QHttpResponseHeader( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QHttpResponseHeader( ( *reinterpret_cast< QHttpResponseHeader( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -82,8 +82,8 @@ static void hbqt_SlotsExecQNetworkProxyPointer( PHB_ITEM * codeBlock, void ** ar { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QNetworkProxy( ( *reinterpret_cast< QNetworkProxy( * )>( arguments[ 1 ] ) ) ) ); - hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 2 ] ) ); + hb_vmPushPointer( new QNetworkProxy( ( *reinterpret_cast< QNetworkProxy( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ + hb_vmPushPointer( *reinterpret_cast< void*( * )>( arguments[ 2 ] ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 2 ); } @@ -91,7 +91,7 @@ static void hbqt_SlotsExecQNetworkRequest( PHB_ITEM * codeBlock, void ** argumen { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QNetworkRequest( ( *reinterpret_cast< QNetworkRequest( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QNetworkRequest( ( *reinterpret_cast< QNetworkRequest( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); } @@ -99,7 +99,7 @@ static void hbqt_SlotsExecQUrlInfo( PHB_ITEM * codeBlock, void ** arguments ) { hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushPointer( new QUrlInfo( ( *reinterpret_cast< QUrlInfo( * )>( arguments[ 1 ] ) ) ) ); + hb_vmPushPointer( new QUrlInfo( ( *reinterpret_cast< QUrlInfo( * )>( arguments[ 1 ] ) ) ) ); /* TOFIX: Pass .prg level object to callback */ hb_vmSend( 1 ); }