diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8ff2520738..36eb684295 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,52 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-28 11:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/hbqtgui.hbm + - contrib/hbqt/qtgui/hbqt_registersignals.cpp + + contrib/hbqt/qtgui/hbqt_init.cpp + * contrib/hbqt/qtwebkit/hbqtwebkit.hbm + + contrib/hbqt/qtwebkit/hbqt_init.cpp + * contrib/hbqt/qtcore/hbqtcore.hbm + - contrib/hbqt/qtcore/hbqt_registersignals.cpp + + contrib/hbqt/qtcore/hbqt_init.cpp + * contrib/hbqt/qtnetwork/hbqtnetwork.hbm + - contrib/hbqt/qtnetwork/hbqt_registersignals.cpp + + contrib/hbqt/qtnetwork/hbqt_init.cpp + * contrib/hbqt/qscintilla/hbqscintilla.hbm + + contrib/hbqt/qscintilla/hbqt_init.cpp + * contrib/hbqt/qtuitools/hbqtuitools.hbm + + contrib/hbqt/qtuitools/hbqt_init.cpp + * contrib/hbqt/qtdesigner/hbqtdesigner.hbm + + contrib/hbqt/qtdesigner/hbqt_init.cpp + + Extended existing signal register init modules to + be generic lib level initialization ones. + + Added such lib level init module to all remaining + HBQT libs. + + * contrib/hbqt/qtgui/hbqtgui.hbx + * contrib/hbqt/qtwebkit/hbqtwebkit.hbx + * contrib/hbqt/qtnetwork/hbqtnetwork.hbx + * contrib/hbqt/qtuitools/hbqtuitools.hbx + * contrib/hbqt/qtdesigner/hbqtdesigner.hbx + * Regenerated. + + * contrib/hbqt/hbqt_all.hbp + + Enabled HBQTDESIGNER and HBQTWEBKIT libs. + + * contrib/hbqt/qtgui/qth/QApplication.qth + * contrib/hbqt/qtgui/g/QApplication.cpp + * contrib/hbqt/qtcore/qth/QCoreApplication.qth + * contrib/hbqt/qtcore/g/QCoreApplication.cpp + + Merged existing lib init functionality into + generic lib init code. + + * contrib/hbide/idemain.prg + * Adapted to above changes. + + ; TODO: Add automatic references to puller symbols. + ; TODO: Delete old explicit puller symbols. + 2010-10-28 01:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqt_misc.prg ! Debug stuff left in. diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index b27082a658..340e691734 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -86,14 +86,8 @@ REQUEST __HBEXTERN__HBQTCORE__ REQUEST __HBEXTERN__HBQTGUI__ REQUEST __HBEXTERN__HBQTNETWORK__ -REQUEST __HBQT_REGISTERCORECALLBACKS -REQUEST __HBQT_REGISTERGUICALLBACKS -REQUEST __HBQT_REGISTERNETWORKCALLBACKS - /*----------------------------------------------------------------------*/ -REQUEST HB_QTGUI - REQUEST DBFCDX REQUEST DBFNTX REQUEST DBFNSX diff --git a/harbour/contrib/hbqt/hbqt_all.hbp b/harbour/contrib/hbqt/hbqt_all.hbp index 94ac4ac98d..fcb4f5f4a9 100644 --- a/harbour/contrib/hbqt/hbqt_all.hbp +++ b/harbour/contrib/hbqt/hbqt_all.hbp @@ -11,8 +11,8 @@ # Do not change this to hbqt.hbc reference. hbqtcore.hbc -# hbqtdesigner.hbc +hbqtdesigner.hbc hbqtgui.hbc hbqtnetwork.hbc hbqtuitools.hbc -# hbqtwebkit.hbc +hbqtwebkit.hbc diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm index 22182d2f18..b738a95e02 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm @@ -7,6 +7,8 @@ g/filelist.hbm +hbqt_init.cpp + hbqt_hbqsciscintilla.cpp hbqt_hbqsciscintilla.h diff --git a/harbour/contrib/hbqt/qscintilla/hbqt_init.cpp b/harbour/contrib/hbqt/qscintilla/hbqt_init.cpp new file mode 100644 index 0000000000..85208a7846 --- /dev/null +++ b/harbour/contrib/hbqt/qscintilla/hbqt_init.cpp @@ -0,0 +1,100 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta (marcosgambeta at gmail dot com) + * Copyright 2009 Pritpal Bedi (pritpal@vouchcac.com) + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2010 Francesco Perillo () + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbqt.h" + +#include "hbapiitm.h" +#include "hbstack.h" +#include "hbvm.h" +#include "hbinit.h" + +#if QT_VERSION >= 0x040500 + +/*----------------------------------------------------------------------*/ + +static void hbqt_registerCallbacks( void ) +{ +} + +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQSCINTILLA ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqscintilla_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqscintilla_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hbqscintilla_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqscintilla_init_ ) + #include "hbiniseg.h" +#endif + +#endif diff --git a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp index b3027c9312..b92aa1a5fe 100644 --- a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp @@ -114,42 +114,10 @@ #include -#include "hbapi.h" -#include "hbvm.h" -#include "hbinit.h" - #include #include #include -HB_FUNC( HB_QTCORE ) {;} - -static void hbqtcore_Exit( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); -} - -static void hbqtcore_Init( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); - - QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); - QTextCodec::setCodecForTr( codec ); - QTextCodec::setCodecForCStrings( codec ); -} - -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtcore_init_ ) - hb_vmAtInit( hbqtcore_Init, NULL ); - hb_vmAtExit( hbqtcore_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtcore_init_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtcore_init_ -#elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtcore_init_ ) - #include "hbiniseg.h" -#endif - /* * QCoreApplication ( int & argc, char ** argv ) * ~QCoreApplication () diff --git a/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp similarity index 95% rename from harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp rename to harbour/contrib/hbqt/qtcore/hbqt_init.cpp index 6d65f06f56..647ddad4ea 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp @@ -63,6 +63,8 @@ #if QT_VERSION >= 0x040500 +#include + #include #include #include @@ -282,10 +284,8 @@ static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** argument /*----------------------------------------------------------------------*/ -static void hbqt_registerCallbacks( void * cargo ) +static void hbqt_registerCallbacks( void ) { - HB_SYMBOL_UNUSED( cargo ); - hbqt_slots_register_callback( "qint64" , hbqt_SlotsExecInt ); hbqt_slots_register_callback( "qint64$qint64" , hbqt_SlotsExecIntInt ); hbqt_slots_register_callback( "int" , hbqt_SlotsExecInt ); @@ -314,22 +314,36 @@ static void hbqt_registerCallbacks( void * cargo ) hbqt_slots_register_callback( "QUrl" , hbqt_SlotsExecQUrl ); } -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtcore_register_init_ ) - hb_vmAtInit( hbqt_registerCallbacks, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtcore_register_init_ ) +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQTCORE ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); + QTextCodec::setCodecForTr( codec ); + QTextCodec::setCodecForCStrings( codec ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtcore_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtcore_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtcore_register_init_ + #pragma startup _hbqtcore_init_ #elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtcore_register_init_ ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtcore_init_ ) #include "hbiniseg.h" #endif -/*----------------------------------------------------------------------*/ - -HB_FUNC( __HBQT_REGISTERCORECALLBACKS ) -{ - hbqt_registerCallbacks( NULL ); -} - #endif diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index 551a806f39..1863273b7f 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -7,7 +7,7 @@ g/filelist.hbm -hbqt_registersignals.cpp +hbqt_init.cpp hbqt_pointer.cpp hbqt_version.cpp diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx index a1a36a7cf4..a82c3abc65 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx @@ -88,7 +88,6 @@ DYNAMIC HB_QSIZE DYNAMIC HB_QSIZEF DYNAMIC HB_QSTRINGLIST DYNAMIC HB_QSTRINGREF -DYNAMIC HB_QTCORE DYNAMIC HB_QTEXTBOUNDARYFINDER DYNAMIC HB_QTEXTCODEC DYNAMIC HB_QTEXTDECODER @@ -221,13 +220,13 @@ DYNAMIC QURLFROMPOINTER DYNAMIC QVARIANT DYNAMIC QVARIANTFROMPOINTER DYNAMIC QVERSION +DYNAMIC __HBQTCORE DYNAMIC __HBQT_ERROR DYNAMIC __HBQT_EVENTS_CONNECT DYNAMIC __HBQT_EVENTS_DISCONNECT DYNAMIC __HBQT_EVENTS_NEW DYNAMIC __HBQT_ISPOINTER DYNAMIC __HBQT_PTR -DYNAMIC __HBQT_REGISTERCORECALLBACKS DYNAMIC __HBQT_SLOTS_CONNECT DYNAMIC __HBQT_SLOTS_DISCONNECT DYNAMIC __HBQT_SLOTS_NEW diff --git a/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth b/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth index 535cee3bc0..81b1d78936 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth @@ -63,41 +63,8 @@ Constructor = No -#include "hbapi.h" -#include "hbvm.h" -#include "hbinit.h" - #include #include -#include - -HB_FUNC( HB_QTCORE ) {;} - -static void hbqtcore_Exit( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); -} - -static void hbqtcore_Init( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); - - QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); - QTextCodec::setCodecForTr( codec ); - QTextCodec::setCodecForCStrings( codec ); -} - -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtcore_init_ ) - hb_vmAtInit( hbqtcore_Init, NULL ); - hb_vmAtExit( hbqtcore_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtcore_init_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtcore_init_ -#elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtcore_init_ ) - #include "hbiniseg.h" -#endif /* * QCoreApplication ( int & argc, char ** argv ) diff --git a/harbour/contrib/hbqt/qtdesigner/hbqt_init.cpp b/harbour/contrib/hbqt/qtdesigner/hbqt_init.cpp new file mode 100644 index 0000000000..63e080a69a --- /dev/null +++ b/harbour/contrib/hbqt/qtdesigner/hbqt_init.cpp @@ -0,0 +1,100 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta (marcosgambeta at gmail dot com) + * Copyright 2009 Pritpal Bedi (pritpal@vouchcac.com) + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2010 Francesco Perillo () + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbqt.h" + +#include "hbapiitm.h" +#include "hbstack.h" +#include "hbvm.h" +#include "hbinit.h" + +#if QT_VERSION >= 0x040500 + +/*----------------------------------------------------------------------*/ + +static void hbqt_registerCallbacks( void ) +{ +} + +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQTDESIGNER ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtdesigner_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtdesigner_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hbqtdesigner_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtdesigner_init_ ) + #include "hbiniseg.h" +#endif + +#endif diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm index 340991c2b5..2cbdde5a70 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm @@ -9,5 +9,7 @@ g/filelist.hbm +hbqt_init.cpp + ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx index 436716ba91..21b6eff7d5 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx @@ -28,14 +28,31 @@ #command DYNAMIC => EXTERNAL #endif +DYNAMIC HB_QDESIGNERACTIONEDITORINTERFACE +DYNAMIC HB_QDESIGNERFORMEDITORINTERFACE +DYNAMIC HB_QDESIGNERFORMWINDOWCURSORINTERFACE +DYNAMIC HB_QDESIGNERFORMWINDOWINTERFACE +DYNAMIC HB_QDESIGNERFORMWINDOWMANAGERINTERFACE +DYNAMIC HB_QDESIGNEROBJECTINSPECTORINTERFACE +DYNAMIC HB_QDESIGNERPROPERTYEDITORINTERFACE +DYNAMIC HB_QDESIGNERWIDGETBOXINTERFACE DYNAMIC QDESIGNERACTIONEDITORINTERFACE +DYNAMIC QDESIGNERACTIONEDITORINTERFACEFROMPOINTER DYNAMIC QDESIGNERFORMEDITORINTERFACE +DYNAMIC QDESIGNERFORMEDITORINTERFACEFROMPOINTER DYNAMIC QDESIGNERFORMWINDOWCURSORINTERFACE +DYNAMIC QDESIGNERFORMWINDOWCURSORINTERFACEFROMPOINTER DYNAMIC QDESIGNERFORMWINDOWINTERFACE +DYNAMIC QDESIGNERFORMWINDOWINTERFACEFROMPOINTER DYNAMIC QDESIGNERFORMWINDOWMANAGERINTERFACE +DYNAMIC QDESIGNERFORMWINDOWMANAGERINTERFACEFROMPOINTER DYNAMIC QDESIGNEROBJECTINSPECTORINTERFACE +DYNAMIC QDESIGNEROBJECTINSPECTORINTERFACEFROMPOINTER DYNAMIC QDESIGNERPROPERTYEDITORINTERFACE +DYNAMIC QDESIGNERPROPERTYEDITORINTERFACEFROMPOINTER DYNAMIC QDESIGNERWIDGETBOXINTERFACE +DYNAMIC QDESIGNERWIDGETBOXINTERFACEFROMPOINTER +DYNAMIC __HBQTDESIGNER #ifdef __HBEXTERN__HBQTDESIGNER__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index cfca4e23ce..22d693071e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -131,9 +131,6 @@ #include #include "hbapi.h" -#include "hbapierr.h" -#include "hbvm.h" -#include "hbinit.h" #include #include @@ -143,22 +140,7 @@ #include #include -static QApplication * s_app = NULL; - -static int s_argc; -static char ** s_argv; - -HB_FUNC_EXTERN( HB_QTCORE ); - -HB_FUNC( HB_QTGUI ) -{ - HB_FUNC_EXEC( HB_QTCORE ); -} - -HB_FUNC( HB_QT ) /* For compatibility */ -{ - HB_FUNC_EXEC( HB_QTCORE ); -} +extern HB_EXPORT QApplication * __hbqtgui_app( void ); /* * QApplication ( int & argc, char ** argv ) @@ -170,46 +152,14 @@ HB_FUNC( HB_QT ) /* For compatibility */ */ -static void hbqtgui_Exit( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); -} - -static void hbqtgui_Init( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); - - s_argc = hb_cmdargARGC(); - s_argv = hb_cmdargARGV(); - - s_app = new QApplication( s_argc, s_argv ); - - if( ! s_app ) - hb_errInternal( 11001, "hbqtgui_Init(): QT Initilization Error.", NULL, NULL ); - - hb_cmdargInit( s_argc, s_argv ); -} - -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtgui_init_ ) - hb_vmAtInit( hbqtgui_Init, NULL ); - hb_vmAtExit( hbqtgui_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtgui_init_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtgui_init_ -#elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtgui_init_ ) - #include "hbiniseg.h" -#endif - HB_FUNC( QT_QAPPLICATION_EXECUTE ) { - hb_retni( s_app->exec() ); + hb_retni( __hbqtgui_app()->exec() ); } HB_FUNC( QT_QAPPLICATION_QUIT ) { - s_app->quit(); + __hbqtgui_app()->quit(); } typedef struct @@ -253,8 +203,8 @@ void * hbqt_gcAllocate_QApplication( void * pObj, bool bNew ) HB_FUNC( QT_QAPPLICATION ) { - //__HB_RETPTRGC__( ( QApplication * ) s_app ); - hb_retptr ( s_app ); + //__HB_RETPTRGC__( ( QApplication * ) __hbqtgui_app() ); + hb_retptr( __hbqtgui_app() ); } /* diff --git a/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp similarity index 84% rename from harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp rename to harbour/contrib/hbqt/qtgui/hbqt_init.cpp index 7fb18bb656..0e2cc3e61f 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_init.cpp @@ -56,6 +56,7 @@ #include "hbqt.h" +#include "hbapierr.h" #include "hbapiitm.h" #include "hbstack.h" #include "hbvm.h" @@ -63,6 +64,8 @@ #if QT_VERSION >= 0x040500 +#include + #include #include #include @@ -123,10 +126,8 @@ static void hbqt_SlotsExecQTextBlock( PHB_ITEM * codeBlock, void ** arguments ) /*----------------------------------------------------------------------*/ -static void hbqt_registerCallbacks( void * cargo ) +static void hbqt_registerCallbacks( void ) { - HB_SYMBOL_UNUSED( cargo ); - hbqt_slots_register_callback( "QColor" , hbqt_SlotsExecQColor ); hbqt_slots_register_callback( "QFont" , hbqt_SlotsExecQFont ); hbqt_slots_register_callback( "QItemSelection$QItemSelection" , hbqt_SlotsExecItemSelItemSel ); @@ -135,22 +136,59 @@ static void hbqt_registerCallbacks( void * cargo ) hbqt_slots_register_callback( "QTextCursor" , hbqt_SlotsExecQTextCursor ); } -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtgui_register_init_ ) - hb_vmAtInit( hbqt_registerCallbacks, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtgui_register_init_ ) +/*----------------------------------------------------------------------*/ + +static QApplication * s_app = NULL; + +static int s_argc; +static char ** s_argv; + +HB_FUNC_EXTERN( __HBQTCORE ); + +HB_FUNC( __HBQTGUI ) +{ + HB_FUNC_EXEC( __HBQTCORE ); +} + +extern HB_EXPORT QApplication * __hbqtgui_app( void ); + +QApplication * __hbqtgui_app( void ) +{ + return s_app; +} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + s_argc = hb_cmdargARGC(); + s_argv = hb_cmdargARGV(); + + s_app = new QApplication( s_argc, s_argv ); + + if( ! s_app ) + hb_errInternal( 11001, "hbqt_lib_init(): HBQTGUI Initilization Error.", NULL, NULL ); + + hb_cmdargInit( s_argc, s_argv ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtgui_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtgui_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtgui_register_init_ + #pragma startup _hbqtgui_init_ #elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtgui_register_init_ ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtgui_init_ ) #include "hbiniseg.h" #endif -/*----------------------------------------------------------------------*/ - -HB_FUNC( __HBQT_REGISTERGUICALLBACKS ) -{ - hbqt_registerCallbacks( NULL ); -} - #endif diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index 696525f227..3d1f6d6dd6 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -7,13 +7,13 @@ g/filelist.hbm -hbqt_registersignals.cpp hbqt_hbqabstractitemmodel.cpp hbqt_hbqgraphicsitem.cpp hbqt_hbqgraphicsscene.cpp hbqt_hbqplaintextedit.cpp hbqt_hbqsyntaxhighlighter.cpp hbqt_hbqtableview.cpp +hbqt_init.cpp hbqt_utils.cpp hbqt_hbqabstractitemmodel.h diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx index 37cb6ae75e..f14fa833cb 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx @@ -258,7 +258,6 @@ DYNAMIC HB_QSTYLEOPTIONVIEWITEM DYNAMIC HB_QSTYLEPAINTER DYNAMIC HB_QSYNTAXHIGHLIGHTER DYNAMIC HB_QSYSTEMTRAYICON -DYNAMIC HB_QT DYNAMIC HB_QTABBAR DYNAMIC HB_QTABLEVIEW DYNAMIC HB_QTABLEWIDGET @@ -290,7 +289,6 @@ DYNAMIC HB_QTEXTLISTFORMAT DYNAMIC HB_QTEXTOBJECT DYNAMIC HB_QTEXTOPTION DYNAMIC HB_QTEXTTABLEFORMAT -DYNAMIC HB_QTGUI DYNAMIC HB_QTIMEEDIT DYNAMIC HB_QTOOLBAR DYNAMIC HB_QTOOLBOX @@ -818,7 +816,7 @@ DYNAMIC QWIZARDFROMPOINTER DYNAMIC QWIZARDPAGE DYNAMIC QWIZARDPAGEFROMPOINTER DYNAMIC Q__TR -DYNAMIC __HBQT_REGISTERGUICALLBACKS +DYNAMIC __HBQTGUI #ifdef __HBEXTERN__HBQTGUI__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth index 855beb4e8e..874c014eb2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth @@ -62,9 +62,6 @@ Constructor = no #include "hbapi.h" -#include "hbapierr.h" -#include "hbvm.h" -#include "hbinit.h" #include #include @@ -74,22 +71,7 @@ Constructor = no #include #include -static QApplication * s_app = NULL; - -static int s_argc; -static char ** s_argv; - -HB_FUNC_EXTERN( HB_QTCORE ); - -HB_FUNC( HB_QTGUI ) -{ - HB_FUNC_EXEC( HB_QTCORE ); -} - -HB_FUNC( HB_QT ) /* For compatibility */ -{ - HB_FUNC_EXEC( HB_QTCORE ); -} +extern HB_EXPORT QApplication * __hbqtgui_app( void ); /* * QApplication ( int & argc, char ** argv ) @@ -102,50 +84,18 @@ HB_FUNC( HB_QT ) /* For compatibility */ HB_FUNC( QT_QAPPLICATION ) { - //__HB_RETPTRGC__( ( QApplication * ) s_app ); - hb_retptr ( s_app ); + //__HB_RETPTRGC__( ( QApplication * ) __hbqtgui_app() ); + hb_retptr( __hbqtgui_app() ); } -static void hbqtgui_Exit( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); -} - -static void hbqtgui_Init( void * cargo ) -{ - HB_SYMBOL_UNUSED( cargo ); - - s_argc = hb_cmdargARGC(); - s_argv = hb_cmdargARGV(); - - s_app = new QApplication( s_argc, s_argv ); - - if( ! s_app ) - hb_errInternal( 11001, "hbqtgui_Init(): QT Initilization Error.", NULL, NULL ); - - hb_cmdargInit( s_argc, s_argv ); -} - -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtgui_init_ ) - hb_vmAtInit( hbqtgui_Init, NULL ); - hb_vmAtExit( hbqtgui_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtgui_init_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtgui_init_ -#elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtgui_init_ ) - #include "hbiniseg.h" -#endif - HB_FUNC( QT_QAPPLICATION_EXECUTE ) { - hb_retni( s_app->exec() ); + hb_retni( __hbqtgui_app()->exec() ); } HB_FUNC( QT_QAPPLICATION_QUIT ) { - s_app->quit(); + __hbqtgui_app()->quit(); } diff --git a/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp b/harbour/contrib/hbqt/qtnetwork/hbqt_init.cpp similarity index 90% rename from harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp rename to harbour/contrib/hbqt/qtnetwork/hbqt_init.cpp index a83c81bc4e..8a80d05101 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqt_registersignals.cpp +++ b/harbour/contrib/hbqt/qtnetwork/hbqt_init.cpp @@ -105,32 +105,40 @@ static void hbqt_SlotsExecQUrlInfo( PHB_ITEM * codeBlock, void ** arguments ) /*----------------------------------------------------------------------*/ -static void hbqt_registerCallbacks( void * cargo ) +static void hbqt_registerCallbacks( void ) { - HB_SYMBOL_UNUSED( cargo ); - hbqt_slots_register_callback( "QHttpResponseHeader" , hbqt_SlotsExecQHttpResponseHeader ); hbqt_slots_register_callback( "QNetworkProxy$pointer" , hbqt_SlotsExecQNetworkProxyPointer ); hbqt_slots_register_callback( "QNetworkRequest" , hbqt_SlotsExecQNetworkRequest ); hbqt_slots_register_callback( "QUrlInfo" , hbqt_SlotsExecQUrlInfo ); } -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtnetwork_register_init_ ) - hb_vmAtInit( hbqt_registerCallbacks, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqtnetwork_register_init_ ) +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQTNETWORK ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtnetwork_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtnetwork_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqtnetwork_register_init_ + #pragma startup _hbqtnetwork_init_ #elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtnetwork_register_init_ ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtnetwork_init_ ) #include "hbiniseg.h" #endif -/*----------------------------------------------------------------------*/ - -HB_FUNC( __HBQT_REGISTERNETWORKCALLBACKS ) -{ - hbqt_registerCallbacks( NULL ); -} - #endif diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm index ae86bd00a0..8626f09b65 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm @@ -7,7 +7,6 @@ g/filelist.hbm -hbqt_registersignals.cpp +hbqt_init.cpp ../qtcore/hbqtcore.hbc - diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx index 54c784a4be..a8f5efddc5 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx @@ -46,7 +46,7 @@ DYNAMIC QHTTPRESPONSEHEADER DYNAMIC QHTTPRESPONSEHEADERFROMPOINTER DYNAMIC QNETWORKREQUEST DYNAMIC QNETWORKREQUESTFROMPOINTER -DYNAMIC __HBQT_REGISTERNETWORKCALLBACKS +DYNAMIC __HBQTNETWORK #ifdef __HBEXTERN__HBQTNETWORK__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/hbqt/qtuitools/hbqt_init.cpp b/harbour/contrib/hbqt/qtuitools/hbqt_init.cpp new file mode 100644 index 0000000000..af6b23b5fe --- /dev/null +++ b/harbour/contrib/hbqt/qtuitools/hbqt_init.cpp @@ -0,0 +1,100 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta (marcosgambeta at gmail dot com) + * Copyright 2009 Pritpal Bedi (pritpal@vouchcac.com) + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2010 Francesco Perillo () + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbqt.h" + +#include "hbapiitm.h" +#include "hbstack.h" +#include "hbvm.h" +#include "hbinit.h" + +#if QT_VERSION >= 0x040500 + +/*----------------------------------------------------------------------*/ + +static void hbqt_registerCallbacks( void ) +{ +} + +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQTUITOOLS ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtuitools_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtuitools_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hbqtuitools_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtuitools_init_ ) + #include "hbiniseg.h" +#endif + +#endif diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm index a5717ee8bf..cd6d27ef01 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm @@ -7,6 +7,8 @@ g/filelist.hbm +hbqt_init.cpp + THbQtUILoader.prg ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx index d9fa38ca66..7294cb1bbd 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx @@ -32,6 +32,7 @@ DYNAMIC HBQTUILOADER DYNAMIC HB_QUILOADER DYNAMIC QUILOADER DYNAMIC QUILOADERFROMPOINTER +DYNAMIC __HBQTUITOOLS #ifdef __HBEXTERN__HBQTUITOOLS__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/hbqt/qtwebkit/hbqt_init.cpp b/harbour/contrib/hbqt/qtwebkit/hbqt_init.cpp new file mode 100644 index 0000000000..9748e68c2f --- /dev/null +++ b/harbour/contrib/hbqt/qtwebkit/hbqt_init.cpp @@ -0,0 +1,100 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta (marcosgambeta at gmail dot com) + * Copyright 2009 Pritpal Bedi (pritpal@vouchcac.com) + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2010 Francesco Perillo () + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbqt.h" + +#include "hbapiitm.h" +#include "hbstack.h" +#include "hbvm.h" +#include "hbinit.h" + +#if QT_VERSION >= 0x040500 + +/*----------------------------------------------------------------------*/ + +static void hbqt_registerCallbacks( void ) +{ +} + +/*----------------------------------------------------------------------*/ + +HB_FUNC( __HBQTWEBKIT ) {;} + +static void hbqt_lib_init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + hbqt_registerCallbacks(); +} + +static void hbqt_lib_exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hbqtwebkit_init_ ) + hb_vmAtInit( hbqt_lib_init, NULL ); + hb_vmAtExit( hbqt_lib_exit, NULL ); +HB_CALL_ON_STARTUP_END( _hbqtwebkit_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hbqtwebkit_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hbqtwebkit_init_ ) + #include "hbiniseg.h" +#endif + +#endif diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm index 8a8d0e9657..3b52a2fe7b 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm @@ -7,6 +7,8 @@ g/filelist.hbm +hbqt_init.cpp + ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc ../qtnetwork/hbqtnetwork.hbc diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx index b49274462c..14d7694950 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx @@ -28,16 +28,37 @@ #command DYNAMIC => EXTERNAL #endif +DYNAMIC HB_QWEBFRAME +DYNAMIC HB_QWEBHISTORY +DYNAMIC HB_QWEBHISTORYINTERFACE +DYNAMIC HB_QWEBHISTORYITEM +DYNAMIC HB_QWEBHITTESTRESULT +DYNAMIC HB_QWEBPAGE +DYNAMIC HB_QWEBPLUGINFACTORY +DYNAMIC HB_QWEBSECURITYORIGIN +DYNAMIC HB_QWEBSETTINGS +DYNAMIC HB_QWEBVIEW DYNAMIC QWEBFRAME +DYNAMIC QWEBFRAMEFROMPOINTER DYNAMIC QWEBHISTORY +DYNAMIC QWEBHISTORYFROMPOINTER DYNAMIC QWEBHISTORYINTERFACE +DYNAMIC QWEBHISTORYINTERFACEFROMPOINTER DYNAMIC QWEBHISTORYITEM +DYNAMIC QWEBHISTORYITEMFROMPOINTER DYNAMIC QWEBHITTESTRESULT +DYNAMIC QWEBHITTESTRESULTFROMPOINTER DYNAMIC QWEBPAGE +DYNAMIC QWEBPAGEFROMPOINTER DYNAMIC QWEBPLUGINFACTORY +DYNAMIC QWEBPLUGINFACTORYFROMPOINTER DYNAMIC QWEBSECURITYORIGIN +DYNAMIC QWEBSECURITYORIGINFROMPOINTER DYNAMIC QWEBSETTINGS +DYNAMIC QWEBSETTINGSFROMPOINTER DYNAMIC QWEBVIEW +DYNAMIC QWEBVIEWFROMPOINTER +DYNAMIC __HBQTWEBKIT #ifdef __HBEXTERN__HBQTWEBKIT__REQUEST #uncommand DYNAMIC => EXTERNAL