From ec5bd29ffe1bffb4783b10e31b85220e8a0b2b2d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Nov 2010 11:34:18 +0000 Subject: [PATCH] 2010-11-03 12:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_all.hbp - Disable whole container for dos platform, as it seems to get confused about long filenames. * ChangeLog * TODOs marked as DONE. ! Typos. * contrib/hbqt/utils/hbqtgen.prg % Do not generate extern pullers automatically. They are quite simple, rarely (if ever) changing files, so this is not big drawbacks, and it opens the door to generate rest of files dynamically. * contrib/hbqt/qtgui/hbqtgui.hbm * contrib/hbqt/qtgui/g/filelist.hbm - contrib/hbqt/qtgui/g/hbqtgui_extern.prg + contrib/hbqt/qtgui/hbqt_extern.prg * contrib/hbqt/qtwebkit/hbqtwebkit.hbm * contrib/hbqt/qtwebkit/g/filelist.hbm - contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.prg + contrib/hbqt/qtwebkit/hbqt_extern.prg * contrib/hbqt/qtcore/hbqtcore.hbm * contrib/hbqt/qtcore/g/filelist.hbm - contrib/hbqt/qtcore/g/hbqtcore_extern.prg + contrib/hbqt/qtcore/hbqt_extern.prg * contrib/hbqt/qtnetwork/hbqtnetwork.hbm * contrib/hbqt/qtnetwork/g/filelist.hbm - contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.prg + contrib/hbqt/qtnetwork/hbqt_extern.prg * contrib/hbqt/qscintilla/hbqscintilla.hbm * contrib/hbqt/qscintilla/g/filelist.hbm - contrib/hbqt/qscintilla/g/hbqscintilla_extern.prg + contrib/hbqt/qscintilla/hbqt_extern.prg * contrib/hbqt/qtuitools/hbqtuitools.hbm * contrib/hbqt/qtuitools/g/filelist.hbm - contrib/hbqt/qtuitools/g/hbqtuitools_extern.prg + contrib/hbqt/qtuitools/hbqt_extern.prg * contrib/hbqt/qtdesigner/hbqtdesigner.hbm * contrib/hbqt/qtdesigner/g/filelist.hbm - contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.prg + contrib/hbqt/qtdesigner/hbqt_extern.prg * Moved extern pullers to non-generated area. --- harbour/ChangeLog | 74 +++++++++++++++---- harbour/contrib/hbqt/hbqt_all.hbp | 2 + .../contrib/hbqt/qscintilla/g/filelist.hbm | 1 - .../contrib/hbqt/qscintilla/hbqscintilla.hbm | 2 + ...bqscintilla_extern.prg => hbqt_extern.prg} | 0 harbour/contrib/hbqt/qtcore/g/filelist.hbm | 1 - .../hbqtcore_extern.prg => hbqt_extern.prg} | 0 harbour/contrib/hbqt/qtcore/hbqtcore.hbm | 1 + .../contrib/hbqt/qtdesigner/g/filelist.hbm | 1 - ...bqtdesigner_extern.prg => hbqt_extern.prg} | 0 .../contrib/hbqt/qtdesigner/hbqtdesigner.hbm | 2 + harbour/contrib/hbqt/qtgui/g/filelist.hbm | 1 - .../{g/hbqtgui_extern.prg => hbqt_extern.prg} | 0 harbour/contrib/hbqt/qtgui/hbqtgui.hbm | 1 + harbour/contrib/hbqt/qtnetwork/g/filelist.hbm | 1 - ...hbqtnetwork_extern.prg => hbqt_extern.prg} | 0 .../contrib/hbqt/qtnetwork/hbqtnetwork.hbm | 2 + harbour/contrib/hbqt/qtuitools/g/filelist.hbm | 1 - ...hbqtuitools_extern.prg => hbqt_extern.prg} | 0 .../contrib/hbqt/qtuitools/hbqtuitools.hbm | 2 + harbour/contrib/hbqt/qtwebkit/g/filelist.hbm | 1 - .../hbqtwebkit_extern.prg => hbqt_extern.prg} | 0 harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm | 2 + harbour/contrib/hbqt/utils/hbqtgen.prg | 26 +------ 24 files changed, 78 insertions(+), 43 deletions(-) rename harbour/contrib/hbqt/qscintilla/{g/hbqscintilla_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtcore/{g/hbqtcore_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtdesigner/{g/hbqtdesigner_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtgui/{g/hbqtgui_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtnetwork/{g/hbqtnetwork_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtuitools/{g/hbqtuitools_extern.prg => hbqt_extern.prg} (100%) rename harbour/contrib/hbqt/qtwebkit/{g/hbqtwebkit_extern.prg => hbqt_extern.prg} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f5c3506c9e..7974fd25ba 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,51 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-03 12:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/hbqt_all.hbp + - Disable whole container for dos platform, as it seems + to get confused about long filenames. + + * ChangeLog + * TODOs marked as DONE. + ! Typos. + + * contrib/hbqt/utils/hbqtgen.prg + % Do not generate extern pullers automatically. + They are quite simple, rarely (if ever) changing + files, so this is not big drawbacks, and it opens + the door to generate rest of files dynamically. + + * contrib/hbqt/qtgui/hbqtgui.hbm + * contrib/hbqt/qtgui/g/filelist.hbm + - contrib/hbqt/qtgui/g/hbqtgui_extern.prg + + contrib/hbqt/qtgui/hbqt_extern.prg + * contrib/hbqt/qtwebkit/hbqtwebkit.hbm + * contrib/hbqt/qtwebkit/g/filelist.hbm + - contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.prg + + contrib/hbqt/qtwebkit/hbqt_extern.prg + * contrib/hbqt/qtcore/hbqtcore.hbm + * contrib/hbqt/qtcore/g/filelist.hbm + - contrib/hbqt/qtcore/g/hbqtcore_extern.prg + + contrib/hbqt/qtcore/hbqt_extern.prg + * contrib/hbqt/qtnetwork/hbqtnetwork.hbm + * contrib/hbqt/qtnetwork/g/filelist.hbm + - contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.prg + + contrib/hbqt/qtnetwork/hbqt_extern.prg + * contrib/hbqt/qscintilla/hbqscintilla.hbm + * contrib/hbqt/qscintilla/g/filelist.hbm + - contrib/hbqt/qscintilla/g/hbqscintilla_extern.prg + + contrib/hbqt/qscintilla/hbqt_extern.prg + * contrib/hbqt/qtuitools/hbqtuitools.hbm + * contrib/hbqt/qtuitools/g/filelist.hbm + - contrib/hbqt/qtuitools/g/hbqtuitools_extern.prg + + contrib/hbqt/qtuitools/hbqt_extern.prg + * contrib/hbqt/qtdesigner/hbqtdesigner.hbm + * contrib/hbqt/qtdesigner/g/filelist.hbm + - contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.prg + + contrib/hbqt/qtdesigner/hbqt_extern.prg + * Moved extern pullers to non-generated area. + 2010-11-03 11:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/external/minizip/minizip.dif * regenerated .diff file by ../../bin/hbxpatch.hbs -rediff @@ -46,7 +91,7 @@ ! Fixed to not spit HB_TR_ALWAYS msgs while running. % Deleted unnecessary HB_SYMBOL_UNUSED in generated code. % Minor optimization in generate code. - ; TODO: Optimize code generated for GC desctructor. + ; TODO: Optimize code generated for GC desctructor. [DONE] * contrib/hbqt/*/g/* * Regenerated. @@ -301,7 +346,7 @@ event. It will instead return .F. now. To be consistent with slots in this regard. * Undone previous optimization after realizing that - events and slots low-functiona return different error codes. + events and slots low-level functions return different error codes. It didn't cause any harm with current system though. * contrib/hbqt/qtcore/hbqt_hbqevents.cpp @@ -317,9 +362,9 @@ 2010-10-28 19:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqt_misc.prg * Laxed the rules for handling low-level connect/disconnect errors. - Now some cases will now RTE, some will return .F., some will get + Now some cases will RTE, some will return .F., some will get ignored and .T. returned. Please refine it as required. - * Optimized :connect()/:disconnect() + % Optimized :connect()/:disconnect() * contrib/hbqt/qtcore/hbqt_hbqslots.cpp ! __HBQT_SLOTS_CONNECT() fixed to check for codeblock parameter @@ -335,7 +380,7 @@ ! Fixed wrong :connect call. Thanks to Tamas Tevesz for pinpointing it. - contrib/hbqt/tests/dialogqt.prg - - Deleted files which doesn't compile since 1 year. + - Deleted file which doesn't compile since 1 year. 2010-10-28 12:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rdd/dbstrux.prg @@ -359,7 +404,7 @@ * contrib/hbxbp/tests/demoxbp.prg * contrib/hbxbp/tests/dialogqt.prg - Deleted no more necessary REQUEST HB_QT and REQUEST HB_QTGUI - lines. INCOMPATIBLE: Please deleted these from your user code. + lines. INCOMPATIBLE: Please delete these from your user code. 2010-10-28 11:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqtgui.hbm @@ -404,8 +449,8 @@ * contrib/hbide/idemain.prg * Adapted to above changes. - ; TODO: Add automatic references to puller symbols. - ; TODO: Delete old explicit puller symbols. + ; TODO: Add automatic references to puller symbols. [DONE] + ; TODO: Delete old explicit puller symbols. [DONE] 2010-10-28 01:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqt_misc.prg @@ -532,7 +577,7 @@ in generated RTE, instead of "CONNECT" string which might not be easily located. ; TODO: Maybe it'd be even better to throw the RTE from the - wrapper class. + wrapper class. [DONE] - Deleted commented lines. * Formatted according to Harbour stds. @@ -721,7 +766,7 @@ - Deleted eval callback variation (it was disabled). % Cleaned headers. ; TODO: Dynamically register the callbacks, so we can finally - delete QtGui references from this code. + delete QtGui references from this code. [DONE] * contrib/hbqt/qtcore/hbqtcore.hbm % Do not include hbqt_hbqslots.h anymore. @@ -1340,7 +1385,7 @@ requires loading .ui/.uic files dynamically. ; TOFIX: Separate dynamic ui loader code from static one (pbly HbQtUi class needs to be split into two - parts) + parts) [DONE] * contrib/hbide/idemain.prg + Reenabled puller code, because external scripts may need it. @@ -1679,6 +1724,7 @@ input should be changed to :fromPointer(). As next step :from() should be moved to class level and proper object type checking added to avoid assigning wrong QT object to HBQT object wrapper. + [DONE-ish] * contrib/hbxbp/xbplistbox.prg * contrib/hbxbp/xbpwindow.prg @@ -2796,7 +2842,7 @@ TODO: check real error codes for it and also for other operations like opening the same port more then once and add valid translations - ; TODO: add some basic trnaslation for OS2 error codes. + ; TODO: add some basic translation for OS2 error codes. HB_COM_ERR_TIMEOUT seems to be most important for portable programs. @@ -3320,7 +3366,7 @@ * Renamed: HBQT_SETCODECFORCSTRINGS() -> __HBQT_SETCODECFORCSTRINGS() * Renamed: HBQT_SETCODECFORTR -> __HBQT_SETCODECFORTR() ; These should never be called by a Harbour application. - ; TODO: Remove them in the future. + ; TODO: Remove them in the future. [DONE] * contrib/hbqt/qtgui/qth/QApplication.qth * contrib/hbqt/qtcore/qth/QCoreApplication.qth @@ -3330,7 +3376,7 @@ ! Fixed to use HB_QTCORE and HB_QTGUI puller symbols instead of former HB_QT. Please change your code. ; TODO: Change HB_QT to HB_QTGUI. [DONE] - ; TODO: Delete HB_QT + ; TODO: Delete HB_QT [DONE] * contrib/hbqt/qtgui/g/QApplication.cpp * contrib/hbqt/qtcore/g/QCoreApplication.cpp diff --git a/harbour/contrib/hbqt/hbqt_all.hbp b/harbour/contrib/hbqt/hbqt_all.hbp index fcb4f5f4a9..1624add3d7 100644 --- a/harbour/contrib/hbqt/hbqt_all.hbp +++ b/harbour/contrib/hbqt/hbqt_all.hbp @@ -7,6 +7,8 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- +"-stop={dos}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp})." + -hbcontainer # Do not change this to hbqt.hbc reference. diff --git a/harbour/contrib/hbqt/qscintilla/g/filelist.hbm b/harbour/contrib/hbqt/qscintilla/g/filelist.hbm index ca3fc60353..aee9d8e345 100644 --- a/harbour/contrib/hbqt/qscintilla/g/filelist.hbm +++ b/harbour/contrib/hbqt/qscintilla/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqscintilla_extern.prg HBQsciScintilla.cpp QsciAbstractAPIs.cpp QsciAPIs.cpp diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm index b738a95e02..fe2a136a5a 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm @@ -12,5 +12,7 @@ hbqt_init.cpp hbqt_hbqsciscintilla.cpp hbqt_hbqsciscintilla.h +hbqt_extern.prg + ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.prg b/harbour/contrib/hbqt/qscintilla/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.prg rename to harbour/contrib/hbqt/qscintilla/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtcore/g/filelist.hbm b/harbour/contrib/hbqt/qtcore/g/filelist.hbm index c63fc6c4e0..acb403ee6b 100644 --- a/harbour/contrib/hbqt/qtcore/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtcore_extern.prg HBQEvents.cpp HBQSlots.cpp HBQString.cpp diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.prg b/harbour/contrib/hbqt/qtcore/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.prg rename to harbour/contrib/hbqt/qtcore/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index 1863273b7f..5eb99f8a21 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -15,6 +15,7 @@ hbqt_hbqevents.cpp hbqt_hbqslots.cpp hbqt_hbqstring.cpp +hbqt_extern.prg hbqt_misc.prg hbqt_hbqevents.h diff --git a/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm b/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm index 47a0159346..65d40fbeef 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtdesigner_extern.prg QDesignerActionEditorInterface.cpp QDesignerFormEditorInterface.cpp QDesignerFormWindowCursorInterface.cpp diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.prg b/harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.prg rename to harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm index 2cbdde5a70..e7340fb7c8 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm @@ -11,5 +11,7 @@ g/filelist.hbm hbqt_init.cpp +hbqt_extern.prg + ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtgui/g/filelist.hbm b/harbour/contrib/hbqt/qtgui/g/filelist.hbm index f1c9d167a8..cca3b03be8 100644 --- a/harbour/contrib/hbqt/qtgui/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtgui/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtgui_extern.prg HBQAbstractItemModel.cpp HBQGraphicsItem.cpp HBQGraphicsScene.cpp diff --git a/harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.prg b/harbour/contrib/hbqt/qtgui/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.prg rename to harbour/contrib/hbqt/qtgui/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index 3d1f6d6dd6..902d8a7771 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -23,6 +23,7 @@ hbqt_hbqsyntaxhighlighter.h hbqt_hbqtableview.h hbqt_errorsys.prg +hbqt_extern.prg THbQtUI.prg diff --git a/harbour/contrib/hbqt/qtnetwork/g/filelist.hbm b/harbour/contrib/hbqt/qtnetwork/g/filelist.hbm index e784b06d51..966c37a746 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtnetwork/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtnetwork_extern.prg QFtp.cpp QHttp.cpp QHttpHeader.cpp diff --git a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.prg b/harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.prg rename to harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm index 8626f09b65..2d0a6cd645 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm @@ -9,4 +9,6 @@ g/filelist.hbm hbqt_init.cpp +hbqt_extern.prg + ../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtuitools/g/filelist.hbm b/harbour/contrib/hbqt/qtuitools/g/filelist.hbm index 558ca82864..0064c5345e 100644 --- a/harbour/contrib/hbqt/qtuitools/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtuitools/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtuitools_extern.prg QUiLoader.cpp TQUiLoader.prg diff --git a/harbour/contrib/hbqt/qtuitools/g/hbqtuitools_extern.prg b/harbour/contrib/hbqt/qtuitools/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtuitools/g/hbqtuitools_extern.prg rename to harbour/contrib/hbqt/qtuitools/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm index cd6d27ef01..d4c9bf7c8b 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm @@ -9,6 +9,8 @@ g/filelist.hbm hbqt_init.cpp +hbqt_extern.prg + THbQtUILoader.prg ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm b/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm index 6e6b161650..0a177e92bc 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm @@ -8,7 +8,6 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- -hbqtwebkit_extern.prg QWebFrame.cpp QWebHistory.cpp QWebHistoryInterface.cpp diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.prg b/harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.prg rename to harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm index 3b52a2fe7b..5f0a29c465 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm @@ -9,6 +9,8 @@ g/filelist.hbm hbqt_init.cpp +hbqt_extern.prg + ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc ../qtnetwork/hbqtnetwork.hbc diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index d5a10104e5..65486a9c74 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -401,23 +401,6 @@ METHOD HbQtGenerator:buildHeaderFile( cpp_, cPathOut, cProFile ) CreateTarget( cFile + "hb" + cName + ".h", txt_ ) - /* Create extern puller file */ - - txt_ := {} - AEval( hdr_, {| tmp | AAdd( txt_, tmp ) } ) - - aadd( txt_, "#ifndef __HB" + Upper( cName ) + "_EXTERN_CH" ) - aadd( txt_, "#define __HB" + Upper( cName ) + "_EXTERN_CH" ) - aadd( txt_, "" ) - aadd( txt_, "#define __HBEXTERN__HB" + Upper( cName ) + "__ANNOUNCE" ) - aadd( txt_, "#define __HBEXTERN__HB" + Upper( cName ) + "__REQUEST" ) - aadd( txt_, '#include "hb' + cName + '.hbx"' ) - aadd( txt_, "" ) - - aadd( txt_, "#endif /* __HB" + Upper( cName ) + "_EXTERN_CH */" ) - - CreateTarget( cFile + "hb" + cName + "_extern.prg", txt_ ) - RETURN NIL /*----------------------------------------------------------------------*/ @@ -442,7 +425,6 @@ METHOD HbQtGenerator:buildMakeFile( cPathOut, cProFile ) hbm_ := {} aeval( hdr_, {|e| aadd( hbm_, e ) } ) // - aadd( hbm_, "hb" + FNameGetName( cProFile ) + "_extern.prg" ) FOR EACH s IN ::aWidgetList aadd( hbm_, + s + ".cpp" ) NEXT @@ -1948,21 +1930,21 @@ METHOD HbQtSource:buildCppCode( oMtd ) ENDIF oMtd:cPrgRet := "o" + oMtd:cDocNMRet - CASE ( isAqtObject( oRet:cCast ) ) .AND. ; + CASE isAqtObject( oRet:cCast ) .AND. ; oRet:lFar .AND. ; oRet:lConst .AND. ; - ( "Abstract" $ oRet:cCast ) + "Abstract" $ oRet:cCast oMtd:cCmd := "hb_retptrGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) )" oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p - CASE ( isAqtObject( oRet:cCast ) ) .AND. ; + CASE isAqtObject( oRet:cCast ) .AND. ; oRet:lFar .AND. ; oRet:lConst .AND. ; oRet:lVirt oMtd:cCmd := "hb_retptrGC( hbqt_gcAllocate_" + oRet:cCast + "( ( void * ) " + oMtd:cCmn + ", false ) )" oMtd:cPrgRet := "o" + oMtd:cDocNMRet //p - CASE ( isAqtObject( oRet:cCast ) ) .AND. ; + CASE isAqtObject( oRet:cCast ) .AND. ; oRet:lFar .AND. ; oRet:lConst .AND. ; oRet:lConstL