diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 24cffb7999..6d6d6dcb77 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,68 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-04 04:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * hbqt/hbqt_hbmk2_plugin.hbs + ! Fixed to not pickup false object references. + ! Fixed to automatically pickup object references in manual contructor code. + * crc32 restored to be compatible with old one. + ! Fixed typo causing incremental build always rebuild everything + (for .qth files). + + * hbqt/qtcore/qth/HBQString.qth + ! Fixed reference to manual header. + + * hbqt/qtgui/hbqt_hbqtableview.h + * hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h + * hbqt/qtgui/hbqt_hbqplaintextedit.h + * hbqt/qtgui/hbqt_hbqgraphicsitem.h + * Header cleanup. Hopefully good. + + * contrib/hbqt/qtwebkit/qth/QWebView.qth + - Deleted reference to no more existing hbqtnetwork.h + + + hbqt/qtgui/hbqtgui.h + + hbqt/qtcore/hbqtcore.h + + Added headers with stuff referenced by non-generated code + (and some more) + + + contrib/hbqt/qtgui/qth/filelist.hbm + + contrib/hbqt/qtwebkit/qth/filelist.hbm + + contrib/hbqt/qtcore/qth/filelist.hbm + + contrib/hbqt/qtnetwork/qth/filelist.hbm + + contrib/hbqt/qscintilla/qth/filelist.hbm + + contrib/hbqt/qtuitools/qth/filelist.hbm + + contrib/hbqt/qtdesigner/qth/filelist.hbm + + Added new .hbm files pulling in .qth and + setting up generation. + This way also .qth placement became fully modular. + + * contrib/hbqt/hbqt_common.hbm + * hbqt/qtgui/hbqtgui.hbc + * hbqt/qtgui/hbqtgui.hbm + * hbqt/qtwebkit/hbqtwebkit.hbc + * hbqt/qtwebkit/hbqtwebkit.hbm + * hbqt/qtcore/hbqtcore.hbc + * hbqt/qtcore/hbqtcore.hbm + * hbqt/qtnetwork/hbqtnetwork.hbc + * hbqt/qtnetwork/hbqtnetwork.hbm + * hbqt/qscintilla/hbqscintilla.hbm + * hbqt/qscintilla/hbqscintilla.hbc + * hbqt/qtuitools/hbqtuitools.hbm + * hbqt/qtuitools/hbqtuitools.hbc + * hbqt/qtdesigner/hbqtdesigner.hbm + * hbqt/qtdesigner/hbqtdesigner.hbc + - Deleted 'g' subdir from header path list. + * Changed to use .qth files directly. + + ; TODO: If things go well, g subfolders, doc/en + folder content and utils dirs can be deleted. + ; TODO: Cleanup the way HBQT_TYPE_* and hb_par_* are defined. + It's currently kinda hackish. + + ; Now everyone can start to bitch, moan and argue or ignore. + That's sole reason I'm doing commits. Thanks in advance. + 2010-11-04 01:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_hbmk2_plugin.hbs + Reworked standalone hbqt generator as dynamic hbmk2 diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index c5ac8db0f2..dd4d1a7707 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -18,7 +18,6 @@ -w3 -es2 -i. --iqtcore/g -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64} diff --git a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs index bfa646a6c6..6283f71f9e 100644 --- a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs +++ b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs @@ -309,8 +309,8 @@ FUNCTION hbmk2_plugin_qt( hbmk2 ) FOR EACH cSrc, cDstCPP, cDstPRG, cDstDOC IN hbmk2[ "vars" ][ "aQTH_Src" ], hbmk2[ "vars" ][ "aQTH_CPP" ], hbmk2[ "vars" ][ "aQTH_PRG" ], hbmk2[ "vars" ][ "aQTH_DOC" ] IF hbmk2[ "lINC" ] .AND. ! hbmk2[ "lREBUILD" ] - lBuildIt := ! hb_FGetDateTime( cDst, @tDstCPP ) .OR. ; - ! hb_FGetDateTime( cDst, @tDstPRG ) .OR. ; + lBuildIt := ! hb_FGetDateTime( cDstCPP, @tDstCPP ) .OR. ; + ! hb_FGetDateTime( cDstPRG, @tDstPRG ) .OR. ; ! hb_FGetDateTime( cSrc, @tSrc ) .OR. ; tSrc > tDstCPP .OR. ; tSrc > tDstPRG @@ -320,6 +320,7 @@ FUNCTION hbmk2_plugin_qt( hbmk2 ) IF lBuildIt IF ! hbmk2[ "lDONTEXEC" ] +OUTSTD( "GEN", cSrc, hb_eol() ) IF ! qth_to_src( cSrc, cDstCPP, cDstPRG, cDstDOC, hbmk2[ "vars" ][ "qtmodule" ], hbmk2[ "vars" ][ "qtver" ] ) IF ! hbmk2[ "lIGNOREERROR" ] cRetVal := "error" @@ -1250,7 +1251,7 @@ METHOD HbQtSource:new( cQtModule, cQtVer, cQTHFileName, cCPPFileName, cPRGFileNa /*----------------------------------------------------------------------*/ METHOD HbQtSource:build() - LOCAL i, s, oMtd, tmp + LOCAL i, s, oMtd, tmp, tmp1 LOCAL aLine ::hRef[ ::cQtObject ] := NIL @@ -1291,6 +1292,21 @@ METHOD HbQtSource:build() aadd( aLine, "" ) #endif + IF ::isConstructor + FOR i := 3 TO len( ::new_ ) - 1 + IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" ) + IF "__HB_RETPTRGC__(" $ ::new_[ i ] + tmp1 := ::new_[ i ] + DO WHILE ( tmp := At( "hbqt_par_", tmp1 ) ) > 0 + tmp1 := SubStr( tmp1, tmp + Len( "hbqt_par_" ) ) + hbqtgen_AddRef( ::hRef, Left( tmp1, At( "(", tmp1 ) - 1 ) ) + tmp1 := SubStr( tmp1, At( "(", tmp1 ) + 1 ) + ENDDO + ENDIF + ENDIF + NEXT + ENDIF + /*----------------------------------------------------------------------*/ /* Generate necessary declarations */ aadd( aLine, "HB_EXTERN_BEGIN" ) @@ -1316,7 +1332,7 @@ METHOD HbQtSource:build() NEXT aadd( aLine, "" ) FOR EACH s IN ::hRef - aadd( aLine, PadR( "#define HBQT_TYPE_" + s:__enumKey(), 64 ) + "0x" + hb_NumToHex( hb_crc32( "HBQT_TYPE_" + s:__enumKey() ), 8 ) ) + aadd( aLine, PadR( "#define HBQT_TYPE_" + s:__enumKey(), 64 ) + "0x" + hb_NumToHex( hb_crc32( "HBQT_TYPE_" + hb_asciiUpper( ::cQtModule ) + s:__enumKey() ), 8 ) ) NEXT aadd( aLine, "" ) /*----------------------------------------------------------------------*/ @@ -1464,13 +1480,13 @@ METHOD HbQtSource:build() endif aadd( aLine, " " ) FOR i := 3 TO len( ::new_ ) - 1 - IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" ) - IF "__HB_RETPTRGC__(" $ ::new_[ i ] - s := ::new_[ i ] - s := trim( strtran( s, "__HB_RETPTRGC__(", "pObj =" ) ) - s := strtran( s, ");", ";" ) - s := strtran( s, "( "+ ::cQtObject + "* )", "" ) - aadd( aLine, s ) + IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" ) + IF "__HB_RETPTRGC__(" $ ::new_[ i ] + s := ::new_[ i ] + s := trim( strtran( s, "__HB_RETPTRGC__(", "pObj =" ) ) + s := strtran( s, ");", ";" ) + s := strtran( s, "( "+ ::cQtObject + "* )", "" ) + aadd( aLine, s ) ELSE aadd( aLine, ::new_[ i ] ) ENDIF @@ -2108,6 +2124,7 @@ METHOD HbQtSource:parseVariables( cProto ) METHOD HbQtSource:parseProto( cProto, fBody_ ) LOCAL aArg, n, nn, cHBIdx, nIndex, s, ss, cFirstParamCast, cArg LOCAL oMtd, oRet, oArg, k, cKey, cVal + LOCAL cRef IF ( n := at( "(", cProto ) ) == 0 RETURN .f. @@ -2185,6 +2202,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ENDIF ENDIF + cRef := NIL + DO CASE CASE oArg:cCast == "..." oArg:cBody := "..." @@ -2338,20 +2357,20 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) oArg:cTypeHB := "C" CASE oArg:cCast == "QIcon" - ::hRef[ "QIcon" ] := NIL + cRef := "QIcon" s := "*hbqt_par_QIcon( " + cHBIdx + " )" oArg:cBody := "( HB_ISCHAR( " + cHBIdx + " ) ? " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) )" + " : " + s + ")" oArg:cDoc := "co" + oArg:cCast //oMtd:cDocNM // "p" oArg:cTypeHB := "CO" // "PCO" CASE oArg:lFar - ::hRef[ oArg:cCast ] := NIL + cRef := oArg:cCast oArg:cBody := "hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" oArg:cDoc := "o" + oArg:cCast //oMtd:cDocNM oArg:cTypeHB := "O" // "PO" CASE oArg:lAnd .AND. oArg:lConst - ::hRef[ oArg:cCast ] := NIL + cRef := oArg:cCast s := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" IF !empty( oArg:cDefault ) .and. ( "(" $ oArg:cDefault ) oArg:cBody := "( HB_ISOBJECT( " + cHBIdx + " ) ? " + s + " : " + oArg:cDefault + " )" @@ -2362,13 +2381,13 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) oArg:cTypeHB := "O" //"PO" CASE oArg:lAnd - ::hRef[ oArg:cCast ] := NIL + cRef := oArg:cCast oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" oArg:cDoc := "o" + oArg:cCast //oMtd:cDocNM //p oArg:cTypeHB := "O" //"PO" CASE oArg:cCast == "QChar" - ::hRef[ oArg:cCast ] := NIL + cRef := oArg:cCast oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" oArg:cDoc := "o" + oArg:cCast //oMtd:cDocNM oArg:cTypeHB := "O" //"PO" @@ -2380,6 +2399,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ENDCASE + hbqtgen_AddRef( ::hRef, cRef ) + oMtd:cParas += oArg:cBody + ", " oMtd:cDocs += oArg:cDoc + ", " NEXT @@ -2411,11 +2432,20 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) RETURN oMtd:lValid +STATIC PROCEDURE hbqtgen_AddRef( hRef, cRef ) + + IF ! Empty( cRef ) .AND. !( ">" $ cRef ) .AND. !( cRef $ "uchar|QString|QRgb|Bool|char" ) + hRef[ cRef ] := NIL + ENDIF + + RETURN + /*----------------------------------------------------------------------*/ METHOD HbQtSource:buildCppCode( oMtd ) LOCAL oRet := oMtd:oRet LOCAL cPara := oMtd:cParas + LOCAL cRef oMtd:cWdg := "hbqt_par_" + ::cQtObject + "( 1 )->" oMtd:cParas := iif( oMtd:isVariable(), "", "( " + oMtd:cParas + " )" ) @@ -2442,7 +2472,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) oMtd:cCmd := "" oMtd:cPrgRet := "" OTHERWISE - ::hRef[ "QList" ] := NIL + cRef := "QList" oMtd:cCmd := "hb_retptrGC( hbqt_gcAllocate_QList( new " + oRet:cCast + "( " + oMtd:cCmn + " ), true ) )" oMtd:cPrgRet := "o" + oMtd:cDocNMRet ENDCASE @@ -2502,7 +2532,8 @@ METHOD HbQtSource:buildCppCode( oMtd ) CASE oRet:lFar .AND. ! oRet:lConst IF hbqtgen_isAqtObject( oRet:cCast ) - oMtd:cCmd := hbqtgen_Get_Command( ::hRef, oRet:cCast, oMtd:cCmn, .F. ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn, .F. ) ELSE /* TOFIX: Such code is not valid and should never be generated [vszakats] */ oMtd:cCmd := "hb_retptr( ( " + oRet:cCast + "* ) " + oMtd:cCmn + " )" @@ -2513,7 +2544,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) oRet:lFar .AND. ; oRet:lConst .AND. ; "Abstract" $ oRet:cCast - ::hRef[ oRet:cCast ] := NIL + cRef := oRet:cCast oMtd:cCmd := "hb_retptrGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) )" oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p @@ -2521,7 +2552,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) oRet:lFar .AND. ; oRet:lConst .AND. ; oRet:lVirt - ::hRef[ oRet:cCast ] := NIL + cRef := oRet:cCast oMtd:cCmd := "hb_retptrGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) )" oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p @@ -2529,25 +2560,30 @@ METHOD HbQtSource:buildCppCode( oMtd ) oRet:lFar .AND. ; oRet:lConst .AND. ; oRet:lConstL - oMtd:cCmd := hbqtgen_Get_Command_1( ::hRef, oRet:cCast, oMtd:cCmn ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command_1( oRet:cCast, oMtd:cCmn ) oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p CASE oRet:lAnd .AND. oRet:lConst - oMtd:cCmd := hbqtgen_Get_Command( ::hRef, oRet:cCast, oMtd:cCmn ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn ) oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p CASE oRet:lConst - oMtd:cCmd := hbqtgen_Get_Command( ::hRef, oRet:cCast, oMtd:cCmn ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn ) oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p CASE oRet:lAnd - oMtd:cCmd := hbqtgen_Get_Command( ::hRef, oRet:cCast, oMtd:cCmn ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn ) oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p OTHERWISE /* No attribute is attached to return value */ IF hbqtgen_isAqtObject( oRet:cCast ) - oMtd:cCmd := hbqtgen_Get_Command( ::hRef, oRet:cCast, oMtd:cCmn ) + cRef := oRet:cCast + oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn ) oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p ELSE @@ -2566,6 +2602,7 @@ METHOD HbQtSource:buildCppCode( oMtd ) IF ( oMtd:lValid := ! Empty( oMtd:cCmd ) ) aadd( ::aMethods, oMtd ) + hbqtgen_AddRef( ::hRef, cRef ) ENDIF RETURN Self @@ -2727,22 +2764,17 @@ METHOD HbqtArgument:new( cTxt, cQtObject, enum_, lConstL, lIsRetArg ) // Helper Functions /*----------------------------------------------------------------------*/ -STATIC FUNCTION hbqtgen_Get_Command_1( hRef, cWgt, cCmn ) - - hRef[ cWgt ] := NIL - +STATIC FUNCTION hbqtgen_Get_Command_1( cWgt, cCmn ) RETURN "hb_retptrGC( hbqt_gcAllocate_" + cWgt + "( new " + cWgt + "( *( " + cCmn + " ) ), true ) )" /*----------------------------------------------------------------------*/ -STATIC FUNCTION hbqtgen_Get_Command( hRef, cWgt, cCmn, lNew ) +STATIC FUNCTION hbqtgen_Get_Command( cWgt, cCmn, lNew ) IF lNew == NIL lNew := .T. ENDIF - hRef[ cWgt ] := NIL - IF lNew RETURN "hb_retptrGC( hbqt_gcAllocate_" + cWgt + "( new " + cWgt + "( " + cCmn + " ), true ) )" ELSE diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc index e52aae6170..d636dc5908 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=g +incpaths=. libs=../qtcore/hbqtcore.hbc libs=../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm index fe2a136a5a..3ccd003b98 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp diff --git a/harbour/contrib/hbqt/qscintilla/qth/filelist.hbm b/harbour/contrib/hbqt/qscintilla/qth/filelist.hbm new file mode 100644 index 0000000000..de92b67102 --- /dev/null +++ b/harbour/contrib/hbqt/qscintilla/qth/filelist.hbm @@ -0,0 +1,21 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qscintilla +-pflag=-qthdocdir=../doc/ + +HBQsciScintilla.qth + +QsciAbstractAPIs.qth +QsciAPIs.qth +QsciCommand.qth +QsciCommandSet.qth +QsciDocument.qth +QsciLexer.qth +QsciLexerCPP.qth +QsciLexerFlagship.qth +QsciScintilla.qth +QsciStyle.qth +QsciStyledText.qth diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.h b/harbour/contrib/hbqt/qtcore/hbqtcore.h new file mode 100644 index 0000000000..46d5b60814 --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.h @@ -0,0 +1,28 @@ +/* + * $Id$ + */ + +#ifndef __HBQTCORE_H +#define __HBQTCORE_H + +#include "hbqt.h" + +HB_EXTERN_BEGIN + +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQEvents ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQSlots ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQString ); + +extern HB_EXPORT void * hbqt_gcAllocate_HBQEvents( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_HBQSlots( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_HBQString( void * pObj, bool bNew ); + +HB_EXTERN_END + +#define hbqt_par_HBQEvents( n ) ( ( HBQEvents * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQSlots( n ) ( ( HBQSlots * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQString( n ) ( ( HBQString * ) hbqt_gcpointer( n ) ) + +#define HBQT_TYPE_QSize 0x5E28750F + +#endif /* __HBQTCORE_H */ diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc index 7b6f3b4435..3cb614f230 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=. g +incpaths=. libs=../hbqt_common.hbc diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index 5eb99f8a21..33c9198a08 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp hbqt_pointer.cpp diff --git a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth index 079fd0c80e..47e4fb030b 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth @@ -71,7 +71,7 @@ ClubMethods = no #include #include -#include "../hbqt_hbqstring.h" +#include "hbqt_hbqstring.h" /* * HBQString () @@ -312,6 +312,3 @@ QString number ( qulonglong n, int base = 10 ) - - - diff --git a/harbour/contrib/hbqt/qtcore/qth/filelist.hbm b/harbour/contrib/hbqt/qtcore/qth/filelist.hbm new file mode 100644 index 0000000000..9f3e1cfb53 --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/qth/filelist.hbm @@ -0,0 +1,72 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtcore +-pflag=-qthdocdir=../doc/ + +HBQEvents.qth +HBQSlots.qth +HBQString.qth + +# QAbstractEventDispatcher.qth +QAbstractItemModel.qth +QAbstractListModel.qth +QAbstractTableModel.qth +QBitArray.qth +QBuffer.qth +QByteArray.qth +QChar.qth +QCoreApplication.qth +QDataStream.qth +QDate.qth +QDateTime.qth +QDir.qth +QEvent.qth +QEventLoop.qth +QFile.qth +QFileInfo.qth +QGenericArgument.qth +QGenericReturnArgument.qth +QIODevice.qth +QLatin1Char.qth +QLatin1String.qth +QLine.qth +QLineF.qth +QList.qth +QLocale.qth +QMetaClassInfo.qth +QMetaEnum.qth +QMetaMethod.qth +QMetaObject.qth +QMetaProperty.qth +QMetaType.qth +QMimeData.qth +QModelIndex.qth +QObject.qth +QPoint.qth +QPointF.qth +QProcess.qth +QRect.qth +QRectF.qth +QRegExp.qth +QResource.qth +QSettings.qth +QSignalMapper.qth +QSize.qth +QSizeF.qth +QStringList.qth +QStringRef.qth +QTextBoundaryFinder.qth +QTextCodec.qth +QTextDecoder.qth +QTextEncoder.qth +QTextStream.qth +QThread.qth +QTime.qth +QTimeLine.qth +QTimer.qth +QTranslator.qth +QUrl.qth +QVariant.qth diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc index 27ac6309f7..9385be5dfd 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=g +incpaths=. libs=../qtcore/hbqtcore.hbc libs=../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm index e7340fb7c8..16b8913a3e 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm @@ -5,9 +5,8 @@ -stop{symbian} -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp diff --git a/harbour/contrib/hbqt/qtdesigner/qth/filelist.hbm b/harbour/contrib/hbqt/qtdesigner/qth/filelist.hbm new file mode 100644 index 0000000000..176b0741b6 --- /dev/null +++ b/harbour/contrib/hbqt/qtdesigner/qth/filelist.hbm @@ -0,0 +1,16 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtdesigner +-pflag=-qthdocdir=../doc/ + +QDesignerActionEditorInterface.qth +QDesignerFormEditorInterface.qth +QDesignerFormWindowCursorInterface.qth +QDesignerFormWindowInterface.qth +QDesignerFormWindowManagerInterface.qth +QDesignerObjectInspectorInterface.qth +QDesignerPropertyEditorInterface.qth +QDesignerWidgetBoxInterface.qth diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.h index 82018354e3..35ee842f13 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.h @@ -53,7 +53,7 @@ #ifndef HBQT_HBQGRAPHICSITEM_H #define HBQT_HBQGRAPHICSITEM_H -#include "hbqtgui.h" +#include "hbqt.h" #include #include diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h index 70fc2d6994..bd8f8449e3 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h @@ -53,7 +53,7 @@ #ifndef HBQT_HBQPLAINTEXTEDIT_H #define HBQT_HBQPLAINTEXTEDIT_H -#include "hbqtgui.h" +#include "hbqt.h" #include diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h index c5b3e82e48..c97427d147 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h @@ -53,7 +53,7 @@ #ifndef HBQSYNTAXHIGHLIGHTER_H #define HBQSYNTAXHIGHLIGHTER_H -#include "hbqtgui.h" +#include "hbqt.h" /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h index 9c6b40a819..a8153782c3 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h @@ -53,7 +53,7 @@ #ifndef HBQT_HBQTABLEVIEW_H #define HBQT_HBQTABLEVIEW_H -#include "hbqtgui.h" +#include "hbqt.h" #include #include diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.h b/harbour/contrib/hbqt/qtgui/hbqtgui.h new file mode 100644 index 0000000000..407da62725 --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.h @@ -0,0 +1,44 @@ +/* + * $Id$ + */ + +#ifndef __HBQTGUI_H +#define __HBQTGUI_H + +#include "hbqt.h" + +HB_EXTERN_BEGIN + +extern HB_EXPORT void * hbqt_gcAllocate_QAction( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QIcon( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QPixmap( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QMenu( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QPalette( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QActionGroup( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew ); + +HB_EXTERN_END + +#define hbqt_par_QAction( n ) ( ( QAction * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPalette( n ) ( ( QPalette * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRegion( n ) ( ( QRegion * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPainter( n ) ( ( QPainter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPixmap( n ) ( ( QPixmap * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrinter( n ) ( ( QPrinter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidget( n ) ( ( QWidget * ) hbqt_gcpointer( n ) ) + +#define HBQT_TYPE_QBitmap 0x210679C1 +#define HBQT_TYPE_QBoxLayout 0x8E2E0CAF +#define HBQT_TYPE_QBrush 0x96A039B0 +#define HBQT_TYPE_QColor 0x0151A39A +#define HBQT_TYPE_QFont 0x0A35B749 +#ifndef HBQT_TYPE_QIcon +#define HBQT_TYPE_QIcon 0xBF359640 +#endif +#ifndef HBQT_TYPE_QPixmap +#define HBQT_TYPE_QPixmap 0x25CE65E9 +#endif + +#endif /* __HBQTGUI_H */ diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc index fe3363df7b..fc1a6ef4c2 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=. g +incpaths=. libs=../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index 902d8a7771..bfe077e598 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_hbqabstractitemmodel.cpp hbqt_hbqgraphicsitem.cpp diff --git a/harbour/contrib/hbqt/qtgui/qth/filelist.hbm b/harbour/contrib/hbqt/qtgui/qth/filelist.hbm new file mode 100644 index 0000000000..705a092b59 --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/qth/filelist.hbm @@ -0,0 +1,272 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtgui +-pflag=-qthdocdir=../doc/ + +HBQAbstractItemModel.qth +HBQGraphicsItem.qth +HBQGraphicsScene.qth +HBQPlainTextEdit.qth +HBQSyntaxHighlighter.qth +HBQTableView.qth +HBQTextBlockUserData.qth + +QAbstractButton.qth +QAbstractGraphicsShapeItem.qth +QAbstractItemDelegate.qth +QAbstractItemView.qth +QAbstractPrintDialog.qth +QAbstractProxyModel.qth +QAbstractScrollArea.qth +QAbstractSlider.qth +QAbstractSpinBox.qth +QAbstractTextDocumentLayout.qth +QAction.qth +QActionGroup.qth +QApplication.qth +QBitmap.qth +QBoxLayout.qth +QBrush.qth +QButtonGroup.qth +QCalendarWidget.qth +QCheckBox.qth +QClipboard.qth +QColor.qth +QColorDialog.qth +QComboBox.qth +QCommandLinkButton.qth +QCommonStyle.qth +QCompleter.qth +QConicalGradient.qth +QContextMenuEvent.qth +QCursor.qth +QDateEdit.qth +QDateTimeEdit.qth +QDesktopServices.qth +QDesktopWidget.qth +QDial.qth +QDialog.qth +QDirModel.qth +QDockWidget.qth +QDoubleSpinBox.qth +QDoubleValidator.qth +QDrag.qth +QDragEnterEvent.qth +QDragLeaveEvent.qth +QDragMoveEvent.qth +QDropEvent.qth +QErrorMessage.qth +QFileDialog.qth +QFileIconProvider.qth +QFileSystemModel.qth +QFocusEvent.qth +QFocusFrame.qth +QFont.qth +QFontComboBox.qth +QFontDatabase.qth +QFontDialog.qth +QFontInfo.qth +QFontMetrics.qth +QFontMetricsF.qth +QFormLayout.qth +QFrame.qth +QGradient.qth +QGraphicsEllipseItem.qth +QGraphicsGridLayout.qth +QGraphicsItem.qth +QGraphicsItemAnimation.qth +QGraphicsItemGroup.qth +QGraphicsLayout.qth +QGraphicsLayoutItem.qth +QGraphicsLinearLayout.qth +QGraphicsLineItem.qth +QGraphicsPathItem.qth +QGraphicsPixmapItem.qth +QGraphicsPolygonItem.qth +QGraphicsProxyWidget.qth +QGraphicsRectItem.qth +QGraphicsScene.qth +QGraphicsSceneContextMenuEvent.qth +QGraphicsSceneDragDropEvent.qth +QGraphicsSceneEvent.qth +QGraphicsSceneHelpEvent.qth +QGraphicsSceneHoverEvent.qth +QGraphicsSceneMouseEvent.qth +QGraphicsSceneMoveEvent.qth +QGraphicsSceneResizeEvent.qth +QGraphicsSceneWheelEvent.qth +QGraphicsSimpleTextItem.qth +QGraphicsTextItem.qth +QGraphicsView.qth +QGraphicsWidget.qth +QGridLayout.qth +QGroupBox.qth +QHBoxLayout.qth +QHeaderView.qth +QHelpEvent.qth +QHideEvent.qth +QIcon.qth +QImage.qth +QImageReader.qth +QImageWriter.qth +# QInputContext.qth # Disabled because of OS/2 +QInputDialog.qth +QInputEvent.qth +QInputMethodEvent.qth +QIntValidator.qth +QItemDelegate.qth +# QItemEditorCreator.qth +QItemEditorCreatorBase.qth +QItemEditorFactory.qth +QItemSelection.qth +QItemSelectionModel.qth +QKeyEvent.qth +QKeySequence.qth +QLabel.qth +QLayout.qth +QLayoutItem.qth +QLCDNumber.qth +QLinearGradient.qth +QLineEdit.qth +QListView.qth +QListWidget.qth +QListWidgetItem.qth +QMainWindow.qth +QMatrix.qth +QMdiArea.qth +QMdiSubWindow.qth +QMenu.qth +QMenuBar.qth +QMessageBox.qth +QMouseEvent.qth +QMoveEvent.qth +QMovie.qth +QPageSetupDialog.qth +QPaintDevice.qth +QPaintEngine.qth +QPainter.qth +QPainterPath.qth +QPaintEvent.qth +QPalette.qth +QPen.qth +QPicture.qth +QPixmap.qth +QPlainTextDocumentLayout.qth +QPlainTextEdit.qth +QPolygon.qth +QPolygonF.qth +QPrintDialog.qth +QPrintEngine.qth +QPrinter.qth +QPrinterInfo.qth +QPrintPreviewDialog.qth +QProgressBar.qth +QProgressDialog.qth +QPushButton.qth +QRadialGradient.qth +QRadioButton.qth +QRegExpValidator.qth +QRegion.qth +QResizeEvent.qth +QScrollArea.qth +QScrollBar.qth +QSessionManager.qth +QShowEvent.qth +QSizeGrip.qth +QSizePolicy.qth +QSlider.qth +QSortFilterProxyModel.qth +QSound.qth +QSpacerItem.qth +QSpinBox.qth +QSplashScreen.qth +QSplitter.qth +QStackedWidget.qth +QStandardItem.qth +QStandardItemModel.qth +QStatusBar.qth +QStringListModel.qth +QStyle.qth +QStyledItemDelegate.qth +QStyleFactory.qth +QStyleHintReturn.qth +QStyleHintReturnMask.qth +QStyleHintReturnVariant.qth +QStyleOption.qth +QStyleOptionButton.qth +QStyleOptionComboBox.qth +QStyleOptionComplex.qth +QStyleOptionDockWidget.qth +QStyleOptionFocusRect.qth +QStyleOptionFrame.qth +QStyleOptionGraphicsItem.qth +QStyleOptionGroupBox.qth +QStyleOptionHeader.qth +QStyleOptionMenuItem.qth +QStyleOptionProgressBar.qth +QStyleOptionSizeGrip.qth +QStyleOptionSlider.qth +QStyleOptionSpinBox.qth +QStyleOptionTab.qth +QStyleOptionTabBarBase.qth +QStyleOptionTabWidgetFrame.qth +QStyleOptionTitleBar.qth +QStyleOptionToolBar.qth +QStyleOptionToolBox.qth +QStyleOptionToolButton.qth +QStyleOptionViewItem.qth +QStylePainter.qth +QSyntaxHighlighter.qth +QSystemTrayIcon.qth +QTabBar.qth +QTableView.qth +QTableWidget.qth +QTableWidgetItem.qth +QTableWidgetSelectionRange.qth +QTabWidget.qth +QTextBlock.qth +QTextBlockFormat.qth +QTextBlockGroup.qth +QTextBrowser.qth +QTextCharFormat.qth +QTextCursor.qth +QTextDocument.qth +QTextDocumentFragment.qth +QTextDocumentWriter.qth +QTextEdit.qth +QTextFormat.qth +QTextFragment.qth +QTextFrame.qth +QTextFrameFormat.qth +QTextImageFormat.qth +QTextInlineObject.qth +QTextItem.qth +QTextLayout.qth +QTextLength.qth +QTextLine.qth +QTextList.qth +QTextListFormat.qth +QTextObject.qth +QTextOption.qth +QTextTableFormat.qth +QTimeEdit.qth +QToolBar.qth +QToolBox.qth +QToolButton.qth +QTransform.qth +QTreeView.qth +QTreeWidget.qth +QTreeWidgetItem.qth +QValidator.qth +QVBoxLayout.qth +QWheelEvent.qth +QWidget.qth +QWidgetAction.qth +QWidgetItem.qth +QWindowsStyle.qth +QWindowStateChangeEvent.qth +QWizard.qth +QWizardPage.qth diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc index 1d525a4d4e..e4589fa651 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=g +incpaths=. libs=../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm index 2d0a6cd645..72e541d5c8 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp diff --git a/harbour/contrib/hbqt/qtnetwork/qth/filelist.hbm b/harbour/contrib/hbqt/qtnetwork/qth/filelist.hbm new file mode 100644 index 0000000000..e7906e622a --- /dev/null +++ b/harbour/contrib/hbqt/qtnetwork/qth/filelist.hbm @@ -0,0 +1,14 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtnetwork +-pflag=-qthdocdir=../doc/ + +QFtp.qth +QHttp.qth +QHttpHeader.qth +QHttpRequestHeader.qth +QHttpResponseHeader.qth +QNetworkRequest.qth diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc index 970e51dc63..b29d69d81e 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=g +incpaths=. libs=../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm index d4c9bf7c8b..b7d482a0ef 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp diff --git a/harbour/contrib/hbqt/qtuitools/qth/filelist.hbm b/harbour/contrib/hbqt/qtuitools/qth/filelist.hbm new file mode 100644 index 0000000000..a15910445d --- /dev/null +++ b/harbour/contrib/hbqt/qtuitools/qth/filelist.hbm @@ -0,0 +1,9 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtuitools +-pflag=-qthdocdir=../doc/ + +QUiLoader.qth diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc index 4dee118a82..82431f5d18 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc @@ -7,7 +7,7 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -incpaths=. g +incpaths=. libs=../qtcore/hbqtcore.hbc libs=../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm index 5f0a29c465..77f9e49629 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm @@ -3,9 +3,8 @@ # -i. --ig -g/filelist.hbm +qth/filelist.hbm hbqt_init.cpp diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index 64eb2173b7..9add853a86 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -62,7 +62,6 @@ folder = qtwebkit #include "hbqtgui.h" -#include "hbqtnetwork.h" #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/filelist.hbm b/harbour/contrib/hbqt/qtwebkit/qth/filelist.hbm new file mode 100644 index 0000000000..de7bb6609f --- /dev/null +++ b/harbour/contrib/hbqt/qtwebkit/qth/filelist.hbm @@ -0,0 +1,18 @@ +# +# $Id$ +# + +-pflag=-qtver=0x040500 +-pflag=-qtmodule=qtwebkit +-pflag=-qthdocdir=../doc/ + +QWebFrame.qth +QWebHistory.qth +QWebHistoryInterface.qth +QWebHistoryItem.qth +QWebHitTestResult.qth +QWebPage.qth +QWebPluginFactory.qth +QWebSecurityOrigin.qth +QWebSettings.qth +QWebView.qth