diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 96dc224e67..d49ed2fc85 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,14 +17,25 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-21 17:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/hbqt_misc.prg + + Introduced new class HbQtObjectHandler() and made all Qt + classes INHERIT from it. This class is responsible for managing + common variables and tasks. Shifted VAR pPtr and METHODS configure() + and OnError() into this class. + + * Regenerated .prg sources + 2009-12-21 16:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/generator/hbqtgen.prg * contrib/hbqt/hbqt_misc.prg - * Regenerated .prg sources + Implemented class level error handelling if wrong message is sent to the object. The message is displayed in Qt's message box and includes ProcName()/ProcLine(). + * Regenerated .prg sources + 2009-12-22 01:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * external/pcre/Makefile ! Forcing C mode for this external component, which is diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 97ad7931c0..cf53532ae1 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1554,16 +1554,19 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) aadd( txt_, '' ) n := ascan( cls_, {|e_| left( lower( e_[ 1 ] ), 7 ) == 'inherit' .and. !empty( e_[ 2 ] ) } ) - s := 'CREATE CLASS ' + cWidget + iif( n > 0, ' INHERIT ' + cls_[ n, 2 ], '' ) + //s := 'CREATE CLASS ' + cWidget + iif( n > 0, ' INHERIT HbQtObjectHandler' + iif( empty( cls_[ n, 2 ] ), "" , ", " + cls_[ n, 2 ] ), '' ) + s := 'CREATE CLASS ' + cWidget + ' INHERIT HbQtObjectHandler' + iif( n > 0, ", " + cls_[ n, 2 ], '' ) aadd( txt_, s ) aadd( txt_, ' ' ) + #if 0 aadd( txt_, ' VAR pPtr' ) aadd( txt_, ' ' ) aadd( txt_, ' ERROR HANDLER onError()' ) aadd( txt_, ' ' ) + #endif aadd( txt_, ' METHOD new()' ) - aadd( txt_, ' METHOD configure( xObject )' ) + //aadd( txt_, ' METHOD configure( xObject )' ) aadd( txt_, ' ' ) /* Populate METHODS */ @@ -1605,6 +1608,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( ... )' ) aadd( txt_, ' RETURN Self' ) aadd( txt_, ' ' ) + #if 0 aadd( txt_, ' ' ) aadd( txt_, 'METHOD ' + cWidget + ':configure( xObject )' ) aadd( txt_, ' IF hb_isObject( xObject )' ) @@ -1618,6 +1622,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) aadd( txt_, 'METHOD ' + cWidget + ':onError()' ) aadd( txt_, ' RETURN hbqt_showError( __GetMessage() )' ) aadd( txt_, ' ' ) + #endif /* Define methods */ FOR i := 1 TO len( mth_ ) aadd( txt_, ' ' ) diff --git a/harbour/contrib/hbqt/hbqt_misc.prg b/harbour/contrib/hbqt/hbqt_misc.prg index 6cc2126983..cf8d67ea53 100644 --- a/harbour/contrib/hbqt/hbqt_misc.prg +++ b/harbour/contrib/hbqt/hbqt_misc.prg @@ -50,10 +50,38 @@ */ /*----------------------------------------------------------------------*/ +#include "hbclass.ch" #include "hbqt.ch" /*----------------------------------------------------------------------*/ +CLASS HbQtObjectHandler + + VAR pPtr + + METHOD configure() + + ERROR HANDLER onError() + + ENDCLASS + +/*----------------------------------------------------------------------*/ + +METHOD HbQtObjectHandler:configure( xObject ) + IF hb_isObject( xObject ) + ::pPtr := xObject:pPtr + ELSEIF hb_isPointer( xObject ) + ::pPtr := xObject + ENDIF + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD HbQtObjectHandler:onError() + RETURN hbqt_showError( __GetMessage() ) + +/*----------------------------------------------------------------------*/ + FUNCTION hbqt_ptr( xParam ) LOCAL cClsName diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg index c5804a3f98..cbe28b2b08 100644 --- a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg +++ b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractItemModel INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractItemModel INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD buddy( pIndex ) METHOD canFetchMore( pParent ) @@ -118,19 +113,6 @@ METHOD QAbstractItemModel:new( ... ) RETURN Self -METHOD QAbstractItemModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractItemModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractItemModel:buddy( pIndex ) RETURN Qt_QAbstractItemModel_buddy( ::pPtr, hbqt_ptr( pIndex ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg index 06ecc07020..5bd8007ed6 100644 --- a/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg +++ b/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractListModel INHERIT QAbstractItemModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractListModel INHERIT HbQtObjectHandler, QAbstractItemModel METHOD new() - METHOD configure( xObject ) METHOD index( nRow, nColumn, pParent ) @@ -87,19 +82,6 @@ METHOD QAbstractListModel:new( ... ) RETURN Self -METHOD QAbstractListModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractListModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractListModel:index( nRow, nColumn, pParent ) RETURN Qt_QAbstractListModel_index( ::pPtr, nRow, nColumn, hbqt_ptr( pParent ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg index 6c9693a360..543e918ed0 100644 --- a/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg +++ b/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractTableModel INHERIT QAbstractItemModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractTableModel INHERIT HbQtObjectHandler, QAbstractItemModel METHOD new() - METHOD configure( xObject ) METHOD index( nRow, nColumn, pParent ) @@ -87,19 +82,6 @@ METHOD QAbstractTableModel:new( ... ) RETURN Self -METHOD QAbstractTableModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractTableModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractTableModel:index( nRow, nColumn, pParent ) RETURN Qt_QAbstractTableModel_index( ::pPtr, nRow, nColumn, hbqt_ptr( pParent ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQBitArray.prg b/harbour/contrib/hbqt/qtcore/TQBitArray.prg index 6a8b398bae..9c87a4a5c5 100644 --- a/harbour/contrib/hbqt/qtcore/TQBitArray.prg +++ b/harbour/contrib/hbqt/qtcore/TQBitArray.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QBitArray - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QBitArray INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD at( nI ) METHOD clear() @@ -102,19 +97,6 @@ METHOD QBitArray:new( ... ) RETURN Self -METHOD QBitArray:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QBitArray:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QBitArray:at( nI ) RETURN Qt_QBitArray_at( ::pPtr, nI ) diff --git a/harbour/contrib/hbqt/qtcore/TQByteArray.prg b/harbour/contrib/hbqt/qtcore/TQByteArray.prg index e5a70688d1..69fc7b768c 100644 --- a/harbour/contrib/hbqt/qtcore/TQByteArray.prg +++ b/harbour/contrib/hbqt/qtcore/TQByteArray.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QByteArray - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QByteArray INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD append( pBa ) METHOD append_1( cStr ) @@ -183,19 +178,6 @@ METHOD QByteArray:new( ... ) RETURN Self -METHOD QByteArray:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QByteArray:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QByteArray:append( pBa ) RETURN Qt_QByteArray_append( ::pPtr, hbqt_ptr( pBa ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg b/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg index 00a7250196..06c13d3325 100644 --- a/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg +++ b/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCoreApplication INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCoreApplication INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD notify( pReceiver, pEvent ) METHOD addLibraryPath( cPath ) @@ -126,19 +121,6 @@ METHOD QCoreApplication:new( ... ) RETURN Self -METHOD QCoreApplication:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCoreApplication:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCoreApplication:notify( pReceiver, pEvent ) RETURN Qt_QCoreApplication_notify( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pEvent ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQDataStream.prg b/harbour/contrib/hbqt/qtcore/TQDataStream.prg index a3bd5c2bba..8814f8e9f4 100644 --- a/harbour/contrib/hbqt/qtcore/TQDataStream.prg +++ b/harbour/contrib/hbqt/qtcore/TQDataStream.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDataStream - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDataStream INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD atEnd() METHOD byteOrder() @@ -99,19 +94,6 @@ METHOD QDataStream:new( ... ) RETURN Self -METHOD QDataStream:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDataStream:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDataStream:atEnd() RETURN Qt_QDataStream_atEnd( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQDate.prg b/harbour/contrib/hbqt/qtcore/TQDate.prg index 4835bf361f..aa77d8e941 100644 --- a/harbour/contrib/hbqt/qtcore/TQDate.prg +++ b/harbour/contrib/hbqt/qtcore/TQDate.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDate - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDate INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addDays( nNdays ) METHOD addMonths( nNmonths ) @@ -105,19 +100,6 @@ METHOD QDate:new( ... ) RETURN Self -METHOD QDate:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDate:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDate:addDays( nNdays ) RETURN Qt_QDate_addDays( ::pPtr, nNdays ) diff --git a/harbour/contrib/hbqt/qtcore/TQDateTime.prg b/harbour/contrib/hbqt/qtcore/TQDateTime.prg index ce13172a44..1d84cef75f 100644 --- a/harbour/contrib/hbqt/qtcore/TQDateTime.prg +++ b/harbour/contrib/hbqt/qtcore/TQDateTime.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDateTime - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDateTime INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addDays( nNdays ) METHOD addMSecs( nMsecs ) @@ -112,19 +107,6 @@ METHOD QDateTime:new( ... ) RETURN Self -METHOD QDateTime:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDateTime:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDateTime:addDays( nNdays ) RETURN Qt_QDateTime_addDays( ::pPtr, nNdays ) diff --git a/harbour/contrib/hbqt/qtcore/TQDir.prg b/harbour/contrib/hbqt/qtcore/TQDir.prg index 902a085d29..d5085718fc 100644 --- a/harbour/contrib/hbqt/qtcore/TQDir.prg +++ b/harbour/contrib/hbqt/qtcore/TQDir.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDir - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDir INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD absoluteFilePath( cFileName ) METHOD absolutePath() @@ -138,19 +133,6 @@ METHOD QDir:new( ... ) RETURN Self -METHOD QDir:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDir:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDir:absoluteFilePath( cFileName ) RETURN Qt_QDir_absoluteFilePath( ::pPtr, cFileName ) diff --git a/harbour/contrib/hbqt/qtcore/TQEvent.prg b/harbour/contrib/hbqt/qtcore/TQEvent.prg index a6bdf7114c..07e7a50127 100644 --- a/harbour/contrib/hbqt/qtcore/TQEvent.prg +++ b/harbour/contrib/hbqt/qtcore/TQEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QEvent INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD accept() METHOD ignore() @@ -93,19 +88,6 @@ METHOD QEvent:new( ... ) RETURN Self -METHOD QEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QEvent:accept() RETURN Qt_QEvent_accept( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQEventLoop.prg b/harbour/contrib/hbqt/qtcore/TQEventLoop.prg index 1a59852fa9..cf8abcf898 100644 --- a/harbour/contrib/hbqt/qtcore/TQEventLoop.prg +++ b/harbour/contrib/hbqt/qtcore/TQEventLoop.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QEventLoop INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QEventLoop INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD exec( nFlags ) METHOD exit( nReturnCode ) @@ -92,19 +87,6 @@ METHOD QEventLoop:new( ... ) RETURN Self -METHOD QEventLoop:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QEventLoop:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QEventLoop:exec( nFlags ) RETURN Qt_QEventLoop_exec( ::pPtr, nFlags ) diff --git a/harbour/contrib/hbqt/qtcore/TQFile.prg b/harbour/contrib/hbqt/qtcore/TQFile.prg index d57ec18855..fd15cc3298 100644 --- a/harbour/contrib/hbqt/qtcore/TQFile.prg +++ b/harbour/contrib/hbqt/qtcore/TQFile.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFile INHERIT QIODevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFile INHERIT HbQtObjectHandler, QIODevice METHOD new() - METHOD configure( xObject ) METHOD atEnd() METHOD close() @@ -120,19 +115,6 @@ METHOD QFile:new( ... ) RETURN Self -METHOD QFile:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFile:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFile:atEnd() RETURN Qt_QFile_atEnd( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQFileInfo.prg b/harbour/contrib/hbqt/qtcore/TQFileInfo.prg index 7f74dffb11..5a4ae8bef6 100644 --- a/harbour/contrib/hbqt/qtcore/TQFileInfo.prg +++ b/harbour/contrib/hbqt/qtcore/TQFileInfo.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFileInfo - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFileInfo INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD absoluteDir() METHOD absoluteFilePath() @@ -130,19 +125,6 @@ METHOD QFileInfo:new( ... ) RETURN Self -METHOD QFileInfo:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFileInfo:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFileInfo:absoluteDir() RETURN Qt_QFileInfo_absoluteDir( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQIODevice.prg b/harbour/contrib/hbqt/qtcore/TQIODevice.prg index 873793e588..298a9d91e3 100644 --- a/harbour/contrib/hbqt/qtcore/TQIODevice.prg +++ b/harbour/contrib/hbqt/qtcore/TQIODevice.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QIODevice INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QIODevice INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD atEnd() METHOD bytesAvailable() @@ -119,19 +114,6 @@ METHOD QIODevice:new( ... ) RETURN Self -METHOD QIODevice:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QIODevice:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QIODevice:atEnd() RETURN Qt_QIODevice_atEnd( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg b/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg index 2305ad7f3e..4c473c24d6 100644 --- a/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg +++ b/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLatin1Char - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLatin1Char INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD toLatin1() METHOD unicode() @@ -88,19 +83,6 @@ METHOD QLatin1Char:new( ... ) RETURN Self -METHOD QLatin1Char:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLatin1Char:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLatin1Char:toLatin1() RETURN Qt_QLatin1Char_toLatin1( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1String.prg b/harbour/contrib/hbqt/qtcore/TQLatin1String.prg index a7c8ac0f6a..0a4e760128 100644 --- a/harbour/contrib/hbqt/qtcore/TQLatin1String.prg +++ b/harbour/contrib/hbqt/qtcore/TQLatin1String.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLatin1String - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLatin1String INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD latin1() @@ -87,19 +82,6 @@ METHOD QLatin1String:new( ... ) RETURN Self -METHOD QLatin1String:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLatin1String:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLatin1String:latin1() RETURN Qt_QLatin1String_latin1( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQLine.prg b/harbour/contrib/hbqt/qtcore/TQLine.prg index af11662aa5..989c231c3d 100644 --- a/harbour/contrib/hbqt/qtcore/TQLine.prg +++ b/harbour/contrib/hbqt/qtcore/TQLine.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLine - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLine INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD p1() METHOD p2() @@ -103,19 +98,6 @@ METHOD QLine:new( ... ) RETURN Self -METHOD QLine:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLine:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLine:p1() RETURN Qt_QLine_p1( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQLineF.prg b/harbour/contrib/hbqt/qtcore/TQLineF.prg index 53e8fee157..bd80d41d1a 100644 --- a/harbour/contrib/hbqt/qtcore/TQLineF.prg +++ b/harbour/contrib/hbqt/qtcore/TQLineF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLineF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLineF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD p1() METHOD p2() @@ -113,19 +108,6 @@ METHOD QLineF:new( ... ) RETURN Self -METHOD QLineF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLineF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLineF:p1() RETURN Qt_QLineF_p1( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQList.prg b/harbour/contrib/hbqt/qtcore/TQList.prg index 544e7f922e..d3f8a13218 100644 --- a/harbour/contrib/hbqt/qtcore/TQList.prg +++ b/harbour/contrib/hbqt/qtcore/TQList.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QList - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QList INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD append( xValue ) METHOD at( nI ) @@ -126,19 +121,6 @@ METHOD QList:new( ... ) RETURN Self -METHOD QList:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QList:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QList:append( xValue ) RETURN Qt_QList_append( ::pPtr, xValue ) diff --git a/harbour/contrib/hbqt/qtcore/TQLocale.prg b/harbour/contrib/hbqt/qtcore/TQLocale.prg index 68bb692089..4a263d6c82 100644 --- a/harbour/contrib/hbqt/qtcore/TQLocale.prg +++ b/harbour/contrib/hbqt/qtcore/TQLocale.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLocale - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLocale INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD amText() METHOD country() @@ -134,19 +129,6 @@ METHOD QLocale:new( ... ) RETURN Self -METHOD QLocale:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLocale:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLocale:amText() RETURN Qt_QLocale_amText( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQMimeData.prg b/harbour/contrib/hbqt/qtcore/TQMimeData.prg index 581468f002..a918683634 100644 --- a/harbour/contrib/hbqt/qtcore/TQMimeData.prg +++ b/harbour/contrib/hbqt/qtcore/TQMimeData.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMimeData INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMimeData INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD clear() METHOD colorData() @@ -105,19 +100,6 @@ METHOD QMimeData:new( ... ) RETURN Self -METHOD QMimeData:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMimeData:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMimeData:clear() RETURN Qt_QMimeData_clear( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQModelIndex.prg b/harbour/contrib/hbqt/qtcore/TQModelIndex.prg index 666339493a..5be1b29330 100644 --- a/harbour/contrib/hbqt/qtcore/TQModelIndex.prg +++ b/harbour/contrib/hbqt/qtcore/TQModelIndex.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QModelIndex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QModelIndex INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD child( nRow, nColumn ) METHOD column() @@ -97,19 +92,6 @@ METHOD QModelIndex:new( ... ) RETURN Self -METHOD QModelIndex:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QModelIndex:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QModelIndex:child( nRow, nColumn ) RETURN Qt_QModelIndex_child( ::pPtr, nRow, nColumn ) diff --git a/harbour/contrib/hbqt/qtcore/TQObject.prg b/harbour/contrib/hbqt/qtcore/TQObject.prg index 8639cfbe4e..e5a2769887 100644 --- a/harbour/contrib/hbqt/qtcore/TQObject.prg +++ b/harbour/contrib/hbqt/qtcore/TQObject.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QObject INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD blockSignals( lBlock ) METHOD connect( pSender, pSignal, pMethod, nType ) @@ -115,19 +110,6 @@ METHOD QObject:new( ... ) RETURN Self -METHOD QObject:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QObject:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QObject:blockSignals( lBlock ) RETURN Qt_QObject_blockSignals( ::pPtr, lBlock ) diff --git a/harbour/contrib/hbqt/qtcore/TQPoint.prg b/harbour/contrib/hbqt/qtcore/TQPoint.prg index 5dd82b0f0f..c16f4fc83a 100644 --- a/harbour/contrib/hbqt/qtcore/TQPoint.prg +++ b/harbour/contrib/hbqt/qtcore/TQPoint.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPoint - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPoint INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD isNull() METHOD manhattanLength() @@ -94,19 +89,6 @@ METHOD QPoint:new( ... ) RETURN Self -METHOD QPoint:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPoint:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPoint:isNull() RETURN Qt_QPoint_isNull( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQPointF.prg b/harbour/contrib/hbqt/qtcore/TQPointF.prg index 680112fabd..1675e87499 100644 --- a/harbour/contrib/hbqt/qtcore/TQPointF.prg +++ b/harbour/contrib/hbqt/qtcore/TQPointF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPointF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPointF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD isNull() METHOD rx() @@ -94,19 +89,6 @@ METHOD QPointF:new( ... ) RETURN Self -METHOD QPointF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPointF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPointF:isNull() RETURN Qt_QPointF_isNull( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQProcess.prg b/harbour/contrib/hbqt/qtcore/TQProcess.prg index 3b466fec46..311afc243c 100644 --- a/harbour/contrib/hbqt/qtcore/TQProcess.prg +++ b/harbour/contrib/hbqt/qtcore/TQProcess.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QProcess INHERIT QIODevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QProcess INHERIT HbQtObjectHandler, QIODevice METHOD new() - METHOD configure( xObject ) METHOD close() METHOD closeReadChannel( nChannel ) @@ -119,19 +114,6 @@ METHOD QProcess:new( ... ) RETURN Self -METHOD QProcess:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QProcess:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QProcess:close() RETURN Qt_QProcess_close( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQRect.prg b/harbour/contrib/hbqt/qtcore/TQRect.prg index 73293d36b6..7740b5d29e 100644 --- a/harbour/contrib/hbqt/qtcore/TQRect.prg +++ b/harbour/contrib/hbqt/qtcore/TQRect.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRect - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRect INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD adjust( nDx1, nDy1, nDx2, nDy2 ) METHOD adjusted( nDx1, nDy1, nDx2, nDy2 ) @@ -145,19 +140,6 @@ METHOD QRect:new( ... ) RETURN Self -METHOD QRect:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRect:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QRect:adjust( nDx1, nDy1, nDx2, nDy2 ) RETURN Qt_QRect_adjust( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) diff --git a/harbour/contrib/hbqt/qtcore/TQRectF.prg b/harbour/contrib/hbqt/qtcore/TQRectF.prg index 975b88c171..9d59a54175 100644 --- a/harbour/contrib/hbqt/qtcore/TQRectF.prg +++ b/harbour/contrib/hbqt/qtcore/TQRectF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRectF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRectF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD adjust( nDx1, nDy1, nDx2, nDy2 ) METHOD adjusted( nDx1, nDy1, nDx2, nDy2 ) @@ -146,19 +141,6 @@ METHOD QRectF:new( ... ) RETURN Self -METHOD QRectF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRectF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QRectF:adjust( nDx1, nDy1, nDx2, nDy2 ) RETURN Qt_QRectF_adjust( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) diff --git a/harbour/contrib/hbqt/qtcore/TQRegExp.prg b/harbour/contrib/hbqt/qtcore/TQRegExp.prg index 29192aa550..48446c0b39 100644 --- a/harbour/contrib/hbqt/qtcore/TQRegExp.prg +++ b/harbour/contrib/hbqt/qtcore/TQRegExp.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRegExp - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRegExp INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD cap( nNth ) METHOD capturedTexts() @@ -105,19 +100,6 @@ METHOD QRegExp:new( ... ) RETURN Self -METHOD QRegExp:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRegExp:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QRegExp:cap( nNth ) RETURN Qt_QRegExp_cap( ::pPtr, nNth ) diff --git a/harbour/contrib/hbqt/qtcore/TQResource.prg b/harbour/contrib/hbqt/qtcore/TQResource.prg index 592e3d143f..c529d01253 100644 --- a/harbour/contrib/hbqt/qtcore/TQResource.prg +++ b/harbour/contrib/hbqt/qtcore/TQResource.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QResource - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QResource INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD absoluteFilePath() METHOD data() @@ -98,19 +93,6 @@ METHOD QResource:new( ... ) RETURN Self -METHOD QResource:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QResource:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QResource:absoluteFilePath() RETURN Qt_QResource_absoluteFilePath( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg b/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg index f6c7f601f0..5e5dbefeb4 100644 --- a/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg +++ b/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSignalMapper INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSignalMapper INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD mapping( nId ) METHOD mapping_1( cId ) @@ -97,19 +92,6 @@ METHOD QSignalMapper:new( ... ) RETURN Self -METHOD QSignalMapper:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSignalMapper:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSignalMapper:mapping( nId ) RETURN Qt_QSignalMapper_mapping( ::pPtr, nId ) diff --git a/harbour/contrib/hbqt/qtcore/TQSize.prg b/harbour/contrib/hbqt/qtcore/TQSize.prg index 5a24db1a16..f442327e11 100644 --- a/harbour/contrib/hbqt/qtcore/TQSize.prg +++ b/harbour/contrib/hbqt/qtcore/TQSize.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSize - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSize INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD height() METHOD isEmpty() @@ -100,19 +95,6 @@ METHOD QSize:new( ... ) RETURN Self -METHOD QSize:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSize:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSize:height() RETURN Qt_QSize_height( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQSizeF.prg b/harbour/contrib/hbqt/qtcore/TQSizeF.prg index 7bf2cca20f..722850ce1d 100644 --- a/harbour/contrib/hbqt/qtcore/TQSizeF.prg +++ b/harbour/contrib/hbqt/qtcore/TQSizeF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSizeF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSizeF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD boundedTo( pOtherSize ) METHOD expandedTo( pOtherSize ) @@ -101,19 +96,6 @@ METHOD QSizeF:new( ... ) RETURN Self -METHOD QSizeF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSizeF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSizeF:boundedTo( pOtherSize ) RETURN Qt_QSizeF_boundedTo( ::pPtr, hbqt_ptr( pOtherSize ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQStringList.prg b/harbour/contrib/hbqt/qtcore/TQStringList.prg index 69d72b4f9c..8b7770f198 100644 --- a/harbour/contrib/hbqt/qtcore/TQStringList.prg +++ b/harbour/contrib/hbqt/qtcore/TQStringList.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStringList INHERIT QList - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStringList INHERIT HbQtObjectHandler, QList METHOD new() - METHOD configure( xObject ) METHOD append( cValue ) METHOD filter( cStr, nCs ) @@ -121,19 +116,6 @@ METHOD QStringList:new( ... ) RETURN Self -METHOD QStringList:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStringList:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStringList:append( cValue ) RETURN Qt_QStringList_append( ::pPtr, cValue ) diff --git a/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg b/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg index d765b7a967..168b268746 100644 --- a/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg +++ b/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextBoundaryFinder - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextBoundaryFinder INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD boundaryReasons() METHOD isAtBoundary() @@ -97,19 +92,6 @@ METHOD QTextBoundaryFinder:new( ... ) RETURN Self -METHOD QTextBoundaryFinder:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextBoundaryFinder:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextBoundaryFinder:boundaryReasons() RETURN Qt_QTextBoundaryFinder_boundaryReasons( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQTextCodec.prg b/harbour/contrib/hbqt/qtcore/TQTextCodec.prg index b36b1dcae1..1986ac839b 100644 --- a/harbour/contrib/hbqt/qtcore/TQTextCodec.prg +++ b/harbour/contrib/hbqt/qtcore/TQTextCodec.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextCodec - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextCodec INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD canEncode( nCh ) METHOD canEncode_1( cS ) @@ -106,19 +101,6 @@ METHOD QTextCodec:new( ... ) RETURN Self -METHOD QTextCodec:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextCodec:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextCodec:canEncode( nCh ) RETURN Qt_QTextCodec_canEncode( ::pPtr, nCh ) diff --git a/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg b/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg index 445037470b..2808ca4358 100644 --- a/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg +++ b/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextDecoder - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextDecoder INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD toUnicode( pChars, nLen ) @@ -87,19 +82,6 @@ METHOD QTextDecoder:new( ... ) RETURN Self -METHOD QTextDecoder:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextDecoder:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextDecoder:toUnicode( pChars, nLen ) RETURN Qt_QTextDecoder_toUnicode( ::pPtr, hbqt_ptr( pChars ), nLen ) diff --git a/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg b/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg index 8eb93b84c5..7760eda81e 100644 --- a/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg +++ b/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextEncoder - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextEncoder INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD fromUnicode( cStr ) @@ -87,19 +82,6 @@ METHOD QTextEncoder:new( ... ) RETURN Self -METHOD QTextEncoder:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextEncoder:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextEncoder:fromUnicode( cStr ) RETURN Qt_QTextEncoder_fromUnicode( ::pPtr, cStr ) diff --git a/harbour/contrib/hbqt/qtcore/TQTextStream.prg b/harbour/contrib/hbqt/qtcore/TQTextStream.prg index 00ef72f6b4..a3a0cf21c8 100644 --- a/harbour/contrib/hbqt/qtcore/TQTextStream.prg +++ b/harbour/contrib/hbqt/qtcore/TQTextStream.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextStream - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextStream INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD atEnd() METHOD autoDetectUnicode() @@ -122,19 +117,6 @@ METHOD QTextStream:new( ... ) RETURN Self -METHOD QTextStream:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextStream:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextStream:atEnd() RETURN Qt_QTextStream_atEnd( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQThread.prg b/harbour/contrib/hbqt/qtcore/TQThread.prg index 6c4d4aa18d..596ecd7bec 100644 --- a/harbour/contrib/hbqt/qtcore/TQThread.prg +++ b/harbour/contrib/hbqt/qtcore/TQThread.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QThread INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QThread INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD exit( nReturnCode ) METHOD isFinished() @@ -100,19 +95,6 @@ METHOD QThread:new( ... ) RETURN Self -METHOD QThread:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QThread:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QThread:exit( nReturnCode ) RETURN Qt_QThread_exit( ::pPtr, nReturnCode ) diff --git a/harbour/contrib/hbqt/qtcore/TQTime.prg b/harbour/contrib/hbqt/qtcore/TQTime.prg index f927d68c04..c63104caa9 100644 --- a/harbour/contrib/hbqt/qtcore/TQTime.prg +++ b/harbour/contrib/hbqt/qtcore/TQTime.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTime - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTime INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addMSecs( nMs ) METHOD addSecs( nS ) @@ -106,19 +101,6 @@ METHOD QTime:new( ... ) RETURN Self -METHOD QTime:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTime:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTime:addMSecs( nMs ) RETURN Qt_QTime_addMSecs( ::pPtr, nMs ) diff --git a/harbour/contrib/hbqt/qtcore/TQTimer.prg b/harbour/contrib/hbqt/qtcore/TQTimer.prg index ee1e7669a3..20e149d8d4 100644 --- a/harbour/contrib/hbqt/qtcore/TQTimer.prg +++ b/harbour/contrib/hbqt/qtcore/TQTimer.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTimer INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTimer INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD interval() METHOD isActive() @@ -96,19 +91,6 @@ METHOD QTimer:new( ... ) RETURN Self -METHOD QTimer:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTimer:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTimer:interval() RETURN Qt_QTimer_interval( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQTranslator.prg b/harbour/contrib/hbqt/qtcore/TQTranslator.prg index 9391f7ce53..a8d35e823c 100644 --- a/harbour/contrib/hbqt/qtcore/TQTranslator.prg +++ b/harbour/contrib/hbqt/qtcore/TQTranslator.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTranslator INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTranslator INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD isEmpty() METHOD load( cFilename, cDirectory, cSearch_delimiters, cSuffix ) @@ -90,19 +85,6 @@ METHOD QTranslator:new( ... ) RETURN Self -METHOD QTranslator:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTranslator:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTranslator:isEmpty() RETURN Qt_QTranslator_isEmpty( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQUiLoader.prg b/harbour/contrib/hbqt/qtcore/TQUiLoader.prg index 9c51f584ba..c04117d35a 100644 --- a/harbour/contrib/hbqt/qtcore/TQUiLoader.prg +++ b/harbour/contrib/hbqt/qtcore/TQUiLoader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QUiLoader INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QUiLoader INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD addPluginPath( cPath ) METHOD availableLayouts() @@ -100,19 +95,6 @@ METHOD QUiLoader:new( ... ) RETURN Self -METHOD QUiLoader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QUiLoader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QUiLoader:addPluginPath( cPath ) RETURN Qt_QUiLoader_addPluginPath( ::pPtr, cPath ) diff --git a/harbour/contrib/hbqt/qtcore/TQUrl.prg b/harbour/contrib/hbqt/qtcore/TQUrl.prg index 10b90234fe..8d32ada623 100644 --- a/harbour/contrib/hbqt/qtcore/TQUrl.prg +++ b/harbour/contrib/hbqt/qtcore/TQUrl.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QUrl INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QUrl INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addEncodedQueryItem( pKey, pValue ) METHOD addQueryItem( cKey, cValue ) @@ -155,19 +150,6 @@ METHOD QUrl:new( ... ) RETURN Self -METHOD QUrl:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QUrl:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QUrl:addEncodedQueryItem( pKey, pValue ) RETURN Qt_QUrl_addEncodedQueryItem( ::pPtr, hbqt_ptr( pKey ), hbqt_ptr( pValue ) ) diff --git a/harbour/contrib/hbqt/qtcore/TQVariant.prg b/harbour/contrib/hbqt/qtcore/TQVariant.prg index 1691f98aa5..bdbacc3906 100644 --- a/harbour/contrib/hbqt/qtcore/TQVariant.prg +++ b/harbour/contrib/hbqt/qtcore/TQVariant.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QVariant - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QVariant INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD canConvert( nT ) METHOD canConvert_1( nT ) @@ -122,19 +117,6 @@ METHOD QVariant:new( ... ) RETURN Self -METHOD QVariant:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QVariant:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QVariant:canConvert( nT ) RETURN Qt_QVariant_canConvert( ::pPtr, nT ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg b/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg index 94089008cf..0d64f2e66b 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractButton INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractButton INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD autoExclusive() METHOD autoRepeat() @@ -112,19 +107,6 @@ METHOD QAbstractButton:new( ... ) RETURN Self -METHOD QAbstractButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractButton:autoExclusive() RETURN Qt_QAbstractButton_autoExclusive( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg b/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg index 5f35553dc8..42eb28ab81 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractItemDelegate INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractItemDelegate INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD createEditor( pParent, pOption, pIndex ) METHOD editorEvent( pEvent, pModel, pOption, pIndex ) @@ -93,19 +88,6 @@ METHOD QAbstractItemDelegate:new( ... ) RETURN Self -METHOD QAbstractItemDelegate:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractItemDelegate:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractItemDelegate:createEditor( pParent, pOption, pIndex ) RETURN Qt_QAbstractItemDelegate_createEditor( ::pPtr, hbqt_ptr( pParent ), hbqt_ptr( pOption ), hbqt_ptr( pIndex ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg b/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg index f8a8a79eed..45ff21c651 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractItemView INHERIT QAbstractScrollArea - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractItemView INHERIT HbQtObjectHandler, QAbstractScrollArea METHOD new() - METHOD configure( xObject ) METHOD alternatingRowColors() METHOD autoScrollMargin() @@ -149,19 +144,6 @@ METHOD QAbstractItemView:new( ... ) RETURN Self -METHOD QAbstractItemView:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractItemView:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractItemView:alternatingRowColors() RETURN Qt_QAbstractItemView_alternatingRowColors( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg b/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg index 6ca9c14095..d197eb8a15 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractPrintDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractPrintDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD exec() METHOD fromPage() @@ -96,19 +91,6 @@ METHOD QAbstractPrintDialog:new( ... ) RETURN Self -METHOD QAbstractPrintDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractPrintDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractPrintDialog:exec() RETURN Qt_QAbstractPrintDialog_exec( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg b/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg index 84f135faa5..83435a7502 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractProxyModel INHERIT QAbstractItemModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractProxyModel INHERIT HbQtObjectHandler, QAbstractItemModel METHOD new() - METHOD configure( xObject ) METHOD mapFromSource( pSourceIndex ) METHOD mapSelectionFromSource( pSourceSelection ) @@ -92,19 +87,6 @@ METHOD QAbstractProxyModel:new( ... ) RETURN Self -METHOD QAbstractProxyModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractProxyModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractProxyModel:mapFromSource( pSourceIndex ) RETURN Qt_QAbstractProxyModel_mapFromSource( ::pPtr, hbqt_ptr( pSourceIndex ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg b/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg index 20df72108e..822bb1197c 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractScrollArea INHERIT QFrame - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractScrollArea INHERIT HbQtObjectHandler, QFrame METHOD new() - METHOD configure( xObject ) METHOD addScrollBarWidget( pWidget, nAlignment ) METHOD cornerWidget() @@ -100,19 +95,6 @@ METHOD QAbstractScrollArea:new( ... ) RETURN Self -METHOD QAbstractScrollArea:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractScrollArea:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractScrollArea:addScrollBarWidget( pWidget, nAlignment ) RETURN Qt_QAbstractScrollArea_addScrollBarWidget( ::pPtr, hbqt_ptr( pWidget ), nAlignment ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg b/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg index c972df0c41..2d839d1336 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractSlider INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractSlider INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD hasTracking() METHOD invertedAppearance() @@ -110,19 +105,6 @@ METHOD QAbstractSlider:new( ... ) RETURN Self -METHOD QAbstractSlider:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractSlider:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractSlider:hasTracking() RETURN Qt_QAbstractSlider_hasTracking( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg index ec34367a0b..a7b0fb504f 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractSpinBox INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractSpinBox INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD buttonSymbols() @@ -112,19 +107,6 @@ METHOD QAbstractSpinBox:new( ... ) RETURN Self -METHOD QAbstractSpinBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractSpinBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractSpinBox:alignment() RETURN Qt_QAbstractSpinBox_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg b/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg index ee346f268d..8a13557905 100644 --- a/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAbstractTextDocumentLayout INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAbstractTextDocumentLayout INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD anchorAt( pPosition ) METHOD blockBoundingRect( pBlock ) @@ -97,19 +92,6 @@ METHOD QAbstractTextDocumentLayout:new( ... ) RETURN Self -METHOD QAbstractTextDocumentLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAbstractTextDocumentLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAbstractTextDocumentLayout:anchorAt( pPosition ) RETURN Qt_QAbstractTextDocumentLayout_anchorAt( ::pPtr, hbqt_ptr( pPosition ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQAction.prg b/harbour/contrib/hbqt/qtgui/TQAction.prg index d4fc0d4691..1c5360112c 100644 --- a/harbour/contrib/hbqt/qtgui/TQAction.prg +++ b/harbour/contrib/hbqt/qtgui/TQAction.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QAction INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QAction INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD actionGroup() METHOD activate( nEvent ) @@ -134,19 +129,6 @@ METHOD QAction:new( ... ) RETURN Self -METHOD QAction:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QAction:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QAction:actionGroup() RETURN Qt_QAction_actionGroup( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQActionGroup.prg b/harbour/contrib/hbqt/qtgui/TQActionGroup.prg index b25fc4cfb7..91b38fe462 100644 --- a/harbour/contrib/hbqt/qtgui/TQActionGroup.prg +++ b/harbour/contrib/hbqt/qtgui/TQActionGroup.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QActionGroup INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QActionGroup INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD addAction( pAction ) METHOD addAction_1( cText ) @@ -98,19 +93,6 @@ METHOD QActionGroup:new( ... ) RETURN Self -METHOD QActionGroup:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QActionGroup:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QActionGroup:addAction( pAction ) RETURN Qt_QActionGroup_addAction( ::pPtr, hbqt_ptr( pAction ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQApplication.prg b/harbour/contrib/hbqt/qtgui/TQApplication.prg index 23cac6f0ae..63936333cd 100644 --- a/harbour/contrib/hbqt/qtgui/TQApplication.prg +++ b/harbour/contrib/hbqt/qtgui/TQApplication.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QApplication INHERIT QCoreApplication - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QApplication INHERIT HbQtObjectHandler, QCoreApplication METHOD new() - METHOD configure( xObject ) METHOD commitData( pManager ) METHOD inputContext() @@ -162,19 +157,6 @@ METHOD QApplication:new( ... ) RETURN Self -METHOD QApplication:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QApplication:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QApplication:commitData( pManager ) RETURN Qt_QApplication_commitData( ::pPtr, hbqt_ptr( pManager ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQBitmap.prg b/harbour/contrib/hbqt/qtgui/TQBitmap.prg index 1c87b8fde4..170ad69a0e 100644 --- a/harbour/contrib/hbqt/qtgui/TQBitmap.prg +++ b/harbour/contrib/hbqt/qtgui/TQBitmap.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QBitmap INHERIT QPixmap - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QBitmap INHERIT HbQtObjectHandler, QPixmap METHOD new() - METHOD configure( xObject ) METHOD clear() METHOD transformed( pMatrix ) @@ -90,19 +85,6 @@ METHOD QBitmap:new( ... ) RETURN Self -METHOD QBitmap:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QBitmap:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QBitmap:clear() RETURN Qt_QBitmap_clear( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg index b08d5884b0..d9b4df9f27 100644 --- a/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QBoxLayout INHERIT QLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QBoxLayout INHERIT HbQtObjectHandler, QLayout METHOD new() - METHOD configure( xObject ) METHOD addLayout( pLayout, nStretch ) METHOD addSpacerItem( pSpacerItem ) @@ -106,19 +101,6 @@ METHOD QBoxLayout:new( ... ) RETURN Self -METHOD QBoxLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QBoxLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QBoxLayout:addLayout( pLayout, nStretch ) RETURN Qt_QBoxLayout_addLayout( ::pPtr, hbqt_ptr( pLayout ), nStretch ) diff --git a/harbour/contrib/hbqt/qtgui/TQBrush.prg b/harbour/contrib/hbqt/qtgui/TQBrush.prg index 5bc1d3e713..a12df430f8 100644 --- a/harbour/contrib/hbqt/qtgui/TQBrush.prg +++ b/harbour/contrib/hbqt/qtgui/TQBrush.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QBrush - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QBrush INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD color() METHOD isOpaque() @@ -100,19 +95,6 @@ METHOD QBrush:new( ... ) RETURN Self -METHOD QBrush:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QBrush:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QBrush:color() RETURN Qt_QBrush_color( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg b/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg index 3fb8a20e1c..db16b3e9c0 100644 --- a/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg +++ b/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QButtonGroup INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QButtonGroup INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD addButton( pButton ) METHOD addButton_1( pButton, nId ) @@ -96,19 +91,6 @@ METHOD QButtonGroup:new( ... ) RETURN Self -METHOD QButtonGroup:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QButtonGroup:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QButtonGroup:addButton( pButton ) RETURN Qt_QButtonGroup_addButton( ::pPtr, hbqt_ptr( pButton ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg b/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg index 9dafad6005..973c43a2a9 100644 --- a/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCalendarWidget INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCalendarWidget INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD dateEditAcceptDelay() METHOD dateTextFormat( pDate ) @@ -124,19 +119,6 @@ METHOD QCalendarWidget:new( ... ) RETURN Self -METHOD QCalendarWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCalendarWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCalendarWidget:dateEditAcceptDelay() RETURN Qt_QCalendarWidget_dateEditAcceptDelay( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQCheckBox.prg b/harbour/contrib/hbqt/qtgui/TQCheckBox.prg index 32a8b53164..19f9f98643 100644 --- a/harbour/contrib/hbqt/qtgui/TQCheckBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQCheckBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCheckBox INHERIT QAbstractButton - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCheckBox INHERIT HbQtObjectHandler, QAbstractButton METHOD new() - METHOD configure( xObject ) METHOD checkState() METHOD isTristate() @@ -90,19 +85,6 @@ METHOD QCheckBox:new( ... ) RETURN Self -METHOD QCheckBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCheckBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCheckBox:checkState() RETURN Qt_QCheckBox_checkState( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQClipboard.prg b/harbour/contrib/hbqt/qtgui/TQClipboard.prg index 12ebc3ef47..a41efb1249 100644 --- a/harbour/contrib/hbqt/qtgui/TQClipboard.prg +++ b/harbour/contrib/hbqt/qtgui/TQClipboard.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QClipboard INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QClipboard INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD clear( nMode ) METHOD image( nMode ) @@ -100,19 +95,6 @@ METHOD QClipboard:new( ... ) RETURN Self -METHOD QClipboard:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QClipboard:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QClipboard:clear( nMode ) RETURN Qt_QClipboard_clear( ::pPtr, nMode ) diff --git a/harbour/contrib/hbqt/qtgui/TQColor.prg b/harbour/contrib/hbqt/qtgui/TQColor.prg index 23325c5f3d..d1a4b53987 100644 --- a/harbour/contrib/hbqt/qtgui/TQColor.prg +++ b/harbour/contrib/hbqt/qtgui/TQColor.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QColor - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QColor INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD alpha() METHOD alphaF() @@ -151,19 +146,6 @@ METHOD QColor:new( ... ) RETURN Self -METHOD QColor:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QColor:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QColor:alpha() RETURN Qt_QColor_alpha( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQColorDialog.prg b/harbour/contrib/hbqt/qtgui/TQColorDialog.prg index 02274371ea..baf8b3b743 100644 --- a/harbour/contrib/hbqt/qtgui/TQColorDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQColorDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QColorDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QColorDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD currentColor() METHOD open() @@ -101,19 +96,6 @@ METHOD QColorDialog:new( ... ) RETURN Self -METHOD QColorDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QColorDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QColorDialog:currentColor() RETURN Qt_QColorDialog_currentColor( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQComboBox.prg b/harbour/contrib/hbqt/qtgui/TQComboBox.prg index 5540f50784..2a5fa86147 100644 --- a/harbour/contrib/hbqt/qtgui/TQComboBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQComboBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QComboBox INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QComboBox INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addItem( cText, pUserData ) METHOD addItem_1( cIcon, cText, pUserData ) @@ -145,19 +140,6 @@ METHOD QComboBox:new( ... ) RETURN Self -METHOD QComboBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QComboBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QComboBox:addItem( cText, pUserData ) RETURN Qt_QComboBox_addItem( ::pPtr, cText, hbqt_ptr( pUserData ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg b/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg index 22eebc3dbf..373fbb44b8 100644 --- a/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCommandLinkButton INHERIT QPushButton - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCommandLinkButton INHERIT HbQtObjectHandler, QPushButton METHOD new() - METHOD configure( xObject ) METHOD description() METHOD setDescription( cDescription ) @@ -88,19 +83,6 @@ METHOD QCommandLinkButton:new( ... ) RETURN Self -METHOD QCommandLinkButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCommandLinkButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCommandLinkButton:description() RETURN Qt_QCommandLinkButton_description( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg b/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg index 1e23bbee27..4ca104e009 100644 --- a/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg +++ b/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCommonStyle INHERIT QStyle - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCommonStyle INHERIT HbQtObjectHandler, QStyle METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QCommonStyle:new( ... ) ::pPtr := Qt_QCommonStyle( ... ) RETURN Self - -METHOD QCommonStyle:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCommonStyle:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQCompleter.prg b/harbour/contrib/hbqt/qtgui/TQCompleter.prg index 81c861228a..747137662d 100644 --- a/harbour/contrib/hbqt/qtgui/TQCompleter.prg +++ b/harbour/contrib/hbqt/qtgui/TQCompleter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCompleter INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCompleter INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD caseSensitivity() METHOD completionColumn() @@ -115,19 +110,6 @@ METHOD QCompleter:new( ... ) RETURN Self -METHOD QCompleter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCompleter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCompleter:caseSensitivity() RETURN Qt_QCompleter_caseSensitivity( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg b/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg index c8857066fd..bd1b06b5c2 100644 --- a/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg +++ b/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QConicalGradient INHERIT QGradient - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QConicalGradient INHERIT HbQtObjectHandler, QGradient METHOD new() - METHOD configure( xObject ) METHOD angle() METHOD center() @@ -91,19 +86,6 @@ METHOD QConicalGradient:new( ... ) RETURN Self -METHOD QConicalGradient:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QConicalGradient:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QConicalGradient:angle() RETURN Qt_QConicalGradient_angle( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg b/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg index eb03fc2921..450ba151bb 100644 --- a/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QContextMenuEvent INHERIT QInputEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QContextMenuEvent INHERIT HbQtObjectHandler, QInputEvent METHOD new() - METHOD configure( xObject ) METHOD globalPos() METHOD globalX() @@ -93,19 +88,6 @@ METHOD QContextMenuEvent:new( ... ) RETURN Self -METHOD QContextMenuEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QContextMenuEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QContextMenuEvent:globalPos() RETURN Qt_QContextMenuEvent_globalPos( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQCursor.prg b/harbour/contrib/hbqt/qtgui/TQCursor.prg index 219081b6bf..026eff9408 100644 --- a/harbour/contrib/hbqt/qtgui/TQCursor.prg +++ b/harbour/contrib/hbqt/qtgui/TQCursor.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QCursor - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QCursor INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD bitmap() METHOD hotSpot() @@ -95,19 +90,6 @@ METHOD QCursor:new( ... ) RETURN Self -METHOD QCursor:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QCursor:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QCursor:bitmap() RETURN Qt_QCursor_bitmap( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDateEdit.prg b/harbour/contrib/hbqt/qtgui/TQDateEdit.prg index e2bd8a8777..6a8aa6981e 100644 --- a/harbour/contrib/hbqt/qtgui/TQDateEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQDateEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDateEdit INHERIT QDateTimeEdit - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDateEdit INHERIT HbQtObjectHandler, QDateTimeEdit METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QDateEdit:new( ... ) ::pPtr := Qt_QDateEdit( ... ) RETURN Self - -METHOD QDateEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDateEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg b/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg index ac0072aca1..4cb3c7fbdb 100644 --- a/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDateTimeEdit INHERIT QAbstractSpinBox - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDateTimeEdit INHERIT HbQtObjectHandler, QAbstractSpinBox METHOD new() - METHOD configure( xObject ) METHOD calendarPopup() METHOD calendarWidget() @@ -130,19 +125,6 @@ METHOD QDateTimeEdit:new( ... ) RETURN Self -METHOD QDateTimeEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDateTimeEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDateTimeEdit:calendarPopup() RETURN Qt_QDateTimeEdit_calendarPopup( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg b/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg index 2de6b4ad87..e8890d6b1c 100644 --- a/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDesktopWidget INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDesktopWidget INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD availableGeometry( nScreen ) METHOD availableGeometry_1( pWidget ) @@ -98,19 +93,6 @@ METHOD QDesktopWidget:new( ... ) RETURN Self -METHOD QDesktopWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDesktopWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDesktopWidget:availableGeometry( nScreen ) RETURN Qt_QDesktopWidget_availableGeometry( ::pPtr, nScreen ) diff --git a/harbour/contrib/hbqt/qtgui/TQDial.prg b/harbour/contrib/hbqt/qtgui/TQDial.prg index 84a47b1521..76ca4652c5 100644 --- a/harbour/contrib/hbqt/qtgui/TQDial.prg +++ b/harbour/contrib/hbqt/qtgui/TQDial.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDial INHERIT QAbstractSlider - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDial INHERIT HbQtObjectHandler, QAbstractSlider METHOD new() - METHOD configure( xObject ) METHOD notchSize() METHOD notchTarget() @@ -93,19 +88,6 @@ METHOD QDial:new( ... ) RETURN Self -METHOD QDial:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDial:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDial:notchSize() RETURN Qt_QDial_notchSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDialog.prg b/harbour/contrib/hbqt/qtgui/TQDialog.prg index 2389b190f7..2e6c9f9d3d 100644 --- a/harbour/contrib/hbqt/qtgui/TQDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDialog INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDialog INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD isSizeGripEnabled() METHOD result() @@ -96,19 +91,6 @@ METHOD QDialog:new( ... ) RETURN Self -METHOD QDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDialog:isSizeGripEnabled() RETURN Qt_QDialog_isSizeGripEnabled( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDirModel.prg b/harbour/contrib/hbqt/qtgui/TQDirModel.prg index 717322f9bf..9f615543ab 100644 --- a/harbour/contrib/hbqt/qtgui/TQDirModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQDirModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDirModel INHERIT QAbstractItemModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDirModel INHERIT HbQtObjectHandler, QAbstractItemModel METHOD new() - METHOD configure( xObject ) METHOD columnCount( pParent ) METHOD data( pIndex, nRole ) @@ -123,19 +118,6 @@ METHOD QDirModel:new( ... ) RETURN Self -METHOD QDirModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDirModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDirModel:columnCount( pParent ) RETURN Qt_QDirModel_columnCount( ::pPtr, hbqt_ptr( pParent ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQDockWidget.prg b/harbour/contrib/hbqt/qtgui/TQDockWidget.prg index 67768bad11..c15e614f2a 100644 --- a/harbour/contrib/hbqt/qtgui/TQDockWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQDockWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDockWidget INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDockWidget INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD allowedAreas() METHOD features() @@ -98,19 +93,6 @@ METHOD QDockWidget:new( ... ) RETURN Self -METHOD QDockWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDockWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDockWidget:allowedAreas() RETURN Qt_QDockWidget_allowedAreas( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg index afc2486c81..ac4bc6ae48 100644 --- a/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDoubleSpinBox INHERIT QAbstractSpinBox - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDoubleSpinBox INHERIT HbQtObjectHandler, QAbstractSpinBox METHOD new() - METHOD configure( xObject ) METHOD cleanText() METHOD decimals() @@ -104,19 +99,6 @@ METHOD QDoubleSpinBox:new( ... ) RETURN Self -METHOD QDoubleSpinBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDoubleSpinBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDoubleSpinBox:cleanText() RETURN Qt_QDoubleSpinBox_cleanText( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg index 38537fb002..f70e1e3d0d 100644 --- a/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDragEnterEvent INHERIT QDragMoveEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDragEnterEvent INHERIT HbQtObjectHandler, QDragMoveEvent METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QDragEnterEvent:new( ... ) ::pPtr := Qt_QDragEnterEvent( ... ) RETURN Self - -METHOD QDragEnterEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDragEnterEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg index cfd8bb56b1..e116b59729 100644 --- a/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDragLeaveEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDragLeaveEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QDragLeaveEvent:new( ... ) ::pPtr := Qt_QDragLeaveEvent( ... ) RETURN Self - -METHOD QDragLeaveEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDragLeaveEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg index 20278ba1dc..6d89c572fe 100644 --- a/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDragMoveEvent INHERIT QDropEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDragMoveEvent INHERIT HbQtObjectHandler, QDropEvent METHOD new() - METHOD configure( xObject ) METHOD accept( pRectangle ) METHOD accept_1() @@ -91,19 +86,6 @@ METHOD QDragMoveEvent:new( ... ) RETURN Self -METHOD QDragMoveEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDragMoveEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDragMoveEvent:accept( pRectangle ) RETURN Qt_QDragMoveEvent_accept( ::pPtr, hbqt_ptr( pRectangle ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQDropEvent.prg b/harbour/contrib/hbqt/qtgui/TQDropEvent.prg index 8c744ba3fa..32b463e7bf 100644 --- a/harbour/contrib/hbqt/qtgui/TQDropEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQDropEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QDropEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QDropEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD acceptProposedAction() METHOD dropAction() @@ -96,19 +91,6 @@ METHOD QDropEvent:new( ... ) RETURN Self -METHOD QDropEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QDropEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QDropEvent:acceptProposedAction() RETURN Qt_QDropEvent_acceptProposedAction( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg b/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg index e27b376802..d48eb88745 100644 --- a/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg +++ b/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QErrorMessage INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QErrorMessage INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD showMessage( cMessage ) METHOD showMessage_1( cMessage, cType ) @@ -88,19 +83,6 @@ METHOD QErrorMessage:new( ... ) RETURN Self -METHOD QErrorMessage:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QErrorMessage:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QErrorMessage:showMessage( cMessage ) RETURN Qt_QErrorMessage_showMessage( ::pPtr, cMessage ) diff --git a/harbour/contrib/hbqt/qtgui/TQFileDialog.prg b/harbour/contrib/hbqt/qtgui/TQFileDialog.prg index 27b0762272..4423096feb 100644 --- a/harbour/contrib/hbqt/qtgui/TQFileDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQFileDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFileDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFileDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD acceptMode() METHOD confirmOverwrite() @@ -131,19 +126,6 @@ METHOD QFileDialog:new( ... ) RETURN Self -METHOD QFileDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFileDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFileDialog:acceptMode() RETURN Qt_QFileDialog_acceptMode( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg b/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg index 912319ecc7..a920cdbcae 100644 --- a/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg +++ b/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFileIconProvider - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFileIconProvider INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD icon( nType ) METHOD icon_1( pInfo ) @@ -89,19 +84,6 @@ METHOD QFileIconProvider:new( ... ) RETURN Self -METHOD QFileIconProvider:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFileIconProvider:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFileIconProvider:icon( nType ) RETURN Qt_QFileIconProvider_icon( ::pPtr, nType ) diff --git a/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg b/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg index a346ec59eb..64ea224a48 100644 --- a/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFileSystemModel INHERIT QAbstractItemModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFileSystemModel INHERIT HbQtObjectHandler, QAbstractItemModel METHOD new() - METHOD configure( xObject ) METHOD dropMimeData( pData, nAction, nRow, nColumn, pParent ) METHOD fileIcon( pIndex ) @@ -115,19 +110,6 @@ METHOD QFileSystemModel:new( ... ) RETURN Self -METHOD QFileSystemModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFileSystemModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFileSystemModel:dropMimeData( pData, nAction, nRow, nColumn, pParent ) RETURN Qt_QFileSystemModel_dropMimeData( ::pPtr, hbqt_ptr( pData ), nAction, nRow, nColumn, hbqt_ptr( pParent ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg b/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg index d07d977347..70ca966dbf 100644 --- a/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFocusEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFocusEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD gotFocus() METHOD lostFocus() @@ -89,19 +84,6 @@ METHOD QFocusEvent:new( ... ) RETURN Self -METHOD QFocusEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFocusEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFocusEvent:gotFocus() RETURN Qt_QFocusEvent_gotFocus( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg b/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg index f336670cde..f03ad5f859 100644 --- a/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg +++ b/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFocusFrame INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFocusFrame INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD setWidget( pWidget ) METHOD widget() @@ -88,19 +83,6 @@ METHOD QFocusFrame:new( ... ) RETURN Self -METHOD QFocusFrame:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFocusFrame:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFocusFrame:setWidget( pWidget ) RETURN Qt_QFocusFrame_setWidget( ::pPtr, hbqt_ptr( pWidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQFont.prg b/harbour/contrib/hbqt/qtgui/TQFont.prg index a09ac42dd9..abe632c53e 100644 --- a/harbour/contrib/hbqt/qtgui/TQFont.prg +++ b/harbour/contrib/hbqt/qtgui/TQFont.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFont - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFont INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD bold() METHOD capitalization() @@ -144,19 +139,6 @@ METHOD QFont:new( ... ) RETURN Self -METHOD QFont:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFont:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFont:bold() RETURN Qt_QFont_bold( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg b/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg index 3cbaafa71b..a572a8672d 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontComboBox INHERIT QComboBox - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontComboBox INHERIT HbQtObjectHandler, QComboBox METHOD new() - METHOD configure( xObject ) METHOD currentFont() METHOD fontFilters() @@ -92,19 +87,6 @@ METHOD QFontComboBox:new( ... ) RETURN Self -METHOD QFontComboBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontComboBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontComboBox:currentFont() RETURN Qt_QFontComboBox_currentFont( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg b/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg index 664d51a527..893b625080 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontDatabase - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontDatabase INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD bold( cFamily, cStyle ) METHOD families( nWritingSystem ) @@ -106,19 +101,6 @@ METHOD QFontDatabase:new( ... ) RETURN Self -METHOD QFontDatabase:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontDatabase:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontDatabase:bold( cFamily, cStyle ) RETURN Qt_QFontDatabase_bold( ::pPtr, cFamily, cStyle ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontDialog.prg b/harbour/contrib/hbqt/qtgui/TQFontDialog.prg index 6690bd7296..73d9090e91 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD currentFont() METHOD options() @@ -98,19 +93,6 @@ METHOD QFontDialog:new( ... ) RETURN Self -METHOD QFontDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontDialog:currentFont() RETURN Qt_QFontDialog_currentFont( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontInfo.prg b/harbour/contrib/hbqt/qtgui/TQFontInfo.prg index 18eba69507..7d85007722 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontInfo.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontInfo.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontInfo - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontInfo INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD bold() METHOD exactMatch() @@ -98,19 +93,6 @@ METHOD QFontInfo:new( ... ) RETURN Self -METHOD QFontInfo:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontInfo:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontInfo:bold() RETURN Qt_QFontInfo_bold( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg b/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg index 5b41a38f28..93e9bfa619 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontMetrics - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontMetrics INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD ascent() METHOD averageCharWidth() @@ -112,19 +107,6 @@ METHOD QFontMetrics:new( ... ) RETURN Self -METHOD QFontMetrics:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontMetrics:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontMetrics:ascent() RETURN Qt_QFontMetrics_ascent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg b/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg index d5a91f4d33..66ac3c5a15 100644 --- a/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg +++ b/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFontMetricsF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFontMetricsF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD ascent() METHOD averageCharWidth() @@ -111,19 +106,6 @@ METHOD QFontMetricsF:new( ... ) RETURN Self -METHOD QFontMetricsF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFontMetricsF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFontMetricsF:ascent() RETURN Qt_QFontMetricsF_ascent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQFormLayout.prg b/harbour/contrib/hbqt/qtgui/TQFormLayout.prg index eed4b1ed21..4c79b7ab08 100644 --- a/harbour/contrib/hbqt/qtgui/TQFormLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQFormLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFormLayout INHERIT QLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFormLayout INHERIT HbQtObjectHandler, QLayout METHOD new() - METHOD configure( xObject ) METHOD addRow( pLabel, pField ) METHOD addRow_1( pLabel, pField ) @@ -122,19 +117,6 @@ METHOD QFormLayout:new( ... ) RETURN Self -METHOD QFormLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFormLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFormLayout:addRow( pLabel, pField ) RETURN Qt_QFormLayout_addRow( ::pPtr, hbqt_ptr( pLabel ), hbqt_ptr( pField ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQFrame.prg b/harbour/contrib/hbqt/qtgui/TQFrame.prg index ceb965473b..ae842b5f96 100644 --- a/harbour/contrib/hbqt/qtgui/TQFrame.prg +++ b/harbour/contrib/hbqt/qtgui/TQFrame.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFrame INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFrame INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD frameRect() METHOD frameShadow() @@ -99,19 +94,6 @@ METHOD QFrame:new( ... ) RETURN Self -METHOD QFrame:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFrame:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFrame:frameRect() RETURN Qt_QFrame_frameRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQGradient.prg b/harbour/contrib/hbqt/qtgui/TQGradient.prg index c4c4d93099..92388cc836 100644 --- a/harbour/contrib/hbqt/qtgui/TQGradient.prg +++ b/harbour/contrib/hbqt/qtgui/TQGradient.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QGradient - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QGradient INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD coordinateMode() METHOD setColorAt( nPosition, pColor ) @@ -92,19 +87,6 @@ METHOD QGradient:new( ... ) RETURN Self -METHOD QGradient:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QGradient:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QGradient:coordinateMode() RETURN Qt_QGradient_coordinateMode( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQGridLayout.prg b/harbour/contrib/hbqt/qtgui/TQGridLayout.prg index 1c905e55e2..2eb25efc20 100644 --- a/harbour/contrib/hbqt/qtgui/TQGridLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQGridLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QGridLayout INHERIT QLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QGridLayout INHERIT HbQtObjectHandler, QLayout METHOD new() - METHOD configure( xObject ) METHOD addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) METHOD addLayout( pLayout, nRow, nColumn, nAlignment ) @@ -112,19 +107,6 @@ METHOD QGridLayout:new( ... ) RETURN Self -METHOD QGridLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QGridLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QGridLayout:addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) RETURN Qt_QGridLayout_addItem( ::pPtr, hbqt_ptr( pItem ), nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) diff --git a/harbour/contrib/hbqt/qtgui/TQGroupBox.prg b/harbour/contrib/hbqt/qtgui/TQGroupBox.prg index fbfeacd0e8..7ba4853192 100644 --- a/harbour/contrib/hbqt/qtgui/TQGroupBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQGroupBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QGroupBox INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QGroupBox INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD isCheckable() @@ -96,19 +91,6 @@ METHOD QGroupBox:new( ... ) RETURN Self -METHOD QGroupBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QGroupBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QGroupBox:alignment() RETURN Qt_QGroupBox_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg index 1028922df4..1b00209f8e 100644 --- a/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHBoxLayout INHERIT QBoxLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHBoxLayout INHERIT HbQtObjectHandler, QBoxLayout METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QHBoxLayout:new( ... ) ::pPtr := Qt_QHBoxLayout( ... ) RETURN Self - -METHOD QHBoxLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHBoxLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQHeaderView.prg b/harbour/contrib/hbqt/qtgui/TQHeaderView.prg index 0dc3f3b07b..df4f883976 100644 --- a/harbour/contrib/hbqt/qtgui/TQHeaderView.prg +++ b/harbour/contrib/hbqt/qtgui/TQHeaderView.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHeaderView INHERIT QAbstractItemView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHeaderView INHERIT HbQtObjectHandler, QAbstractItemView METHOD new() - METHOD configure( xObject ) METHOD cascadingSectionResizes() METHOD count() @@ -143,19 +138,6 @@ METHOD QHeaderView:new( ... ) RETURN Self -METHOD QHeaderView:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHeaderView:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHeaderView:cascadingSectionResizes() RETURN Qt_QHeaderView_cascadingSectionResizes( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg b/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg index cb8fa4718e..a6ee88546f 100644 --- a/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHelpEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHelpEvent INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD globalPos() METHOD globalX() @@ -92,19 +87,6 @@ METHOD QHelpEvent:new( ... ) RETURN Self -METHOD QHelpEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHelpEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHelpEvent:globalPos() RETURN Qt_QHelpEvent_globalPos( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQIcon.prg b/harbour/contrib/hbqt/qtgui/TQIcon.prg index 4c6120b5ee..3291d8f1db 100644 --- a/harbour/contrib/hbqt/qtgui/TQIcon.prg +++ b/harbour/contrib/hbqt/qtgui/TQIcon.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QIcon - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QIcon INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD actualSize( pSize, nMode, nState ) METHOD addFile( cFileName, pSize, nMode, nState ) @@ -96,19 +91,6 @@ METHOD QIcon:new( ... ) RETURN Self -METHOD QIcon:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QIcon:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QIcon:actualSize( pSize, nMode, nState ) RETURN Qt_QIcon_actualSize( ::pPtr, hbqt_ptr( pSize ), nMode, nState ) diff --git a/harbour/contrib/hbqt/qtgui/TQImage.prg b/harbour/contrib/hbqt/qtgui/TQImage.prg index 6444823394..eae404384a 100644 --- a/harbour/contrib/hbqt/qtgui/TQImage.prg +++ b/harbour/contrib/hbqt/qtgui/TQImage.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QImage - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QImage INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD allGray() METHOD alphaChannel() @@ -146,19 +141,6 @@ METHOD QImage:new( ... ) RETURN Self -METHOD QImage:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QImage:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QImage:allGray() RETURN Qt_QImage_allGray( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQImageReader.prg b/harbour/contrib/hbqt/qtgui/TQImageReader.prg index 0d097a4986..aa9d887c68 100644 --- a/harbour/contrib/hbqt/qtgui/TQImageReader.prg +++ b/harbour/contrib/hbqt/qtgui/TQImageReader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QImageReader - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QImageReader INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD autoDetectImageFormat() METHOD backgroundColor() @@ -124,19 +119,6 @@ METHOD QImageReader:new( ... ) RETURN Self -METHOD QImageReader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QImageReader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QImageReader:autoDetectImageFormat() RETURN Qt_QImageReader_autoDetectImageFormat( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQImageWriter.prg b/harbour/contrib/hbqt/qtgui/TQImageWriter.prg index 93da7822b5..f7125b0cd4 100644 --- a/harbour/contrib/hbqt/qtgui/TQImageWriter.prg +++ b/harbour/contrib/hbqt/qtgui/TQImageWriter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QImageWriter - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QImageWriter INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD canWrite() METHOD compression() @@ -104,19 +99,6 @@ METHOD QImageWriter:new( ... ) RETURN Self -METHOD QImageWriter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QImageWriter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QImageWriter:canWrite() RETURN Qt_QImageWriter_canWrite( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQInputContext.prg b/harbour/contrib/hbqt/qtgui/TQInputContext.prg index 92fbdecb57..b9b81ef2e9 100644 --- a/harbour/contrib/hbqt/qtgui/TQInputContext.prg +++ b/harbour/contrib/hbqt/qtgui/TQInputContext.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QInputContext INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QInputContext INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD filterEvent( pEvent ) METHOD font() @@ -97,19 +92,6 @@ METHOD QInputContext:new( ... ) RETURN Self -METHOD QInputContext:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QInputContext:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QInputContext:filterEvent( pEvent ) RETURN Qt_QInputContext_filterEvent( ::pPtr, hbqt_ptr( pEvent ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQInputDialog.prg b/harbour/contrib/hbqt/qtgui/TQInputDialog.prg index 8abae50371..bdb6f6024c 100644 --- a/harbour/contrib/hbqt/qtgui/TQInputDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQInputDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QInputDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QInputDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD cancelButtonText() METHOD comboBoxItems() @@ -130,19 +125,6 @@ METHOD QInputDialog:new( ... ) RETURN Self -METHOD QInputDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QInputDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QInputDialog:cancelButtonText() RETURN Qt_QInputDialog_cancelButtonText( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQInputEvent.prg b/harbour/contrib/hbqt/qtgui/TQInputEvent.prg index 7f59690094..f7ca529982 100644 --- a/harbour/contrib/hbqt/qtgui/TQInputEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQInputEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QInputEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QInputEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD modifiers() @@ -87,19 +82,6 @@ METHOD QInputEvent:new( ... ) RETURN Self -METHOD QInputEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QInputEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QInputEvent:modifiers() RETURN Qt_QInputEvent_modifiers( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg b/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg index 8b9c130a94..cbba31a1cd 100644 --- a/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QInputMethodEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QInputMethodEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD commitString() METHOD preeditString() @@ -91,19 +86,6 @@ METHOD QInputMethodEvent:new( ... ) RETURN Self -METHOD QInputMethodEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QInputMethodEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QInputMethodEvent:commitString() RETURN Qt_QInputMethodEvent_commitString( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelection.prg b/harbour/contrib/hbqt/qtgui/TQItemSelection.prg index 0d233ad3b8..50748eee3d 100644 --- a/harbour/contrib/hbqt/qtgui/TQItemSelection.prg +++ b/harbour/contrib/hbqt/qtgui/TQItemSelection.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QItemSelection INHERIT QList - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QItemSelection INHERIT HbQtObjectHandler, QList METHOD new() - METHOD configure( xObject ) METHOD contains( pIndex ) METHOD merge( pOther, nCommand ) @@ -89,19 +84,6 @@ METHOD QItemSelection:new( ... ) RETURN Self -METHOD QItemSelection:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QItemSelection:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QItemSelection:contains( pIndex ) RETURN Qt_QItemSelection_contains( ::pPtr, hbqt_ptr( pIndex ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg b/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg index 252a2682a0..cc8a260c59 100644 --- a/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QItemSelectionModel INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QItemSelectionModel INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD columnIntersectsSelection( nColumn, pParent ) METHOD currentIndex() @@ -101,19 +96,6 @@ METHOD QItemSelectionModel:new( ... ) RETURN Self -METHOD QItemSelectionModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QItemSelectionModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QItemSelectionModel:columnIntersectsSelection( nColumn, pParent ) RETURN Qt_QItemSelectionModel_columnIntersectsSelection( ::pPtr, nColumn, hbqt_ptr( pParent ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg b/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg index f3d40f0633..c588de85b2 100644 --- a/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QKeyEvent INHERIT QInputEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QKeyEvent INHERIT HbQtObjectHandler, QInputEvent METHOD new() - METHOD configure( xObject ) METHOD count() METHOD isAutoRepeat() @@ -95,19 +90,6 @@ METHOD QKeyEvent:new( ... ) RETURN Self -METHOD QKeyEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QKeyEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QKeyEvent:count() RETURN Qt_QKeyEvent_count( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQKeySequence.prg b/harbour/contrib/hbqt/qtgui/TQKeySequence.prg index 619ee99f9b..d68adfd233 100644 --- a/harbour/contrib/hbqt/qtgui/TQKeySequence.prg +++ b/harbour/contrib/hbqt/qtgui/TQKeySequence.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QKeySequence - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QKeySequence INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD count() METHOD isEmpty() @@ -92,19 +87,6 @@ METHOD QKeySequence:new( ... ) RETURN Self -METHOD QKeySequence:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QKeySequence:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QKeySequence:count() RETURN Qt_QKeySequence_count( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg b/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg index abf63664d7..0f6e85f23e 100644 --- a/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg +++ b/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLCDNumber INHERIT QFrame - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLCDNumber INHERIT HbQtObjectHandler, QFrame METHOD new() - METHOD configure( xObject ) METHOD checkOverflow( nNum ) METHOD checkOverflow_1( nNum ) @@ -105,19 +100,6 @@ METHOD QLCDNumber:new( ... ) RETURN Self -METHOD QLCDNumber:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLCDNumber:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLCDNumber:checkOverflow( nNum ) RETURN Qt_QLCDNumber_checkOverflow( ::pPtr, nNum ) diff --git a/harbour/contrib/hbqt/qtgui/TQLabel.prg b/harbour/contrib/hbqt/qtgui/TQLabel.prg index 3bcff1994b..84087135c8 100644 --- a/harbour/contrib/hbqt/qtgui/TQLabel.prg +++ b/harbour/contrib/hbqt/qtgui/TQLabel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLabel INHERIT QFrame - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLabel INHERIT HbQtObjectHandler, QFrame METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD buddy() @@ -115,19 +110,6 @@ METHOD QLabel:new( ... ) RETURN Self -METHOD QLabel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLabel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLabel:alignment() RETURN Qt_QLabel_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQLayout.prg b/harbour/contrib/hbqt/qtgui/TQLayout.prg index 27fb9b2a47..36b06e2c06 100644 --- a/harbour/contrib/hbqt/qtgui/TQLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLayout INHERIT QObject, QLayoutItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLayout INHERIT HbQtObjectHandler, QObject, QLayoutItem METHOD new() - METHOD configure( xObject ) METHOD activate() METHOD addItem( pItem ) @@ -115,19 +110,6 @@ METHOD QLayout:new( ... ) RETURN Self -METHOD QLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLayout:activate() RETURN Qt_QLayout_activate( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg b/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg index b52988aac2..97fad8bc9a 100644 --- a/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLayoutItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLayoutItem INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD controlTypes() @@ -103,19 +98,6 @@ METHOD QLayoutItem:new( ... ) RETURN Self -METHOD QLayoutItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLayoutItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLayoutItem:alignment() RETURN Qt_QLayoutItem_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQLineEdit.prg b/harbour/contrib/hbqt/qtgui/TQLineEdit.prg index cbe812fc39..f4be294257 100644 --- a/harbour/contrib/hbqt/qtgui/TQLineEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQLineEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLineEdit INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLineEdit INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD backspace() @@ -141,19 +136,6 @@ METHOD QLineEdit:new( ... ) RETURN Self -METHOD QLineEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLineEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLineEdit:alignment() RETURN Qt_QLineEdit_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg b/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg index 3e3351d15d..eb49c8ca3e 100644 --- a/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg +++ b/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QLinearGradient INHERIT QGradient - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QLinearGradient INHERIT HbQtObjectHandler, QGradient METHOD new() - METHOD configure( xObject ) METHOD finalStop() METHOD setFinalStop( pStop ) @@ -92,19 +87,6 @@ METHOD QLinearGradient:new( ... ) RETURN Self -METHOD QLinearGradient:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QLinearGradient:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QLinearGradient:finalStop() RETURN Qt_QLinearGradient_finalStop( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQListView.prg b/harbour/contrib/hbqt/qtgui/TQListView.prg index 14eea327ea..9c6fcc51c3 100644 --- a/harbour/contrib/hbqt/qtgui/TQListView.prg +++ b/harbour/contrib/hbqt/qtgui/TQListView.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QListView INHERIT QAbstractItemView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QListView INHERIT HbQtObjectHandler, QAbstractItemView METHOD new() - METHOD configure( xObject ) METHOD batchSize() METHOD clearPropertyFlags() @@ -115,19 +110,6 @@ METHOD QListView:new( ... ) RETURN Self -METHOD QListView:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QListView:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QListView:batchSize() RETURN Qt_QListView_batchSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQListWidget.prg b/harbour/contrib/hbqt/qtgui/TQListWidget.prg index f7e59d53cb..55b58568cb 100644 --- a/harbour/contrib/hbqt/qtgui/TQListWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQListWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QListWidget INHERIT QListView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QListWidget INHERIT HbQtObjectHandler, QListView METHOD new() - METHOD configure( xObject ) METHOD addItem( cLabel ) METHOD addItem_1( pItem ) @@ -116,19 +111,6 @@ METHOD QListWidget:new( ... ) RETURN Self -METHOD QListWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QListWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QListWidget:addItem( cLabel ) RETURN Qt_QListWidget_addItem( ::pPtr, cLabel ) diff --git a/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg index 3b5d051478..8bca6203a5 100644 --- a/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QListWidgetItem INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QListWidgetItem INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD background() METHOD checkState() @@ -121,19 +116,6 @@ METHOD QListWidgetItem:new( ... ) RETURN Self -METHOD QListWidgetItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QListWidgetItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QListWidgetItem:background() RETURN Qt_QListWidgetItem_background( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQMainWindow.prg b/harbour/contrib/hbqt/qtgui/TQMainWindow.prg index 7419c852d2..19356dbc3a 100644 --- a/harbour/contrib/hbqt/qtgui/TQMainWindow.prg +++ b/harbour/contrib/hbqt/qtgui/TQMainWindow.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMainWindow INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMainWindow INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addDockWidget( nArea, pDockwidget ) METHOD addDockWidget_1( nArea, pDockwidget, nOrientation ) @@ -134,19 +129,6 @@ METHOD QMainWindow:new( ... ) RETURN Self -METHOD QMainWindow:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMainWindow:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMainWindow:addDockWidget( nArea, pDockwidget ) RETURN Qt_QMainWindow_addDockWidget( ::pPtr, nArea, hbqt_ptr( pDockwidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQMatrix.prg b/harbour/contrib/hbqt/qtgui/TQMatrix.prg index 3f246cd416..78138297cd 100644 --- a/harbour/contrib/hbqt/qtgui/TQMatrix.prg +++ b/harbour/contrib/hbqt/qtgui/TQMatrix.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMatrix - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMatrix INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD m11() METHOD m12() @@ -115,19 +110,6 @@ METHOD QMatrix:new( ... ) RETURN Self -METHOD QMatrix:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMatrix:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMatrix:m11() RETURN Qt_QMatrix_m11( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQMenu.prg b/harbour/contrib/hbqt/qtgui/TQMenu.prg index b5826d084c..70e47ed592 100644 --- a/harbour/contrib/hbqt/qtgui/TQMenu.prg +++ b/harbour/contrib/hbqt/qtgui/TQMenu.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMenu INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMenu INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD actionAt( pPt ) METHOD actionGeometry( pAct ) @@ -119,19 +114,6 @@ METHOD QMenu:new( ... ) RETURN Self -METHOD QMenu:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMenu:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMenu:actionAt( pPt ) RETURN Qt_QMenu_actionAt( ::pPtr, hbqt_ptr( pPt ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQMenuBar.prg b/harbour/contrib/hbqt/qtgui/TQMenuBar.prg index 89e87873b1..9743bf9326 100644 --- a/harbour/contrib/hbqt/qtgui/TQMenuBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQMenuBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMenuBar INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMenuBar INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD activeAction() METHOD addAction( cText ) @@ -100,19 +95,6 @@ METHOD QMenuBar:new( ... ) RETURN Self -METHOD QMenuBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMenuBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMenuBar:activeAction() RETURN Qt_QMenuBar_activeAction( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQMessageBox.prg b/harbour/contrib/hbqt/qtgui/TQMessageBox.prg index d59787b84f..b3fe95d089 100644 --- a/harbour/contrib/hbqt/qtgui/TQMessageBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQMessageBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMessageBox INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMessageBox INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD addButton( pButton, nRole ) METHOD addButton_1( cText, nRole ) @@ -124,19 +119,6 @@ METHOD QMessageBox:new( ... ) RETURN Self -METHOD QMessageBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMessageBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMessageBox:addButton( pButton, nRole ) RETURN Qt_QMessageBox_addButton( ::pPtr, hbqt_ptr( pButton ), nRole ) diff --git a/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg b/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg index 76780a63e6..ca00d1a5d4 100644 --- a/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMouseEvent INHERIT QInputEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMouseEvent INHERIT HbQtObjectHandler, QInputEvent METHOD new() - METHOD configure( xObject ) METHOD button() METHOD buttons() @@ -95,19 +90,6 @@ METHOD QMouseEvent:new( ... ) RETURN Self -METHOD QMouseEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMouseEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMouseEvent:button() RETURN Qt_QMouseEvent_button( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg b/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg index dc7cad66d5..eb46a25e39 100644 --- a/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMoveEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMoveEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD oldPos() METHOD pos() @@ -88,19 +83,6 @@ METHOD QMoveEvent:new( ... ) RETURN Self -METHOD QMoveEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMoveEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMoveEvent:oldPos() RETURN Qt_QMoveEvent_oldPos( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQMovie.prg b/harbour/contrib/hbqt/qtgui/TQMovie.prg index 55d08fed42..7e3f0cb46a 100644 --- a/harbour/contrib/hbqt/qtgui/TQMovie.prg +++ b/harbour/contrib/hbqt/qtgui/TQMovie.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QMovie INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QMovie INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD backgroundColor() METHOD cacheMode() @@ -114,19 +109,6 @@ METHOD QMovie:new( ... ) RETURN Self -METHOD QMovie:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QMovie:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QMovie:backgroundColor() RETURN Qt_QMovie_backgroundColor( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg b/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg index 4d9fa36b53..b0c071df3c 100644 --- a/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPageSetupDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPageSetupDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD exec() METHOD open( pReceiver, pMember ) @@ -94,19 +89,6 @@ METHOD QPageSetupDialog:new( ... ) RETURN Self -METHOD QPageSetupDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPageSetupDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPageSetupDialog:exec() RETURN Qt_QPageSetupDialog_exec( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg b/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg index 556680f2cd..8ae8e6fd09 100644 --- a/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg +++ b/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPaintDevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPaintDevice INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD depth() METHOD height() @@ -98,19 +93,6 @@ METHOD QPaintDevice:new( ... ) RETURN Self -METHOD QPaintDevice:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPaintDevice:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPaintDevice:depth() RETURN Qt_QPaintDevice_depth( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg b/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg index d69a640699..6186b3ba16 100644 --- a/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPaintEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPaintEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD rect() METHOD region() @@ -88,19 +83,6 @@ METHOD QPaintEvent:new( ... ) RETURN Self -METHOD QPaintEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPaintEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPaintEvent:rect() RETURN Qt_QPaintEvent_rect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPainter.prg b/harbour/contrib/hbqt/qtgui/TQPainter.prg index 5372a9f620..81af60af1e 100644 --- a/harbour/contrib/hbqt/qtgui/TQPainter.prg +++ b/harbour/contrib/hbqt/qtgui/TQPainter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPainter - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPainter INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD background() METHOD backgroundMode() @@ -268,19 +263,6 @@ METHOD QPainter:new( ... ) RETURN Self -METHOD QPainter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPainter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPainter:background() RETURN Qt_QPainter_background( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPainterPath.prg b/harbour/contrib/hbqt/qtgui/TQPainterPath.prg index 7d57b7e66f..ad98a01277 100644 --- a/harbour/contrib/hbqt/qtgui/TQPainterPath.prg +++ b/harbour/contrib/hbqt/qtgui/TQPainterPath.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPainterPath - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPainterPath INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addEllipse( pBoundingRectangle ) METHOD addEllipse_1( nX, nY, nWidth, nHeight ) @@ -137,19 +132,6 @@ METHOD QPainterPath:new( ... ) RETURN Self -METHOD QPainterPath:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPainterPath:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPainterPath:addEllipse( pBoundingRectangle ) RETURN Qt_QPainterPath_addEllipse( ::pPtr, hbqt_ptr( pBoundingRectangle ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQPalette.prg b/harbour/contrib/hbqt/qtgui/TQPalette.prg index 042d3dd1b2..2e6eed9728 100644 --- a/harbour/contrib/hbqt/qtgui/TQPalette.prg +++ b/harbour/contrib/hbqt/qtgui/TQPalette.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPalette - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPalette INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD alternateBase() METHOD base() @@ -121,19 +116,6 @@ METHOD QPalette:new( ... ) RETURN Self -METHOD QPalette:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPalette:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPalette:alternateBase() RETURN Qt_QPalette_alternateBase( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPen.prg b/harbour/contrib/hbqt/qtgui/TQPen.prg index 6aa0fc6b3a..38e3844624 100644 --- a/harbour/contrib/hbqt/qtgui/TQPen.prg +++ b/harbour/contrib/hbqt/qtgui/TQPen.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPen - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPen INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD brush() METHOD capStyle() @@ -107,19 +102,6 @@ METHOD QPen:new( ... ) RETURN Self -METHOD QPen:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPen:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPen:brush() RETURN Qt_QPen_brush( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPicture.prg b/harbour/contrib/hbqt/qtgui/TQPicture.prg index 833c56d319..cb51bc8bbd 100644 --- a/harbour/contrib/hbqt/qtgui/TQPicture.prg +++ b/harbour/contrib/hbqt/qtgui/TQPicture.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPicture INHERIT QPaintDevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPicture INHERIT HbQtObjectHandler, QPaintDevice METHOD new() - METHOD configure( xObject ) METHOD boundingRect() METHOD data() @@ -97,19 +92,6 @@ METHOD QPicture:new( ... ) RETURN Self -METHOD QPicture:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPicture:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPicture:boundingRect() RETURN Qt_QPicture_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPixmap.prg b/harbour/contrib/hbqt/qtgui/TQPixmap.prg index 8a048b309a..753dc28fe4 100644 --- a/harbour/contrib/hbqt/qtgui/TQPixmap.prg +++ b/harbour/contrib/hbqt/qtgui/TQPixmap.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPixmap INHERIT QPaintDevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPixmap INHERIT HbQtObjectHandler, QPaintDevice METHOD new() - METHOD configure( xObject ) METHOD alphaChannel() METHOD cacheKey() @@ -126,19 +121,6 @@ METHOD QPixmap:new( ... ) RETURN Self -METHOD QPixmap:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPixmap:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPixmap:alphaChannel() RETURN Qt_QPixmap_alphaChannel( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg index f1b186389c..84cccb9ff7 100644 --- a/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPlainTextEdit INHERIT QAbstractScrollArea - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPlainTextEdit INHERIT HbQtObjectHandler, QAbstractScrollArea METHOD new() - METHOD configure( xObject ) METHOD backgroundVisible() METHOD blockCount() @@ -143,19 +138,6 @@ METHOD QPlainTextEdit:new( ... ) RETURN Self -METHOD QPlainTextEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPlainTextEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPlainTextEdit:backgroundVisible() RETURN Qt_QPlainTextEdit_backgroundVisible( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPolygon.prg b/harbour/contrib/hbqt/qtgui/TQPolygon.prg index 1c8be21ddc..4c36d6f524 100644 --- a/harbour/contrib/hbqt/qtgui/TQPolygon.prg +++ b/harbour/contrib/hbqt/qtgui/TQPolygon.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPolygon - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPolygon INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD boundingRect() METHOD containsPoint( pPoint, nFillRule ) @@ -99,19 +94,6 @@ METHOD QPolygon:new( ... ) RETURN Self -METHOD QPolygon:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPolygon:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPolygon:boundingRect() RETURN Qt_QPolygon_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPolygonF.prg b/harbour/contrib/hbqt/qtgui/TQPolygonF.prg index 3038d9ecce..a7b76683f7 100644 --- a/harbour/contrib/hbqt/qtgui/TQPolygonF.prg +++ b/harbour/contrib/hbqt/qtgui/TQPolygonF.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPolygonF - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPolygonF INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD boundingRect() METHOD containsPoint( pPoint, nFillRule ) @@ -95,19 +90,6 @@ METHOD QPolygonF:new( ... ) RETURN Self -METHOD QPolygonF:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPolygonF:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPolygonF:boundingRect() RETURN Qt_QPolygonF_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg b/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg index 1ca7ecb5e5..e4b5c2eec0 100644 --- a/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPrintDialog INHERIT QAbstractPrintDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPrintDialog INHERIT HbQtObjectHandler, QAbstractPrintDialog METHOD new() - METHOD configure( xObject ) METHOD done( nResult ) METHOD open( pReceiver, pMember ) @@ -95,19 +90,6 @@ METHOD QPrintDialog:new( ... ) RETURN Self -METHOD QPrintDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPrintDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPrintDialog:done( nResult ) RETURN Qt_QPrintDialog_done( ::pPtr, nResult ) diff --git a/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg b/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg index 79e8d1619e..84d757d5b3 100644 --- a/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg +++ b/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPrintEngine - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPrintEngine INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD abort() METHOD metric( nId ) @@ -92,19 +87,6 @@ METHOD QPrintEngine:new( ... ) RETURN Self -METHOD QPrintEngine:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPrintEngine:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPrintEngine:abort() RETURN Qt_QPrintEngine_abort( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg b/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg index 95cbdf39dc..befc892959 100644 --- a/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPrintPreviewDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPrintPreviewDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD open( pReceiver, pMember ) METHOD printer() @@ -88,19 +83,6 @@ METHOD QPrintPreviewDialog:new( ... ) RETURN Self -METHOD QPrintPreviewDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPrintPreviewDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPrintPreviewDialog:open( pReceiver, pMember ) RETURN Qt_QPrintPreviewDialog_open( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQPrinter.prg b/harbour/contrib/hbqt/qtgui/TQPrinter.prg index 7541692d8a..be1b832005 100644 --- a/harbour/contrib/hbqt/qtgui/TQPrinter.prg +++ b/harbour/contrib/hbqt/qtgui/TQPrinter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPrinter INHERIT QPaintDevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPrinter INHERIT HbQtObjectHandler, QPaintDevice METHOD new() - METHOD configure( xObject ) METHOD abort() METHOD collateCopies() @@ -141,19 +136,6 @@ METHOD QPrinter:new( ... ) RETURN Self -METHOD QPrinter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPrinter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPrinter:abort() RETURN Qt_QPrinter_abort( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQProgressBar.prg b/harbour/contrib/hbqt/qtgui/TQProgressBar.prg index d7a83f0293..9c906d12b8 100644 --- a/harbour/contrib/hbqt/qtgui/TQProgressBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQProgressBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QProgressBar INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QProgressBar INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD format() @@ -107,19 +102,6 @@ METHOD QProgressBar:new( ... ) RETURN Self -METHOD QProgressBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QProgressBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QProgressBar:alignment() RETURN Qt_QProgressBar_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg b/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg index f84b639549..e78ac7be83 100644 --- a/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg +++ b/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QProgressDialog INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QProgressDialog INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD autoClose() METHOD autoReset() @@ -110,19 +105,6 @@ METHOD QProgressDialog:new( ... ) RETURN Self -METHOD QProgressDialog:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QProgressDialog:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QProgressDialog:autoClose() RETURN Qt_QProgressDialog_autoClose( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQPushButton.prg b/harbour/contrib/hbqt/qtgui/TQPushButton.prg index bdfb9be481..2ee540a503 100644 --- a/harbour/contrib/hbqt/qtgui/TQPushButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQPushButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QPushButton INHERIT QAbstractButton - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QPushButton INHERIT HbQtObjectHandler, QAbstractButton METHOD new() - METHOD configure( xObject ) METHOD autoDefault() METHOD isDefault() @@ -95,19 +90,6 @@ METHOD QPushButton:new( ... ) RETURN Self -METHOD QPushButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QPushButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QPushButton:autoDefault() RETURN Qt_QPushButton_autoDefault( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg b/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg index 98dbee770c..edcab7d874 100644 --- a/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg +++ b/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRadialGradient INHERIT QGradient - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRadialGradient INHERIT HbQtObjectHandler, QGradient METHOD new() - METHOD configure( xObject ) METHOD center() METHOD focalPoint() @@ -94,19 +89,6 @@ METHOD QRadialGradient:new( ... ) RETURN Self -METHOD QRadialGradient:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRadialGradient:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QRadialGradient:center() RETURN Qt_QRadialGradient_center( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQRadioButton.prg b/harbour/contrib/hbqt/qtgui/TQRadioButton.prg index 8477cd9166..6f862ae099 100644 --- a/harbour/contrib/hbqt/qtgui/TQRadioButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQRadioButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRadioButton INHERIT QAbstractButton - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRadioButton INHERIT HbQtObjectHandler, QAbstractButton METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QRadioButton:new( ... ) ::pPtr := Qt_QRadioButton( ... ) RETURN Self - -METHOD QRadioButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRadioButton:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQRegion.prg b/harbour/contrib/hbqt/qtgui/TQRegion.prg index e3929cd6ec..c00d207f8a 100644 --- a/harbour/contrib/hbqt/qtgui/TQRegion.prg +++ b/harbour/contrib/hbqt/qtgui/TQRegion.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QRegion - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QRegion INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD boundingRect() METHOD contains( pP ) @@ -104,19 +99,6 @@ METHOD QRegion:new( ... ) RETURN Self -METHOD QRegion:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QRegion:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QRegion:boundingRect() RETURN Qt_QRegion_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg b/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg index 37451044c9..1ff1e50541 100644 --- a/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QResizeEvent INHERIT QEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QResizeEvent INHERIT HbQtObjectHandler, QEvent METHOD new() - METHOD configure( xObject ) METHOD oldSize() METHOD size() @@ -88,19 +83,6 @@ METHOD QResizeEvent:new( ... ) RETURN Self -METHOD QResizeEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QResizeEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QResizeEvent:oldSize() RETURN Qt_QResizeEvent_oldSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQScrollArea.prg b/harbour/contrib/hbqt/qtgui/TQScrollArea.prg index ac2e8835c7..deef0c9ce9 100644 --- a/harbour/contrib/hbqt/qtgui/TQScrollArea.prg +++ b/harbour/contrib/hbqt/qtgui/TQScrollArea.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QScrollArea INHERIT QAbstractScrollArea - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QScrollArea INHERIT HbQtObjectHandler, QAbstractScrollArea METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD ensureVisible( nX, nY, nXmargin, nYmargin ) @@ -95,19 +90,6 @@ METHOD QScrollArea:new( ... ) RETURN Self -METHOD QScrollArea:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QScrollArea:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QScrollArea:alignment() RETURN Qt_QScrollArea_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQScrollBar.prg b/harbour/contrib/hbqt/qtgui/TQScrollBar.prg index 2ac3db9201..abcdeb4b65 100644 --- a/harbour/contrib/hbqt/qtgui/TQScrollBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQScrollBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QScrollBar INHERIT QAbstractSlider - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QScrollBar INHERIT HbQtObjectHandler, QAbstractSlider METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QScrollBar:new( ... ) ::pPtr := Qt_QScrollBar( ... ) RETURN Self - -METHOD QScrollBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QScrollBar:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQSessionManager.prg b/harbour/contrib/hbqt/qtgui/TQSessionManager.prg index ab9631f75b..9f66bc54e4 100644 --- a/harbour/contrib/hbqt/qtgui/TQSessionManager.prg +++ b/harbour/contrib/hbqt/qtgui/TQSessionManager.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSessionManager INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSessionManager INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD allowsErrorInteraction() METHOD allowsInteraction() @@ -102,19 +97,6 @@ METHOD QSessionManager:new( ... ) RETURN Self -METHOD QSessionManager:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSessionManager:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSessionManager:allowsErrorInteraction() RETURN Qt_QSessionManager_allowsErrorInteraction( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg b/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg index 801c8acec2..2c0aabfc86 100644 --- a/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg +++ b/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSizeGrip INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSizeGrip INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QSizeGrip:new( ... ) ::pPtr := Qt_QSizeGrip( ... ) RETURN Self - -METHOD QSizeGrip:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSizeGrip:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg b/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg index 46b7be2fb7..f450ab5a93 100644 --- a/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg +++ b/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSizePolicy - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSizePolicy INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD controlType() METHOD expandingDirections() @@ -100,19 +95,6 @@ METHOD QSizePolicy:new( ... ) RETURN Self -METHOD QSizePolicy:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSizePolicy:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSizePolicy:controlType() RETURN Qt_QSizePolicy_controlType( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSlider.prg b/harbour/contrib/hbqt/qtgui/TQSlider.prg index a1e3549199..78021d9379 100644 --- a/harbour/contrib/hbqt/qtgui/TQSlider.prg +++ b/harbour/contrib/hbqt/qtgui/TQSlider.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSlider INHERIT QAbstractSlider - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSlider INHERIT HbQtObjectHandler, QAbstractSlider METHOD new() - METHOD configure( xObject ) METHOD setTickInterval( nTi ) METHOD setTickPosition( nPosition ) @@ -90,19 +85,6 @@ METHOD QSlider:new( ... ) RETURN Self -METHOD QSlider:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSlider:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSlider:setTickInterval( nTi ) RETURN Qt_QSlider_setTickInterval( ::pPtr, nTi ) diff --git a/harbour/contrib/hbqt/qtgui/TQSound.prg b/harbour/contrib/hbqt/qtgui/TQSound.prg index 96c2f9519f..2a9be3556b 100644 --- a/harbour/contrib/hbqt/qtgui/TQSound.prg +++ b/harbour/contrib/hbqt/qtgui/TQSound.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSound - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSound INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD fileName() METHOD isFinished() @@ -93,19 +88,6 @@ METHOD QSound:new( ... ) RETURN Self -METHOD QSound:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSound:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSound:fileName() RETURN Qt_QSound_fileName( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg b/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg index 2f0537294a..5918b73915 100644 --- a/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSpacerItem INHERIT QLayoutItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSpacerItem INHERIT HbQtObjectHandler, QLayoutItem METHOD new() - METHOD configure( xObject ) METHOD changeSize( nW, nH, nHPolicy, nVPolicy ) METHOD isEmpty() @@ -89,19 +84,6 @@ METHOD QSpacerItem:new( ... ) RETURN Self -METHOD QSpacerItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSpacerItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSpacerItem:changeSize( nW, nH, nHPolicy, nVPolicy ) RETURN Qt_QSpacerItem_changeSize( ::pPtr, nW, nH, nHPolicy, nVPolicy ) diff --git a/harbour/contrib/hbqt/qtgui/TQSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQSpinBox.prg index d507daddd9..93473162c4 100644 --- a/harbour/contrib/hbqt/qtgui/TQSpinBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQSpinBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSpinBox INHERIT QAbstractSpinBox - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSpinBox INHERIT HbQtObjectHandler, QAbstractSpinBox METHOD new() - METHOD configure( xObject ) METHOD cleanText() METHOD maximum() @@ -100,19 +95,6 @@ METHOD QSpinBox:new( ... ) RETURN Self -METHOD QSpinBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSpinBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSpinBox:cleanText() RETURN Qt_QSpinBox_cleanText( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg b/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg index 7dce9d611c..5f0c4df06a 100644 --- a/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg +++ b/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSplashScreen INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSplashScreen INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD finish( pMainWin ) METHOD pixmap() @@ -92,19 +87,6 @@ METHOD QSplashScreen:new( ... ) RETURN Self -METHOD QSplashScreen:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSplashScreen:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSplashScreen:finish( pMainWin ) RETURN Qt_QSplashScreen_finish( ::pPtr, hbqt_ptr( pMainWin ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQSplitter.prg b/harbour/contrib/hbqt/qtgui/TQSplitter.prg index 40a9a06faa..ae8d38edb1 100644 --- a/harbour/contrib/hbqt/qtgui/TQSplitter.prg +++ b/harbour/contrib/hbqt/qtgui/TQSplitter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSplitter INHERIT QFrame - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSplitter INHERIT HbQtObjectHandler, QFrame METHOD new() - METHOD configure( xObject ) METHOD addWidget( pWidget ) METHOD childrenCollapsible() @@ -107,19 +102,6 @@ METHOD QSplitter:new( ... ) RETURN Self -METHOD QSplitter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSplitter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSplitter:addWidget( pWidget ) RETURN Qt_QSplitter_addWidget( ::pPtr, hbqt_ptr( pWidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItem.prg b/harbour/contrib/hbqt/qtgui/TQStandardItem.prg index 5c72dab92c..101dda6f89 100644 --- a/harbour/contrib/hbqt/qtgui/TQStandardItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQStandardItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStandardItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStandardItem INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD accessibleDescription() METHOD accessibleText() @@ -157,19 +152,6 @@ METHOD QStandardItem:new( ... ) RETURN Self -METHOD QStandardItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStandardItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStandardItem:accessibleDescription() RETURN Qt_QStandardItem_accessibleDescription( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg b/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg index a97291820a..9aa7649238 100644 --- a/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStandardItemModel INHERIT QAbstractItemModeL - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStandardItemModel INHERIT HbQtObjectHandler, QAbstractItemModeL METHOD new() - METHOD configure( xObject ) METHOD appendRow( pItem ) METHOD clear() @@ -112,19 +107,6 @@ METHOD QStandardItemModel:new( ... ) RETURN Self -METHOD QStandardItemModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStandardItemModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStandardItemModel:appendRow( pItem ) RETURN Qt_QStandardItemModel_appendRow( ::pPtr, hbqt_ptr( pItem ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQStatusBar.prg b/harbour/contrib/hbqt/qtgui/TQStatusBar.prg index f5150b227e..e99644fc55 100644 --- a/harbour/contrib/hbqt/qtgui/TQStatusBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQStatusBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStatusBar INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStatusBar INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addPermanentWidget( pWidget, nStretch ) METHOD addWidget( pWidget, nStretch ) @@ -96,19 +91,6 @@ METHOD QStatusBar:new( ... ) RETURN Self -METHOD QStatusBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStatusBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStatusBar:addPermanentWidget( pWidget, nStretch ) RETURN Qt_QStatusBar_addPermanentWidget( ::pPtr, hbqt_ptr( pWidget ), nStretch ) diff --git a/harbour/contrib/hbqt/qtgui/TQStringListModel.prg b/harbour/contrib/hbqt/qtgui/TQStringListModel.prg index dbd553341e..1d568065bc 100644 --- a/harbour/contrib/hbqt/qtgui/TQStringListModel.prg +++ b/harbour/contrib/hbqt/qtgui/TQStringListModel.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStringListModel INHERIT QAbstractListModel - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStringListModel INHERIT HbQtObjectHandler, QAbstractListModel METHOD new() - METHOD configure( xObject ) METHOD data( pIndex, nRole ) METHOD flags( pIndex ) @@ -94,19 +89,6 @@ METHOD QStringListModel:new( ... ) RETURN Self -METHOD QStringListModel:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStringListModel:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStringListModel:data( pIndex, nRole ) RETURN Qt_QStringListModel_data( ::pPtr, hbqt_ptr( pIndex ), nRole ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyle.prg b/harbour/contrib/hbqt/qtgui/TQStyle.prg index fd59ee76c1..9ebfd9caa0 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyle.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyle.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyle INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyle INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD combinedLayoutSpacing( nControls1, nControls2, nOrientation, pOption, pWidget ) METHOD drawComplexControl( nControl, pOption, pPainter, pWidget ) @@ -115,19 +110,6 @@ METHOD QStyle:new( ... ) RETURN Self -METHOD QStyle:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyle:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyle:combinedLayoutSpacing( nControls1, nControls2, nOrientation, pOption, pWidget ) RETURN Qt_QStyle_combinedLayoutSpacing( ::pPtr, nControls1, nControls2, nOrientation, hbqt_ptr( pOption ), hbqt_ptr( pWidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg b/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg index 166d43b47b..c73574e399 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleFactory - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleFactory INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD create( cKey ) METHOD keys() @@ -88,19 +83,6 @@ METHOD QStyleFactory:new( ... ) RETURN Self -METHOD QStyleFactory:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleFactory:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleFactory:create( cKey ) RETURN Qt_QStyleFactory_create( ::pPtr, cKey ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg index 6b3845382e..5ad07b650b 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleHintReturn - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleHintReturn INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QStyleHintReturn:new( ... ) ::pPtr := Qt_QStyleHintReturn( ... ) RETURN Self - -METHOD QStyleHintReturn:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleHintReturn:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg index a0c10e12a2..7b351cd473 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleHintReturnMask INHERIT QStyleHintReturn - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleHintReturnMask INHERIT HbQtObjectHandler, QStyleHintReturn METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QStyleHintReturnMask:new( ... ) ::pPtr := Qt_QStyleHintReturnMask( ... ) RETURN Self - -METHOD QStyleHintReturnMask:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleHintReturnMask:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg index c532abb856..f3fb16947e 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleHintReturnVariant INHERIT QStyleHintReturn - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleHintReturnVariant INHERIT HbQtObjectHandler, QStyleHintReturn METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QStyleHintReturnVariant:new( ... ) ::pPtr := Qt_QStyleHintReturnVariant( ... ) RETURN Self - -METHOD QStyleHintReturnVariant:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleHintReturnVariant:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOption.prg b/harbour/contrib/hbqt/qtgui/TQStyleOption.prg index ed512377ca..226000714c 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOption.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOption.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOption INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD initFrom( pWidget ) METHOD direction() @@ -94,19 +89,6 @@ METHOD QStyleOption:new( ... ) RETURN Self -METHOD QStyleOption:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOption:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOption:initFrom( pWidget ) RETURN Qt_QStyleOption_initFrom( ::pPtr, hbqt_ptr( pWidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg index c821951543..3c1b9a7d59 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionButton INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionButton INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD features() METHOD icon() @@ -90,19 +85,6 @@ METHOD QStyleOptionButton:new( ... ) RETURN Self -METHOD QStyleOptionButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionButton:features() RETURN Qt_QStyleOptionButton_features( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg index 2387672c1d..0d32a171dd 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionComboBox INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionComboBox INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD currentIcon() METHOD currentText() @@ -92,19 +87,6 @@ METHOD QStyleOptionComboBox:new( ... ) RETURN Self -METHOD QStyleOptionComboBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionComboBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionComboBox:currentIcon() RETURN Qt_QStyleOptionComboBox_currentIcon( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg index 5e9e2d5426..86fb4ee536 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionComplex INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionComplex INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD activeSubControls() METHOD subControls() @@ -88,19 +83,6 @@ METHOD QStyleOptionComplex:new( ... ) RETURN Self -METHOD QStyleOptionComplex:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionComplex:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionComplex:activeSubControls() RETURN Qt_QStyleOptionComplex_activeSubControls( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg index 53688604e3..428c6f3b20 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionDockWidget INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionDockWidget INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD closable() METHOD floatable() @@ -90,19 +85,6 @@ METHOD QStyleOptionDockWidget:new( ... ) RETURN Self -METHOD QStyleOptionDockWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionDockWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionDockWidget:closable() RETURN Qt_QStyleOptionDockWidget_closable( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg index 042804213d..00c0321ac5 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionFocusRect INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionFocusRect INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD backgroundColor() @@ -87,19 +82,6 @@ METHOD QStyleOptionFocusRect:new( ... ) RETURN Self -METHOD QStyleOptionFocusRect:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionFocusRect:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionFocusRect:backgroundColor() RETURN Qt_QStyleOptionFocusRect_backgroundColor( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg index cceee8e411..45a0a4b92d 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionFrame INHERIT qStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionFrame INHERIT HbQtObjectHandler, qStyleOption METHOD new() - METHOD configure( xObject ) METHOD lineWidth() METHOD midLineWidth() @@ -88,19 +83,6 @@ METHOD QStyleOptionFrame:new( ... ) RETURN Self -METHOD QStyleOptionFrame:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionFrame:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionFrame:lineWidth() RETURN Qt_QStyleOptionFrame_lineWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg index 143d445a3c..8ab25881dd 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionGroupBox INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionGroupBox INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD features() METHOD lineWidth() @@ -92,19 +87,6 @@ METHOD QStyleOptionGroupBox:new( ... ) RETURN Self -METHOD QStyleOptionGroupBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionGroupBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionGroupBox:features() RETURN Qt_QStyleOptionGroupBox_features( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg index 5725c24ee0..0b7b00033d 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionHeader INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionHeader INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD icon() METHOD iconAlignment() @@ -95,19 +90,6 @@ METHOD QStyleOptionHeader:new( ... ) RETURN Self -METHOD QStyleOptionHeader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionHeader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionHeader:icon() RETURN Qt_QStyleOptionHeader_icon( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg index 34a32ce805..6ed0983b65 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionMenuItem INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionMenuItem INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD checkType() METHOD checked() @@ -96,19 +91,6 @@ METHOD QStyleOptionMenuItem:new( ... ) RETURN Self -METHOD QStyleOptionMenuItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionMenuItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionMenuItem:checkType() RETURN Qt_QStyleOptionMenuItem_checkType( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg index 31a1f15c8d..8faf081859 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionProgressBar INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionProgressBar INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD maximum() METHOD minimum() @@ -92,19 +87,6 @@ METHOD QStyleOptionProgressBar:new( ... ) RETURN Self -METHOD QStyleOptionProgressBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionProgressBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionProgressBar:maximum() RETURN Qt_QStyleOptionProgressBar_maximum( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg index ef3f7f676d..411afa5a22 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionSizeGrip INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionSizeGrip INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD corner() @@ -87,19 +82,6 @@ METHOD QStyleOptionSizeGrip:new( ... ) RETURN Self -METHOD QStyleOptionSizeGrip:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionSizeGrip:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionSizeGrip:corner() RETURN Qt_QStyleOptionSizeGrip_corner( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg index 73e4198ee4..f0607ddf54 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionSlider INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionSlider INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD dialWrapping() METHOD maximum() @@ -98,19 +93,6 @@ METHOD QStyleOptionSlider:new( ... ) RETURN Self -METHOD QStyleOptionSlider:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionSlider:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionSlider:dialWrapping() RETURN Qt_QStyleOptionSlider_dialWrapping( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg index d6798ebfa1..9acfbf8c82 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionSpinBox INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionSpinBox INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD buttonSymbols() METHOD frame() @@ -89,19 +84,6 @@ METHOD QStyleOptionSpinBox:new( ... ) RETURN Self -METHOD QStyleOptionSpinBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionSpinBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionSpinBox:buttonSymbols() RETURN Qt_QStyleOptionSpinBox_buttonSymbols( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg index 0cf85677a1..d7beac8173 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionTab INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionTab INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD cornerWidgets() METHOD icon() @@ -93,19 +88,6 @@ METHOD QStyleOptionTab:new( ... ) RETURN Self -METHOD QStyleOptionTab:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionTab:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionTab:cornerWidgets() RETURN Qt_QStyleOptionTab_cornerWidgets( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg index 2a5197f97a..f5ecd3abea 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionTabBarBase INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionTabBarBase INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD selectedTabRect() METHOD shape() @@ -89,19 +84,6 @@ METHOD QStyleOptionTabBarBase:new( ... ) RETURN Self -METHOD QStyleOptionTabBarBase:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionTabBarBase:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionTabBarBase:selectedTabRect() RETURN Qt_QStyleOptionTabBarBase_selectedTabRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg index 4aa1580d4e..a1a04afdd6 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionTabWidgetFrame INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionTabWidgetFrame INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD leftCornerWidgetSize() METHOD lineWidth() @@ -92,19 +87,6 @@ METHOD QStyleOptionTabWidgetFrame:new( ... ) RETURN Self -METHOD QStyleOptionTabWidgetFrame:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionTabWidgetFrame:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionTabWidgetFrame:leftCornerWidgetSize() RETURN Qt_QStyleOptionTabWidgetFrame_leftCornerWidgetSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg index ce04ad6ec7..1f9037e790 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionTitleBar INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionTitleBar INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD icon() METHOD text() @@ -90,19 +85,6 @@ METHOD QStyleOptionTitleBar:new( ... ) RETURN Self -METHOD QStyleOptionTitleBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionTitleBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionTitleBar:icon() RETURN Qt_QStyleOptionTitleBar_icon( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg index 814c01a8b6..86a9ce09b0 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionToolBar INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionToolBar INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD features() METHOD lineWidth() @@ -92,19 +87,6 @@ METHOD QStyleOptionToolBar:new( ... ) RETURN Self -METHOD QStyleOptionToolBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionToolBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionToolBar:features() RETURN Qt_QStyleOptionToolBar_features( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg index 9408c200f2..fcf2eff228 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionToolBox INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionToolBox INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD icon() METHOD text() @@ -88,19 +83,6 @@ METHOD QStyleOptionToolBox:new( ... ) RETURN Self -METHOD QStyleOptionToolBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionToolBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionToolBox:icon() RETURN Qt_QStyleOptionToolBox_icon( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg index 8b67c41757..57ec2ae261 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionToolButton INHERIT QStyleOptionComplex - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionToolButton INHERIT HbQtObjectHandler, QStyleOptionComplex METHOD new() - METHOD configure( xObject ) METHOD arrowType() METHOD features() @@ -94,19 +89,6 @@ METHOD QStyleOptionToolButton:new( ... ) RETURN Self -METHOD QStyleOptionToolButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionToolButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionToolButton:arrowType() RETURN Qt_QStyleOptionToolButton_arrowType( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg index 96e6b5ff73..a99d5b5335 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyleOptionViewItem INHERIT QStyleOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyleOptionViewItem INHERIT HbQtObjectHandler, QStyleOption METHOD new() - METHOD configure( xObject ) METHOD decorationAlignment() METHOD decorationPosition() @@ -93,19 +88,6 @@ METHOD QStyleOptionViewItem:new( ... ) RETURN Self -METHOD QStyleOptionViewItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyleOptionViewItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyleOptionViewItem:decorationAlignment() RETURN Qt_QStyleOptionViewItem_decorationAlignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQStylePainter.prg b/harbour/contrib/hbqt/qtgui/TQStylePainter.prg index 87ba471823..abacf8c4aa 100644 --- a/harbour/contrib/hbqt/qtgui/TQStylePainter.prg +++ b/harbour/contrib/hbqt/qtgui/TQStylePainter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStylePainter INHERIT QPainter - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStylePainter INHERIT HbQtObjectHandler, QPainter METHOD new() - METHOD configure( xObject ) METHOD begin( pWidget ) METHOD begin_1( pPd, pWidget ) @@ -94,19 +89,6 @@ METHOD QStylePainter:new( ... ) RETURN Self -METHOD QStylePainter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStylePainter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStylePainter:begin( pWidget ) RETURN Qt_QStylePainter_begin( ::pPtr, hbqt_ptr( pWidget ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg b/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg index 9fd7f82755..1a5a04f046 100644 --- a/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg +++ b/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QStyledItemDelegate - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QStyledItemDelegate INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD createEditor( pParent, pOption, pIndex ) METHOD displayText( pValue, pLocale ) @@ -93,19 +88,6 @@ METHOD QStyledItemDelegate:new( ... ) RETURN Self -METHOD QStyledItemDelegate:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QStyledItemDelegate:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QStyledItemDelegate:createEditor( pParent, pOption, pIndex ) RETURN Qt_QStyledItemDelegate_createEditor( ::pPtr, hbqt_ptr( pParent ), hbqt_ptr( pOption ), hbqt_ptr( pIndex ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg index e3a2978a49..9841bd4daf 100644 --- a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg +++ b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSyntaxHighlighter INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSyntaxHighlighter INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD document() METHOD setDocument( pDoc ) @@ -89,19 +84,6 @@ METHOD QSyntaxHighlighter:new( ... ) RETURN Self -METHOD QSyntaxHighlighter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSyntaxHighlighter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSyntaxHighlighter:document() RETURN Qt_QSyntaxHighlighter_document( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg b/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg index ffdaf94b61..37893f8861 100644 --- a/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg +++ b/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QSystemTrayIcon INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QSystemTrayIcon INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD contextMenu() METHOD geometry() @@ -100,19 +95,6 @@ METHOD QSystemTrayIcon:new( ... ) RETURN Self -METHOD QSystemTrayIcon:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QSystemTrayIcon:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QSystemTrayIcon:contextMenu() RETURN Qt_QSystemTrayIcon_contextMenu( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTabBar.prg b/harbour/contrib/hbqt/qtgui/TQTabBar.prg index 31bf1a00a2..eabb67ba17 100644 --- a/harbour/contrib/hbqt/qtgui/TQTabBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQTabBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTabBar INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTabBar INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addTab( cText ) METHOD count() @@ -130,19 +125,6 @@ METHOD QTabBar:new( ... ) RETURN Self -METHOD QTabBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTabBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTabBar:addTab( cText ) RETURN Qt_QTabBar_addTab( ::pPtr, cText ) diff --git a/harbour/contrib/hbqt/qtgui/TQTabWidget.prg b/harbour/contrib/hbqt/qtgui/TQTabWidget.prg index f589e9db4d..1188adb8a0 100644 --- a/harbour/contrib/hbqt/qtgui/TQTabWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQTabWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTabWidget INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD addTab( pPage, cLabel ) METHOD addTab_1( pPage, cIcon, cLabel ) @@ -127,19 +122,6 @@ METHOD QTabWidget:new( ... ) RETURN Self -METHOD QTabWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTabWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTabWidget:addTab( pPage, cLabel ) RETURN Qt_QTabWidget_addTab( ::pPtr, hbqt_ptr( pPage ), cLabel ) diff --git a/harbour/contrib/hbqt/qtgui/TQTableView.prg b/harbour/contrib/hbqt/qtgui/TQTableView.prg index 259a830cd6..170ad01d18 100644 --- a/harbour/contrib/hbqt/qtgui/TQTableView.prg +++ b/harbour/contrib/hbqt/qtgui/TQTableView.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTableView INHERIT QAbstractItemView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTableView INHERIT HbQtObjectHandler, QAbstractItemView METHOD new() - METHOD configure( xObject ) METHOD clearSpans() METHOD columnAt( nX ) @@ -128,19 +123,6 @@ METHOD QTableView:new( ... ) RETURN Self -METHOD QTableView:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTableView:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTableView:clearSpans() RETURN Qt_QTableView_clearSpans( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidget.prg b/harbour/contrib/hbqt/qtgui/TQTableWidget.prg index 7da6a63387..c43cba3de8 100644 --- a/harbour/contrib/hbqt/qtgui/TQTableWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQTableWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTableWidget INHERIT QTableView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTableWidget INHERIT HbQtObjectHandler, QTableView METHOD new() - METHOD configure( xObject ) METHOD cellWidget( nRow, nColumn ) METHOD closePersistentEditor( pItem ) @@ -132,19 +127,6 @@ METHOD QTableWidget:new( ... ) RETURN Self -METHOD QTableWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTableWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTableWidget:cellWidget( nRow, nColumn ) RETURN Qt_QTableWidget_cellWidget( ::pPtr, nRow, nColumn ) diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg index e04a05c790..f1497ebe4f 100644 --- a/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTableWidgetItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTableWidgetItem INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD background() METHOD checkState() @@ -121,19 +116,6 @@ METHOD QTableWidgetItem:new( ... ) RETURN Self -METHOD QTableWidgetItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTableWidgetItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTableWidgetItem:background() RETURN Qt_QTableWidgetItem_background( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg b/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg index e7c52d590e..2ac4531dbe 100644 --- a/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg +++ b/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTableWidgetSelectionRange - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTableWidgetSelectionRange INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD bottomRow() METHOD columnCount() @@ -92,19 +87,6 @@ METHOD QTableWidgetSelectionRange:new( ... ) RETURN Self -METHOD QTableWidgetSelectionRange:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTableWidgetSelectionRange:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTableWidgetSelectionRange:bottomRow() RETURN Qt_QTableWidgetSelectionRange_bottomRow( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlock.prg b/harbour/contrib/hbqt/qtgui/TQTextBlock.prg index 6975d62251..0ebfd9bac0 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextBlock.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextBlock.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextBlock - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextBlock INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD blockFormat() METHOD blockFormatIndex() @@ -111,19 +106,6 @@ METHOD QTextBlock:new( ... ) RETURN Self -METHOD QTextBlock:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextBlock:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextBlock:blockFormat() RETURN Qt_QTextBlock_blockFormat( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg index 7a77cd9fe9..1107176836 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextBlockFormat INHERIT QTextFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextBlockFormat INHERIT HbQtObjectHandler, QTextFormat METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD bottomMargin() @@ -105,19 +100,6 @@ METHOD QTextBlockFormat:new( ... ) RETURN Self -METHOD QTextBlockFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextBlockFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextBlockFormat:alignment() RETURN Qt_QTextBlockFormat_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg b/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg index d52c47a716..72990cf203 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextBlockGroup INHERIT QTextObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextBlockGroup INHERIT HbQtObjectHandler, QTextObject METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QTextBlockGroup:new( ... ) ::pPtr := Qt_QTextBlockGroup( ... ) RETURN Self - -METHOD QTextBlockGroup:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextBlockGroup:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg b/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg index d999219ff7..239db9248a 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextBrowser INHERIT QTextEdit - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextBrowser INHERIT HbQtObjectHandler, QTextEdit METHOD new() - METHOD configure( xObject ) METHOD backwardHistoryCount() METHOD clearHistory() @@ -106,19 +101,6 @@ METHOD QTextBrowser:new( ... ) RETURN Self -METHOD QTextBrowser:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextBrowser:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextBrowser:backwardHistoryCount() RETURN Qt_QTextBrowser_backwardHistoryCount( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg index 46e1b7b3b6..a49b45f5d5 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextCharFormat INHERIT QTextFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextCharFormat INHERIT HbQtObjectHandler, QTextFormat METHOD new() - METHOD configure( xObject ) METHOD anchorHref() METHOD anchorNames() @@ -133,19 +128,6 @@ METHOD QTextCharFormat:new( ... ) RETURN Self -METHOD QTextCharFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextCharFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextCharFormat:anchorHref() RETURN Qt_QTextCharFormat_anchorHref( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextCursor.prg b/harbour/contrib/hbqt/qtgui/TQTextCursor.prg index 015bd63add..cb26e0fc8a 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextCursor.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextCursor.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextCursor - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextCursor INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD anchor() METHOD atBlockEnd() @@ -146,19 +141,6 @@ METHOD QTextCursor:new( ... ) RETURN Self -METHOD QTextCursor:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextCursor:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextCursor:anchor() RETURN Qt_QTextCursor_anchor( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocument.prg b/harbour/contrib/hbqt/qtgui/TQTextDocument.prg index f9edd578b8..6bdceef743 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextDocument.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextDocument.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextDocument INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextDocument INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD addResource( nType, pName, pResource ) METHOD adjustSize() @@ -152,19 +147,6 @@ METHOD QTextDocument:new( ... ) RETURN Self -METHOD QTextDocument:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextDocument:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextDocument:addResource( nType, pName, pResource ) RETURN Qt_QTextDocument_addResource( ::pPtr, nType, hbqt_ptr( pName ), hbqt_ptr( pResource ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg b/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg index 7282067686..ddac075dec 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextDocumentFragment - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextDocumentFragment INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD isEmpty() METHOD toHtml( pEncoding ) @@ -93,19 +88,6 @@ METHOD QTextDocumentFragment:new( ... ) RETURN Self -METHOD QTextDocumentFragment:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextDocumentFragment:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextDocumentFragment:isEmpty() RETURN Qt_QTextDocumentFragment_isEmpty( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg b/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg index dda88bb1b3..3da1652d56 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextDocumentWriter - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextDocumentWriter INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD codec() METHOD device() @@ -96,19 +91,6 @@ METHOD QTextDocumentWriter:new( ... ) RETURN Self -METHOD QTextDocumentWriter:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextDocumentWriter:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextDocumentWriter:codec() RETURN Qt_QTextDocumentWriter_codec( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextEdit.prg b/harbour/contrib/hbqt/qtgui/TQTextEdit.prg index 9ebaccd3e0..f3c810b0ce 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextEdit INHERIT QAbstractScrollArea - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextEdit INHERIT HbQtObjectHandler, QAbstractScrollArea METHOD new() - METHOD configure( xObject ) METHOD acceptRichText() METHOD alignment() @@ -167,19 +162,6 @@ METHOD QTextEdit:new( ... ) RETURN Self -METHOD QTextEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextEdit:acceptRichText() RETURN Qt_QTextEdit_acceptRichText( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextFormat.prg index 63b65a3c5e..9953e64d36 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextFormat INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD background() METHOD boolProperty( nPropertyId ) @@ -127,19 +122,6 @@ METHOD QTextFormat:new( ... ) RETURN Self -METHOD QTextFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextFormat:background() RETURN Qt_QTextFormat_background( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextFragment.prg b/harbour/contrib/hbqt/qtgui/TQTextFragment.prg index 6be8118cae..65792bf36e 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextFragment.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextFragment.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextFragment - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextFragment INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD charFormat() METHOD charFormatIndex() @@ -93,19 +88,6 @@ METHOD QTextFragment:new( ... ) RETURN Self -METHOD QTextFragment:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextFragment:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextFragment:charFormat() RETURN Qt_QTextFragment_charFormat( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrame.prg b/harbour/contrib/hbqt/qtgui/TQTextFrame.prg index fe833ddb5e..e2a811f7c5 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextFrame.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextFrame.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextFrame INHERIT QTextObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextFrame INHERIT HbQtObjectHandler, QTextObject METHOD new() - METHOD configure( xObject ) METHOD firstCursorPosition() METHOD firstPosition() @@ -93,19 +88,6 @@ METHOD QTextFrame:new( ... ) RETURN Self -METHOD QTextFrame:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextFrame:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextFrame:firstCursorPosition() RETURN Qt_QTextFrame_firstCursorPosition( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg index 40f7dbdf37..8df52708c2 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextFrameFormat INHERIT QTextFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextFrameFormat INHERIT HbQtObjectHandler, QTextFormat METHOD new() - METHOD configure( xObject ) METHOD border() METHOD borderBrush() @@ -115,19 +110,6 @@ METHOD QTextFrameFormat:new( ... ) RETURN Self -METHOD QTextFrameFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextFrameFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextFrameFormat:border() RETURN Qt_QTextFrameFormat_border( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg index a16f657b0e..e688837f95 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextImageFormat INHERIT QTextCharFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextImageFormat INHERIT HbQtObjectHandler, QTextCharFormat METHOD new() - METHOD configure( xObject ) METHOD height() METHOD isValid() @@ -93,19 +88,6 @@ METHOD QTextImageFormat:new( ... ) RETURN Self -METHOD QTextImageFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextImageFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextImageFormat:height() RETURN Qt_QTextImageFormat_height( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg b/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg index 52edf8c1cf..70d21e5ea2 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextInlineObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextInlineObject INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD ascent() METHOD descent() @@ -99,19 +94,6 @@ METHOD QTextInlineObject:new( ... ) RETURN Self -METHOD QTextInlineObject:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextInlineObject:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextInlineObject:ascent() RETURN Qt_QTextInlineObject_ascent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextItem.prg b/harbour/contrib/hbqt/qtgui/TQTextItem.prg index 4e0a28c421..91bf6a7361 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextItem INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD ascent() METHOD descent() @@ -92,19 +87,6 @@ METHOD QTextItem:new( ... ) RETURN Self -METHOD QTextItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextItem:ascent() RETURN Qt_QTextItem_ascent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextLayout.prg b/harbour/contrib/hbqt/qtgui/TQTextLayout.prg index b29bacc36c..1c207f6cf2 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextLayout INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD beginLayout() METHOD boundingRect() @@ -115,19 +110,6 @@ METHOD QTextLayout:new( ... ) RETURN Self -METHOD QTextLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextLayout:beginLayout() RETURN Qt_QTextLayout_beginLayout( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextLength.prg b/harbour/contrib/hbqt/qtgui/TQTextLength.prg index 012f5a56fe..bab48252e8 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextLength.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextLength.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextLength - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextLength INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD rawValue() METHOD type() @@ -89,19 +84,6 @@ METHOD QTextLength:new( ... ) RETURN Self -METHOD QTextLength:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextLength:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextLength:rawValue() RETURN Qt_QTextLength_rawValue( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextLine.prg b/harbour/contrib/hbqt/qtgui/TQTextLine.prg index 4bcd1822cc..2965148b91 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextLine.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextLine.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextLine - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextLine INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD ascent() METHOD cursorToX( nCursorPos, nEdge ) @@ -107,19 +102,6 @@ METHOD QTextLine:new( ... ) RETURN Self -METHOD QTextLine:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextLine:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextLine:ascent() RETURN Qt_QTextLine_ascent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg index a8d9c2be43..7d7e4c21d7 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextListFormat INHERIT QTextFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextListFormat INHERIT HbQtObjectHandler, QTextFormat METHOD new() - METHOD configure( xObject ) METHOD indent() METHOD isValid() @@ -91,19 +86,6 @@ METHOD QTextListFormat:new( ... ) RETURN Self -METHOD QTextListFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextListFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextListFormat:indent() RETURN Qt_QTextListFormat_indent( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextObject.prg b/harbour/contrib/hbqt/qtgui/TQTextObject.prg index 243a5fdb24..d410fa09d8 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextObject.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextObject.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextObject INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextObject INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD document() METHOD format() @@ -90,19 +85,6 @@ METHOD QTextObject:new( ... ) RETURN Self -METHOD QTextObject:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextObject:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextObject:document() RETURN Qt_QTextObject_document( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextOption.prg b/harbour/contrib/hbqt/qtgui/TQTextOption.prg index 2becea6192..3615597a8e 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextOption.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextOption.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextOption - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextOption INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD flags() @@ -98,19 +93,6 @@ METHOD QTextOption:new( ... ) RETURN Self -METHOD QTextOption:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextOption:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextOption:alignment() RETURN Qt_QTextOption_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg index 8615f0f279..6e5bf18c8d 100644 --- a/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg +++ b/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTextTableFormat INHERIT QTextFrameFormat - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTextTableFormat INHERIT HbQtObjectHandler, QTextFrameFormat METHOD new() - METHOD configure( xObject ) METHOD alignment() METHOD cellPadding() @@ -97,19 +92,6 @@ METHOD QTextTableFormat:new( ... ) RETURN Self -METHOD QTextTableFormat:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTextTableFormat:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTextTableFormat:alignment() RETURN Qt_QTextTableFormat_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg b/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg index 5203d9bd49..3518dabc96 100644 --- a/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg +++ b/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTimeEdit INHERIT QDateTimeEdit - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTimeEdit INHERIT HbQtObjectHandler, QDateTimeEdit METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QTimeEdit:new( ... ) ::pPtr := Qt_QTimeEdit( ... ) RETURN Self - -METHOD QTimeEdit:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTimeEdit:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQToolBar.prg b/harbour/contrib/hbqt/qtgui/TQToolBar.prg index eacbe6fcba..42f2c75c07 100644 --- a/harbour/contrib/hbqt/qtgui/TQToolBar.prg +++ b/harbour/contrib/hbqt/qtgui/TQToolBar.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QToolBar INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QToolBar INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD actionAt( pP ) METHOD actionAt_1( nX, nY ) @@ -114,19 +109,6 @@ METHOD QToolBar:new( ... ) RETURN Self -METHOD QToolBar:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QToolBar:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QToolBar:actionAt( pP ) RETURN Qt_QToolBar_actionAt( ::pPtr, hbqt_ptr( pP ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQToolBox.prg b/harbour/contrib/hbqt/qtgui/TQToolBox.prg index e7fc063739..20578f6848 100644 --- a/harbour/contrib/hbqt/qtgui/TQToolBox.prg +++ b/harbour/contrib/hbqt/qtgui/TQToolBox.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QToolBox INHERIT QFrame - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QToolBox INHERIT HbQtObjectHandler, QFrame METHOD new() - METHOD configure( xObject ) METHOD addItem( pWidget, cIconSet, cText ) METHOD addItem_1( pW, cText ) @@ -106,19 +101,6 @@ METHOD QToolBox:new( ... ) RETURN Self -METHOD QToolBox:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QToolBox:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QToolBox:addItem( pWidget, cIconSet, cText ) RETURN Qt_QToolBox_addItem( ::pPtr, hbqt_ptr( pWidget ), cIconSet, cText ) diff --git a/harbour/contrib/hbqt/qtgui/TQToolButton.prg b/harbour/contrib/hbqt/qtgui/TQToolButton.prg index 5238a04705..e7e9fe0ee4 100644 --- a/harbour/contrib/hbqt/qtgui/TQToolButton.prg +++ b/harbour/contrib/hbqt/qtgui/TQToolButton.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QToolButton INHERIT QAbstractButton - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QToolButton INHERIT HbQtObjectHandler, QAbstractButton METHOD new() - METHOD configure( xObject ) METHOD arrowType() METHOD autoRaise() @@ -99,19 +94,6 @@ METHOD QToolButton:new( ... ) RETURN Self -METHOD QToolButton:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QToolButton:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QToolButton:arrowType() RETURN Qt_QToolButton_arrowType( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTransform.prg b/harbour/contrib/hbqt/qtgui/TQTransform.prg index aa69c47c27..912c3ec2d4 100644 --- a/harbour/contrib/hbqt/qtgui/TQTransform.prg +++ b/harbour/contrib/hbqt/qtgui/TQTransform.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTransform - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTransform INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD m11() METHOD m12() @@ -135,19 +130,6 @@ METHOD QTransform:new( ... ) RETURN Self -METHOD QTransform:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTransform:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTransform:m11() RETURN Qt_QTransform_m11( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTreeView.prg b/harbour/contrib/hbqt/qtgui/TQTreeView.prg index b60db93154..d629e693b1 100644 --- a/harbour/contrib/hbqt/qtgui/TQTreeView.prg +++ b/harbour/contrib/hbqt/qtgui/TQTreeView.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTreeView INHERIT QAbstractItemView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTreeView INHERIT HbQtObjectHandler, QAbstractItemView METHOD new() - METHOD configure( xObject ) METHOD allColumnsShowFocus() METHOD autoExpandDelay() @@ -135,19 +130,6 @@ METHOD QTreeView:new( ... ) RETURN Self -METHOD QTreeView:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTreeView:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTreeView:allColumnsShowFocus() RETURN Qt_QTreeView_allColumnsShowFocus( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg b/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg index 6cf396f7f4..51761d7e4e 100644 --- a/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTreeWidget INHERIT QTreeView - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTreeWidget INHERIT HbQtObjectHandler, QTreeView METHOD new() - METHOD configure( xObject ) METHOD addTopLevelItem( pItem ) METHOD closePersistentEditor( pItem, nColumn ) @@ -123,19 +118,6 @@ METHOD QTreeWidget:new( ... ) RETURN Self -METHOD QTreeWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTreeWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTreeWidget:addTopLevelItem( pItem ) RETURN Qt_QTreeWidget_addTopLevelItem( ::pPtr, hbqt_ptr( pItem ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg index 65a9d695f5..03bf71abe7 100644 --- a/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QTreeWidgetItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QTreeWidgetItem INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addChild( pChild ) METHOD background( nColumn ) @@ -138,19 +133,6 @@ METHOD QTreeWidgetItem:new( ... ) RETURN Self -METHOD QTreeWidgetItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QTreeWidgetItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QTreeWidgetItem:addChild( pChild ) RETURN Qt_QTreeWidgetItem_addChild( ::pPtr, hbqt_ptr( pChild ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg index 39081c3386..08852c6bc3 100644 --- a/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg +++ b/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QVBoxLayout INHERIT QBoxLayout - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QVBoxLayout INHERIT HbQtObjectHandler, QBoxLayout METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QVBoxLayout:new( ... ) ::pPtr := Qt_QVBoxLayout( ... ) RETURN Self - -METHOD QVBoxLayout:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QVBoxLayout:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQValidator.prg b/harbour/contrib/hbqt/qtgui/TQValidator.prg index 19c3968f13..6c1a027692 100644 --- a/harbour/contrib/hbqt/qtgui/TQValidator.prg +++ b/harbour/contrib/hbqt/qtgui/TQValidator.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QValidator INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QValidator INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD locale() METHOD setLocale( pLocale ) @@ -88,19 +83,6 @@ METHOD QValidator:new( ... ) RETURN Self -METHOD QValidator:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QValidator:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QValidator:locale() RETURN Qt_QValidator_locale( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg b/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg index b7494c0af2..459ffae99e 100644 --- a/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg +++ b/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWheelEvent INHERIT QInputEvent - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWheelEvent INHERIT HbQtObjectHandler, QInputEvent METHOD new() - METHOD configure( xObject ) METHOD buttons() METHOD delta() @@ -95,19 +90,6 @@ METHOD QWheelEvent:new( ... ) RETURN Self -METHOD QWheelEvent:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWheelEvent:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWheelEvent:buttons() RETURN Qt_QWheelEvent_buttons( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQWidget.prg b/harbour/contrib/hbqt/qtgui/TQWidget.prg index 0c8df8dd3f..35f8fc63fd 100644 --- a/harbour/contrib/hbqt/qtgui/TQWidget.prg +++ b/harbour/contrib/hbqt/qtgui/TQWidget.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWidget INHERIT QObject, QPaintDevice - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWidget INHERIT HbQtObjectHandler, QObject, QPaintDevice METHOD new() - METHOD configure( xObject ) METHOD acceptDrops() METHOD accessibleDescription() @@ -297,19 +292,6 @@ METHOD QWidget:new( ... ) RETURN Self -METHOD QWidget:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWidget:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWidget:acceptDrops() RETURN Qt_QWidget_acceptDrops( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg b/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg index f255f16ac5..61f310f5ee 100644 --- a/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg +++ b/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWidgetAction INHERIT QAction - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWidgetAction INHERIT HbQtObjectHandler, QAction METHOD new() - METHOD configure( xObject ) METHOD defaultWidget() METHOD releaseWidget( pWidget ) @@ -90,19 +85,6 @@ METHOD QWidgetAction:new( ... ) RETURN Self -METHOD QWidgetAction:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWidgetAction:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWidgetAction:defaultWidget() RETURN Qt_QWidgetAction_defaultWidget( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg index 1fcc4e345e..ffe47c72b5 100644 --- a/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg +++ b/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWidgetItem INHERIT QLayoutItem - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWidgetItem INHERIT HbQtObjectHandler, QLayoutItem METHOD new() - METHOD configure( xObject ) METHOD isEmpty() METHOD widget() @@ -88,19 +83,6 @@ METHOD QWidgetItem:new( ... ) RETURN Self -METHOD QWidgetItem:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWidgetItem:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWidgetItem:isEmpty() RETURN Qt_QWidgetItem_isEmpty( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg b/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg index 98ada8993d..a34051b8a6 100644 --- a/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg +++ b/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWindowsStyle INHERIT QCommonStyle - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWindowsStyle INHERIT HbQtObjectHandler, QCommonStyle METHOD new() - METHOD configure( xObject ) ENDCLASS @@ -85,16 +80,3 @@ METHOD QWindowsStyle:new( ... ) ::pPtr := Qt_QWindowsStyle( ... ) RETURN Self - -METHOD QWindowsStyle:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWindowsStyle:onError() - RETURN hbqt_showError( __GetMessage() ) - diff --git a/harbour/contrib/hbqt/qtgui/TQWizard.prg b/harbour/contrib/hbqt/qtgui/TQWizard.prg index 7ca5a6ebaf..8177f9efc5 100644 --- a/harbour/contrib/hbqt/qtgui/TQWizard.prg +++ b/harbour/contrib/hbqt/qtgui/TQWizard.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWizard INHERIT QDialog - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWizard INHERIT HbQtObjectHandler, QDialog METHOD new() - METHOD configure( xObject ) METHOD addPage( pPage ) METHOD button( nWhich ) @@ -119,19 +114,6 @@ METHOD QWizard:new( ... ) RETURN Self -METHOD QWizard:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWizard:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWizard:addPage( pPage ) RETURN Qt_QWizard_addPage( ::pPtr, hbqt_ptr( pPage ) ) diff --git a/harbour/contrib/hbqt/qtgui/TQWizardPage.prg b/harbour/contrib/hbqt/qtgui/TQWizardPage.prg index fc41c1f7fe..bf3864db33 100644 --- a/harbour/contrib/hbqt/qtgui/TQWizardPage.prg +++ b/harbour/contrib/hbqt/qtgui/TQWizardPage.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QWizardPage INHERIT QWidget - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QWizardPage INHERIT HbQtObjectHandler, QWidget METHOD new() - METHOD configure( xObject ) METHOD buttonText( nWhich ) METHOD cleanupPage() @@ -103,19 +98,6 @@ METHOD QWizardPage:new( ... ) RETURN Self -METHOD QWizardPage:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QWizardPage:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QWizardPage:buttonText( nWhich ) RETURN Qt_QWizardPage_buttonText( ::pPtr, nWhich ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQFtp.prg b/harbour/contrib/hbqt/qtnetwork/TQFtp.prg index a45e0d50a2..8616667af2 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQFtp.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQFtp.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QFtp INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QFtp INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD bytesAvailable() METHOD cd( cDir ) @@ -112,19 +107,6 @@ METHOD QFtp:new( ... ) RETURN Self -METHOD QFtp:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QFtp:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QFtp:bytesAvailable() RETURN Qt_QFtp_bytesAvailable( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttp.prg b/harbour/contrib/hbqt/qtnetwork/TQHttp.prg index 5ae0c5ceb6..f1fa041b80 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQHttp.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQHttp.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHttp INHERIT QObject - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHttp INHERIT HbQtObjectHandler, QObject METHOD new() - METHOD configure( xObject ) METHOD bytesAvailable() METHOD clearPendingRequests() @@ -110,19 +105,6 @@ METHOD QHttp:new( ... ) RETURN Self -METHOD QHttp:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHttp:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHttp:bytesAvailable() RETURN Qt_QHttp_bytesAvailable( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg index e81b1c916f..f01599c139 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHttpHeader - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHttpHeader INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD addValue( cKey, cValue ) METHOD allValues( cKey ) @@ -104,19 +99,6 @@ METHOD QHttpHeader:new( ... ) RETURN Self -METHOD QHttpHeader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHttpHeader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHttpHeader:addValue( cKey, cValue ) RETURN Qt_QHttpHeader_addValue( ::pPtr, cKey, cValue ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg index 1ea432d1a2..cf17c977d1 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHttpRequestHeader INHERIT QHttpHeader - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHttpRequestHeader INHERIT HbQtObjectHandler, QHttpHeader METHOD new() - METHOD configure( xObject ) METHOD majorVersion() METHOD method() @@ -91,19 +86,6 @@ METHOD QHttpRequestHeader:new( ... ) RETURN Self -METHOD QHttpRequestHeader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHttpRequestHeader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHttpRequestHeader:majorVersion() RETURN Qt_QHttpRequestHeader_majorVersion( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg index a338298948..b48f94bc12 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QHttpResponseHeader INHERIT QHttpHeader - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QHttpResponseHeader INHERIT HbQtObjectHandler, QHttpHeader METHOD new() - METHOD configure( xObject ) METHOD majorVersion() METHOD minorVersion() @@ -91,19 +86,6 @@ METHOD QHttpResponseHeader:new( ... ) RETURN Self -METHOD QHttpResponseHeader:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QHttpResponseHeader:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QHttpResponseHeader:majorVersion() RETURN Qt_QHttpResponseHeader_majorVersion( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg b/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg index f071d6747f..ff9af09907 100644 --- a/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg +++ b/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg @@ -63,14 +63,9 @@ #include "hbclass.ch" -CREATE CLASS QNetworkRequest - - VAR pPtr - - ERROR HANDLER onError() +CREATE CLASS QNetworkRequest INHERIT HbQtObjectHandler METHOD new() - METHOD configure( xObject ) METHOD attribute( nCode, pDefaultValue ) METHOD hasRawHeader( pHeaderName ) @@ -95,19 +90,6 @@ METHOD QNetworkRequest:new( ... ) RETURN Self -METHOD QNetworkRequest:configure( xObject ) - IF hb_isObject( xObject ) - ::pPtr := xObject:pPtr - ELSEIF hb_isPointer( xObject ) - ::pPtr := xObject - ENDIF - RETURN Self - - -METHOD QNetworkRequest:onError() - RETURN hbqt_showError( __GetMessage() ) - - METHOD QNetworkRequest:attribute( nCode, pDefaultValue ) RETURN Qt_QNetworkRequest_attribute( ::pPtr, nCode, hbqt_ptr( pDefaultValue ) )