From 4966601bd1ca609aa42575a979ec4ce119e1b557 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 11 Dec 2021 14:05:09 +0100 Subject: [PATCH] Updated Qt4 bindings --- scripts/mkqtdecl4/mkqtdecl.conf | 20 +++++++++++++++++++ src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc | 6 ++++++ src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc | 6 ++++++ src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc | 6 ++++++ src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc | 6 ++++++ src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc | 5 +---- src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc | 6 +----- src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc | 6 ++++++ .../qt4/QtXml/gsiDeclQXmlDefaultHandler.cc | 14 +++++++++++++ 9 files changed, 66 insertions(+), 9 deletions(-) diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf index de9123023..2b7c1713a 100644 --- a/scripts/mkqtdecl4/mkqtdecl.conf +++ b/scripts/mkqtdecl4/mkqtdecl.conf @@ -165,10 +165,30 @@ drop_class "QtGlobal" drop_class "QThreadStorage" drop_class "QThreadStorageData" drop_class "QtMsgHandler" +drop_class "QtMsgType" drop_class "QtPlugin" drop_class "QtPluginInstanceFunction" drop_class "QtPrivate" drop_class "QtSharedPointer" +drop_class "QtValidLicenseForActiveQtModule" +drop_class "QtValidLicenseForCoreModule" +drop_class "QtValidLicenseForDBusModule" +drop_class "QtValidLicenseForDeclarativeModule" +drop_class "QtValidLicenseForGuiModule" +drop_class "QtValidLicenseForHelpModule" +drop_class "QtValidLicenseForMultimediaModule" +drop_class "QtValidLicenseForNetworkModule" +drop_class "QtValidLicenseForOpenGLModule" +drop_class "QtValidLicenseForOpenVGModule" +drop_class "QtValidLicenseForQt3SupportLightModule" +drop_class "QtValidLicenseForQt3SupportModule" +drop_class "QtValidLicenseForScriptModule" +drop_class "QtValidLicenseForScriptToolsModule" +drop_class "QtValidLicenseForSqlModule" +drop_class "QtValidLicenseForSvgModule" +drop_class "QtValidLicenseForTestModule" +drop_class "QtValidLicenseForXmlModule" +drop_class "QtValidLicenseForXmlPatternsModule" drop_class "QTypeInfo" drop_class "QUuid" drop_class "QUpdateLaterEvent" diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc index 59aec216f..5c6651407 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc @@ -327,6 +327,12 @@ gsi::Class decl_QDropEvent (qtdecl_QEvent (), "QtGui", "QDropEvent_N methods_QDropEvent (), "@hide\n@alias QDropEvent"); +// Additional base classes + +gsi::Class &qtdecl_QMimeSource (); + +gsi::ClassExt base_class_QMimeSource_in_QDropEvent (qtdecl_QMimeSource ()); + GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDropEvent () { return decl_QDropEvent; } } diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc index cd8b24b52..62ac8be96 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc @@ -311,6 +311,12 @@ qt_gsi::QtNativeClass decl_QGraphicsObject (qtdecl_QObject (), methods_QGraphicsObject (), "@hide\n@alias QGraphicsObject"); +// Additional base classes + +gsi::Class &qtdecl_QGraphicsItem (); + +gsi::ClassExt base_class_QGraphicsItem_in_QGraphicsObject (qtdecl_QGraphicsItem ()); + GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; } } diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc index 4019d1e40..edb1a1ec1 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc @@ -1361,6 +1361,12 @@ qt_gsi::QtNativeClass decl_QGraphicsWidget (qtdecl_QGraphicsObj methods_QGraphicsWidget (), "@hide\n@alias QGraphicsWidget"); +// Additional base classes + +gsi::Class &qtdecl_QGraphicsLayoutItem (); + +gsi::ClassExt base_class_QGraphicsLayoutItem_in_QGraphicsWidget (qtdecl_QGraphicsLayoutItem ()); + GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; } } diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc index 792f3c696..919614171 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc @@ -1022,6 +1022,12 @@ qt_gsi::QtNativeClass decl_QLayout (qtdecl_QObject (), "QtGui", "QLayou methods_QLayout (), "@hide\n@alias QLayout"); +// Additional base classes + +gsi::Class &qtdecl_QLayoutItem (); + +gsi::ClassExt base_class_QLayoutItem_in_QLayout (qtdecl_QLayoutItem ()); + GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLayout () { return decl_QLayout; } } diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc index 2bf079574..f110e9317 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc @@ -27,11 +27,8 @@ * This file has been created automatically */ -#include -#include -#include -#include #include +#include #include "gsiQt.h" #include "gsiQtGuiCommon.h" #include diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc index 1451ba452..2fcb2d74e 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc @@ -27,12 +27,8 @@ * This file has been created automatically */ -#include -#include -#include -#include -#include #include +#include #include "gsiQt.h" #include "gsiQtGuiCommon.h" #include diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc index 592300861..8395e6b82 100644 --- a/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc @@ -4793,6 +4793,12 @@ qt_gsi::QtNativeClass decl_QWidget (qtdecl_QObject (), "QtGui", "QWidge methods_QWidget (), "@hide\n@alias QWidget"); +// Additional base classes + +gsi::Class &qtdecl_QPaintDevice (); + +gsi::ClassExt base_class_QPaintDevice_in_QWidget (qtdecl_QPaintDevice ()); + GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidget () { return decl_QWidget; } } diff --git a/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc index 04548a09e..a7a7490de 100644 --- a/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc @@ -777,6 +777,20 @@ gsi::Class decl_QXmlDefaultHandler (qtdecl_QXmlContentHandle methods_QXmlDefaultHandler (), "@hide\n@alias QXmlDefaultHandler"); +// Additional base classes + +gsi::Class &qtdecl_QXmlErrorHandler (); +gsi::Class &qtdecl_QXmlDTDHandler (); +gsi::Class &qtdecl_QXmlEntityResolver (); +gsi::Class &qtdecl_QXmlLexicalHandler (); +gsi::Class &qtdecl_QXmlDeclHandler (); + +gsi::ClassExt base_class_QXmlErrorHandler_in_QXmlDefaultHandler (qtdecl_QXmlErrorHandler ()); +gsi::ClassExt base_class_QXmlDTDHandler_in_QXmlDefaultHandler (qtdecl_QXmlDTDHandler ()); +gsi::ClassExt base_class_QXmlEntityResolver_in_QXmlDefaultHandler (qtdecl_QXmlEntityResolver ()); +gsi::ClassExt base_class_QXmlLexicalHandler_in_QXmlDefaultHandler (qtdecl_QXmlLexicalHandler ()); +gsi::ClassExt base_class_QXmlDeclHandler_in_QXmlDefaultHandler (qtdecl_QXmlDeclHandler ()); + GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; } }