From 6ef6bf183bceba148d4f0e2889d461f1bd511a73 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 2 Aug 2010 06:50:17 +0000 Subject: [PATCH] 2010-08-02 08:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - contrib/hbqt/qtdesigner/* + contrib/hbqt/qtdesigner/g + contrib/hbqt/qtdesigner/g/* - contrib/hbqt/qtwebkit/- + contrib/hbqt/qtwebkit/g + contrib/hbqt/qtwebkit/g/* * Moved generated files under g subdir. * Renamed _garbage header to have component prefix * Regenerated * contrib/hbqt/qtdesigner/doc/en/* * contrib/hbqt/qtwebkit/doc/en/* * Regenerated * contrib/hbqt/qtwebkit/hbqtwebkit.hbp * contrib/hbqt/qtwebkit/hbqtwebkits.hbp * contrib/hbqt/qtdesigner/hbqtdesigner.hbp * contrib/hbqt/qtdesigner/hbqtdesigners.hbp * Updated to reflect above changes. * Synced with other components. + contrib/hbqt/hbqtdesigner.hbc + contrib/hbqt/hbqtwebkit.hbc + contrib/hbqt/qtdesigner/hbqtdesigner.hbc + contrib/hbqt/qtwebkit/hbqtwebkit.hbc + Added .hbc files for these components. + contrib/hbqt/hbqt_commons.hbm + Added common hbm for static build settings. * contrib/hbqt/qtdesigner/qth/* * contrib/hbqt/qtwebkit/qth/* - Deleted manually added local GC headers. * contrib/hbqt/qtcore/hbqt_hbslots.h + Added TOFIX about QtGui dependency. * contrib/hbqt/qtcore/hbqtcores.hbp * contrib/hbqt/qtgui/hbqtguis.hbp * contrib/hbqt/qtnetwork/hbqtnetworks.hbp % Using hbqt_commons.hbm * contrib/hbqt/utils/qtdesigner.qtp ! Fixed typo in target dirs. --- harbour/ChangeLog | 46 +++++ harbour/contrib/hbqt/hbqt_commons.hbm | 16 ++ harbour/contrib/hbqt/hbqtdesigner.hbc | 10 + harbour/contrib/hbqt/hbqtwebkit.hbc | 10 + harbour/contrib/hbqt/qtcore/hbqt_hbslots.h | 1 + harbour/contrib/hbqt/qtcore/hbqtcores.hbp | 6 +- .../class_qdesigneractioneditorinterface.txt | 112 ++++++----- .../en/class_qdesignerformeditorinterface.txt | 124 ++++++------ ...ass_qdesignerformwindowcursorinterface.txt | 132 +++++++------ .../en/class_qdesignerformwindowinterface.txt | 178 +++++++++--------- ...ss_qdesignerformwindowmanagerinterface.txt | 156 ++++++++------- ...lass_qdesignerobjectinspectorinterface.txt | 108 ++++++----- ...class_qdesignerpropertyeditorinterface.txt | 118 ++++++------ .../en/class_qdesignerwidgetboxinterface.txt | 112 ++++++----- .../QDesignerActionEditorInterface.cpp | 9 +- .../{ => g}/QDesignerFormEditorInterface.cpp | 9 +- .../QDesignerFormWindowCursorInterface.cpp | 9 +- .../{ => g}/QDesignerFormWindowInterface.cpp | 9 +- .../QDesignerFormWindowManagerInterface.cpp | 9 +- .../QDesignerObjectInspectorInterface.cpp | 9 +- .../QDesignerPropertyEditorInterface.cpp | 9 +- .../{ => g}/QDesignerWidgetBoxInterface.cpp | 9 +- .../TQDesignerActionEditorInterface.prg | 0 .../{ => g}/TQDesignerFormEditorInterface.prg | 0 .../TQDesignerFormWindowCursorInterface.prg | 0 .../{ => g}/TQDesignerFormWindowInterface.prg | 0 .../TQDesignerFormWindowManagerInterface.prg | 0 .../TQDesignerObjectInspectorInterface.prg | 0 .../TQDesignerPropertyEditorInterface.prg | 0 .../{ => g}/TQDesignerWidgetBoxInterface.prg | 0 .../hbqt/qtdesigner/{ => g}/filelist.hbm | 6 + .../hbqt/qtdesigner/g/hbqtdesigner_garbage.h | 30 +++ .../contrib/hbqt/qtdesigner/hbqt_garbage.h | 28 --- .../contrib/hbqt/qtdesigner/hbqtdesigner.hbc | 18 ++ .../contrib/hbqt/qtdesigner/hbqtdesigner.hbp | 6 +- .../contrib/hbqt/qtdesigner/hbqtdesigners.hbp | 8 +- .../qth/QDesignerActionEditorInterface.qth | 3 +- .../qth/QDesignerFormEditorInterface.qth | 3 +- .../QDesignerFormWindowCursorInterface.qth | 3 +- .../qth/QDesignerFormWindowInterface.qth | 4 +- .../QDesignerFormWindowManagerInterface.qth | 4 +- .../qth/QDesignerObjectInspectorInterface.qth | 3 +- .../qth/QDesignerPropertyEditorInterface.qth | 3 +- .../qth/QDesignerWidgetBoxInterface.qth | 3 +- harbour/contrib/hbqt/qtgui/hbqtguis.hbp | 6 +- .../contrib/hbqt/qtnetwork/hbqtnetworks.hbp | 6 +- .../hbqt/qtwebkit/{ => g}/QWebFrame.cpp | 26 ++- .../hbqt/qtwebkit/{ => g}/QWebHistory.cpp | 62 ++++-- .../qtwebkit/{ => g}/QWebHistoryInterface.cpp | 9 +- .../hbqt/qtwebkit/{ => g}/QWebHistoryItem.cpp | 9 +- .../qtwebkit/{ => g}/QWebHitTestResult.cpp | 9 +- .../hbqt/qtwebkit/{ => g}/QWebPage.cpp | 9 +- .../qtwebkit/{ => g}/QWebPluginFactory.cpp | 36 ++-- .../qtwebkit/{ => g}/QWebSecurityOrigin.cpp | 47 +++-- .../hbqt/qtwebkit/{ => g}/QWebSettings.cpp | 9 +- .../hbqt/qtwebkit/{ => g}/QWebView.cpp | 9 +- .../hbqt/qtwebkit/{ => g}/TQWebFrame.prg | 5 + .../hbqt/qtwebkit/{ => g}/TQWebHistory.prg | 15 ++ .../{ => g}/TQWebHistoryInterface.prg | 0 .../qtwebkit/{ => g}/TQWebHistoryItem.prg | 0 .../qtwebkit/{ => g}/TQWebHitTestResult.prg | 0 .../hbqt/qtwebkit/{ => g}/TQWebPage.prg | 0 .../qtwebkit/{ => g}/TQWebPluginFactory.prg | 5 + .../qtwebkit/{ => g}/TQWebSecurityOrigin.prg | 10 + .../hbqt/qtwebkit/{ => g}/TQWebSettings.prg | 0 .../hbqt/qtwebkit/{ => g}/TQWebView.prg | 0 .../hbqt/qtwebkit/{ => g}/filelist.hbm | 6 + .../hbqt/qtwebkit/g/hbqtwebkit_garbage.h | 34 ++++ harbour/contrib/hbqt/qtwebkit/hbqt_garbage.h | 32 ---- harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc | 18 ++ harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp | 6 +- harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp | 8 +- .../contrib/hbqt/qtwebkit/qth/QWebFrame.qth | 11 +- .../contrib/hbqt/qtwebkit/qth/QWebHistory.qth | 13 +- .../qtwebkit/qth/QWebHistoryInterface.qth | 9 +- .../hbqt/qtwebkit/qth/QWebHistoryItem.qth | 3 +- .../hbqt/qtwebkit/qth/QWebHitTestResult.qth | 11 +- .../contrib/hbqt/qtwebkit/qth/QWebPage.qth | 5 +- .../hbqt/qtwebkit/qth/QWebPluginFactory.qth | 9 +- .../hbqt/qtwebkit/qth/QWebSecurityOrigin.qth | 11 +- .../hbqt/qtwebkit/qth/QWebSettings.qth | 13 +- .../contrib/hbqt/qtwebkit/qth/QWebView.qth | 4 +- harbour/contrib/hbqt/utils/qtdesigner.qtp | 6 +- 83 files changed, 1005 insertions(+), 789 deletions(-) create mode 100644 harbour/contrib/hbqt/hbqt_commons.hbm create mode 100644 harbour/contrib/hbqt/hbqtdesigner.hbc create mode 100644 harbour/contrib/hbqt/hbqtwebkit.hbc rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerActionEditorInterface.cpp (97%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerFormEditorInterface.cpp (98%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerFormWindowCursorInterface.cpp (98%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerFormWindowInterface.cpp (99%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerFormWindowManagerInterface.cpp (99%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerObjectInspectorInterface.cpp (96%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerPropertyEditorInterface.cpp (97%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/QDesignerWidgetBoxInterface.cpp (97%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerActionEditorInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerFormEditorInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerFormWindowCursorInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerFormWindowInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerFormWindowManagerInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerObjectInspectorInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerPropertyEditorInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/TQDesignerWidgetBoxInterface.prg (100%) rename harbour/contrib/hbqt/qtdesigner/{ => g}/filelist.hbm (65%) create mode 100644 harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_garbage.h delete mode 100644 harbour/contrib/hbqt/qtdesigner/hbqt_garbage.h create mode 100644 harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebFrame.cpp (96%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebHistory.cpp (84%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebHistoryInterface.cpp (97%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebHistoryItem.cpp (98%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebHitTestResult.cpp (98%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebPage.cpp (99%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebPluginFactory.cpp (90%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebSecurityOrigin.cpp (86%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebSettings.cpp (99%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/QWebView.cpp (99%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebFrame.prg (98%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebHistory.prg (92%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebHistoryInterface.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebHistoryItem.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebHitTestResult.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebPage.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebPluginFactory.prg (97%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebSecurityOrigin.prg (94%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebSettings.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/TQWebView.prg (100%) rename harbour/contrib/hbqt/qtwebkit/{ => g}/filelist.hbm (55%) create mode 100644 harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_garbage.h delete mode 100644 harbour/contrib/hbqt/qtwebkit/hbqt_garbage.h create mode 100644 harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 583bc6c0c0..c1131537cf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,52 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-02 08:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + - contrib/hbqt/qtdesigner/* + + contrib/hbqt/qtdesigner/g + + contrib/hbqt/qtdesigner/g/* + - contrib/hbqt/qtwebkit/- + + contrib/hbqt/qtwebkit/g + + contrib/hbqt/qtwebkit/g/* + * Moved generated files under g subdir. + * Renamed _garbage header to have component prefix + * Regenerated + + * contrib/hbqt/qtdesigner/doc/en/* + * contrib/hbqt/qtwebkit/doc/en/* + * Regenerated + + * contrib/hbqt/qtwebkit/hbqtwebkit.hbp + * contrib/hbqt/qtwebkit/hbqtwebkits.hbp + * contrib/hbqt/qtdesigner/hbqtdesigner.hbp + * contrib/hbqt/qtdesigner/hbqtdesigners.hbp + * Updated to reflect above changes. + * Synced with other components. + + + contrib/hbqt/hbqtdesigner.hbc + + contrib/hbqt/hbqtwebkit.hbc + + contrib/hbqt/qtdesigner/hbqtdesigner.hbc + + contrib/hbqt/qtwebkit/hbqtwebkit.hbc + + Added .hbc files for these components. + + + contrib/hbqt/hbqt_commons.hbm + + Added common hbm for static build settings. + + * contrib/hbqt/qtdesigner/qth/* + * contrib/hbqt/qtwebkit/qth/* + - Deleted manually added local GC headers. + + * contrib/hbqt/qtcore/hbqt_hbslots.h + + Added TOFIX about QtGui dependency. + + * contrib/hbqt/qtcore/hbqtcores.hbp + * contrib/hbqt/qtgui/hbqtguis.hbp + * contrib/hbqt/qtnetwork/hbqtnetworks.hbp + % Using hbqt_commons.hbm + + * contrib/hbqt/utils/qtdesigner.qtp + ! Fixed typo in target dirs. + 2010-08-02 02:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/make.hbs + Make it capable to build project dependencies which are not on the diff --git a/harbour/contrib/hbqt/hbqt_commons.hbm b/harbour/contrib/hbqt/hbqt_commons.hbm new file mode 100644 index 0000000000..92824f4db7 --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_commons.hbm @@ -0,0 +1,16 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +# Common settings for all hbqt subcomponents (static mode) + +hbqt_common.hbm + +-stop{!HB_QT_BUILD_STATIC|!allwin} + +-cflag=-DQT_NODLL diff --git a/harbour/contrib/hbqt/hbqtdesigner.hbc b/harbour/contrib/hbqt/hbqtdesigner.hbc new file mode 100644 index 0000000000..8fc26bec2f --- /dev/null +++ b/harbour/contrib/hbqt/hbqtdesigner.hbc @@ -0,0 +1,10 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=qtdesigner/hbqtdesigner.hbc diff --git a/harbour/contrib/hbqt/hbqtwebkit.hbc b/harbour/contrib/hbqt/hbqtwebkit.hbc new file mode 100644 index 0000000000..e5fab48132 --- /dev/null +++ b/harbour/contrib/hbqt/hbqtwebkit.hbc @@ -0,0 +1,10 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=qtwebkit/hbqtwebkit.hbc diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h index 8b1d71ce58..1272941bcc 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h @@ -59,6 +59,7 @@ #include "hbqtcore_garbage.h" +/* TOFIX: QtGui components should not be accessed from this component */ #include #include #include diff --git a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp index 154bed5826..42e92d1886 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp +++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp @@ -2,13 +2,9 @@ # $Id$ # -../hbqt_common.hbm +../hbqt_commons.hbm g/filelist.hbm hbqtcore.hbm -ig - --stop{!HB_QT_BUILD_STATIC|!allwin} - --cflag=-DQT_NODLL diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt index 898a33e8da..2eeca0c976 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt @@ -1,57 +1,55 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerActionEditorInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesigneractioneditorinterface.html - $ONELINER$ - Creates a new QDesignerActionEditorInterface object. - $INHERITS$ - QWidget - $SYNTAX$ - QDesignerActionEditorInterface():new( ... ) - QDesignerActionEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) - QDesignerActionEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerActionEditorInterface - $METHODS$ - :core() -> pQDesignerFormEditorInterface - :manageAction( pAction ) -> NIL - :unmanageAction( pAction ) -> NIL - :setFormWindow( pFormWindow ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerActionEditorInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerActionEditorInterface.cpp - Library : hb - $SEEALSO$ - QWidget - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerActionEditorInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesigneractioneditorinterface.html + * $ONELINER$ + * Creates a new QDesignerActionEditorInterface object. + * $INHERITS$ + * QWidget + * $SYNTAX$ + * QDesignerActionEditorInterface():new( ... ) + * QDesignerActionEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) + * QDesignerActionEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerActionEditorInterface + * $METHODS$ + * :core() -> pQDesignerFormEditorInterface + * :manageAction( pAction ) -> NIL + * :unmanageAction( pAction ) -> NIL + * :setFormWindow( pFormWindow ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerActionEditorInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerActionEditorInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QWidget + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt index 767bb01cca..d7603c067c 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt @@ -1,63 +1,61 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerFormEditorInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerformeditorinterface.html - $ONELINER$ - Creates a new QDesignerFormEditorInterface object. - $INHERITS$ - QObject - $SYNTAX$ - QDesignerFormEditorInterface():new( ... ) - QDesignerFormEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) - QDesignerFormEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerFormEditorInterface - $METHODS$ - :actionEditor() -> pQDesignerActionEditorInterface - :formWindowManager() -> pQDesignerFormWindowManagerInterface - :objectInspector() -> pQDesignerObjectInspectorInterface - :propertyEditor() -> pQDesignerPropertyEditorInterface - :setActionEditor( pActionEditor ) -> NIL - :setObjectInspector( pObjectInspector ) -> NIL - :setPropertyEditor( pPropertyEditor ) -> NIL - :setWidgetBox( pWidgetBox ) -> NIL - :topLevel() -> pQWidget - :widgetBox() -> pQDesignerWidgetBoxInterface - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerFormEditorInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerFormEditorInterface.cpp - Library : hb - $SEEALSO$ - QObject - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerFormEditorInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerformeditorinterface.html + * $ONELINER$ + * Creates a new QDesignerFormEditorInterface object. + * $INHERITS$ + * QObject + * $SYNTAX$ + * QDesignerFormEditorInterface():new( ... ) + * QDesignerFormEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) + * QDesignerFormEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerFormEditorInterface + * $METHODS$ + * :actionEditor() -> pQDesignerActionEditorInterface + * :formWindowManager() -> pQDesignerFormWindowManagerInterface + * :objectInspector() -> pQDesignerObjectInspectorInterface + * :propertyEditor() -> pQDesignerPropertyEditorInterface + * :setActionEditor( pActionEditor ) -> NIL + * :setObjectInspector( pObjectInspector ) -> NIL + * :setPropertyEditor( pPropertyEditor ) -> NIL + * :setWidgetBox( pWidgetBox ) -> NIL + * :topLevel() -> pQWidget + * :widgetBox() -> pQDesignerWidgetBoxInterface + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerFormEditorInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerFormEditorInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QObject + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt index e5a531a7a7..0cdd7482a9 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt @@ -1,67 +1,65 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerFormWindowCursorInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerformwindowcursorinterface.html - $ONELINER$ - Creates a new QDesignerFormWindowCursorInterface object. - $INHERITS$ - - $SYNTAX$ - QDesignerFormWindowCursorInterface():new( ... ) - QDesignerFormWindowCursorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) - QDesignerFormWindowCursorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerFormWindowCursorInterface - $METHODS$ - :current() -> pQWidget - :formWindow() -> pQDesignerFormWindowInterface - :hasSelection() -> lBool - :isWidgetSelected( pWidget ) -> lBool - :movePosition( nOperation, nMode ) -> lBool - :position() -> nInt - :resetWidgetProperty( pWidget, cName ) -> NIL - :selectedWidget( nIndex ) -> pQWidget - :selectedWidgetCount() -> nInt - :setPosition( nPosition, nMode ) -> NIL - :setProperty( cName, pValue ) -> NIL - :setWidgetProperty( pWidget, cName, pValue ) -> NIL - :widget( nIndex ) -> pQWidget - :widgetCount() -> nInt - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerFormWindowCursorInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerFormWindowCursorInterface.cpp - Library : hb - $SEEALSO$ - - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerFormWindowCursorInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerformwindowcursorinterface.html + * $ONELINER$ + * Creates a new QDesignerFormWindowCursorInterface object. + * $INHERITS$ + * + * $SYNTAX$ + * QDesignerFormWindowCursorInterface():new( ... ) + * QDesignerFormWindowCursorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) + * QDesignerFormWindowCursorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerFormWindowCursorInterface + * $METHODS$ + * :current() -> pQWidget + * :formWindow() -> pQDesignerFormWindowInterface + * :hasSelection() -> lBool + * :isWidgetSelected( pWidget ) -> lBool + * :movePosition( nOperation, nMode ) -> lBool + * :position() -> nInt + * :resetWidgetProperty( pWidget, cName ) -> NIL + * :selectedWidget( nIndex ) -> pQWidget + * :selectedWidgetCount() -> nInt + * :setPosition( nPosition, nMode ) -> NIL + * :setProperty( cName, pValue ) -> NIL + * :setWidgetProperty( pWidget, cName, pValue ) -> NIL + * :widget( nIndex ) -> pQWidget + * :widgetCount() -> nInt + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerFormWindowCursorInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerFormWindowCursorInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt index eea01841ec..e551ab9097 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt @@ -1,90 +1,88 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerFormWindowInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerformwindowinterface.html - $ONELINER$ - Creates a new QDesignerFormWindowInterface object. - $INHERITS$ - QWidget - $SYNTAX$ - QDesignerFormWindowInterface():new( ... ) - QDesignerFormWindowInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) - QDesignerFormWindowInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerFormWindowInterface - $METHODS$ - :addResourceFile( cPath ) -> NIL - :author() -> cQString - :comment() -> cQString - :contents() -> cQString - :core() -> pQDesignerFormEditorInterface - :cursor() -> pQDesignerFormWindowCursorInterface - :emitSelectionChanged() -> NIL - :exportMacro() -> cQString - :features() -> nFeature - :fileName() -> cQString - :grid() -> pQPoint - :hasFeature( nFeature ) -> lBool - :includeHints() -> pQStringList - :isDirty() -> lBool - :isManaged( pWidget ) -> lBool - :layoutDefault( @nMargin, @nSpacing ) -> NIL - :mainContainer() -> pQWidget - :pixmapFunction() -> cQString - :removeResourceFile( cPath ) -> NIL - :resourceFiles() -> pQStringList - :setAuthor( cAuthor ) -> NIL - :setComment( cComment ) -> NIL - :setContents( pDevice ) -> NIL - :setExportMacro( cExportMacro ) -> NIL - :setIncludeHints( pIncludeHints ) -> NIL - :setLayoutDefault( nMargin, nSpacing ) -> NIL - :setMainContainer( pMainContainer ) -> NIL - :setPixmapFunction( cPixmapFunction ) -> NIL - :clearSelection( lUpdate ) -> NIL - :manageWidget( pWidget ) -> NIL - :selectWidget( pWidget, lSelect ) -> NIL - :setContents_1( cContents ) -> NIL - :setDirty( lDirty ) -> NIL - :setFeatures( nFeatures ) -> NIL - :setFileName( cFileName ) -> NIL - :setGrid( pGrid ) -> NIL - :unmanageWidget( pWidget ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerFormWindowInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerFormWindowInterface.cpp - Library : hb - $SEEALSO$ - QWidget - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerFormWindowInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerformwindowinterface.html + * $ONELINER$ + * Creates a new QDesignerFormWindowInterface object. + * $INHERITS$ + * QWidget + * $SYNTAX$ + * QDesignerFormWindowInterface():new( ... ) + * QDesignerFormWindowInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) + * QDesignerFormWindowInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerFormWindowInterface + * $METHODS$ + * :addResourceFile( cPath ) -> NIL + * :author() -> cQString + * :comment() -> cQString + * :contents() -> cQString + * :core() -> pQDesignerFormEditorInterface + * :cursor() -> pQDesignerFormWindowCursorInterface + * :emitSelectionChanged() -> NIL + * :exportMacro() -> cQString + * :features() -> nFeature + * :fileName() -> cQString + * :grid() -> pQPoint + * :hasFeature( nFeature ) -> lBool + * :includeHints() -> pQStringList + * :isDirty() -> lBool + * :isManaged( pWidget ) -> lBool + * :layoutDefault( @nMargin, @nSpacing ) -> NIL + * :mainContainer() -> pQWidget + * :pixmapFunction() -> cQString + * :removeResourceFile( cPath ) -> NIL + * :resourceFiles() -> pQStringList + * :setAuthor( cAuthor ) -> NIL + * :setComment( cComment ) -> NIL + * :setContents( pDevice ) -> NIL + * :setExportMacro( cExportMacro ) -> NIL + * :setIncludeHints( pIncludeHints ) -> NIL + * :setLayoutDefault( nMargin, nSpacing ) -> NIL + * :setMainContainer( pMainContainer ) -> NIL + * :setPixmapFunction( cPixmapFunction ) -> NIL + * :clearSelection( lUpdate ) -> NIL + * :manageWidget( pWidget ) -> NIL + * :selectWidget( pWidget, lSelect ) -> NIL + * :setContents_1( cContents ) -> NIL + * :setDirty( lDirty ) -> NIL + * :setFeatures( nFeatures ) -> NIL + * :setFileName( cFileName ) -> NIL + * :setGrid( pGrid ) -> NIL + * :unmanageWidget( pWidget ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerFormWindowInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerFormWindowInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QWidget + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt index b7a42166dc..0d2a157559 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt @@ -1,79 +1,77 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerFormWindowManagerInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerformwindowmanagerinterface.html - $ONELINER$ - Creates a new QDesignerFormWindowManagerInterface object. - $INHERITS$ - QObject - $SYNTAX$ - QDesignerFormWindowManagerInterface():new( ... ) - QDesignerFormWindowManagerInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) - QDesignerFormWindowManagerInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerFormWindowManagerInterface - $METHODS$ - :actionAdjustSize() -> pQAction - :actionBreakLayout() -> pQAction - :actionCopy() -> pQAction - :actionCut() -> pQAction - :actionDelete() -> pQAction - :actionFormLayout() -> pQAction - :actionGridLayout() -> pQAction - :actionHorizontalLayout() -> pQAction - :actionLower() -> pQAction - :actionPaste() -> pQAction - :actionRaise() -> pQAction - :actionRedo() -> pQAction - :actionSelectAll() -> pQAction - :actionSimplifyLayout() -> pQAction - :actionSplitHorizontal() -> pQAction - :actionSplitVertical() -> pQAction - :actionUndo() -> pQAction - :actionVerticalLayout() -> pQAction - :activeFormWindow() -> pQDesignerFormWindowInterface - :core() -> pQDesignerFormEditorInterface - :createFormWindow( pParent, nFlags ) -> pQDesignerFormWindowInterface - :formWindow( nIndex ) -> pQDesignerFormWindowInterface - :formWindowCount() -> nInt - :addFormWindow( pFormWindow ) -> NIL - :removeFormWindow( pFormWindow ) -> NIL - :setActiveFormWindow( pFormWindow ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerFormWindowManagerInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerFormWindowManagerInterface.cpp - Library : hb - $SEEALSO$ - QObject - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerFormWindowManagerInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerformwindowmanagerinterface.html + * $ONELINER$ + * Creates a new QDesignerFormWindowManagerInterface object. + * $INHERITS$ + * QObject + * $SYNTAX$ + * QDesignerFormWindowManagerInterface():new( ... ) + * QDesignerFormWindowManagerInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) + * QDesignerFormWindowManagerInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerFormWindowManagerInterface + * $METHODS$ + * :actionAdjustSize() -> pQAction + * :actionBreakLayout() -> pQAction + * :actionCopy() -> pQAction + * :actionCut() -> pQAction + * :actionDelete() -> pQAction + * :actionFormLayout() -> pQAction + * :actionGridLayout() -> pQAction + * :actionHorizontalLayout() -> pQAction + * :actionLower() -> pQAction + * :actionPaste() -> pQAction + * :actionRaise() -> pQAction + * :actionRedo() -> pQAction + * :actionSelectAll() -> pQAction + * :actionSimplifyLayout() -> pQAction + * :actionSplitHorizontal() -> pQAction + * :actionSplitVertical() -> pQAction + * :actionUndo() -> pQAction + * :actionVerticalLayout() -> pQAction + * :activeFormWindow() -> pQDesignerFormWindowInterface + * :core() -> pQDesignerFormEditorInterface + * :createFormWindow( pParent, nFlags ) -> pQDesignerFormWindowInterface + * :formWindow( nIndex ) -> pQDesignerFormWindowInterface + * :formWindowCount() -> nInt + * :addFormWindow( pFormWindow ) -> NIL + * :removeFormWindow( pFormWindow ) -> NIL + * :setActiveFormWindow( pFormWindow ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerFormWindowManagerInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerFormWindowManagerInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QObject + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt index c438be6e49..47cfdc5365 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt @@ -1,55 +1,53 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerObjectInspectorInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerobjectinspectorinterface.html - $ONELINER$ - Creates a new QDesignerObjectInspectorInterface object. - $INHERITS$ - QWidget - $SYNTAX$ - QDesignerObjectInspectorInterface():new( ... ) - QDesignerObjectInspectorInterface():from( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) - QDesignerObjectInspectorInterface():configure( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerObjectInspectorInterface - $METHODS$ - :core() -> pQDesignerFormEditorInterface - :setFormWindow( pFormWindow ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerObjectInspectorInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerObjectInspectorInterface.cpp - Library : hb - $SEEALSO$ - QWidget - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerObjectInspectorInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerobjectinspectorinterface.html + * $ONELINER$ + * Creates a new QDesignerObjectInspectorInterface object. + * $INHERITS$ + * QWidget + * $SYNTAX$ + * QDesignerObjectInspectorInterface():new( ... ) + * QDesignerObjectInspectorInterface():from( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) + * QDesignerObjectInspectorInterface():configure( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerObjectInspectorInterface + * $METHODS$ + * :core() -> pQDesignerFormEditorInterface + * :setFormWindow( pFormWindow ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerObjectInspectorInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerObjectInspectorInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QWidget + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt index 01c01c0ef5..3111d65421 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt @@ -1,60 +1,58 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerPropertyEditorInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerpropertyeditorinterface.html - $ONELINER$ - Creates a new QDesignerPropertyEditorInterface object. - $INHERITS$ - QWidget - $SYNTAX$ - QDesignerPropertyEditorInterface():new( ... ) - QDesignerPropertyEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) - QDesignerPropertyEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerPropertyEditorInterface - $METHODS$ - :core() -> pQDesignerFormEditorInterface - :currentPropertyName() -> cQString - :isReadOnly() -> lBool - :object() -> pQObject - :setObject( pObject ) -> NIL - :setPropertyValue( cName, pValue, lChanged ) -> NIL - :setReadOnly( lReadOnly ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerPropertyEditorInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerPropertyEditorInterface.cpp - Library : hb - $SEEALSO$ - QWidget - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerPropertyEditorInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerpropertyeditorinterface.html + * $ONELINER$ + * Creates a new QDesignerPropertyEditorInterface object. + * $INHERITS$ + * QWidget + * $SYNTAX$ + * QDesignerPropertyEditorInterface():new( ... ) + * QDesignerPropertyEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) + * QDesignerPropertyEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerPropertyEditorInterface + * $METHODS$ + * :core() -> pQDesignerFormEditorInterface + * :currentPropertyName() -> cQString + * :isReadOnly() -> lBool + * :object() -> pQObject + * :setObject( pObject ) -> NIL + * :setPropertyValue( cName, pValue, lChanged ) -> NIL + * :setReadOnly( lReadOnly ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerPropertyEditorInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerPropertyEditorInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QWidget + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt index 8628269df3..7e3e14bd1e 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt @@ -1,57 +1,55 @@ -/* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi - */ - -/* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QDesignerWidgetBoxInterface() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qdesignerwidgetboxinterface.html - $ONELINER$ - Creates a new QDesignerWidgetBoxInterface object. - $INHERITS$ - QWidget - $SYNTAX$ - QDesignerWidgetBoxInterface():new( ... ) - QDesignerWidgetBoxInterface():from( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) - QDesignerWidgetBoxInterface():configure( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QDesignerWidgetBoxInterface - $METHODS$ - :fileName() -> cQString - :load() -> lBool - :save() -> lBool - :setFileName( cFileName ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQDesignerWidgetBoxInterface.prg - C++ Wrappers : contrib/hbqt/QDesignerWidgetBoxInterface.cpp - Library : hb - $SEEALSO$ - QWidget - $END$ - */ +/* + * $Id$ + */ + +/* $DOC$ + * $TEMPLATE$ + * Class + * $NAME$ + * QDesignerWidgetBoxInterface() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qdesignerwidgetboxinterface.html + * $ONELINER$ + * Creates a new QDesignerWidgetBoxInterface object. + * $INHERITS$ + * QWidget + * $SYNTAX$ + * QDesignerWidgetBoxInterface():new( ... ) + * QDesignerWidgetBoxInterface():from( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) + * QDesignerWidgetBoxInterface():configure( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QDesignerWidgetBoxInterface + * $METHODS$ + * :fileName() -> cQString + * :load() -> lBool + * :save() -> lBool + * :setFileName( cFileName ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qtdesigner/TQDesignerWidgetBoxInterface.prg + * C++ wrappers : contrib/hbqt/qtdesigner/QDesignerWidgetBoxInterface.cpp + * Library : hbqtdesigner + * $SEEALSO$ + * QWidget + * $END$ + */ diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp similarity index 97% rename from harbour/contrib/hbqt/qtdesigner/QDesignerActionEditorInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp index 09d808f1ce..1a99fe1b5d 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerActionEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerActionEditorInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerActionEditorInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerActionEditorInterface ) @@ -103,6 +105,7 @@ void * hbqt_gcAllocate_QDesignerActionEditorInterface( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDesignerActionEditorInterface >( ( QDesignerActionEditorInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerActionEditorInterface; + p->type = HBQT_TYPE_QDesignerActionEditorInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp similarity index 98% rename from harbour/contrib/hbqt/qtdesigner/QDesignerFormEditorInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp index 3e311ec695..28a8c9a2d9 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerFormEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerFormEditorInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerFormEditorInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface ) @@ -129,6 +131,7 @@ void * hbqt_gcAllocate_QDesignerFormEditorInterface( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDesignerFormEditorInterface >( ( QDesignerFormEditorInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerFormEditorInterface; + p->type = HBQT_TYPE_QDesignerFormEditorInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp similarity index 98% rename from harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowCursorInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp index 325588853a..b88e249356 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowCursorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -73,8 +75,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -87,6 +88,7 @@ typedef struct QDesignerFormWindowCursorInterface * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerFormWindowCursorInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowCursorInterface ) @@ -107,6 +109,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowCursorInterface( void * pObj, bool bNe p->ph = ( QDesignerFormWindowCursorInterface * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerFormWindowCursorInterface; + p->type = HBQT_TYPE_QDesignerFormWindowCursorInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp similarity index 99% rename from harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp index 22910269a7..8a448c55a4 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -73,8 +75,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -88,6 +89,7 @@ typedef struct QPointer< QDesignerFormWindowInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerFormWindowInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowInterface ) @@ -108,6 +110,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowInterface( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDesignerFormWindowInterface >( ( QDesignerFormWindowInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerFormWindowInterface; + p->type = HBQT_TYPE_QDesignerFormWindowInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp similarity index 99% rename from harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowManagerInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp index e856c4e6fa..4c3b15f2d8 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerFormWindowManagerInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerFormWindowManagerInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerFormWindowManagerInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowManagerInterface ) @@ -103,6 +105,7 @@ void * hbqt_gcAllocate_QDesignerFormWindowManagerInterface( void * pObj, bool bN new( & p->ph ) QPointer< QDesignerFormWindowManagerInterface >( ( QDesignerFormWindowManagerInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerFormWindowManagerInterface; + p->type = HBQT_TYPE_QDesignerFormWindowManagerInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp similarity index 96% rename from harbour/contrib/hbqt/qtdesigner/QDesignerObjectInspectorInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp index 6e5e1b4497..ac625b2d3e 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerObjectInspectorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerObjectInspectorInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerObjectInspectorInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerObjectInspectorInterface ) @@ -103,6 +105,7 @@ void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void * pObj, bool bNew new( & p->ph ) QPointer< QDesignerObjectInspectorInterface >( ( QDesignerObjectInspectorInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerObjectInspectorInterface; + p->type = HBQT_TYPE_QDesignerObjectInspectorInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp similarity index 97% rename from harbour/contrib/hbqt/qtdesigner/QDesignerPropertyEditorInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp index 6df8b34c61..c09b4cad48 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerPropertyEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerPropertyEditorInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerPropertyEditorInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerPropertyEditorInterface ) @@ -103,6 +105,7 @@ void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew new( & p->ph ) QPointer< QDesignerPropertyEditorInterface >( ( QDesignerPropertyEditorInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerPropertyEditorInterface; + p->type = HBQT_TYPE_QDesignerPropertyEditorInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp similarity index 97% rename from harbour/contrib/hbqt/qtdesigner/QDesignerWidgetBoxInterface.cpp rename to harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp index 1e1aa5c744..7a10cda0b2 100644 --- a/harbour/contrib/hbqt/qtdesigner/QDesignerWidgetBoxInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtdesigner_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QPointer< QDesignerWidgetBoxInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesignerWidgetBoxInterface; QT_G_FUNC( hbqt_gcRelease_QDesignerWidgetBoxInterface ) @@ -103,6 +105,7 @@ void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDesignerWidgetBoxInterface >( ( QDesignerWidgetBoxInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesignerWidgetBoxInterface; + p->type = HBQT_TYPE_QDesignerWidgetBoxInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerActionEditorInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerActionEditorInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerActionEditorInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerActionEditorInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerFormEditorInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormEditorInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerFormEditorInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormEditorInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowCursorInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowCursorInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowCursorInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowCursorInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowManagerInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowManagerInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerFormWindowManagerInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowManagerInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerObjectInspectorInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerObjectInspectorInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerObjectInspectorInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerObjectInspectorInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerPropertyEditorInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerPropertyEditorInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerPropertyEditorInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerPropertyEditorInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/TQDesignerWidgetBoxInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerWidgetBoxInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtdesigner/TQDesignerWidgetBoxInterface.prg rename to harbour/contrib/hbqt/qtdesigner/g/TQDesignerWidgetBoxInterface.prg diff --git a/harbour/contrib/hbqt/qtdesigner/filelist.hbm b/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm similarity index 65% rename from harbour/contrib/hbqt/qtdesigner/filelist.hbm rename to harbour/contrib/hbqt/qtdesigner/g/filelist.hbm index 7389b7fe32..65d40fbeef 100644 --- a/harbour/contrib/hbqt/qtdesigner/filelist.hbm +++ b/harbour/contrib/hbqt/qtdesigner/g/filelist.hbm @@ -2,6 +2,12 @@ # $Id$ # +# -------------------------------------------------------------------- +# WARNING: Automatically generated source file. DO NOT EDIT! +# Instead, edit corresponding .qth file, +# or the generator tool itself, and run regenarate. +# -------------------------------------------------------------------- + QDesignerActionEditorInterface.cpp QDesignerFormEditorInterface.cpp QDesignerFormWindowCursorInterface.cpp diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_garbage.h b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_garbage.h new file mode 100644 index 0000000000..f5b5636f4b --- /dev/null +++ b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_garbage.h @@ -0,0 +1,30 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerActionEditorInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowCursorInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowManagerInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerObjectInspectorInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerPropertyEditorInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QDesignerWidgetBoxInterface ); + +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerActionEditorInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerFormEditorInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerFormWindowCursorInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerFormWindowInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerFormWindowManagerInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew ); + diff --git a/harbour/contrib/hbqt/qtdesigner/hbqt_garbage.h b/harbour/contrib/hbqt/qtdesigner/hbqt_garbage.h deleted file mode 100644 index 141ed82b30..0000000000 --- a/harbour/contrib/hbqt/qtdesigner/hbqt_garbage.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -extern QT_G_FUNC( hbqt_gcRelease_QDesignerActionEditorInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowCursorInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerFormWindowManagerInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerObjectInspectorInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerPropertyEditorInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QDesignerWidgetBoxInterface ); - -extern void * hbqt_gcAllocate_QDesignerActionEditorInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerFormEditorInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerFormWindowCursorInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerFormWindowInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerFormWindowManagerInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew ); - diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc new file mode 100644 index 0000000000..dc0606ec07 --- /dev/null +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc @@ -0,0 +1,18 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=../qtcore/hbqtcore.hbc + +{!HB_STATIC_QT&!hbdyn}libs=hbqtdesigner${__HB_DYN__} +{!HB_STATIC_QT&(allwin|os2)}libs=QtDesigner4 +{!HB_STATIC_QT&linux}libs=QtDesigner +{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtDesigner.framework/QtDesigner +{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtdesigners${__HB_DYN__} +{HB_STATIC_QT&linux}libs=hbqtdesigner +{HB_STATIC_QT&(allwin|linux)}libs=QtDesigner diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp index 57be89f5ab..7ce057f1be 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp @@ -4,6 +4,10 @@ ../hbqt_common.hbm -filelist.hbm +g/filelist.hbm + +-ig + +../qtcore/hbqtcore.hbc hbqtdesigners.hbp diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp index e6066bcdb6..984a718a96 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp @@ -2,10 +2,10 @@ # $Id$ # -../hbqt_common.hbm +../hbqt_commons.hbm -filelist.hbm +g/filelist.hbm --stop{!HB_QT_BUILD_STATIC|!allwin} +-ig --cflag=-DQT_NODLL +../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth index 8397123ab6..d6c4a42def 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth index f4aabb929d..4f62bed9c9 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth index 993f63e0dd..cb495867b2 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth index a7a101439d..78bd22894f 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -154,4 +153,3 @@ void widgetManaged ( QWidget * widget ) void widgetRemoved ( QWidget * widget ) void widgetUnmanaged ( QWidget * widget ) - diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth index fa9d5b14db..2369485cf9 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -125,4 +124,3 @@ void activeFormWindowChanged ( QDesignerFormWindowInterface * formWindow ) void formWindowAdded ( QDesignerFormWindowInterface * formWindow ) void formWindowRemoved ( QDesignerFormWindowInterface * formWindow ) - diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth index b650eec7cd..447816f931 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth index fba26931c8..bd4ade912a 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth index 97949b0399..d8ca564300 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth @@ -70,8 +70,7 @@ folder = hbqtdesigner #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp index 3744a60c78..b5b1df0f10 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp +++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp @@ -2,7 +2,7 @@ # $Id$ # -../hbqt_common.hbm +../hbqt_commons.hbm g/filelist.hbm hbqtgui.hbm @@ -10,7 +10,3 @@ hbqtgui.hbm -ig ../qtcore/hbqtcore.hbc - --stop{!HB_QT_BUILD_STATIC|!allwin} - --cflag=-DQT_NODLL diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp index 96152efb6b..984a718a96 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp @@ -2,14 +2,10 @@ # $Id$ # -../hbqt_common.hbm +../hbqt_commons.hbm g/filelist.hbm -ig ../qtcore/hbqtcore.hbc - --stop{!HB_QT_BUILD_STATIC|!allwin} - --cflag=-DQT_NODLL diff --git a/harbour/contrib/hbqt/qtwebkit/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp similarity index 96% rename from harbour/contrib/hbqt/qtwebkit/QWebFrame.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index 77b2bdaf19..c7d2cde838 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -59,19 +59,20 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ /* - * Constructed[ 37/40 [ 92.50% ] ] + * Constructed[ 38/40 [ 95.00% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * - * QList childFrames () const * QMultiMap metaData () const * * *** Commented out protos which construct fine but do not compile *** @@ -83,8 +84,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* * @@ -95,6 +95,7 @@ typedef struct QPointer< QWebFrame > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebFrame; QT_G_FUNC( hbqt_gcRelease_QWebFrame ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWebFrame >( ( QWebFrame * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWebFrame; + p->type = HBQT_TYPE_QWebFrame; if( bNew ) { @@ -160,6 +162,20 @@ HB_FUNC( QT_QWEBFRAME_ADDTOJAVASCRIPTWINDOWOBJECT_1 ) } } +/* + * QList childFrames () const + */ +HB_FUNC( QT_QWEBFRAME_CHILDFRAMES ) +{ + QWebFrame * p = hbqt_par_QWebFrame( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->childFrames() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBFRAME_CHILDFRAMES FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->childFrames() ), true ) ); p is NULL" ) ); + } +} + /* * QSize contentsSize () const */ diff --git a/harbour/contrib/hbqt/qtwebkit/QWebHistory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp similarity index 84% rename from harbour/contrib/hbqt/qtwebkit/QWebHistory.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp index c89116b577..63c52201ac 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebHistory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp @@ -59,28 +59,18 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ -/* - * Constructed[ 14/17 [ 82.35% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * QList backItems ( int maxItems ) const - * QList forwardItems ( int maxItems ) const - * QList items () const - */ - #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -92,6 +82,7 @@ typedef struct QWebHistory * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebHistory; QT_G_FUNC( hbqt_gcRelease_QWebHistory ) @@ -112,6 +103,7 @@ void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ) p->ph = ( QWebHistory * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWebHistory; + p->type = HBQT_TYPE_QWebHistory; if( bNew ) { @@ -157,6 +149,20 @@ HB_FUNC( QT_QWEBHISTORY_BACKITEM ) } } +/* + * QList backItems ( int maxItems ) const + */ +HB_FUNC( QT_QWEBHISTORY_BACKITEMS ) +{ + QWebHistory * p = hbqt_par_QWebHistory( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->backItems( hb_parni( 2 ) ) ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBHISTORY_BACKITEMS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->backItems( hb_parni( 2 ) ) ), true ) ); p is NULL" ) ); + } +} + /* * bool canGoBack () const */ @@ -269,6 +275,20 @@ HB_FUNC( QT_QWEBHISTORY_FORWARDITEM ) } } +/* + * QList forwardItems ( int maxItems ) const + */ +HB_FUNC( QT_QWEBHISTORY_FORWARDITEMS ) +{ + QWebHistory * p = hbqt_par_QWebHistory( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->forwardItems( hb_parni( 2 ) ) ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBHISTORY_FORWARDITEMS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->forwardItems( hb_parni( 2 ) ) ), true ) ); p is NULL" ) ); + } +} + /* * void goToItem ( const QWebHistoryItem & item ) */ @@ -297,6 +317,20 @@ HB_FUNC( QT_QWEBHISTORY_ITEMAT ) } } +/* + * QList items () const + */ +HB_FUNC( QT_QWEBHISTORY_ITEMS ) +{ + QWebHistory * p = hbqt_par_QWebHistory( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->items() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBHISTORY_ITEMS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->items() ), true ) ); p is NULL" ) ); + } +} + /* * int maximumItemCount () const */ diff --git a/harbour/contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp similarity index 97% rename from harbour/contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp index 201dea467f..7137f5bb89 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -82,6 +83,7 @@ typedef struct QPointer< QWebHistoryInterface > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebHistoryInterface; QT_G_FUNC( hbqt_gcRelease_QWebHistoryInterface ) @@ -102,6 +104,7 @@ void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWebHistoryInterface >( ( QWebHistoryInterface * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWebHistoryInterface; + p->type = HBQT_TYPE_QWebHistoryInterface; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/QWebHistoryItem.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp similarity index 98% rename from harbour/contrib/hbqt/qtwebkit/QWebHistoryItem.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp index 5072aa7156..1d8d9d25f0 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebHistoryItem.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -69,8 +71,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QWebHistoryItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebHistoryItem; QT_G_FUNC( hbqt_gcRelease_QWebHistoryItem ) @@ -118,6 +120,7 @@ void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew ) p->ph = ( QWebHistoryItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWebHistoryItem; + p->type = HBQT_TYPE_QWebHistoryItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/QWebHitTestResult.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp similarity index 98% rename from harbour/contrib/hbqt/qtwebkit/QWebHitTestResult.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp index 79f60e8782..e57d291042 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebHitTestResult.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -83,6 +84,7 @@ typedef struct QWebHitTestResult * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebHitTestResult; QT_G_FUNC( hbqt_gcRelease_QWebHitTestResult ) @@ -118,6 +120,7 @@ void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew ) p->ph = ( QWebHitTestResult * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWebHitTestResult; + p->type = HBQT_TYPE_QWebHitTestResult; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp similarity index 99% rename from harbour/contrib/hbqt/qtwebkit/QWebPage.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp index 568e854ae5..688935162a 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebPage.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -79,8 +81,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -93,6 +94,7 @@ typedef struct QPointer< QWebPage > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebPage; QT_G_FUNC( hbqt_gcRelease_QWebPage ) @@ -139,6 +141,7 @@ void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWebPage >( ( QWebPage * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWebPage; + p->type = HBQT_TYPE_QWebPage; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp similarity index 90% rename from harbour/contrib/hbqt/qtwebkit/QWebPluginFactory.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp index aa86107777..53bf86daf7 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,24 +72,10 @@ * enum Extension { } */ -/* - * Constructed[ 3/5 [ 60.00% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * virtual QList plugins () const = 0 - * - * *** Commented out protos which construct fine but do not compile *** - * - * // virtual bool extension ( Extension extension, const ExtensionOption * option = 0, ExtensionReturn * output = 0 ) - */ - #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -100,6 +88,7 @@ typedef struct QPointer< QWebPluginFactory > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebPluginFactory; QT_G_FUNC( hbqt_gcRelease_QWebPluginFactory ) @@ -120,6 +109,7 @@ void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWebPluginFactory >( ( QWebPluginFactory * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWebPluginFactory; + p->type = HBQT_TYPE_QWebPluginFactory; if( bNew ) { @@ -151,6 +141,20 @@ HB_FUNC( QT_QWEBPLUGINFACTORY_CREATE ) } } +/* + * virtual QList plugins () const = 0 + */ +HB_FUNC( QT_QWEBPLUGINFACTORY_PLUGINS ) +{ + QWebPluginFactory * p = hbqt_par_QWebPluginFactory( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->plugins() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBPLUGINFACTORY_PLUGINS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->plugins() ), true ) ); p is NULL" ) ); + } +} + /* * virtual void refreshPlugins () */ diff --git a/harbour/contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp similarity index 86% rename from harbour/contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp index 24fca3ca12..f71cd17b93 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp @@ -59,27 +59,18 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ -/* - * Constructed[ 6/8 [ 75.00% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * QList databases () const - * QList allOrigins () - */ - #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -92,6 +83,7 @@ typedef struct QWebSecurityOrigin * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebSecurityOrigin; QT_G_FUNC( hbqt_gcRelease_QWebSecurityOrigin ) @@ -127,6 +119,7 @@ void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew ) p->ph = ( QWebSecurityOrigin * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWebSecurityOrigin; + p->type = HBQT_TYPE_QWebSecurityOrigin; if( bNew ) { @@ -179,6 +172,20 @@ HB_FUNC( QT_QWEBSECURITYORIGIN_DATABASEUSAGE ) } } +/* + * QList databases () const + */ +HB_FUNC( QT_QWEBSECURITYORIGIN_DATABASES ) +{ + QWebSecurityOrigin * p = hbqt_par_QWebSecurityOrigin( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->databases() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBSECURITYORIGIN_DATABASES FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->databases() ), true ) ); p is NULL" ) ); + } +} + /* * QString host () const */ @@ -235,6 +242,20 @@ HB_FUNC( QT_QWEBSECURITYORIGIN_SETDATABASEQUOTA ) } } +/* + * QList allOrigins () + */ +HB_FUNC( QT_QWEBSECURITYORIGIN_ALLORIGINS ) +{ + QWebSecurityOrigin * p = hbqt_par_QWebSecurityOrigin( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->allOrigins() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBSECURITYORIGIN_ALLORIGINS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->allOrigins() ), true ) ); p is NULL" ) ); + } +} + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/qtwebkit/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp similarity index 99% rename from harbour/contrib/hbqt/qtwebkit/QWebSettings.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp index 2b8d82e593..75ba665a1e 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebSettings.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -76,8 +78,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -89,6 +90,7 @@ typedef struct QWebSettings * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebSettings; QT_G_FUNC( hbqt_gcRelease_QWebSettings ) @@ -109,6 +111,7 @@ void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ) p->ph = ( QWebSettings * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWebSettings; + p->type = HBQT_TYPE_QWebSettings; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp similarity index 99% rename from harbour/contrib/hbqt/qtwebkit/QWebView.cpp rename to harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp index e8fba36ca9..22be18e238 100644 --- a/harbour/contrib/hbqt/qtwebkit/QWebView.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp @@ -59,7 +59,9 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqt.h" +#include "hbqtwebkit_garbage.h" +#include "hbqtcore_garbage.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +70,7 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -82,6 +83,7 @@ typedef struct QPointer< QWebView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWebView; QT_G_FUNC( hbqt_gcRelease_QWebView ) @@ -128,6 +130,7 @@ void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWebView >( ( QWebView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWebView; + p->type = HBQT_TYPE_QWebView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebFrame.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg similarity index 98% rename from harbour/contrib/hbqt/qtwebkit/TQWebFrame.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg index 9910c676e1..6725b73d3c 100644 --- a/harbour/contrib/hbqt/qtwebkit/TQWebFrame.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg @@ -69,6 +69,7 @@ CREATE CLASS QWebFrame INHERIT HbQtObjectHandler, QObject METHOD addToJavaScriptWindowObject( cName, pObject ) METHOD addToJavaScriptWindowObject_1( cName, pObject, nOwn ) + METHOD childFrames() METHOD contentsSize() METHOD frameName() METHOD geometry() @@ -125,6 +126,10 @@ METHOD QWebFrame:addToJavaScriptWindowObject_1( cName, pObject, nOwn ) RETURN Qt_QWebFrame_addToJavaScriptWindowObject_1( ::pPtr, cName, hbqt_ptr( pObject ), nOwn ) +METHOD QWebFrame:childFrames() + RETURN Qt_QWebFrame_childFrames( ::pPtr ) + + METHOD QWebFrame:contentsSize() RETURN Qt_QWebFrame_contentsSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebHistory.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebHistory.prg similarity index 92% rename from harbour/contrib/hbqt/qtwebkit/TQWebHistory.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebHistory.prg index 742ae0d80b..13c0fceaa9 100644 --- a/harbour/contrib/hbqt/qtwebkit/TQWebHistory.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebHistory.prg @@ -69,6 +69,7 @@ CREATE CLASS QWebHistory INHERIT HbQtObjectHandler METHOD back() METHOD backItem() + METHOD backItems( nMaxItems ) METHOD canGoBack() METHOD canGoForward() METHOD clear() @@ -77,8 +78,10 @@ CREATE CLASS QWebHistory INHERIT HbQtObjectHandler METHOD currentItemIndex() METHOD forward() METHOD forwardItem() + METHOD forwardItems( nMaxItems ) METHOD goToItem( pItem ) METHOD itemAt( nI ) + METHOD items() METHOD maximumItemCount() METHOD setMaximumItemCount( nCount ) @@ -102,6 +105,10 @@ METHOD QWebHistory:backItem() RETURN Qt_QWebHistory_backItem( ::pPtr ) +METHOD QWebHistory:backItems( nMaxItems ) + RETURN Qt_QWebHistory_backItems( ::pPtr, nMaxItems ) + + METHOD QWebHistory:canGoBack() RETURN Qt_QWebHistory_canGoBack( ::pPtr ) @@ -134,6 +141,10 @@ METHOD QWebHistory:forwardItem() RETURN Qt_QWebHistory_forwardItem( ::pPtr ) +METHOD QWebHistory:forwardItems( nMaxItems ) + RETURN Qt_QWebHistory_forwardItems( ::pPtr, nMaxItems ) + + METHOD QWebHistory:goToItem( pItem ) RETURN Qt_QWebHistory_goToItem( ::pPtr, hbqt_ptr( pItem ) ) @@ -142,6 +153,10 @@ METHOD QWebHistory:itemAt( nI ) RETURN Qt_QWebHistory_itemAt( ::pPtr, nI ) +METHOD QWebHistory:items() + RETURN Qt_QWebHistory_items( ::pPtr ) + + METHOD QWebHistory:maximumItemCount() RETURN Qt_QWebHistory_maximumItemCount( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebHistoryInterface.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebHistoryInterface.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebHistoryInterface.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebHistoryInterface.prg diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebHistoryItem.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebHistoryItem.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebHistoryItem.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebHistoryItem.prg diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebHitTestResult.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebHitTestResult.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebHitTestResult.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebHitTestResult.prg diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebPage.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebPage.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebPage.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebPage.prg diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebPluginFactory.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg similarity index 97% rename from harbour/contrib/hbqt/qtwebkit/TQWebPluginFactory.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg index 3374d08a14..cb585299d8 100644 --- a/harbour/contrib/hbqt/qtwebkit/TQWebPluginFactory.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg @@ -68,6 +68,7 @@ CREATE CLASS QWebPluginFactory INHERIT HbQtObjectHandler, QObject METHOD new( ... ) METHOD create( cMimeType, pUrl, pArgumentNames, pArgumentValues ) + METHOD plugins() METHOD refreshPlugins() METHOD supportsExtension( nExtension ) @@ -87,6 +88,10 @@ METHOD QWebPluginFactory:create( cMimeType, pUrl, pArgumentNames, pArgumentValue RETURN Qt_QWebPluginFactory_create( ::pPtr, cMimeType, hbqt_ptr( pUrl ), hbqt_ptr( pArgumentNames ), hbqt_ptr( pArgumentValues ) ) +METHOD QWebPluginFactory:plugins() + RETURN Qt_QWebPluginFactory_plugins( ::pPtr ) + + METHOD QWebPluginFactory:refreshPlugins() RETURN Qt_QWebPluginFactory_refreshPlugins( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebSecurityOrigin.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg similarity index 94% rename from harbour/contrib/hbqt/qtwebkit/TQWebSecurityOrigin.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg index a09d99787b..cc5f28938c 100644 --- a/harbour/contrib/hbqt/qtwebkit/TQWebSecurityOrigin.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg @@ -69,10 +69,12 @@ CREATE CLASS QWebSecurityOrigin INHERIT HbQtObjectHandler METHOD databaseQuota() METHOD databaseUsage() + METHOD databases() METHOD host() METHOD port() METHOD scheme() METHOD setDatabaseQuota( nQuota ) + METHOD allOrigins() ENDCLASS @@ -94,6 +96,10 @@ METHOD QWebSecurityOrigin:databaseUsage() RETURN Qt_QWebSecurityOrigin_databaseUsage( ::pPtr ) +METHOD QWebSecurityOrigin:databases() + RETURN Qt_QWebSecurityOrigin_databases( ::pPtr ) + + METHOD QWebSecurityOrigin:host() RETURN Qt_QWebSecurityOrigin_host( ::pPtr ) @@ -109,3 +115,7 @@ METHOD QWebSecurityOrigin:scheme() METHOD QWebSecurityOrigin:setDatabaseQuota( nQuota ) RETURN Qt_QWebSecurityOrigin_setDatabaseQuota( ::pPtr, nQuota ) + +METHOD QWebSecurityOrigin:allOrigins() + RETURN Qt_QWebSecurityOrigin_allOrigins( ::pPtr ) + diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebSettings.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebSettings.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebSettings.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebSettings.prg diff --git a/harbour/contrib/hbqt/qtwebkit/TQWebView.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg similarity index 100% rename from harbour/contrib/hbqt/qtwebkit/TQWebView.prg rename to harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg diff --git a/harbour/contrib/hbqt/qtwebkit/filelist.hbm b/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm similarity index 55% rename from harbour/contrib/hbqt/qtwebkit/filelist.hbm rename to harbour/contrib/hbqt/qtwebkit/g/filelist.hbm index 8781d0ea4f..0a177e92bc 100644 --- a/harbour/contrib/hbqt/qtwebkit/filelist.hbm +++ b/harbour/contrib/hbqt/qtwebkit/g/filelist.hbm @@ -2,6 +2,12 @@ # $Id$ # +# -------------------------------------------------------------------- +# WARNING: Automatically generated source file. DO NOT EDIT! +# Instead, edit corresponding .qth file, +# or the generator tool itself, and run regenarate. +# -------------------------------------------------------------------- + QWebFrame.cpp QWebHistory.cpp QWebHistoryInterface.cpp diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_garbage.h b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_garbage.h new file mode 100644 index 0000000000..17a2e8e984 --- /dev/null +++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_garbage.h @@ -0,0 +1,34 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebFrame ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebHistory ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebHistoryInterface ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebHistoryItem ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebHitTestResult ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebPage ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebPluginFactory ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebSecurityOrigin ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebSettings ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QWebView ); + +extern HB_EXPORT void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ); + diff --git a/harbour/contrib/hbqt/qtwebkit/hbqt_garbage.h b/harbour/contrib/hbqt/qtwebkit/hbqt_garbage.h deleted file mode 100644 index ab84179fb2..0000000000 --- a/harbour/contrib/hbqt/qtwebkit/hbqt_garbage.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -extern QT_G_FUNC( hbqt_gcRelease_QWebFrame ); -extern QT_G_FUNC( hbqt_gcRelease_QWebHistory ); -extern QT_G_FUNC( hbqt_gcRelease_QWebHistoryInterface ); -extern QT_G_FUNC( hbqt_gcRelease_QWebHistoryItem ); -extern QT_G_FUNC( hbqt_gcRelease_QWebHitTestResult ); -extern QT_G_FUNC( hbqt_gcRelease_QWebPage ); -extern QT_G_FUNC( hbqt_gcRelease_QWebPluginFactory ); -extern QT_G_FUNC( hbqt_gcRelease_QWebSecurityOrigin ); -extern QT_G_FUNC( hbqt_gcRelease_QWebSettings ); -extern QT_G_FUNC( hbqt_gcRelease_QWebView ); - -extern void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ); - diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc new file mode 100644 index 0000000000..7742ca0a95 --- /dev/null +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc @@ -0,0 +1,18 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=../qtcore/hbqtcore.hbc + +{!HB_STATIC_QT&!hbdyn}libs=hbqtwebkit${__HB_DYN__} +{!HB_STATIC_QT&(allwin|os2)}libs=QtWebKit4 +{!HB_STATIC_QT&linux}libs=QtWebKit +{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit +{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtwebkits${__HB_DYN__} +{HB_STATIC_QT&linux}libs=hbqtwebkit +{HB_STATIC_QT&(allwin|linux)}libs=QtWebKit diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp index 1d3ded9e56..e728e6bdbd 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp @@ -4,6 +4,10 @@ ../hbqt_common.hbm -filelist.hbm +g/filelist.hbm + +-ig + +../qtcore/hbqtcore.hbc hbqtwebkits.hbp diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp index e6066bcdb6..984a718a96 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp @@ -2,10 +2,10 @@ # $Id$ # -../hbqt_common.hbm +../hbqt_commons.hbm -filelist.hbm +g/filelist.hbm --stop{!HB_QT_BUILD_STATIC|!allwin} +-ig --cflag=-DQT_NODLL +../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth index 2544d99f57..817f401ed4 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth @@ -57,7 +57,7 @@ Inherits = QObject Type = Core -New = +New = Destructor = no folder = qtwebkit @@ -65,11 +65,10 @@ folder = qtwebkit #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* - * + * */ HB_FUNC( QT_QWEBFRAME ) { @@ -133,7 +132,3 @@ void javaScriptWindowObjectCleared () void titleChanged ( const QString & title ) void urlChanged ( const QUrl & url ) - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth index 4e5057e8aa..1bc49cc91a 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth @@ -56,21 +56,20 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = Destructor = no folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* - * + * */ HB_FUNC( QT_QWEBHISTORY ) { @@ -106,7 +105,3 @@ void setMaximumItemCount ( int count ) - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth index 91a0a44f88..067246192a 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth @@ -57,14 +57,13 @@ Inherits = QObject Type = Core -New = +New = folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -93,7 +92,3 @@ void setDefaultInterface ( QWebHistoryInterface * defaultInterface ) - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth index e8ac4ae31f..571ecc2bd9 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth @@ -65,8 +65,7 @@ folder = qtwebkit #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth index 39b03fc249..ef1f67a450 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth @@ -56,16 +56,15 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -104,7 +103,3 @@ QString title () const - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth index 3a36349777..927c4368ce 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth @@ -63,8 +63,7 @@ folder = qtwebkit #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -150,5 +149,3 @@ void toolBarVisibilityChangeRequested ( bool visible ) void unsupportedContent ( QNetworkReply * reply ) void windowCloseRequested () - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth index 5e11ff0e51..103873251a 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth @@ -57,14 +57,13 @@ Inherits = QObject Type = Core -New = +New = folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -95,7 +94,3 @@ virtual bool supportsExtension ( Extension extension ) const - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth index 632133f4cb..b5b147a9f0 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth @@ -56,16 +56,15 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -101,7 +100,3 @@ QList allOrigins () - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth index fcd804d5c6..eea5846885 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = Destructor = no folder = qtwebkit @@ -66,12 +66,11 @@ folder = qtwebkit #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* - * + * */ HB_FUNC( QT_QWEBSETTINGS ) { @@ -120,7 +119,3 @@ QPixmap webGraphic ( WebGraphic type ) - - - - diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index 10bc9a3857..25a43ea11c 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -62,8 +62,7 @@ folder = qtwebkit #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" +#include "../hbqt_local.h" /* @@ -119,4 +118,3 @@ void statusBarMessage ( const QString & text ) void titleChanged ( const QString & title ) void urlChanged ( const QUrl & url ) - diff --git a/harbour/contrib/hbqt/utils/qtdesigner.qtp b/harbour/contrib/hbqt/utils/qtdesigner.qtp index 0f4d84ad70..5f094a9952 100644 --- a/harbour/contrib/hbqt/utils/qtdesigner.qtp +++ b/harbour/contrib/hbqt/utils/qtdesigner.qtp @@ -2,9 +2,9 @@ ; $Id$ ; --I=../qdesigner/qth --O=../qdesigner/g --D=../qdesigner/doc +-I=../qtdesigner/qth +-O=../qtdesigner/g +-D=../qtdesigner/doc QDesignerActionEditorInterface.qth QDesignerFormEditorInterface.qth