From 2df4248fbc3b38f129e77e6b056b8904c1d9c512 Mon Sep 17 00:00:00 2001 From: therecipe Date: Wed, 11 Jul 2018 16:42:34 +0200 Subject: [PATCH] fixes for several bugs + change js string conversion + fix showcase example --- androidextras/androidextras_android.cpp | 1 - bluetooth/bluetooth.cpp | 24 - charts/charts.cpp | 74 --- core/core.cpp | 117 ---- core/core.go | 66 +- datavisualization/datavisualization.cpp | 98 --- dbus/dbus.cpp | 16 - designer/designer.cpp | 4 - gamepad/gamepad.cpp | 6 - gui/gui.cpp | 103 +--- gui/gui.go | 36 ++ gui/gui.h | 4 + help/help.cpp | 8 - internal/binding/converter/body_input_go.go | 10 +- internal/binding/converter/input.go | 35 +- internal/binding/converter/output.go | 116 ++-- internal/binding/converter/type.go | 5 +- internal/binding/parser/class.go | 4 - internal/binding/parser/class_add.go | 18 + internal/binding/parser/class_fix.go | 5 + internal/binding/parser/function.go | 10 +- internal/binding/parser/function_fix.go | 8 + internal/binding/templater/function_cpp.go | 2 +- internal/binding/templater/function_go.go | 23 +- .../binding/templater/template_cgo_qmake.go | 3 + internal/binding/templater/template_cpp.go | 22 +- internal/binding/templater/template_go.go | 10 +- internal/binding/templater/template_h.go | 13 - internal/cmd/deploy/assets.go | 2 +- internal/cmd/deploy/bundle.go | 11 +- internal/cmd/deploy/run.go | 2 +- internal/cmd/setup/install.go | 3 + .../showcases/sia/controller/controller.go | 22 +- .../sia/files/controller/actionButton.go | 5 - .../showcases/sia/files/controller/files.go | 77 +-- .../sia/files/dialog/controller/dialog.go | 14 +- internal/examples/showcases/sia/main.go | 2 + .../sia/view/left/controller/progressBar.go | 11 + .../sia/view/left/qml/Left/ProgressBar.qml | 3 + .../examples/showcases/sia/view/qml/View.qml | 4 +- .../showcases/sia/view/top/controller/lock.go | 16 +- .../sia/view/top/controller/status.go | 37 +- .../showcases/sia/wallet/controller/wallet.go | 86 +-- .../sia/wallet/dialog/controller/dialog.go | 54 +- .../showcases/sia/wallet/model/wallet.go | 1 + location/location.cpp | 8 - macextras/macextras.cpp | 8 - multimedia/multimedia.cpp | 124 +--- multimedia/multimedia.go | 12 + multimedia/multimedia.h | 1 + network/network.cpp | 40 -- nfc/nfc.cpp | 172 ------ nfc/nfc.go | 217 +------ nfc/nfc.h | 30 - positioning/positioning.cpp | 10 - printsupport/printsupport.cpp | 1 - purchasing/purchasing.cpp | 4 - qml/qml.cpp | 50 -- quick/quick.cpp | 6 - remoteobjects/remoteobjects.cpp | 16 - sailfish/sailfish_sailfish.cpp | 1 - script/script.cpp | 6 - scripttools/scripttools.cpp | 4 - scxml/scxml.cpp | 8 - sensors/sensors.cpp | 86 --- serialbus/serialbus.cpp | 20 - serialport/serialport.cpp | 8 - speech/speech.cpp | 8 - sql/sql.cpp | 14 - svg/svg.cpp | 10 - testlib/testlib.cpp | 563 ++---------------- testlib/testlib.go | 495 +-------------- testlib/testlib.h | 70 +-- uitools/uitools.cpp | 4 - webchannel/webchannel.cpp | 6 - webengine/webengine.cpp | 18 - websockets/websockets.cpp | 8 - widgets/widgets.cpp | 74 --- xmlpatterns/xmlpatterns.cpp | 4 - 79 files changed, 425 insertions(+), 2872 deletions(-) diff --git a/androidextras/androidextras_android.cpp b/androidextras/androidextras_android.cpp index b0ba92ae..9a4abbbf 100644 --- a/androidextras/androidextras_android.cpp +++ b/androidextras/androidextras_android.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/bluetooth/bluetooth.cpp b/bluetooth/bluetooth.cpp index 67e59d04..0132c9fd 100644 --- a/bluetooth/bluetooth.cpp +++ b/bluetooth/bluetooth.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -54,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -169,8 +167,6 @@ void* QBluetoothDeviceDiscoveryAgent_NewQBluetoothDeviceDiscoveryAgent(void* par return new MyQBluetoothDeviceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothDeviceDiscoveryAgent(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothDeviceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothDeviceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -210,8 +206,6 @@ void* QBluetoothDeviceDiscoveryAgent_NewQBluetoothDeviceDiscoveryAgent2(void* de return new MyQBluetoothDeviceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothDeviceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothDeviceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothDeviceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -753,8 +747,6 @@ void* QBluetoothLocalDevice_NewQBluetoothLocalDevice(void* parent) return new MyQBluetoothLocalDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothLocalDevice(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothLocalDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothLocalDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -794,8 +786,6 @@ void* QBluetoothLocalDevice_NewQBluetoothLocalDevice2(void* address, void* paren return new MyQBluetoothLocalDevice(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothLocalDevice(*static_cast(address), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothLocalDevice(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothLocalDevice(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1205,8 +1195,6 @@ void* QBluetoothServer_NewQBluetoothServer(long long serverType, void* parent) return new MyQBluetoothServer(static_cast(serverType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServer(static_cast(serverType), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothServer(static_cast(serverType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServer(static_cast(serverType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1523,8 +1511,6 @@ void* QBluetoothServiceDiscoveryAgent_NewQBluetoothServiceDiscoveryAgent(void* p return new MyQBluetoothServiceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServiceDiscoveryAgent(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothServiceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServiceDiscoveryAgent(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1564,8 +1550,6 @@ void* QBluetoothServiceDiscoveryAgent_NewQBluetoothServiceDiscoveryAgent2(void* return new MyQBluetoothServiceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServiceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothServiceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothServiceDiscoveryAgent(*static_cast(deviceAdapter), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2161,8 +2145,6 @@ void* QBluetoothSocket_NewQBluetoothSocket(long long socketType, void* parent) return new MyQBluetoothSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothSocket(static_cast(socketType), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2202,8 +2184,6 @@ void* QBluetoothSocket_NewQBluetoothSocket2(void* parent) return new MyQBluetoothSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothSocket(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2669,8 +2649,6 @@ void* QBluetoothTransferManager_NewQBluetoothTransferManager(void* parent) return new MyQBluetoothTransferManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothTransferManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothTransferManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothTransferManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2906,8 +2884,6 @@ void* QBluetoothTransferReply_NewQBluetoothTransferReply(void* parent) return new MyQBluetoothTransferReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothTransferReply(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBluetoothTransferReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBluetoothTransferReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/charts/charts.cpp b/charts/charts.cpp index 5c6a5bf8..fd9e3511 100644 --- a/charts/charts.cpp +++ b/charts/charts.cpp @@ -83,7 +83,6 @@ #include #include #include -#include #include #include #include @@ -117,7 +116,6 @@ #include #include #include -#include #include #include #include @@ -2344,8 +2342,6 @@ void* QAreaSeries_NewQAreaSeries(void* parent) return new MyQAreaSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAreaSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAreaSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAreaSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2759,8 +2755,6 @@ void* QBarCategoryAxis_NewQBarCategoryAxis(void* parent) return new MyQBarCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarCategoryAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBarCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3079,8 +3073,6 @@ void* QBarSeries_NewQBarSeries(void* parent) return new MyQBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3179,8 +3171,6 @@ void* QBarSet_NewQBarSet(struct QtCharts_PackedString label, void* parent) return new MyQBarSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBarSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3844,8 +3834,6 @@ void* QBoxPlotSeries_NewQBoxPlotSeries(void* parent) return new MyQBoxPlotSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxPlotSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBoxPlotSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxPlotSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4263,8 +4251,6 @@ void* QBoxSet_NewQBoxSet(struct QtCharts_PackedString label, void* parent) return new MyQBoxSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBoxSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxSet(QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4304,8 +4290,6 @@ void* QBoxSet_NewQBoxSet2(double le, double lq, double m, double uq, double ue, return new MyQBoxSet(le, lq, m, uq, ue, QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxSet(le, lq, m, uq, ue, QString::fromUtf8(label.data, label.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBoxSet(le, lq, m, uq, ue, QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBoxSet(le, lq, m, uq, ue, QString::fromUtf8(label.data, label.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4804,8 +4788,6 @@ void* QCandlestickModelMapper_NewQCandlestickModelMapper(void* parent) return new MyQCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5204,8 +5186,6 @@ void* QCandlestickSeries_NewQCandlestickSeries(void* parent) return new MyQCandlestickSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCandlestickSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5796,8 +5776,6 @@ void* QCandlestickSet_NewQCandlestickSet2(double open, double high, double low, return new MyQCandlestickSet(open, high, low, close, timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSet(open, high, low, close, timestamp, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCandlestickSet(open, high, low, close, timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSet(open, high, low, close, timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5837,8 +5815,6 @@ void* QCandlestickSet_NewQCandlestickSet(double timestamp, void* parent) return new MyQCandlestickSet(timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSet(timestamp, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCandlestickSet(timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCandlestickSet(timestamp, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6332,8 +6308,6 @@ void* QCategoryAxis_NewQCategoryAxis(void* parent) return new MyQCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCategoryAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCategoryAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8521,8 +8495,6 @@ void* QDateTimeAxis_NewQDateTimeAxis(void* parent) return new MyQDateTimeAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDateTimeAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDateTimeAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDateTimeAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8730,8 +8702,6 @@ void* QHBarModelMapper_NewQHBarModelMapper(void* parent) return new MyQHBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHBarModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9083,8 +9053,6 @@ void* QHBoxPlotModelMapper_NewQHBoxPlotModelMapper(void* parent) return new MyQHBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHBoxPlotModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9440,8 +9408,6 @@ void* QHCandlestickModelMapper_NewQHCandlestickModelMapper(void* parent) return new MyQHCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHCandlestickModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9679,8 +9645,6 @@ void* QHPieModelMapper_NewQHPieModelMapper(void* parent) return new MyQHPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHPieModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9903,8 +9867,6 @@ void* QHXYModelMapper_NewQHXYModelMapper(void* parent) return new MyQHXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHXYModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10154,8 +10116,6 @@ void* QHorizontalBarSeries_NewQHorizontalBarSeries(void* parent) return new MyQHorizontalBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHorizontalBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10256,8 +10216,6 @@ void* QHorizontalPercentBarSeries_NewQHorizontalPercentBarSeries(void* parent) return new MyQHorizontalPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalPercentBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHorizontalPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10358,8 +10316,6 @@ void* QHorizontalStackedBarSeries_NewQHorizontalStackedBarSeries(void* parent) return new MyQHorizontalStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalStackedBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHorizontalStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHorizontalStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11875,8 +11831,6 @@ void* QLineSeries_NewQLineSeries(void* parent) return new MyQLineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLineSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11996,8 +11950,6 @@ void* QLogValueAxis_NewQLogValueAxis(void* parent) return new MyQLogValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLogValueAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLogValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLogValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12263,8 +12215,6 @@ void* QPercentBarSeries_NewQPercentBarSeries(void* parent) return new MyQPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPercentBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPercentBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12429,8 +12379,6 @@ void* QPieSeries_NewQPieSeries(void* parent) return new MyQPieSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPieSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12872,8 +12820,6 @@ void* QPieSlice_NewQPieSlice(void* parent) return new MyQPieSlice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSlice(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPieSlice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSlice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12913,8 +12859,6 @@ void* QPieSlice_NewQPieSlice2(struct QtCharts_PackedString label, double value, return new MyQPieSlice(QString::fromUtf8(label.data, label.len), value, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSlice(QString::fromUtf8(label.data, label.len), value, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPieSlice(QString::fromUtf8(label.data, label.len), value, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPieSlice(QString::fromUtf8(label.data, label.len), value, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -13715,8 +13659,6 @@ void* QScatterSeries_NewQScatterSeries(void* parent) return new MyQScatterSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatterSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScatterSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatterSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -13900,8 +13842,6 @@ void* QSplineSeries_NewQSplineSeries(void* parent) return new MyQSplineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSplineSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSplineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSplineSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -13992,8 +13932,6 @@ void* QStackedBarSeries_NewQStackedBarSeries(void* parent) return new MyQStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStackedBarSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStackedBarSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -14091,8 +14029,6 @@ void* QVBarModelMapper_NewQVBarModelMapper(void* parent) return new MyQVBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVBarModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVBarModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -14444,8 +14380,6 @@ void* QVBoxPlotModelMapper_NewQVBoxPlotModelMapper(void* parent) return new MyQVBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVBoxPlotModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVBoxPlotModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -14791,8 +14725,6 @@ void* QVCandlestickModelMapper_NewQVCandlestickModelMapper(void* parent) return new MyQVCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVCandlestickModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVCandlestickModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15040,8 +14972,6 @@ void* QVPieModelMapper_NewQVPieModelMapper(void* parent) return new MyQVPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVPieModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVPieModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15264,8 +15194,6 @@ void* QVXYModelMapper_NewQVXYModelMapper(void* parent) return new MyQVXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVXYModelMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVXYModelMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15520,8 +15448,6 @@ void* QValueAxis_NewQValueAxis(void* parent) return new MyQValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValueAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValueAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/core/core.cpp b/core/core.cpp index bf715b78..5979b1b4 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -87,7 +87,6 @@ #include #include #include -#include #include #include #include @@ -150,7 +149,6 @@ #include #include #include -#include #include #include #include @@ -165,7 +163,6 @@ #include #include #include -#include #include #include #include @@ -273,8 +270,6 @@ void* QAbstractAnimation_NewQAbstractAnimation(void* parent) return new MyQAbstractAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractAnimation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -890,8 +885,6 @@ void* QAbstractItemModel_NewQAbstractItemModel(void* parent) return new MyQAbstractItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2436,8 +2429,6 @@ void* QAbstractListModel_NewQAbstractListModel(void* parent) return new MyQAbstractListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractListModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2668,8 +2659,6 @@ void* QAbstractProxyModel_NewQAbstractProxyModel(void* parent) return new MyQAbstractProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractProxyModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3088,8 +3077,6 @@ void* QAbstractTableModel_NewQAbstractTableModel(void* parent) return new MyQAbstractTableModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractTableModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractTableModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractTableModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3429,8 +3416,6 @@ void* QAnimationGroup_NewQAnimationGroup(void* parent) return new MyQAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAnimationGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3749,8 +3734,6 @@ void* QBuffer_NewQBuffer2(void* byteArray, void* parent) return new MyQBuffer(static_cast(byteArray), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBuffer(static_cast(byteArray), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBuffer(static_cast(byteArray), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBuffer(static_cast(byteArray), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3790,8 +3773,6 @@ void* QBuffer_NewQBuffer(void* parent) return new MyQBuffer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBuffer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBuffer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBuffer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5054,8 +5035,6 @@ void* QChildEvent_NewQChildEvent(long long ty, void* child) return new MyQChildEvent(static_cast(ty), static_cast(child)); } else if (dynamic_cast(static_cast(child))) { return new MyQChildEvent(static_cast(ty), static_cast(child)); - } else if (dynamic_cast(static_cast(child))) { - return new MyQChildEvent(static_cast(ty), static_cast(child)); } else if (dynamic_cast(static_cast(child))) { return new MyQChildEvent(static_cast(ty), static_cast(child)); } else if (dynamic_cast(static_cast(child))) { @@ -7150,8 +7129,6 @@ void* QEventLoop_NewQEventLoop(void* parent) return new MyQEventLoop(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQEventLoop(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQEventLoop(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQEventLoop(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7295,8 +7272,6 @@ void* QEventTransition_NewQEventTransition2(void* object, long long ty, void* so return new MyQEventTransition(static_cast(object), static_cast(ty), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQEventTransition(static_cast(object), static_cast(ty), static_cast(sourceState)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQEventTransition(static_cast(object), static_cast(ty), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQEventTransition(static_cast(object), static_cast(ty), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { @@ -7454,8 +7429,6 @@ void* QFile_NewQFile3(void* parent) return new MyQFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFile(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7500,8 +7473,6 @@ void* QFile_NewQFile4(struct QtCore_PackedString name, void* parent) return new MyQFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8135,8 +8106,6 @@ void* QFileSelector_NewQFileSelector(void* parent) return new MyQFileSelector(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSelector(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFileSelector(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSelector(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8242,8 +8211,6 @@ void* QFileSystemWatcher_NewQFileSystemWatcher(void* parent) return new MyQFileSystemWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemWatcher(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFileSystemWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8283,8 +8250,6 @@ void* QFileSystemWatcher_NewQFileSystemWatcher2(struct QtCore_PackedString paths return new MyQFileSystemWatcher(QString::fromUtf8(paths.data, paths.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemWatcher(QString::fromUtf8(paths.data, paths.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFileSystemWatcher(QString::fromUtf8(paths.data, paths.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemWatcher(QString::fromUtf8(paths.data, paths.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8695,8 +8660,6 @@ void* QIODevice_NewQIODevice2(void* parent) return new MyQIODevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIODevice(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIODevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIODevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9386,8 +9349,6 @@ void* QIdentityProxyModel_NewQIdentityProxyModel(void* parent) return new MyQIdentityProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIdentityProxyModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIdentityProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIdentityProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9594,8 +9555,6 @@ void* QItemSelectionModel_NewQItemSelectionModel2(void* model, void* parent) return new MyQItemSelectionModel(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemSelectionModel(static_cast(model), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemSelectionModel(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemSelectionModel(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10932,8 +10891,6 @@ void* QLibrary_NewQLibrary(void* parent) return new MyQLibrary(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLibrary(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10973,8 +10930,6 @@ void* QLibrary_NewQLibrary2(struct QtCore_PackedString fileName, void* parent) return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11014,8 +10969,6 @@ void* QLibrary_NewQLibrary4(struct QtCore_PackedString fileName, struct QtCore_P return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), QString::fromUtf8(version.data, version.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), QString::fromUtf8(version.data, version.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), QString::fromUtf8(version.data, version.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), QString::fromUtf8(version.data, version.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11055,8 +11008,6 @@ void* QLibrary_NewQLibrary3(struct QtCore_PackedString fileName, int verNum, voi return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), verNum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), verNum, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), verNum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLibrary(QString::fromUtf8(fileName.data, fileName.len), verNum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15084,8 +15035,6 @@ void* QParallelAnimationGroup_NewQParallelAnimationGroup(void* parent) return new MyQParallelAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQParallelAnimationGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQParallelAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQParallelAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15193,8 +15142,6 @@ void* QPauseAnimation_NewQPauseAnimation(void* parent) return new MyQPauseAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPauseAnimation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPauseAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPauseAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15234,8 +15181,6 @@ void* QPauseAnimation_NewQPauseAnimation2(int msecs, void* parent) return new MyQPauseAnimation(msecs, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPauseAnimation(msecs, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPauseAnimation(msecs, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPauseAnimation(msecs, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15404,8 +15349,6 @@ void* QPluginLoader_NewQPluginLoader(void* parent) return new MyQPluginLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPluginLoader(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPluginLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPluginLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15445,8 +15388,6 @@ void* QPluginLoader_NewQPluginLoader2(struct QtCore_PackedString fileName, void* return new MyQPluginLoader(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPluginLoader(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPluginLoader(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPluginLoader(QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15735,8 +15676,6 @@ void* QPropertyAnimation_NewQPropertyAnimation(void* parent) return new MyQPropertyAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPropertyAnimation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPropertyAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPropertyAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15776,8 +15715,6 @@ void* QPropertyAnimation_NewQPropertyAnimation2(void* target, void* propertyName return new MyQPropertyAnimation(static_cast(target), *static_cast(propertyName), static_cast(parent)); } else if (dynamic_cast(static_cast(target))) { return new MyQPropertyAnimation(static_cast(target), *static_cast(propertyName), static_cast(parent)); - } else if (dynamic_cast(static_cast(target))) { - return new MyQPropertyAnimation(static_cast(target), *static_cast(propertyName), static_cast(parent)); } else if (dynamic_cast(static_cast(target))) { return new MyQPropertyAnimation(static_cast(target), *static_cast(propertyName), static_cast(parent)); } else if (dynamic_cast(static_cast(target))) { @@ -17227,8 +17164,6 @@ void* QSaveFile_NewQSaveFile2(void* parent) return new MyQSaveFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSaveFile(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSaveFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSaveFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17273,8 +17208,6 @@ void* QSaveFile_NewQSaveFile3(struct QtCore_PackedString name, void* parent) return new MyQSaveFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSaveFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSaveFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSaveFile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17467,8 +17400,6 @@ void* QSequentialAnimationGroup_NewQSequentialAnimationGroup(void* parent) return new MyQSequentialAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSequentialAnimationGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSequentialAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSequentialAnimationGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17600,8 +17531,6 @@ void* QSettings_NewQSettings5(void* parent) return new MyQSettings(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSettings(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17641,8 +17570,6 @@ void* QSettings_NewQSettings3(long long format, long long scope, struct QtCore_P return new MyQSettings(static_cast(format), static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(format), static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSettings(static_cast(format), static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(format), static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17682,8 +17609,6 @@ void* QSettings_NewQSettings2(long long scope, struct QtCore_PackedString organi return new MyQSettings(static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSettings(static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(static_cast(scope), QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17723,8 +17648,6 @@ void* QSettings_NewQSettings4(struct QtCore_PackedString fileName, long long for return new MyQSettings(QString::fromUtf8(fileName.data, fileName.len), static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(QString::fromUtf8(fileName.data, fileName.len), static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSettings(QString::fromUtf8(fileName.data, fileName.len), static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(QString::fromUtf8(fileName.data, fileName.len), static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17764,8 +17687,6 @@ void* QSettings_NewQSettings(struct QtCore_PackedString organization, struct QtC return new MyQSettings(QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSettings(QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSettings(QString::fromUtf8(organization.data, organization.len), QString::fromUtf8(application.data, application.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18024,8 +17945,6 @@ void* QSharedMemory_NewQSharedMemory2(void* parent) return new MyQSharedMemory(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSharedMemory(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSharedMemory(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSharedMemory(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18065,8 +17984,6 @@ void* QSharedMemory_NewQSharedMemory(struct QtCore_PackedString key, void* paren return new MyQSharedMemory(QString::fromUtf8(key.data, key.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSharedMemory(QString::fromUtf8(key.data, key.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSharedMemory(QString::fromUtf8(key.data, key.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSharedMemory(QString::fromUtf8(key.data, key.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18202,8 +18119,6 @@ void* QSignalBlocker_NewQSignalBlocker2(void* object) return new QSignalBlocker(*static_cast(object)); } else if (dynamic_cast(static_cast(object))) { return new QSignalBlocker(*static_cast(object)); - } else if (dynamic_cast(static_cast(object))) { - return new QSignalBlocker(*static_cast(object)); } else if (dynamic_cast(static_cast(object))) { return new QSignalBlocker(*static_cast(object)); } else if (dynamic_cast(static_cast(object))) { @@ -18243,8 +18158,6 @@ void* QSignalBlocker_NewQSignalBlocker(void* object) return new QSignalBlocker(static_cast(object)); } else if (dynamic_cast(static_cast(object))) { return new QSignalBlocker(static_cast(object)); - } else if (dynamic_cast(static_cast(object))) { - return new QSignalBlocker(static_cast(object)); } else if (dynamic_cast(static_cast(object))) { return new QSignalBlocker(static_cast(object)); } else if (dynamic_cast(static_cast(object))) { @@ -18327,8 +18240,6 @@ void* QSignalMapper_NewQSignalMapper(void* parent) return new MyQSignalMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSignalMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSignalMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSignalMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18544,8 +18455,6 @@ void* QSignalTransition_NewQSignalTransition2(void* sender, char* sign, void* so return new MyQSignalTransition(static_cast(sender), const_cast(sign), static_cast(sourceState)); } else if (dynamic_cast(static_cast(sender))) { return new MyQSignalTransition(static_cast(sender), const_cast(sign), static_cast(sourceState)); - } else if (dynamic_cast(static_cast(sender))) { - return new MyQSignalTransition(static_cast(sender), const_cast(sign), static_cast(sourceState)); } else if (dynamic_cast(static_cast(sender))) { return new MyQSignalTransition(static_cast(sender), const_cast(sign), static_cast(sourceState)); } else if (dynamic_cast(static_cast(sender))) { @@ -19013,8 +18922,6 @@ void* QSortFilterProxyModel_NewQSortFilterProxyModel(void* parent) return new MyQSortFilterProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSortFilterProxyModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSortFilterProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSortFilterProxyModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -19582,8 +19489,6 @@ void* QStateMachine_NewQStateMachine(void* parent) return new MyQStateMachine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStateMachine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStateMachine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStateMachine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -19623,8 +19528,6 @@ void* QStateMachine_NewQStateMachine2(long long childMode, void* parent) return new MyQStateMachine(static_cast(childMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStateMachine(static_cast(childMode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStateMachine(static_cast(childMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStateMachine(static_cast(childMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -20062,8 +19965,6 @@ void* QStringListModel_NewQStringListModel(void* parent) return new MyQStringListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStringListModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStringListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStringListModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -20103,8 +20004,6 @@ void* QStringListModel_NewQStringListModel2(struct QtCore_PackedString strin, vo return new MyQStringListModel(QString::fromUtf8(strin.data, strin.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStringListModel(QString::fromUtf8(strin.data, strin.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStringListModel(QString::fromUtf8(strin.data, strin.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStringListModel(QString::fromUtf8(strin.data, strin.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -21058,8 +20957,6 @@ void* QTemporaryFile_NewQTemporaryFile3(void* parent) return new MyQTemporaryFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTemporaryFile(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTemporaryFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTemporaryFile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -21104,8 +21001,6 @@ void* QTemporaryFile_NewQTemporaryFile4(struct QtCore_PackedString templateName, return new MyQTemporaryFile(QString::fromUtf8(templateName.data, templateName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTemporaryFile(QString::fromUtf8(templateName.data, templateName.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTemporaryFile(QString::fromUtf8(templateName.data, templateName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTemporaryFile(QString::fromUtf8(templateName.data, templateName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -21790,8 +21685,6 @@ void* QThread_NewQThread(void* parent) return new MyQThread(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQThread(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQThread(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQThread(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -22034,8 +21927,6 @@ void* QThreadPool_NewQThreadPool(void* parent) return new MyQThreadPool(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQThreadPool(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQThreadPool(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQThreadPool(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -22319,8 +22210,6 @@ void* QTimeLine_NewQTimeLine(int duration, void* parent) return new MyQTimeLine(duration, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTimeLine(duration, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTimeLine(duration, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTimeLine(duration, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -22862,8 +22751,6 @@ void* QTimer_NewQTimer(void* parent) return new MyQTimer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTimer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTimer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTimer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -23064,8 +22951,6 @@ void* QTranslator_NewQTranslator(void* parent) return new MyQTranslator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTranslator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTranslator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTranslator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -24487,8 +24372,6 @@ void* QVariantAnimation_NewQVariantAnimation(void* parent) return new MyQVariantAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVariantAnimation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVariantAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVariantAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/core/core.go b/core/core.go index 1faf6746..16655a76 100644 --- a/core/core.go +++ b/core/core.go @@ -8942,11 +8942,10 @@ func (ptr *QByteArray) __split_newList() unsafe.Pointer { } type QByteArrayList struct { - QList + ptr unsafe.Pointer } type QByteArrayList_ITF interface { - QList_ITF QByteArrayList_PTR() *QByteArrayList } @@ -8956,14 +8955,14 @@ func (ptr *QByteArrayList) QByteArrayList_PTR() *QByteArrayList { func (ptr *QByteArrayList) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QByteArrayList) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } @@ -20332,11 +20331,10 @@ func (ptr *QIdentityProxyModel) RowCountDefault(parent QModelIndex_ITF) int { } type QItemSelection struct { - QList + ptr unsafe.Pointer } type QItemSelection_ITF interface { - QList_ITF QItemSelection_PTR() *QItemSelection } @@ -20346,14 +20344,14 @@ func (ptr *QItemSelection) QItemSelection_PTR() *QItemSelection { func (ptr *QItemSelection) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QItemSelection) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } @@ -24297,44 +24295,6 @@ func (ptr *QLinkedListIterator) DestroyQLinkedListIterator() { } } -type QList struct { - ptr unsafe.Pointer -} - -type QList_ITF interface { - QList_PTR() *QList -} - -func (ptr *QList) QList_PTR() *QList { - return ptr -} - -func (ptr *QList) Pointer() unsafe.Pointer { - if ptr != nil { - return ptr.ptr - } - return nil -} - -func (ptr *QList) SetPointer(p unsafe.Pointer) { - if ptr != nil { - ptr.ptr = p - } -} - -func PointerFromQList(ptr QList_ITF) unsafe.Pointer { - if ptr != nil { - return ptr.QList_PTR().Pointer() - } - return nil -} - -func NewQListFromPointer(ptr unsafe.Pointer) (n *QList) { - n = new(QList) - n.SetPointer(ptr) - return -} - type QListIterator struct { ptr unsafe.Pointer } @@ -33249,11 +33209,10 @@ func (ptr *QPropertyAnimation) TargetObject() *QObject { } type QQueue struct { - QList + ptr unsafe.Pointer } type QQueue_ITF interface { - QList_ITF QQueue_PTR() *QQueue } @@ -33263,14 +33222,14 @@ func (ptr *QQueue) QQueue_PTR() *QQueue { func (ptr *QQueue) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QQueue) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } @@ -41600,11 +41559,10 @@ const ( ) type QStringList struct { - QList + ptr unsafe.Pointer } type QStringList_ITF interface { - QList_ITF QStringList_PTR() *QStringList } @@ -41614,14 +41572,14 @@ func (ptr *QStringList) QStringList_PTR() *QStringList { func (ptr *QStringList) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QStringList) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } diff --git a/datavisualization/datavisualization.cpp b/datavisualization/datavisualization.cpp index 50a292a0..719073c0 100644 --- a/datavisualization/datavisualization.cpp +++ b/datavisualization/datavisualization.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -68,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -541,8 +539,6 @@ void* Q3DCamera_NewQ3DCamera(void* parent) return new MyQ3DCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DCamera(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -869,8 +865,6 @@ void* Q3DInputHandler_NewQ3DInputHandler(void* parent) return new MyQ3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DInputHandler(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1090,8 +1084,6 @@ void* Q3DLight_NewQ3DLight(void* parent) return new MyQ3DLight(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DLight(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DLight(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DLight(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1197,8 +1189,6 @@ void* Q3DObject_NewQ3DObject(void* parent) return new MyQ3DObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DObject(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1546,8 +1536,6 @@ void* Q3DScene_NewQ3DScene(void* parent) return new MyQ3DScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DScene(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2144,8 +2132,6 @@ void* Q3DTheme_NewQ3DTheme2(long long themeType, void* parent) return new MyQ3DTheme(static_cast(themeType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DTheme(static_cast(themeType), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DTheme(static_cast(themeType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DTheme(static_cast(themeType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2185,8 +2171,6 @@ void* Q3DTheme_NewQ3DTheme(void* parent) return new MyQ3DTheme(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DTheme(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQ3DTheme(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQ3DTheme(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3863,8 +3847,6 @@ void* QAbstract3DInputHandler_NewQAbstract3DInputHandler(void* parent) return new MyQAbstract3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstract3DInputHandler(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstract3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstract3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4604,8 +4586,6 @@ void* QBar3DSeries_NewQBar3DSeries2(void* dataProxy, void* parent) return new MyQBar3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBar3DSeries(static_cast(dataProxy), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBar3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBar3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4645,8 +4625,6 @@ void* QBar3DSeries_NewQBar3DSeries(void* parent) return new MyQBar3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBar3DSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBar3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBar3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4860,8 +4838,6 @@ void* QBarDataProxy_NewQBarDataProxy(void* parent) return new MyQBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5151,8 +5127,6 @@ void* QCategory3DAxis_NewQCategory3DAxis(void* parent) return new MyQCategory3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCategory3DAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCategory3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCategory3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5266,8 +5240,6 @@ void* QCustom3DItem_NewQCustom3DItem(void* parent) return new MyQCustom3DItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DItem(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustom3DItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5307,8 +5279,6 @@ void* QCustom3DItem_NewQCustom3DItem2(struct QtDataVisualization_PackedString me return new MyQCustom3DItem(QString::fromUtf8(meshFile.data, meshFile.len), *static_cast(position), *static_cast(scaling), *static_cast(rotation), *static_cast(texture), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DItem(QString::fromUtf8(meshFile.data, meshFile.len), *static_cast(position), *static_cast(scaling), *static_cast(rotation), *static_cast(texture), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustom3DItem(QString::fromUtf8(meshFile.data, meshFile.len), *static_cast(position), *static_cast(scaling), *static_cast(rotation), *static_cast(texture), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DItem(QString::fromUtf8(meshFile.data, meshFile.len), *static_cast(position), *static_cast(scaling), *static_cast(rotation), *static_cast(texture), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5630,8 +5600,6 @@ void* QCustom3DLabel_NewQCustom3DLabel(void* parent) return new MyQCustom3DLabel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DLabel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustom3DLabel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DLabel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5671,8 +5639,6 @@ void* QCustom3DLabel_NewQCustom3DLabel2(struct QtDataVisualization_PackedString return new MyQCustom3DLabel(QString::fromUtf8(text.data, text.len), *static_cast(font), *static_cast(position), *static_cast(scaling), *static_cast(rotation), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DLabel(QString::fromUtf8(text.data, text.len), *static_cast(font), *static_cast(position), *static_cast(scaling), *static_cast(rotation), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustom3DLabel(QString::fromUtf8(text.data, text.len), *static_cast(font), *static_cast(position), *static_cast(scaling), *static_cast(rotation), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DLabel(QString::fromUtf8(text.data, text.len), *static_cast(font), *static_cast(position), *static_cast(scaling), *static_cast(rotation), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5943,8 +5909,6 @@ void* QCustom3DVolume_NewQCustom3DVolume(void* parent) return new MyQCustom3DVolume(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DVolume(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustom3DVolume(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustom3DVolume(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6489,8 +6453,6 @@ void* QHeightMapSurfaceDataProxy_NewQHeightMapSurfaceDataProxy(void* parent) return new MyQHeightMapSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHeightMapSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6530,8 +6492,6 @@ void* QHeightMapSurfaceDataProxy_NewQHeightMapSurfaceDataProxy2(void* image, voi return new MyQHeightMapSurfaceDataProxy(*static_cast(image), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(*static_cast(image), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHeightMapSurfaceDataProxy(*static_cast(image), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(*static_cast(image), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6571,8 +6531,6 @@ void* QHeightMapSurfaceDataProxy_NewQHeightMapSurfaceDataProxy3(struct QtDataVis return new MyQHeightMapSurfaceDataProxy(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHeightMapSurfaceDataProxy(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHeightMapSurfaceDataProxy(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6831,8 +6789,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy2(void* itemModel, void* p return new MyQItemModelBarDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6872,8 +6828,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy4(void* itemModel, struct return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6913,8 +6867,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy5(void* itemModel, struct return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6954,8 +6906,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy7(void* itemModel, struct return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6995,8 +6945,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy6(void* itemModel, struct return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(valueRole.data, valueRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7036,8 +6984,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy3(void* itemModel, struct return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(itemModel), QString::fromUtf8(valueRole.data, valueRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7077,8 +7023,6 @@ void* QItemModelBarDataProxy_NewQItemModelBarDataProxy(void* parent) return new MyQItemModelBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelBarDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7663,8 +7607,6 @@ void* QItemModelScatterDataProxy_NewQItemModelScatterDataProxy2(void* itemModel, return new MyQItemModelScatterDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelScatterDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7704,8 +7646,6 @@ void* QItemModelScatterDataProxy_NewQItemModelScatterDataProxy3(void* itemModel, return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7745,8 +7685,6 @@ void* QItemModelScatterDataProxy_NewQItemModelScatterDataProxy4(void* itemModel, return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(itemModel), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rotationRole.data, rotationRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7786,8 +7724,6 @@ void* QItemModelScatterDataProxy_NewQItemModelScatterDataProxy(void* parent) return new MyQItemModelScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8224,8 +8160,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy2(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8265,8 +8199,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy5(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8306,8 +8238,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy7(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(xPosRole.data, xPosRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(zPosRole.data, zPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8347,8 +8277,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy4(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8388,8 +8316,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy6(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(rowRole.data, rowRole.len), QString::fromUtf8(columnRole.data, columnRole.len), QString::fromUtf8(yPosRole.data, yPosRole.len), QString::fromUtf8(rowCategories.data, rowCategories.len).split("|", QString::SkipEmptyParts), QString::fromUtf8(columnCategories.data, columnCategories.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8429,8 +8355,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy3(void* itemModel, return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(itemModel), QString::fromUtf8(yPosRole.data, yPosRole.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8470,8 +8394,6 @@ void* QItemModelSurfaceDataProxy_NewQItemModelSurfaceDataProxy(void* parent) return new MyQItemModelSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemModelSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemModelSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9118,8 +9040,6 @@ void* QLogValue3DAxisFormatter_NewQLogValue3DAxisFormatter(void* parent) return new MyQLogValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLogValue3DAxisFormatter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLogValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLogValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9277,8 +9197,6 @@ void* QScatter3DSeries_NewQScatter3DSeries(void* parent) return new MyQScatter3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatter3DSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScatter3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatter3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9318,8 +9236,6 @@ void* QScatter3DSeries_NewQScatter3DSeries2(void* dataProxy, void* parent) return new MyQScatter3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatter3DSeries(static_cast(dataProxy), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScatter3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatter3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9560,8 +9476,6 @@ void* QScatterDataProxy_NewQScatterDataProxy(void* parent) return new MyQScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatterDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScatterDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9803,8 +9717,6 @@ void* QSurface3DSeries_NewQSurface3DSeries(void* parent) return new MyQSurface3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurface3DSeries(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSurface3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurface3DSeries(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9844,8 +9756,6 @@ void* QSurface3DSeries_NewQSurface3DSeries2(void* dataProxy, void* parent) return new MyQSurface3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurface3DSeries(static_cast(dataProxy), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSurface3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurface3DSeries(static_cast(dataProxy), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10163,8 +10073,6 @@ void* QSurfaceDataProxy_NewQSurfaceDataProxy(void* parent) return new MyQSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurfaceDataProxy(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSurfaceDataProxy(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10419,8 +10327,6 @@ void* QTouch3DInputHandler_NewQTouch3DInputHandler(void* parent) return new MyQTouch3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTouch3DInputHandler(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTouch3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTouch3DInputHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10514,8 +10420,6 @@ void* QValue3DAxis_NewQValue3DAxis(void* parent) return new MyQValue3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValue3DAxis(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQValue3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValue3DAxis(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10725,8 +10629,6 @@ void* QValue3DAxisFormatter_NewQValue3DAxisFormatter(void* parent) return new MyQValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValue3DAxisFormatter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValue3DAxisFormatter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/dbus/dbus.cpp b/dbus/dbus.cpp index 960850f6..07857ef3 100644 --- a/dbus/dbus.cpp +++ b/dbus/dbus.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -48,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -109,8 +107,6 @@ void* QDBusAbstractAdaptor_NewQDBusAbstractAdaptor(void* obj) return new MyQDBusAbstractAdaptor(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { return new MyQDBusAbstractAdaptor(static_cast(obj)); - } else if (dynamic_cast(static_cast(obj))) { - return new MyQDBusAbstractAdaptor(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { return new MyQDBusAbstractAdaptor(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { @@ -1239,8 +1235,6 @@ void* QDBusInterface_NewQDBusInterface(struct QtDBus_PackedString service, struc return new MyQDBusInterface(QString::fromUtf8(service.data, service.len), QString::fromUtf8(path.data, path.len), QString::fromUtf8(interfa.data, interfa.len), *static_cast(connection), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusInterface(QString::fromUtf8(service.data, service.len), QString::fromUtf8(path.data, path.len), QString::fromUtf8(interfa.data, interfa.len), *static_cast(connection), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusInterface(QString::fromUtf8(service.data, service.len), QString::fromUtf8(path.data, path.len), QString::fromUtf8(interfa.data, interfa.len), *static_cast(connection), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusInterface(QString::fromUtf8(service.data, service.len), QString::fromUtf8(path.data, path.len), QString::fromUtf8(interfa.data, interfa.len), *static_cast(connection), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1863,8 +1857,6 @@ void* QDBusServer_NewQDBusServer2(void* parent) return new MyQDBusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1904,8 +1896,6 @@ void* QDBusServer_NewQDBusServer(struct QtDBus_PackedString address, void* paren return new MyQDBusServer(QString::fromUtf8(address.data, address.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServer(QString::fromUtf8(address.data, address.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusServer(QString::fromUtf8(address.data, address.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServer(QString::fromUtf8(address.data, address.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2177,8 +2167,6 @@ void* QDBusServiceWatcher_NewQDBusServiceWatcher(void* parent) return new MyQDBusServiceWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServiceWatcher(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusServiceWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServiceWatcher(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2218,8 +2206,6 @@ void* QDBusServiceWatcher_NewQDBusServiceWatcher2(struct QtDBus_PackedString ser return new MyQDBusServiceWatcher(QString::fromUtf8(service.data, service.len), *static_cast(connection), static_cast(watchMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServiceWatcher(QString::fromUtf8(service.data, service.len), *static_cast(connection), static_cast(watchMode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusServiceWatcher(QString::fromUtf8(service.data, service.len), *static_cast(connection), static_cast(watchMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusServiceWatcher(QString::fromUtf8(service.data, service.len), *static_cast(connection), static_cast(watchMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2649,8 +2635,6 @@ void* QDBusVirtualObject_NewQDBusVirtualObject(void* parent) return new MyQDBusVirtualObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusVirtualObject(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDBusVirtualObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDBusVirtualObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/designer/designer.cpp b/designer/designer.cpp index 727c646b..be48cf5c 100644 --- a/designer/designer.cpp +++ b/designer/designer.cpp @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -76,7 +75,6 @@ #include #include #include -#include #include #include #include @@ -1190,8 +1188,6 @@ void* QDesignerFormEditorInterface_NewQDesignerFormEditorInterface(void* parent) return new MyQDesignerFormEditorInterface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDesignerFormEditorInterface(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDesignerFormEditorInterface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDesignerFormEditorInterface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/gamepad/gamepad.cpp b/gamepad/gamepad.cpp index 8588d46d..07a9ccd8 100644 --- a/gamepad/gamepad.cpp +++ b/gamepad/gamepad.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -33,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -119,8 +117,6 @@ void* QGamepad_NewQGamepad(int deviceId, void* parent) return new MyQGamepad(deviceId, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGamepad(deviceId, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGamepad(deviceId, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGamepad(deviceId, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -875,8 +871,6 @@ void* QGamepadKeyNavigation_NewQGamepadKeyNavigation(void* parent) return new MyQGamepadKeyNavigation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGamepadKeyNavigation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGamepadKeyNavigation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGamepadKeyNavigation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/gui/gui.cpp b/gui/gui.cpp index cf887552..df0e30e8 100644 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -100,7 +100,6 @@ #include #include #include -#include #include #include #include @@ -214,7 +213,6 @@ #include #include #include -#include #include #include #include @@ -222,7 +220,6 @@ #include #include #include -#include #include #include #include @@ -977,8 +974,6 @@ void* QAccessibleEvent_NewQAccessibleEvent(void* object, long long ty) return new MyQAccessibleEvent(static_cast(object), static_cast(ty)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleEvent(static_cast(object), static_cast(ty)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleEvent(static_cast(object), static_cast(ty)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleEvent(static_cast(object), static_cast(ty)); } else if (dynamic_cast(static_cast(object))) { @@ -1471,8 +1466,6 @@ void* QAccessiblePlugin_NewQAccessiblePlugin(void* parent) return new MyQAccessiblePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccessiblePlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAccessiblePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccessiblePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2013,8 +2006,6 @@ void* QAccessibleTableModelChangeEvent_NewQAccessibleTableModelChangeEvent(void* return new MyQAccessibleTableModelChangeEvent(static_cast(object), static_cast(changeType)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTableModelChangeEvent(static_cast(object), static_cast(changeType)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTableModelChangeEvent(static_cast(object), static_cast(changeType)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTableModelChangeEvent(static_cast(object), static_cast(changeType)); } else if (dynamic_cast(static_cast(object))) { @@ -2171,8 +2162,6 @@ void* QAccessibleTextCursorEvent_NewQAccessibleTextCursorEvent(void* object, int return new MyQAccessibleTextCursorEvent(static_cast(object), cursorPos); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextCursorEvent(static_cast(object), cursorPos); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTextCursorEvent(static_cast(object), cursorPos); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextCursorEvent(static_cast(object), cursorPos); } else if (dynamic_cast(static_cast(object))) { @@ -2249,8 +2238,6 @@ void* QAccessibleTextInsertEvent_NewQAccessibleTextInsertEvent(void* object, int return new MyQAccessibleTextInsertEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextInsertEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTextInsertEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextInsertEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { @@ -2459,8 +2446,6 @@ void* QAccessibleTextRemoveEvent_NewQAccessibleTextRemoveEvent(void* object, int return new MyQAccessibleTextRemoveEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextRemoveEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTextRemoveEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextRemoveEvent(static_cast(object), position, QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { @@ -2547,8 +2532,6 @@ void* QAccessibleTextSelectionEvent_NewQAccessibleTextSelectionEvent(void* objec return new MyQAccessibleTextSelectionEvent(static_cast(object), start, end); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextSelectionEvent(static_cast(object), start, end); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTextSelectionEvent(static_cast(object), start, end); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextSelectionEvent(static_cast(object), start, end); } else if (dynamic_cast(static_cast(object))) { @@ -2640,8 +2623,6 @@ void* QAccessibleTextUpdateEvent_NewQAccessibleTextUpdateEvent(void* object, int return new MyQAccessibleTextUpdateEvent(static_cast(object), position, QString::fromUtf8(oldText.data, oldText.len), QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextUpdateEvent(static_cast(object), position, QString::fromUtf8(oldText.data, oldText.len), QString::fromUtf8(text.data, text.len)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleTextUpdateEvent(static_cast(object), position, QString::fromUtf8(oldText.data, oldText.len), QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleTextUpdateEvent(static_cast(object), position, QString::fromUtf8(oldText.data, oldText.len), QString::fromUtf8(text.data, text.len)); } else if (dynamic_cast(static_cast(object))) { @@ -2743,8 +2724,6 @@ void* QAccessibleValueChangeEvent_NewQAccessibleValueChangeEvent(void* object, v return new MyQAccessibleValueChangeEvent(static_cast(object), *static_cast(value)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleValueChangeEvent(static_cast(object), *static_cast(value)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQAccessibleValueChangeEvent(static_cast(object), *static_cast(value)); } else if (dynamic_cast(static_cast(object))) { return new MyQAccessibleValueChangeEvent(static_cast(object), *static_cast(value)); } else if (dynamic_cast(static_cast(object))) { @@ -4286,8 +4265,6 @@ void* QDoubleValidator_NewQDoubleValidator(void* parent) return new MyQDoubleValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDoubleValidator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDoubleValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDoubleValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4327,8 +4304,6 @@ void* QDoubleValidator_NewQDoubleValidator2(double bottom, double top, int decim return new MyQDoubleValidator(bottom, top, decimals, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDoubleValidator(bottom, top, decimals, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDoubleValidator(bottom, top, decimals, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDoubleValidator(bottom, top, decimals, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4463,8 +4438,6 @@ void* QDrag_NewQDrag(void* dragSource) return new MyQDrag(static_cast(dragSource)); } else if (dynamic_cast(static_cast(dragSource))) { return new MyQDrag(static_cast(dragSource)); - } else if (dynamic_cast(static_cast(dragSource))) { - return new MyQDrag(static_cast(dragSource)); } else if (dynamic_cast(static_cast(dragSource))) { return new MyQDrag(static_cast(dragSource)); } else if (dynamic_cast(static_cast(dragSource))) { @@ -6120,8 +6093,6 @@ void* QGenericPlugin_NewQGenericPlugin(void* parent) return new MyQGenericPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGenericPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGenericPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGenericPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7826,8 +7797,6 @@ void* QIconEnginePlugin_NewQIconEnginePlugin(void* parent) return new MyQIconEnginePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIconEnginePlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIconEnginePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIconEnginePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8041,7 +8010,11 @@ public: MyQImage(const QImage &image) : QImage(image) {}; MyQImage(const QSize &size, QImage::Format format) : QImage(size, format) {}; MyQImage(const QString &fileName, const char *format = Q_NULLPTR) : QImage(fileName, format) {}; + MyQImage(const uchar *data, int width, int height, QImage::Format format) : QImage(data, width, height, format) {}; + MyQImage(const uchar *data, int width, int height, int bytesPerLine, QImage::Format format) : QImage(data, width, height, bytesPerLine, format) {}; MyQImage(int width, int height, QImage::Format format) : QImage(width, height, format) {}; + MyQImage(uchar *data, int width, int height, QImage::Format format) : QImage(data, width, height, format) {}; + MyQImage(uchar *data, int width, int height, int bytesPerLine, QImage::Format format) : QImage(data, width, height, bytesPerLine, format) {}; ~MyQImage() { callbackQImage_DestroyQImage(this); }; QPaintEngine * paintEngine() const { return static_cast(callbackQImage_PaintEngine(const_cast(static_cast(this)))); }; int metric(QPaintDevice::PaintDeviceMetric metric) const { return callbackQPaintDevice_Metric(const_cast(static_cast(this)), metric); }; @@ -8097,11 +8070,31 @@ void* QImage_NewQImage9(struct QtGui_PackedString fileName, char* format) return new MyQImage(QString::fromUtf8(fileName.data, fileName.len), const_cast(format)); } +void* QImage_NewQImage5(char* data, int width, int height, long long format) +{ + return new MyQImage(const_cast(static_cast(static_cast(data))), width, height, static_cast(format)); +} + +void* QImage_NewQImage7(char* data, int width, int height, int bytesPerLine, long long format) +{ + return new MyQImage(const_cast(static_cast(static_cast(data))), width, height, bytesPerLine, static_cast(format)); +} + void* QImage_NewQImage3(int width, int height, long long format) { return new MyQImage(width, height, static_cast(format)); } +void* QImage_NewQImage4(char* data, int width, int height, long long format) +{ + return new MyQImage(static_cast(static_cast(data)), width, height, static_cast(format)); +} + +void* QImage_NewQImage6(char* data, int width, int height, int bytesPerLine, long long format) +{ + return new MyQImage(static_cast(static_cast(data)), width, height, bytesPerLine, static_cast(format)); +} + long long QImage_QImage_ToImageFormat(void* format) { return QImage::toImageFormat(*static_cast(format)); @@ -8726,8 +8719,6 @@ void* QImageIOPlugin_NewQImageIOPlugin(void* parent) return new MyQImageIOPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQImageIOPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQImageIOPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQImageIOPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10157,8 +10148,6 @@ void* QIntValidator_NewQIntValidator(void* parent) return new MyQIntValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIntValidator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIntValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIntValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10198,8 +10187,6 @@ void* QIntValidator_NewQIntValidator2(int minimum, int maximum, void* parent) return new MyQIntValidator(minimum, maximum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIntValidator(minimum, maximum, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIntValidator(minimum, maximum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIntValidator(minimum, maximum, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11248,8 +11235,6 @@ void* QMovie_NewQMovie2(void* device, void* format, void* parent) return new MyQMovie(static_cast(device), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(static_cast(device), *static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMovie(static_cast(device), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(static_cast(device), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11289,8 +11274,6 @@ void* QMovie_NewQMovie(void* parent) return new MyQMovie(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMovie(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -11330,8 +11313,6 @@ void* QMovie_NewQMovie3(struct QtGui_PackedString fileName, void* format, void* return new MyQMovie(QString::fromUtf8(fileName.data, fileName.len), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(QString::fromUtf8(fileName.data, fileName.len), *static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMovie(QString::fromUtf8(fileName.data, fileName.len), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMovie(QString::fromUtf8(fileName.data, fileName.len), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12520,8 +12501,6 @@ void* QOpenGLContext_NewQOpenGLContext(void* parent) return new MyQOpenGLContext(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLContext(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLContext(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLContext(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -13170,8 +13149,6 @@ void* QOpenGLDebugLogger_NewQOpenGLDebugLogger(void* parent) return new MyQOpenGLDebugLogger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLDebugLogger(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLDebugLogger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLDebugLogger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -77484,8 +77461,6 @@ void* QOpenGLShader_NewQOpenGLShader(long long ty, void* parent) return new MyQOpenGLShader(static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLShader(static_cast(ty), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLShader(static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLShader(static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -77794,8 +77769,6 @@ void* QOpenGLShaderProgram_NewQOpenGLShaderProgram(void* parent) return new MyQOpenGLShaderProgram(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLShaderProgram(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLShaderProgram(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLShaderProgram(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -79238,8 +79211,6 @@ void* QOpenGLTimeMonitor_NewQOpenGLTimeMonitor(void* parent) return new MyQOpenGLTimeMonitor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLTimeMonitor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLTimeMonitor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLTimeMonitor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -79570,8 +79541,6 @@ void* QOpenGLTimerQuery_NewQOpenGLTimerQuery(void* parent) return new MyQOpenGLTimerQuery(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLTimerQuery(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLTimerQuery(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLTimerQuery(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -79919,8 +79888,6 @@ void* QOpenGLVertexArrayObject_NewQOpenGLVertexArrayObject(void* parent) return new MyQOpenGLVertexArrayObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLVertexArrayObject(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOpenGLVertexArrayObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOpenGLVertexArrayObject(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -84228,8 +84195,6 @@ void* QPictureFormatPlugin_NewQPictureFormatPlugin(void* parent) return new MyQPictureFormatPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPictureFormatPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPictureFormatPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPictureFormatPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -86655,8 +86620,6 @@ void* QRegExpValidator_NewQRegExpValidator(void* parent) return new MyQRegExpValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegExpValidator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRegExpValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegExpValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -86696,8 +86659,6 @@ void* QRegExpValidator_NewQRegExpValidator2(void* rx, void* parent) return new MyQRegExpValidator(*static_cast(rx), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegExpValidator(*static_cast(rx), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRegExpValidator(*static_cast(rx), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegExpValidator(*static_cast(rx), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -86947,8 +86908,6 @@ void* QRegularExpressionValidator_NewQRegularExpressionValidator(void* parent) return new MyQRegularExpressionValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegularExpressionValidator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRegularExpressionValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegularExpressionValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -86988,8 +86947,6 @@ void* QRegularExpressionValidator_NewQRegularExpressionValidator2(void* re, void return new MyQRegularExpressionValidator(*static_cast(re), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegularExpressionValidator(*static_cast(re), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRegularExpressionValidator(*static_cast(re), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRegularExpressionValidator(*static_cast(re), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -88970,8 +88927,6 @@ void* QStandardItemModel_NewQStandardItemModel(void* parent) return new MyQStandardItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStandardItemModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStandardItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStandardItemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -89011,8 +88966,6 @@ void* QStandardItemModel_NewQStandardItemModel2(int rows, int columns, void* par return new MyQStandardItemModel(rows, columns, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStandardItemModel(rows, columns, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStandardItemModel(rows, columns, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStandardItemModel(rows, columns, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -90952,8 +90905,6 @@ void* QSyntaxHighlighter_NewQSyntaxHighlighter(void* parent) return new MyQSyntaxHighlighter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSyntaxHighlighter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSyntaxHighlighter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSyntaxHighlighter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -92584,8 +92535,6 @@ void* QTextDocument_NewQTextDocument(void* parent) return new MyQTextDocument(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextDocument(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTextDocument(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextDocument(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -92625,8 +92574,6 @@ void* QTextDocument_NewQTextDocument2(struct QtGui_PackedString text, void* pare return new MyQTextDocument(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextDocument(QString::fromUtf8(text.data, text.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTextDocument(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextDocument(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -96202,8 +96149,6 @@ void* QValidator_NewQValidator(void* parent) return new MyQValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValidator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQValidator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/gui/gui.go b/gui/gui.go index 6ebfff20..32f81c5c 100644 --- a/gui/gui.go +++ b/gui/gui.go @@ -17962,10 +17962,46 @@ func NewQImage9(fileName string, format string) *QImage { return NewQImageFromPointer(C.QImage_NewQImage9(C.struct_QtGui_PackedString{data: fileNameC, len: C.longlong(len(fileName))}, formatC)) } +func NewQImage5(data string, width int, height int, format QImage__Format) *QImage { + var dataC *C.char + if data != "" { + dataC = C.CString(data) + defer C.free(unsafe.Pointer(dataC)) + } + return NewQImageFromPointer(C.QImage_NewQImage5(dataC, C.int(int32(width)), C.int(int32(height)), C.longlong(format))) +} + +func NewQImage7(data string, width int, height int, bytesPerLine int, format QImage__Format) *QImage { + var dataC *C.char + if data != "" { + dataC = C.CString(data) + defer C.free(unsafe.Pointer(dataC)) + } + return NewQImageFromPointer(C.QImage_NewQImage7(dataC, C.int(int32(width)), C.int(int32(height)), C.int(int32(bytesPerLine)), C.longlong(format))) +} + func NewQImage3(width int, height int, format QImage__Format) *QImage { return NewQImageFromPointer(C.QImage_NewQImage3(C.int(int32(width)), C.int(int32(height)), C.longlong(format))) } +func NewQImage4(data string, width int, height int, format QImage__Format) *QImage { + var dataC *C.char + if data != "" { + dataC = C.CString(data) + defer C.free(unsafe.Pointer(dataC)) + } + return NewQImageFromPointer(C.QImage_NewQImage4(dataC, C.int(int32(width)), C.int(int32(height)), C.longlong(format))) +} + +func NewQImage6(data string, width int, height int, bytesPerLine int, format QImage__Format) *QImage { + var dataC *C.char + if data != "" { + dataC = C.CString(data) + defer C.free(unsafe.Pointer(dataC)) + } + return NewQImageFromPointer(C.QImage_NewQImage6(dataC, C.int(int32(width)), C.int(int32(height)), C.int(int32(bytesPerLine)), C.longlong(format))) +} + func QImage_ToImageFormat(format QPixelFormat_ITF) QImage__Format { return QImage__Format(C.QImage_QImage_ToImageFormat(PointerFromQPixelFormat(format))) } diff --git a/gui/gui.h b/gui/gui.h index 24deacd0..d25b873e 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -1278,7 +1278,11 @@ void* QImage_NewQImage11(void* other); void* QImage_NewQImage10(void* image); void* QImage_NewQImage2(void* size, long long format); void* QImage_NewQImage9(struct QtGui_PackedString fileName, char* format); +void* QImage_NewQImage5(char* data, int width, int height, long long format); +void* QImage_NewQImage7(char* data, int width, int height, int bytesPerLine, long long format); void* QImage_NewQImage3(int width, int height, long long format); +void* QImage_NewQImage4(char* data, int width, int height, long long format); +void* QImage_NewQImage6(char* data, int width, int height, int bytesPerLine, long long format); long long QImage_QImage_ToImageFormat(void* format); void* QImage_QImage_TrueMatrix(void* matrix, int width, int height); void* QImage_QImage_ToPixelFormat(long long format); diff --git a/help/help.cpp b/help/help.cpp index 744c1826..33214d12 100644 --- a/help/help.cpp +++ b/help/help.cpp @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -77,7 +76,6 @@ #include #include #include -#include #include #include #include @@ -1870,8 +1868,6 @@ void* QHelpEngine_NewQHelpEngine(struct QtHelp_PackedString collectionFile, void return new MyQHelpEngine(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpEngine(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHelpEngine(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpEngine(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1969,8 +1965,6 @@ void* QHelpEngineCore_NewQHelpEngineCore(struct QtHelp_PackedString collectionFi return new MyQHelpEngineCore(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpEngineCore(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHelpEngineCore(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpEngineCore(QString::fromUtf8(collectionFile.data, collectionFile.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4219,8 +4213,6 @@ void* QHelpSearchEngine_NewQHelpSearchEngine(void* helpEngine, void* parent) return new MyQHelpSearchEngine(static_cast(helpEngine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpSearchEngine(static_cast(helpEngine), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHelpSearchEngine(static_cast(helpEngine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHelpSearchEngine(static_cast(helpEngine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/internal/binding/converter/body_input_go.go b/internal/binding/converter/body_input_go.go index 6f860d38..84edb0a3 100644 --- a/internal/binding/converter/body_input_go.go +++ b/internal/binding/converter/body_input_go.go @@ -57,19 +57,13 @@ func GoInputParametersForJS(function *parser.Function) string { input := make([]string, 0) if !(function.Static || function.Meta == parser.CONSTRUCTOR) { - input = append(input, "(uintptr)(ptr.Pointer())") + input = append(input, "uintptr(ptr.Pointer())") } if function.SignalMode == "" { for _, parameter := range function.Parameters { if parameter.PureGoType != "" { - input = append(input, GoInputJS(fmt.Sprintf("uintptr(unsafe.Pointer(%v%v))", - func() string { - if !strings.HasPrefix(parameter.PureGoType, "*") { - return "&" - } - return "" - }(), parser.CleanName(parameter.Name, parameter.Value)), parameter.Value, function)) + input = append(input, GoInputJS(fmt.Sprintf("%vTID", parser.CleanName(parameter.Name, parameter.Value)), parameter.Value, function)) } else { input = append(input, GoInputJS(parameter.Name, parameter.Value, function)) } diff --git a/internal/binding/converter/input.go b/internal/binding/converter/input.go index 8b2d80ef..5788a71c 100644 --- a/internal/binding/converter/input.go +++ b/internal/binding/converter/input.go @@ -231,12 +231,11 @@ func cppInput(name, value string, f *parser.Function) string { if parser.UseJs() { if strings.Contains(vOld, "*") { if strings.Contains(vOld, "const") { - return fmt.Sprintf("QString::fromStdString(%v.dataP).toUtf8().constData()", name) + return fmt.Sprintf("QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData()", name) } - return fmt.Sprintf("const_cast(QString::fromStdString(%v.dataP).toUtf8().constData())", name) + return fmt.Sprintf("const_cast(QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData())", name) } - - return fmt.Sprintf("*const_cast(QString::fromStdString(%v.dataP).toUtf8().constData())", name) + return fmt.Sprintf("*const_cast(QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData())", name) } if strings.Contains(vOld, "*") { if strings.Contains(vOld, "const") { @@ -253,11 +252,11 @@ func cppInput(name, value string, f *parser.Function) string { if parser.UseJs() { if strings.Contains(vOld, "*") { if strings.Contains(vOld, "const") { - return fmt.Sprintf("const_cast(static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v.dataP).toUtf8().constData()))))", value, value, name) + return fmt.Sprintf("const_cast(static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData()))))", value, value, name) } - return fmt.Sprintf("static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v.dataP).toUtf8().constData())))", value, name) + return fmt.Sprintf("static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData())))", value, name) } - return fmt.Sprintf("*static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v.dataP).toUtf8().constData())))", value, name) + return fmt.Sprintf("*static_cast<%v*>(static_cast(const_cast(QString::fromStdString(%v[\"dataP\"].as()).toUtf8().constData())))", value, name) } if strings.Contains(vOld, "*") { if strings.Contains(vOld, "const") { @@ -275,7 +274,7 @@ func cppInput(name, value string, f *parser.Function) string { if name == "tempVal" { return fmt.Sprintf("new QString(QString::fromStdString(%[1]v))", name) } - return fmt.Sprintf("new QString((%[1]v.dataP != \"\") ? QString::fromStdString(%[1]v.dataP) : QString::fromUtf8(%[1]v.data, %[1]v.len))", name) + return fmt.Sprintf("new QString(QString::fromStdString(%v[\"dataP\"].as()))", name) } return fmt.Sprintf("new QString(QString::fromUtf8(%[1]v.data, %[1]v.len))", name) } @@ -288,7 +287,7 @@ func cppInput(name, value string, f *parser.Function) string { if name == "tempVal" { return fmt.Sprintf("QString::fromStdString(%[1]v)", name) } - return fmt.Sprintf("(%[1]v.dataP != \"\") ? QString::fromStdString(%[1]v.dataP) : QString::fromUtf8(%[1]v.data, %[1]v.len)", name) + return fmt.Sprintf("QString::fromStdString(%v[\"dataP\"].as())", name) } return fmt.Sprintf("QString::fromUtf8(%[1]v.data, %[1]v.len)", name) } @@ -307,7 +306,7 @@ func cppInput(name, value string, f *parser.Function) string { if name == "tempVal" { return fmt.Sprintf("QString::fromStdString(%[1]v).split(\"|\", QString::SkipEmptyParts)", name) } - return fmt.Sprintf("(%[1]v.dataP != \"\") ? QString::fromStdString(%[1]v.dataP).split(\"|\", QString::SkipEmptyParts) : QString::fromUtf8(%[1]v.data, %[1]v.len).split(\"|\", QString::SkipEmptyParts)", name) + return fmt.Sprintf("QString::fromStdString(%v[\"dataP\"].as()).split(\"|\", QString::SkipEmptyParts)", name) } return fmt.Sprintf("QString::fromUtf8(%[1]v.data, %[1]v.len).split(\"|\", QString::SkipEmptyParts)", name) } @@ -494,7 +493,7 @@ func GoInputJS(name, value string, f *parser.Function) string { case "void", "GLvoid", "": { if strings.Contains(vOld, "*") { - return fmt.Sprintf("(uintptr)(%v)", name) + return fmt.Sprintf("uintptr(%v)", name) } return name } @@ -603,27 +602,27 @@ func GoInputJS(name, value string, f *parser.Function) string { } if m := module(parser.State.ClassMap[value].Module); m != module(f) { if _, ok := parser.State.ClassMap[f.ClassName()].WeakLink[parser.State.ClassMap[value].Module]; ok { - return fmt.Sprintf("(uintptr)(unsafe.Pointer(%v))", name) + return fmt.Sprintf("uintptr(unsafe.Pointer(%v))", name) } - return fmt.Sprintf("(uintptr)(%v.PointerFrom%v(%v))", m, strings.Title(value), name) + return fmt.Sprintf("uintptr(%v.PointerFrom%v(%v))", m, strings.Title(value), name) } - return fmt.Sprintf("(uintptr)(PointerFrom%v(%v))", strings.Title(value), name) + return fmt.Sprintf("uintptr(PointerFrom%v(%v))", strings.Title(value), name) } case parser.IsPackedList(value): { if strings.ContainsAny(name, "*&()[]") { - return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_newList%v())\nfor _,v := range %v{\ntmpList.__%v_setList%v(v)\n}\nreturn (uintptr)(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, f.OverloadNumber, name, f.Name, f.OverloadNumber) + return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_newList%v())\nfor _,v := range %v{\ntmpList.__%v_setList%v(v)\n}\nreturn uintptr(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, f.OverloadNumber, name, f.Name, f.OverloadNumber) } - return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_%v_newList%v())\nfor _,v := range %v{\ntmpList.__%v_%v_setList%v(v)\n}\nreturn (uintptr)(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, name, f.OverloadNumber, name, f.Name, name, f.OverloadNumber) + return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_%v_newList%v())\nfor _,v := range %v{\ntmpList.__%v_%v_setList%v(v)\n}\nreturn uintptr(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, name, f.OverloadNumber, name, f.Name, name, f.OverloadNumber) } case parser.IsPackedMap(value): { if strings.ContainsAny(name, "*&()[]") { - return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_newList%v())\nfor k,v := range %v{\ntmpList.__%v_setList%v(k, v)\n}\nreturn (uintptr)(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, f.OverloadNumber, name, f.Name, f.OverloadNumber) + return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_newList%v())\nfor k,v := range %v{\ntmpList.__%v_setList%v(k, v)\n}\nreturn uintptr(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, f.OverloadNumber, name, f.Name, f.OverloadNumber) } - return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_%v_newList%v())\nfor k,v := range %v{\ntmpList.__%v_%v_setList%v(k, v)\n}\nreturn (uintptr)(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, name, f.OverloadNumber, name, f.Name, name, f.OverloadNumber) + return fmt.Sprintf("func() uintptr {\ntmpList := New%vFromPointer(New%vFromPointer(nil).__%v_%v_newList%v())\nfor k,v := range %v{\ntmpList.__%v_%v_setList%v(k, v)\n}\nreturn uintptr(tmpList.Pointer())\n}()", strings.Title(f.ClassName()), strings.Title(f.ClassName()), f.Name, name, f.OverloadNumber, name, f.Name, name, f.OverloadNumber) } } diff --git a/internal/binding/converter/output.go b/internal/binding/converter/output.go index b9543777..2b76781b 100644 --- a/internal/binding/converter/output.go +++ b/internal/binding/converter/output.go @@ -455,7 +455,7 @@ func CppOutput(name, value string, f *parser.Function) string { if parser.UseJs() { if f.IsMap { out := cppOutput(fmt.Sprintf("({%v tmp = %v->value%v; if (i == %v->size()-1) { %v->~%v(); }; tmp; })", value, strings.Split(name, "->")[0], "("+strings.TrimSuffix(strings.Split(name, "_atList(")[1], ", i)")+")", strings.Split(name, "->")[0], strings.Split(name, "->")[0], parser.CleanValue(f.Container)), value, f) - if !strings.Contains(cppOutput(name, value, f), "_Packed") && f.BoundByEmscripten { + if !strings.Contains(cppOutput(name, value, f), "emscripten::val") && f.BoundByEmscripten { if !strings.Contains(out, "emscripten::val::global") { out = "reinterpret_cast(" + out + ")" } @@ -463,7 +463,7 @@ func CppOutput(name, value string, f *parser.Function) string { return out } out := cppOutput(fmt.Sprintf("({%v tmp = %v->at%v; if (i == %v->size()-1) { %v->~%v(); }; tmp; })", value, strings.Split(name, "->")[0], "("+strings.Split(name, "_atList(")[1], strings.Split(name, "->")[0], strings.Split(name, "->")[0], parser.CleanValue(f.Container)), value, f) - if !strings.Contains(cppOutput(name, value, f), "_Packed") && f.BoundByEmscripten { + if !strings.Contains(cppOutput(name, value, f), "emscripten::val") && f.BoundByEmscripten { if !strings.Contains(out, "emscripten::val::global") { out = "reinterpret_cast(" + out + ")" } @@ -496,7 +496,7 @@ func CppOutput(name, value string, f *parser.Function) string { if parser.UseJs() && f.SignalMode != parser.CALLBACK { for _, p := range f.Parameters { - if strings.Contains(cppType(f, p.Value), "_Packed") && isClass(parser.CleanValue(f.Output)) && !strings.Contains(cppType(f, f.Output), "_Packed") && f.BoundByEmscripten { + if strings.Contains(cppType(f, p.Value), "emscripten::val") && isClass(parser.CleanValue(f.Output)) && !strings.Contains(cppType(f, f.Output), "emscripten::val") && f.BoundByEmscripten { if !strings.Contains(out, "emscripten::val::global") && !strings.ContainsAny(out, ";") { return fmt.Sprintf("reinterpret_cast(%v)", out) } @@ -505,7 +505,7 @@ func CppOutput(name, value string, f *parser.Function) string { } if parser.UseJs() && f.SignalMode != parser.CALLBACK { - if isClass(parser.CleanValue(f.Output)) && !strings.Contains(cppType(f, f.Output), "_Packed") && f.BoundByEmscripten { + if isClass(parser.CleanValue(f.Output)) && !strings.Contains(cppType(f, f.Output), "emscripten::val") && f.BoundByEmscripten { if !strings.Contains(out, "emscripten::val::global") { if strings.Contains(out, "; new") { return strings.Replace(strings.Replace(out, "; new", "; reinterpret_cast(new", -1), "; })", "); })", -1) @@ -536,13 +536,14 @@ func cppOutputPacked(name, value string, f *parser.Function) string { var out = CppOutput(name, value, f) if strings.Contains(out, "_PackedString") { - if parser.UseJs() { - return fmt.Sprintf("%vPacked.dataP", parser.CleanName(name, value)) - } return fmt.Sprintf("%vPacked", parser.CleanName(name, value)) } if parser.UseJs() { + if strings.Contains(out, "WHITESPACE") { + return out + "[\"dataP\"].as()" + } + if isClass(parser.CleanValue(value)) && !strings.Contains(out, "emscripten::val::global") { return "reinterpret_cast(" + out + ")" } @@ -551,9 +552,9 @@ func cppOutputPacked(name, value string, f *parser.Function) string { return out } -func cppOutputPackingForJs(name, length string) string { +func cppOutputPackingStringForJs(name, length string) string { if parser.UseJs() { - return fmt.Sprintf(", QString::fromUtf8(%v, %v).toStdString()", name, length) + return fmt.Sprintf("emscripten::val ret = emscripten::val::object(); ret.set(\"dataP\", QString::fromUtf8(%v, %v).toStdString()); ret.set(\"len\", %v); ret;", name, length, length) } return "" } @@ -578,65 +579,96 @@ func cppOutput(name, value string, f *parser.Function) string { switch value { case "char", "qint8": { - if strings.Contains(vOld, "*") { - - var fSizeVariable string - for _, p := range f.Parameters { - if strings.Contains(p.Value, "int") { - fSizeVariable = parser.CleanName(p.Name, p.Value) - break - } - } - - if fSizeVariable == "" && strings.Contains(strings.ToLower(f.Name), "data") && parser.State.ClassMap[f.ClassName()].HasFunctionWithName("size") { - fSizeVariable = fmt.Sprintf("static_cast<%v*>(ptr)->size()", f.ClassName()) - } - - if strings.Contains(vOld, "const") { - if fSizeVariable != "" { - return fmt.Sprintf("%v_PackedString { const_cast(%v), %v%v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, fSizeVariable, cppOutputPackingForJs(name, fSizeVariable)) - } - return fmt.Sprintf("%v_PackedString { const_cast(%v), -1%v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, cppOutputPackingForJs(name, "-1")) - } else { - if fSizeVariable != "" { - return fmt.Sprintf("%v_PackedString { %v, %v%v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, fSizeVariable, cppOutputPackingForJs(name, fSizeVariable)) - } - return fmt.Sprintf("%v_PackedString { %v, -1%v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, cppOutputPackingForJs(name, "-1")) + fSizeVariable := "-1" + for _, p := range f.Parameters { + if strings.Contains(p.Value, "int") { + fSizeVariable = parser.CleanName(p.Name, p.Value) + break } } - return fmt.Sprintf("({ char t%v = %v; %v_PackedString { &t%v, -1%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, cppOutputPackingForJs("&t"+tHashName, "-1")) + if fSizeVariable == "-1" && strings.Contains(strings.ToLower(f.Name), "data") && parser.State.ClassMap[f.ClassName()].HasFunctionWithName("size") { + fSizeVariable = fmt.Sprintf("static_cast<%v*>(ptr)->size()", f.ClassName()) + } + + if strings.Contains(vOld, "*") { + if strings.Contains(vOld, "const") { + if parser.UseJs() { + return "({ " + cppOutputPackingStringForJs(fmt.Sprintf("const_cast(%v)", name), fSizeVariable) + " })" + } + return fmt.Sprintf("%v_PackedString { const_cast(%v), %v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, fSizeVariable) + } else { + if parser.UseJs() { + return "({ " + cppOutputPackingStringForJs(name, fSizeVariable) + " })" + } + return fmt.Sprintf("%v_PackedString { %v, %v }", strings.Title(parser.State.ClassMap[f.ClassName()].Module), name, fSizeVariable) + } + } + + if parser.UseJs() { + return fmt.Sprintf("({ char t%v = %v; %v })", tHashName, name, cppOutputPackingStringForJs("&t"+tHashName, "-1")) + } + return fmt.Sprintf("({ char t%v = %v; %v_PackedString { &t%v, %v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, "-1") } case "uchar", "quint8", "GLubyte": { + fSizeVariable := "-1" + if fSizeVariable == "-1" && strings.Contains(strings.ToLower(f.Name), "bits") && len(f.Parameters) == 0 && parser.State.ClassMap[f.ClassName()].HasFunctionWithName("mappedBytes") { + fSizeVariable = fmt.Sprintf("static_cast<%v*>(ptr)->mappedBytes()", f.ClassName()) + } + if strings.Contains(vOld, "*") { if strings.Contains(vOld, "const") { - return fmt.Sprintf("({ char* t%v = static_cast(static_cast(const_cast<%v*>(%v))); %v_PackedString { t%v, -1%v }; })", tHashName, value, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, cppOutputPackingForJs("t"+tHashName, "-1")) + if parser.UseJs() { + return fmt.Sprintf("({ char* t%v = static_cast(static_cast(const_cast<%v*>(%v))); %v })", tHashName, value, name, cppOutputPackingStringForJs("t"+tHashName, fSizeVariable)) + } + return fmt.Sprintf("({ char* t%v = static_cast(static_cast(const_cast<%v*>(%v))); %v_PackedString { t%v, %v }; })", tHashName, value, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, fSizeVariable) } - return fmt.Sprintf("({ char* t%v = static_cast(static_cast(%v)); %v_PackedString { t%v, -1%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, cppOutputPackingForJs("t"+tHashName, "-1")) + if parser.UseJs() { + return fmt.Sprintf("({ char* t%v = static_cast(static_cast(%v)); %v })", tHashName, name, cppOutputPackingStringForJs("t"+tHashName, fSizeVariable)) + } + return fmt.Sprintf("({ char* t%v = static_cast(static_cast(%v)); %v_PackedString { t%v, %v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, fSizeVariable) } if strings.Contains(vOld, "const") { - return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(const_cast<%v*>(&pret%v))); %v_PackedString { t%v, -1%v }; })", vOld, tHashName, name, tHashName, value, tHashName, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, cppOutputPackingForJs("t"+tHashName, "-1")) + if parser.UseJs() { + return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(const_cast<%v*>(&pret%v))); %v })", vOld, tHashName, name, tHashName, value, tHashName, cppOutputPackingStringForJs("t"+tHashName, "-1")) + } + return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(const_cast<%v*>(&pret%v))); %v_PackedString { t%v, %v }; })", vOld, tHashName, name, tHashName, value, tHashName, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, "-1") } - return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(&pret%v)); %v_PackedString { t%v, -1%v }; })", vOld, tHashName, name, tHashName, tHashName, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, cppOutputPackingForJs("t"+tHashName, "-1")) + if parser.UseJs() { + return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(&pret%v)); %v })", vOld, tHashName, name, tHashName, tHashName, cppOutputPackingStringForJs("t"+tHashName, "-1")) + } + return fmt.Sprintf("({ %v pret%v = %v; char* t%v = static_cast(static_cast(&pret%v)); %v_PackedString { t%v, %v }; })", vOld, tHashName, name, tHashName, tHashName, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, "-1") } case "QString": { if strings.Contains(vOld, "*") { - return fmt.Sprintf("({ QByteArray t%v = %v->toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName, cppOutputPackingForJs("const_cast(t"+tHashName+".constData()+10)", "t"+tHashName+".size()-10")) + if parser.UseJs() { + return fmt.Sprintf("({ QByteArray t%v = %v->toUtf8(); %v })", tHashName, name, cppOutputPackingStringForJs("const_cast(t"+tHashName+".prepend(\"WHITESPACE\").constData()+10)", "t"+tHashName+".size()-10")) + } + return fmt.Sprintf("({ QByteArray t%v = %v->toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10 }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName) } - return fmt.Sprintf("({ QByteArray t%v = %v.toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName, cppOutputPackingForJs("const_cast(t"+tHashName+".constData()+10)", "t"+tHashName+".size()-10")) + if parser.UseJs() { + return fmt.Sprintf("({ QByteArray t%v = %v.toUtf8(); %v })", tHashName, name, cppOutputPackingStringForJs("const_cast(t"+tHashName+".prepend(\"WHITESPACE\").constData()+10)", "t"+tHashName+".size()-10")) + } + return fmt.Sprintf("({ QByteArray t%v = %v.toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10 }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName) } case "QStringList": { if strings.Contains(vOld, "*") { - return fmt.Sprintf("({ QByteArray t%v = %v->join(\"|\").toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName, cppOutputPackingForJs("const_cast(t"+tHashName+".constData()+10)", "t"+tHashName+".size()-10")) + if parser.UseJs() { + return fmt.Sprintf("({ QByteArray t%v = %v->join(\"|\").toUtf8(); %v })", tHashName, name, cppOutputPackingStringForJs("const_cast(t"+tHashName+".prepend(\"WHITESPACE\").constData()+10)", "t"+tHashName+".size()-10")) + } + return fmt.Sprintf("({ QByteArray t%v = %v->join(\"|\").toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10 }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName) } - return fmt.Sprintf("({ QByteArray t%v = %v.join(\"|\").toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10%v }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName, cppOutputPackingForJs("const_cast(t"+tHashName+".constData()+10)", "t"+tHashName+".size()-10")) + if parser.UseJs() { + return fmt.Sprintf("({ QByteArray t%v = %v.join(\"|\").toUtf8(); %v })", tHashName, name, cppOutputPackingStringForJs("const_cast(t"+tHashName+".prepend(\"WHITESPACE\").constData()+10)", "t"+tHashName+".size()-10")) + } + return fmt.Sprintf("({ QByteArray t%v = %v.join(\"|\").toUtf8(); %v_PackedString { const_cast(t%v.prepend(\"WHITESPACE\").constData()+10), t%v.size()-10 }; })", tHashName, name, strings.Title(parser.State.ClassMap[f.ClassName()].Module), tHashName, tHashName) } case diff --git a/internal/binding/converter/type.go b/internal/binding/converter/type.go index 16be6afb..28c4a6f1 100644 --- a/internal/binding/converter/type.go +++ b/internal/binding/converter/type.go @@ -335,7 +335,7 @@ func cppTypeInput(f *parser.Function, value string) string { case "char", "qint8", "uchar", "quint8", "GLubyte": { if parser.UseJs() { - return fmt.Sprintf("struct %v_PackedString", strings.Title(parser.State.ClassMap[f.ClassName()].Module)) + return "emscripten::val" } return "char*" } @@ -358,6 +358,9 @@ func cppType(f *parser.Function, value string) string { switch value { case "char", "qint8", "uchar", "quint8", "GLubyte", "QString", "QStringList": { + if parser.UseJs() { + return "emscripten::val" + } return fmt.Sprintf("struct %v_PackedString", strings.Title(parser.State.ClassMap[f.ClassName()].Module)) } diff --git a/internal/binding/parser/class.go b/internal/binding/parser/class.go index 1ad41c7d..bdb091af 100644 --- a/internal/binding/parser/class.go +++ b/internal/binding/parser/class.go @@ -42,10 +42,6 @@ type Class struct { } func (c *Class) register(m *Module) { - if _, ok := State.ClassMap[c.Name]; ok { - return - } - c.DocModule = c.Module c.Module = m.Project c.Pkg = m.Pkg diff --git a/internal/binding/parser/class_add.go b/internal/binding/parser/class_add.go index a023a76f..df8e79db 100644 --- a/internal/binding/parser/class_add.go +++ b/internal/binding/parser/class_add.go @@ -140,6 +140,24 @@ func (c *Class) addGeneralFuncs() { Signature: "()", }) } + case "QVideoFrame": + { + //QImage qt_imageFromVideoFrame(const QVideoFrame &frame) + c.Functions = append(c.Functions, &Function{ + Name: "qt_imageFromVideoFrame", + Fullname: fmt.Sprintf("%v::qt_imageFromVideoFrame", c.Name), + Access: "public", + Virtual: "non", + Meta: PLAIN, + NonMember: true, + Static: true, + Output: fmt.Sprintf("QImage"), + Parameters: []*Parameter{ + {Name: "frame", Value: "const QVideoFrame &"}, + }, + Signature: "(const QVideoFrame &frame)", + }) + } } //TODO: make general diff --git a/internal/binding/parser/class_fix.go b/internal/binding/parser/class_fix.go index 6e071bd4..4a3d0ed9 100644 --- a/internal/binding/parser/class_fix.go +++ b/internal/binding/parser/class_fix.go @@ -186,6 +186,11 @@ func (c *Class) fixBases() { return } + if c.Bases == "QList" { + c.Bases = "" + return + } + switch c.Name { case "QChart", "QLegend": c.Bases = "QGraphicsWidget" diff --git a/internal/binding/parser/function.go b/internal/binding/parser/function.go index 3875fd85..e66bc367 100644 --- a/internal/binding/parser/function.go +++ b/internal/binding/parser/function.go @@ -343,8 +343,14 @@ func (f *Function) IsSupported() bool { f.Fullname == "QAndroidBinder::onTransact", f.Fullname == "QtAndroid::checkPermission", - UseJs() && (strings.Contains(f.Name, "ibraryPath") || f.Fullname == "QLockFile::getLockInfo" || f.Name == "metric" || f.Name == "moveCursor" || - f.Name == "inputMethodEvent" || f.Name == "updateInputMethod" || f.Name == "inputMethodQuery"), + UseJs() && + (strings.Contains(f.Name, "ibraryPath") || f.Fullname == "QLockFile::getLockInfo" || f.Name == "metric" || f.Name == "moveCursor" || + f.Name == "inputMethodEvent" || f.Name == "updateInputMethod" || f.Name == "inputMethodQuery" || + f.Fullname == "QHeaderView::isFirstSectionMovable" || f.Fullname == "QXmlSimpleReader::property" || f.Fullname == "QXmlReader::property" || + f.Fullname == "QWebSocket::ignoreSslErrors" || f.Fullname == "QWebSocket::preSharedKeyAuthenticationRequired" || + f.Fullname == "QWebSocket::sslConfiguration" || f.Fullname == "QWebSocket::setSslConfiguration" || + f.Fullname == "QWebSocketServer::peerVerifyError" || (strings.HasPrefix(f.ClassName(), "QWeb") && strings.Contains(f.Name, "slErrors")) || + f.Fullname == "QWebSocketServer::preSharedKeyAuthenticationRequired" || f.Fullname == "QWebSocketServer::setSslConfiguration" || f.Fullname == "QWebSocketServer::sslConfiguration"), f.Name == "qt_metacast", f.Fullname == "QVariant::fromStdVariant", f.Name == "qt_check_for_QGADGET_macro", diff --git a/internal/binding/parser/function_fix.go b/internal/binding/parser/function_fix.go index 36f413c6..f5b2affd 100644 --- a/internal/binding/parser/function_fix.go +++ b/internal/binding/parser/function_fix.go @@ -126,6 +126,14 @@ func (f *Function) fixGeneral_Version() { f.Signature = strings.Replace(f.Signature, "int", "jobject", -1) } } + case "QImage::QImage": + { + for i := len(f.Parameters) - 1; i >= 0; i-- { + if strings.HasPrefix(f.Parameters[i].Name, "cleanup") { + f.Parameters = append(f.Parameters[:i], f.Parameters[i+1:]...) + } + } + } } } diff --git a/internal/binding/templater/function_cpp.go b/internal/binding/templater/function_cpp.go index 532350f6..79f28ce0 100644 --- a/internal/binding/templater/function_cpp.go +++ b/internal/binding/templater/function_cpp.go @@ -417,7 +417,7 @@ func cppFunctionBodyInternal(function *parser.Function) string { return ` static int argcs = argc; static char** argvs = static_cast(malloc(argcs * sizeof(char*))); - QList aList = QString::fromStdString(argv.dataP).toUtf8().split('|'); + QList aList = QString::fromStdString(argv["dataP"].as()).toUtf8().split('|'); for (int i = 0; i < argcs; i++) argvs[i] = (new QByteArray(aList.at(i)))->data(); diff --git a/internal/binding/templater/function_go.go b/internal/binding/templater/function_go.go index 6e3a4a9f..aaf8a378 100644 --- a/internal/binding/templater/function_go.go +++ b/internal/binding/templater/function_go.go @@ -119,16 +119,21 @@ func goFunctionBody(function *parser.Function) string { } fmt.Fprint(bb, func() string { if function.IsMocFunction && function.SignalMode == "" { - for _, p := range function.Parameters { + for i, p := range function.Parameters { if p.PureGoType != "" { - fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(%[1]v%[2]v), %[2]v)\n", - func() string { - if !strings.HasPrefix(p.PureGoType, "*") { - return "&" - } - return "" - }(), - parser.CleanName(p.Name, p.Value)) + if UseJs() { + fmt.Fprintf(bb, "%vTID := time.Now().UnixNano()+%v\n", parser.CleanName(p.Name, p.Value), i) + fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(uintptr(%[1]vTID)), %[1]v)\n", parser.CleanName(p.Name, p.Value)) + } else { + fmt.Fprintf(bb, "qt.RegisterTemp(unsafe.Pointer(%[1]v%[2]v), %[2]v)\n", + func() string { + if !strings.HasPrefix(p.PureGoType, "*") { + return "&" + } + return "" + }(), + parser.CleanName(p.Name, p.Value)) + } } } diff --git a/internal/binding/templater/template_cgo_qmake.go b/internal/binding/templater/template_cgo_qmake.go index 1eac0742..1ee38bd4 100644 --- a/internal/binding/templater/template_cgo_qmake.go +++ b/internal/binding/templater/template_cgo_qmake.go @@ -150,6 +150,9 @@ func createProject(module, path, target string, mode int, libs []string) { if v == "Speech" { out[i] = "TextToSpeech" } + if v == "Multimedia" { + out = append(out, "multimedia-private") + } out[i] = strings.ToLower(out[i]) } diff --git a/internal/binding/templater/template_cpp.go b/internal/binding/templater/template_cpp.go index 08b1f62d..2b340002 100644 --- a/internal/binding/templater/template_cpp.go +++ b/internal/binding/templater/template_cpp.go @@ -321,11 +321,7 @@ func CppTemplate(module string, mode int, target, tags string) []byte { if strings.HasPrefix(class.Name, "QMac") && !strings.HasPrefix(parser.State.ClassMap[class.Name].Module, "QtMac") { fmt.Fprintf(bb, "int %[1]v_%[1]v_QRegisterMetaType(){\n\t#ifdef Q_OS_OSX\n\t\tqRegisterMetaType<%[1]v*>(); return qRegisterMetaType();\n\t#else\n\t\treturn 0;\n\t#endif\n}\n\n", class.Name) } else { - if UseJs() && (class.IsSubClassOf("QCoreApplication") || class.Name == "QCoreApplication") { - fmt.Fprintf(bb, "int %[1]v_%[1]v_QRegisterMetaType(){qRegisterMetaType<%[1]v*>(); qRegisterMetaType>(\"QVector\"); qRegisterMetaType(); return qRegisterMetaType();}\n\n", class.Name) - } else { - fmt.Fprintf(bb, "int %[1]v_%[1]v_QRegisterMetaType(){qRegisterMetaType<%[1]v*>(); return qRegisterMetaType();}\n\n", class.Name) - } + fmt.Fprintf(bb, "int %[1]v_%[1]v_QRegisterMetaType(){qRegisterMetaType<%[1]v*>(); return qRegisterMetaType();}\n\n", class.Name) } } else { var typeMap = make(map[string]string) @@ -407,7 +403,6 @@ func CppTemplate(module string, mode int, target, tags string) []byte { rand.Seed(time.Now().UTC().UnixNano()) fmt.Fprintf(bb, "EMSCRIPTEN_BINDINGS(r%v) {\n", rand.Intn(10000000)) - fmt.Fprintf(bb, "\temscripten::value_object<%[1]v_PackedString>(\"%[1]v_PackedString\").field(\"dataP\", &%[1]v_PackedString::dataP);\n\n", strings.Title(module)) sort.Stable(sort.StringSlice(exportedFunctions)) @@ -503,7 +498,7 @@ func preambleCpp(module string, input []byte, mode int, target, tags string) []b #define private public #include "%v.h" -%v +%v%v `, buildTags(module, false, mode, tags), @@ -537,7 +532,7 @@ func preambleCpp(module string, input []byte, mode int, target, tags string) []b func() string { if UseJs() { - return "\n#include \n#include " + return "\n#include \n#include \n#include \n#include " } switch module { case "QtAndroidExtras", "QtSailfish": @@ -549,6 +544,13 @@ func preambleCpp(module string, input []byte, mode int, target, tags string) []b return "#include \"_cgo_export.h\"" } }(), + + func() string { + if module == "QtMultimedia" { + return "\n#include \"private/qvideoframe_p.h\"" + } + return "" + }(), ) var classes = make([]string, 0) @@ -589,7 +591,9 @@ func preambleCpp(module string, input []byte, mode int, target, tags string) []b "QRemoteObjectStringLiterals", "ui", "QStringList", - "QtDwmApiDll": + "QtDwmApiDll", + "content", + "QStringView": { continue } diff --git a/internal/binding/templater/template_go.go b/internal/binding/templater/template_go.go index 938a1590..a140cc7a 100644 --- a/internal/binding/templater/template_go.go +++ b/internal/binding/templater/template_go.go @@ -233,7 +233,11 @@ func (ptr *%[1]v) Destroy%[1]v() { } if class.Name != bcn { - fmt.Fprintf(bb, "qt.DisconnectSignal(ptr, \"%v\")\n", f.Name) + if parser.UseJs() { + fmt.Fprintf(bb, "qt.DisconnectSignal(unsafe.Pointer(ptr), \"%v\")\n", f.Name) + } else { + fmt.Fprintf(bb, "qt.DisconnectSignal(ptr, \"%v\")\n", f.Name) + } } } } @@ -553,7 +557,7 @@ import "C" } fmt.Fprint(bb, "import (\n") - for _, m := range append(parser.GetLibs(), "qt", "strings", "unsafe", "log", "runtime", "fmt", "errors", "js") { + for _, m := range append(parser.GetLibs(), "qt", "strings", "unsafe", "log", "runtime", "fmt", "errors", "js", "time") { mlow := strings.ToLower(m) if strings.Contains(inputString, fmt.Sprintf(" %v.", mlow)) || strings.Contains(inputString, fmt.Sprintf("\t%v.", mlow)) || @@ -565,7 +569,7 @@ import "C" strings.Contains(inputString, fmt.Sprintf(")%v.", mlow)) || strings.Contains(inputString, fmt.Sprintf("std_%v.", mlow)) { switch mlow { - case "strings", "unsafe", "log", "runtime", "fmt", "errors": + case "strings", "unsafe", "log", "runtime", "fmt", "errors", "time": fmt.Fprintf(bb, "\"%v\"\n", mlow) case "qt": diff --git a/internal/binding/templater/template_h.go b/internal/binding/templater/template_h.go index bed8b050..c103b474 100644 --- a/internal/binding/templater/template_h.go +++ b/internal/binding/templater/template_h.go @@ -29,14 +29,6 @@ func HTemplate(m string, mode int, tags string) []byte { fmt.Fprint(bb, "#include \n\n") - if UseJs() { - fmt.Fprint(bb, "#include \n") - } - - if UseJs() { - fmt.Fprint(bb, "\n#include \n") - } - fmt.Fprint(bb, "#ifdef __cplusplus\n") for _, c := range parser.SortedClassNamesForModule(m, true) { if parser.State.ClassMap[c].IsSubClassOfQObject() { @@ -49,11 +41,6 @@ func HTemplate(m string, mode int, tags string) []byte { } } - if UseJs() { - fmt.Fprintf(bb, "struct %v_PackedString { char* data; long long len; std::string dataP; };\n", strings.Title(m)) - fmt.Fprintf(bb, "struct %v_PackedList { void* data; long long len; uintptr_t dataP; };\n", strings.Title(m)) - } - fmt.Fprint(bb, "extern \"C\" {\n#endif\n\n") if !UseJs() { diff --git a/internal/cmd/deploy/assets.go b/internal/cmd/deploy/assets.go index 2b76c7f5..3c9396a4 100644 --- a/internal/cmd/deploy/assets.go +++ b/internal/cmd/deploy/assets.go @@ -726,6 +726,6 @@ func js_c_main_wrapper() string { bb.WriteString("emscripten::val script = document.call(\"createElement\", emscripten::val(\"script\"));\n") bb.WriteString("script.set(\"src\", emscripten::val(\"go.js\"));\n") bb.WriteString("document[\"body\"].call(\"appendChild\", script);\n") - bb.WriteString("\n}") + bb.WriteString("}") return bb.String() } diff --git a/internal/cmd/deploy/bundle.go b/internal/cmd/deploy/bundle.go index f72800af..f32c15c3 100644 --- a/internal/cmd/deploy/bundle.go +++ b/internal/cmd/deploy/bundle.go @@ -553,8 +553,6 @@ func bundle(mode, target, path, name, depPath string) { case "js": //copy default assets - buildPath := filepath.Join(depPath, "build") - utils.MkdirAll(buildPath) copy(filepath.Join(utils.QT_QMAKE_DIR(), "..", "src", "plugins", "platforms", "html5", "html5_shell.html"), filepath.Join(depPath, "index.html")) copy(filepath.Join(utils.QT_QMAKE_DIR(), "..", "src", "plugins", "platforms", "html5", "qtloader.js"), depPath) copy(filepath.Join(utils.QT_QMAKE_DIR(), "..", "src", "plugins", "platforms", "html5", "qtlogo.svg"), depPath) @@ -565,7 +563,7 @@ func bundle(mode, target, path, name, depPath string) { //copy custom assets assets := filepath.Join(path, target) utils.MkdirAll(assets) - copy(assets+"/.", buildPath) + copy(assets+"/.", depPath) //add c_main_wrappers if !utils.ExistsFile(filepath.Join(depPath, target+"."+target+"_qml_plugin_import.cpp")) { @@ -605,6 +603,7 @@ func bundle(mode, target, path, name, depPath string) { } } + //TODO: pack js into wasm cmd.Args = append(cmd.Args, []string{"-o", "main.js"}...) cmd.Args = append(cmd.Args, templater.GetiOSClang(target, "", depPath)...) @@ -612,6 +611,12 @@ func bundle(mode, target, path, name, depPath string) { cmd.Env = append(cmd.Env, fmt.Sprintf("%v=%v", key, value)) } utils.RunCmd(cmd, fmt.Sprintf("compile wrapper for %v (%v) on %v", target, target, runtime.GOOS)) + + utils.RemoveAll(filepath.Join(depPath, "c_main_wrapper_js.cpp")) + utils.RemoveAll(filepath.Join(depPath, target+"."+target+"_plugin_import.cpp")) + utils.RemoveAll(filepath.Join(depPath, target+"."+target+"_qml_plugin_import.cpp")) + //TODO: remove go.js + utils.RemoveAll(filepath.Join(depPath, "go.js.map")) } if utils.QT_DOCKER() { diff --git a/internal/cmd/deploy/run.go b/internal/cmd/deploy/run.go index 8bfafd58..40b787dc 100644 --- a/internal/cmd/deploy/run.go +++ b/internal/cmd/deploy/run.go @@ -74,7 +74,7 @@ func run(target, name, depPath, device string) { case "js": //TODO: REVIEW if runtime.GOOS == "darwin" { - exec.Command("/Applications/FirefoxNightly.app/Contents/MacOS/firefox", filepath.Join(depPath, "index.html")).Start() + exec.Command("/Applications/Firefox Nightly.app/Contents/MacOS/firefox", filepath.Join(depPath, "index.html")).Start() } } } diff --git a/internal/cmd/setup/install.go b/internal/cmd/setup/install.go index 816fa0df..ee4b851b 100644 --- a/internal/cmd/setup/install.go +++ b/internal/cmd/setup/install.go @@ -68,6 +68,9 @@ func Install(target string, docker, vagrant bool) { if utils.QT_DYNAMIC_SETUP() && mode == "full" { cc, com := templater.ParseCgo(strings.ToLower(module), target) if cc != "" { + if target == "js" { + com = strings.Replace(com, strings.ToLower(module)+".js_plugin_import.cpp ", "", -1) + } cmd := exec.Command(cc, strings.Split(com, " ")...) cmd.Dir = utils.GoQtPkgPath(strings.ToLower(module)) if target == "js" { diff --git a/internal/examples/showcases/sia/controller/controller.go b/internal/examples/showcases/sia/controller/controller.go index e44ecee0..4288e0fc 100644 --- a/internal/examples/showcases/sia/controller/controller.go +++ b/internal/examples/showcases/sia/controller/controller.go @@ -5,11 +5,10 @@ import ( "github.com/therecipe/qt/core" - "github.com/NebulousLabs/Sia/node/api/client" "github.com/NebulousLabs/Sia/types" ) -var Client = client.New("127.0.0.1:9980") +var DEMO bool var Controller *controller @@ -29,7 +28,8 @@ type controller struct { func (c *controller) init() { Controller = c - c.SetLocked(false) //TODO: + c.SetSynced(false) + c.SetLocked(!DEMO) go c.loop() } @@ -37,21 +37,5 @@ func (c *controller) init() { func (c *controller) loop() { for range time.NewTicker(1 * time.Second).C { - cg, errC := Client.ConsensusGet() - if errC != nil { - println(errC.Error()) - } else { - c.SetSynced(cg.Synced) - c.SetHeight(cg.Height) - } - - wg, errW := Client.WalletGet() - if errW != nil { - println(errW.Error()) - } else { - c.SetLocked(!wg.Unlocked) - c.SetEncrypted(wg.Encrypted) - c.SetWallet(wg) - } } } diff --git a/internal/examples/showcases/sia/files/controller/actionButton.go b/internal/examples/showcases/sia/files/controller/actionButton.go index f32a7994..fb39c847 100644 --- a/internal/examples/showcases/sia/files/controller/actionButton.go +++ b/internal/examples/showcases/sia/files/controller/actionButton.go @@ -3,7 +3,6 @@ package controller import ( "github.com/therecipe/qt/core" - maincontroller "github.com/therecipe/qt/internal/examples/showcases/sia/controller" _ "github.com/therecipe/qt/internal/examples/showcases/sia/files/dialog/controller" ) @@ -23,8 +22,4 @@ func (c *actionButtonController) init() { } func (c *actionButtonController) deleteRequest(name string) { - err := maincontroller.Client.RenterDeletePost(name) - if err != nil { - println("Couldn't delete file:", err.Error()) - } } diff --git a/internal/examples/showcases/sia/files/controller/files.go b/internal/examples/showcases/sia/files/controller/files.go index 131f87eb..fa2684a9 100644 --- a/internal/examples/showcases/sia/files/controller/files.go +++ b/internal/examples/showcases/sia/files/controller/files.go @@ -2,16 +2,10 @@ package controller import ( "encoding/json" - "fmt" - "math" - "sort" "time" "github.com/therecipe/qt/core" - "github.com/NebulousLabs/Sia/modules" - - "github.com/therecipe/qt/internal/examples/showcases/sia/controller" "github.com/therecipe/qt/internal/examples/showcases/sia/files/model" ) @@ -35,73 +29,10 @@ func (c *filesController) init() { func (c *filesController) loop() { for range time.NewTicker(1 * time.Second).C { - - rf, errFiles := controller.Client.RenterFilesGet() - - rdq, errDowload := controller.Client.RenterDownloadsGet() - - if (errFiles != nil || errDowload != nil) && !DEMO { - println(errFiles.Error(), errDowload.Error()) - } else { - files := make([]model.File, len(rf.Files)) - - sort.Sort(bySiaPath(rf.Files)) - for i, f := range rf.Files { - files[i] = model.File{ - Name: f.SiaPath, - Size: filesizeUnits(int64(f.Filesize)), - Redundancy: fmt.Sprintf("%1.1fx", f.Redundancy), - Available: f.Available, - ProgressText: fmt.Sprintf("%1.2f%%", f.UploadProgress), - ProgressValue: f.UploadProgress, - } - } - - for _, df := range rdq.Downloads { - if df.Received == df.Filesize { - continue - } - for i, f := range files { - if df.SiaPath != f.Name { - continue - } - pct := 100 * float64(df.Received) / float64(df.Filesize) - files[i].Available = false - files[i].ProgressText = fmt.Sprintf("%1.2f%%", pct) - files[i].ProgressValue = pct - files[i].Error = df.Error - if df.Error != "" { - println("Couldn't recover", df.SiaPath, "->", df.Error) - } - } - } - - if DEMO { - var df []model.File - json.Unmarshal([]byte(DEMO_FILES), &df) - c.Model().UpdateWith(df) - } else { - c.Model().UpdateWith(files) - } + if DEMO { + var df []model.File + json.Unmarshal([]byte(DEMO_FILES), &df) + c.Model().UpdateWith(df) } - } } - -// bySiaPath implements sort.Interface for [] modules.FileInfo based on the -// SiaPath field. -type bySiaPath []modules.FileInfo - -func (s bySiaPath) Len() int { return len(s) } -func (s bySiaPath) Swap(i, j int) { s[i], s[j] = s[j], s[i] } -func (s bySiaPath) Less(i, j int) bool { return s[i].SiaPath < s[j].SiaPath } - -// filesize returns a string that displays a filesize in human-readable units. -func filesizeUnits(size int64) string { - if size == 0 { - return "0 B" - } - sizes := []string{"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"} - i := int(math.Log10(float64(size)) / 3) - return fmt.Sprintf("%.*f %s", i, float64(size)/math.Pow10(3*i), sizes[i]) -} diff --git a/internal/examples/showcases/sia/files/dialog/controller/dialog.go b/internal/examples/showcases/sia/files/dialog/controller/dialog.go index b8ace05e..1a015df2 100644 --- a/internal/examples/showcases/sia/files/dialog/controller/dialog.go +++ b/internal/examples/showcases/sia/files/dialog/controller/dialog.go @@ -11,6 +11,11 @@ import ( _ "github.com/therecipe/qt/internal/examples/showcases/sia/view/controller" ) +func init() { + if maincontroller.Controller != nil { + } +} + var Controller *dialogController type dialogController struct { @@ -34,9 +39,6 @@ func (c *dialogController) init() { } func (c *dialogController) uploadFiles(files []string) { - for _, f := range files { - go maincontroller.Client.RenterUploadPost("/renter/upload/"+filepath.Base(f), "source="+f, 1, 1) //TODO: dataPieces, parityPieces ? - } } func (c *dialogController) uploadFolder(source string) { @@ -59,10 +61,4 @@ func (c *dialogController) uploadFolder(source string) { } func (c *dialogController) download(name, path string) { - go func() { - err := maincontroller.Client.RenterDownloadGet(name, path, 0, 1, true) //TODO: offset, lenght, async ? - if err != nil { - println("Could not download file:", err.Error()) - } - }() } diff --git a/internal/examples/showcases/sia/main.go b/internal/examples/showcases/sia/main.go index 538d2945..f6cb7ea9 100644 --- a/internal/examples/showcases/sia/main.go +++ b/internal/examples/showcases/sia/main.go @@ -6,6 +6,7 @@ import ( "github.com/therecipe/qt/core" "github.com/therecipe/qt/quick" + _ "github.com/therecipe/qt/svg" //QSvgWidget <- TODO: this comment is needed for js "github.com/therecipe/qt/widgets" _ "github.com/therecipe/qt/internal/examples/showcases/sia/assets" @@ -42,6 +43,7 @@ func init() { os.Setenv("QML_DISABLE_DISK_CACHE", "true") } + controller.DEMO = DEMO wcontroller.DEMO = DEMO fcontroller.DEMO = DEMO } diff --git a/internal/examples/showcases/sia/view/left/controller/progressBar.go b/internal/examples/showcases/sia/view/left/controller/progressBar.go index 792782f8..bb97c4c0 100644 --- a/internal/examples/showcases/sia/view/left/controller/progressBar.go +++ b/internal/examples/showcases/sia/view/left/controller/progressBar.go @@ -15,6 +15,8 @@ import ( type ProgressBarController struct { core.QObject + _ func() `constructor:"init"` + _ string `property:"text"` _ float64 `property:"value"` @@ -23,6 +25,12 @@ type ProgressBarController struct { _ func(types.BlockHeight) `signal:"heightChanged,<-(controller.Controller)"` } +func (c *ProgressBarController) init() { + if controller.DEMO { + c.heightChanged(types.BlockHeight(0)) + } +} + func (c *ProgressBarController) clicked() { gui.QDesktopServices_OpenUrl(core.NewQUrl3("https://explore.sia.tech", 0)) } @@ -31,6 +39,9 @@ func (c *ProgressBarController) heightChanged(height types.BlockHeight) { if controller.Controller.IsSynced() { c.SetText(fmt.Sprintf("BH: %v", controller.Controller.Height())) c.SetValue(100) + } else if controller.DEMO { + c.SetText("BH: DEMO") + c.SetValue(80) } else { estimatedHeight := estimatedHeightAt(time.Now()) estimatedProgress := float64(height) / float64(estimatedHeight) * 100 diff --git a/internal/examples/showcases/sia/view/left/qml/Left/ProgressBar.qml b/internal/examples/showcases/sia/view/left/qml/Left/ProgressBar.qml index 17ba45da..c6dcc2be 100644 --- a/internal/examples/showcases/sia/view/left/qml/Left/ProgressBar.qml +++ b/internal/examples/showcases/sia/view/left/qml/Left/ProgressBar.qml @@ -30,6 +30,9 @@ ProgressBarTemplate { } } Label { + + z: 1 + anchors.centerIn: parent font.pointSize: 12 diff --git a/internal/examples/showcases/sia/view/qml/View.qml b/internal/examples/showcases/sia/view/qml/View.qml index 20fff338..50270714 100644 --- a/internal/examples/showcases/sia/view/qml/View.qml +++ b/internal/examples/showcases/sia/view/qml/View.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 //Rectangle -import QtGraphicalEffects 1.0 //FastBlur +//import QtGraphicalEffects 1.0 //FastBlur import Theme 1.0 //Theme @@ -43,6 +43,7 @@ ViewTemplate { } } + /* FastBlur { anchors.fill: root source: root @@ -51,6 +52,7 @@ ViewTemplate { } onBlur: root.visible = !b + */ onWidthChanged: Theme.currentWidth = width onHeightChanged: Theme.currentHeight = height diff --git a/internal/examples/showcases/sia/view/top/controller/lock.go b/internal/examples/showcases/sia/view/top/controller/lock.go index 7671703e..92549c41 100644 --- a/internal/examples/showcases/sia/view/top/controller/lock.go +++ b/internal/examples/showcases/sia/view/top/controller/lock.go @@ -1,14 +1,18 @@ package controller import ( - "net/http" - "github.com/therecipe/qt/core" "github.com/therecipe/qt/internal/examples/showcases/sia/controller" dcontroller "github.com/therecipe/qt/internal/examples/showcases/sia/wallet/dialog/controller" ) +func init() { + if false { + controller.Controller = nil + } +} + type LockController struct { core.QObject @@ -21,13 +25,5 @@ func (c *LockController) change() { if c.IsLocked() { dcontroller.Controller.Show("unlock") } else { - req, _ := controller.Client.NewRequest("POST", "/wallet/lock", nil) //TODO: - res, err := http.DefaultClient.Do(req) - if err != nil { - println(err.Error()) - } else { - c.SetLocked(true) - res.Body.Close() - } } } diff --git a/internal/examples/showcases/sia/view/top/controller/status.go b/internal/examples/showcases/sia/view/top/controller/status.go index 4066bb05..87232cb7 100644 --- a/internal/examples/showcases/sia/view/top/controller/status.go +++ b/internal/examples/showcases/sia/view/top/controller/status.go @@ -1,42 +1,31 @@ package controller import ( - "fmt" - "math/big" - "github.com/therecipe/qt/core" - "github.com/NebulousLabs/Sia/node/api" - "github.com/NebulousLabs/Sia/types" - - _ "github.com/therecipe/qt/internal/examples/showcases/sia/controller" + "github.com/therecipe/qt/internal/examples/showcases/sia/controller" ) type StatusController struct { core.QObject + _ func() `constructor:"init"` + _ string `property:"balance"` _ string `property:"delta"` _ func(interface{}) `signal:"wallet,<-(controller.Controller.WalletChanged)"` } -func (c *StatusController) wallet(wgI interface{}) { - wg := wgI.(api.WalletGET) - if wg.Unlocked { - confirmedFloat, _ := new(big.Rat).SetFrac(wg.ConfirmedSiacoinBalance.Big(), types.SiacoinPrecision.Big()).Float64() - c.SetBalance(fmt.Sprintf("%1.5f SC", confirmedFloat)) - - unconfirmedBalance := wg.ConfirmedSiacoinBalance.Add(wg.UnconfirmedIncomingSiacoins).Sub(wg.UnconfirmedOutgoingSiacoins) - if unconfirmedBalance.Cmp(wg.ConfirmedSiacoinBalance) >= 0 { - deltaFloat, _ := new(big.Rat).SetFrac(unconfirmedBalance.Sub(wg.ConfirmedSiacoinBalance).Big(), types.SiacoinPrecision.Big()).Float64() - c.SetDelta(fmt.Sprintf("+%1.5f SC", deltaFloat)) - } else { - deltaFloat, _ := new(big.Rat).SetFrac(wg.ConfirmedSiacoinBalance.Sub(unconfirmedBalance).Big(), types.SiacoinPrecision.Big()).Float64() - c.SetDelta(fmt.Sprintf("-%1.5f SC", deltaFloat)) - } - } else { - c.SetBalance("0") - c.SetDelta("0") +func (c *StatusController) init() { + if controller.DEMO { + c.wallet(nil) + } +} + +func (c *StatusController) wallet(wgI interface{}) { + if controller.DEMO { + c.SetBalance("12345 SC") + c.SetDelta("67890 SC") } } diff --git a/internal/examples/showcases/sia/wallet/controller/wallet.go b/internal/examples/showcases/sia/wallet/controller/wallet.go index 1bf5a654..355efafb 100644 --- a/internal/examples/showcases/sia/wallet/controller/wallet.go +++ b/internal/examples/showcases/sia/wallet/controller/wallet.go @@ -3,15 +3,11 @@ package controller import ( "encoding/json" "fmt" - "math/big" "time" "github.com/therecipe/qt/core" "github.com/therecipe/qt/gui" - "github.com/NebulousLabs/Sia/types" - - "github.com/therecipe/qt/internal/examples/showcases/sia/controller" "github.com/therecipe/qt/internal/examples/showcases/sia/wallet/model" ) @@ -41,84 +37,10 @@ func (c *WalletController) doubleClicked(ID string) { func (c *WalletController) loop() { for range time.NewTicker(1 * time.Second).C { - - wtg, err := controller.Client.WalletTransactionsGet(0, 10000000) - if err != nil && !DEMO { - println(err.Error()) - } else { - - transactions := make([]model.Transaction, 0) - var balance float64 - - for _, txn := range append(wtg.ConfirmedTransactions, wtg.UnconfirmedTransactions...) { - transaction := model.Transaction{ID: txn.TransactionID.String(), Type: "Transaction"} - - // Determine the number of outgoing siacoins and siafunds. - var outgoingSiacoins types.Currency - var outgoingSiafunds types.Currency - for _, input := range txn.Inputs { - if input.FundType == types.SpecifierSiacoinInput && input.WalletAddress { - outgoingSiacoins = outgoingSiacoins.Add(input.Value) - } - if input.FundType == types.SpecifierSiafundInput && input.WalletAddress { - outgoingSiafunds = outgoingSiafunds.Add(input.Value) - } - } - - // Determine the number of incoming siacoins and siafunds. - var incomingSiacoins types.Currency - var incomingSiafunds types.Currency - for _, output := range txn.Outputs { - if output.FundType == types.SpecifierMinerPayout { - incomingSiacoins = incomingSiacoins.Add(output.Value) - } - if output.FundType == types.SpecifierSiacoinOutput && output.WalletAddress { - incomingSiacoins = incomingSiacoins.Add(output.Value) - } - if output.FundType == types.SpecifierSiafundOutput && output.WalletAddress { - incomingSiafunds = incomingSiafunds.Add(output.Value) - } - } - - // Convert the siacoins to float. - incomingSiacoinsFloat, _ := new(big.Rat).SetFrac(incomingSiacoins.Big(), types.SiacoinPrecision.Big()).Float64() - outgoingSiacoinsFloat, _ := new(big.Rat).SetFrac(outgoingSiacoins.Big(), types.SiacoinPrecision.Big()).Float64() - amount := incomingSiacoinsFloat - outgoingSiacoinsFloat - - if amount == 0 { - continue - } - - if controller.Controller.Height() >= txn.ConfirmationHeight { - transaction.Status = "Confirmed" - transaction.Date = time.Unix(int64(txn.ConfirmationTimestamp), 0).Format(time.RFC822Z) - } else { - transaction.Status = "Not Confirmed" - } - - transaction.Amount = fmt.Sprintf("%1.5f SC", amount) - - balance += amount - transaction.Total = fmt.Sprintf("%1.5f SC", balance) - - //TODO: siafunds - // For siafunds, need to avoid having a negative types.Currency. - if incomingSiafunds.Cmp(outgoingSiafunds) >= 0 { - //fmt.Sprintf("%14v SF", incomingSiafunds.Sub(outgoingSiafunds)) - } else { - //fmt.Sprintf("-%14v SF", outgoingSiafunds.Sub(incomingSiafunds)) - } - - transactions = append(transactions, transaction) - } - - if DEMO { - var dt []model.Transaction - json.Unmarshal([]byte(DEMO_TRANSACTIONS), &dt) - c.Model().UpdateWith(dt) - } else { - c.Model().UpdateWith(transactions) - } + if DEMO { + var dt []model.Transaction + json.Unmarshal([]byte(DEMO_TRANSACTIONS), &dt) + c.Model().UpdateWith(dt) } } } diff --git a/internal/examples/showcases/sia/wallet/dialog/controller/dialog.go b/internal/examples/showcases/sia/wallet/dialog/controller/dialog.go index d904e120..069ed79c 100644 --- a/internal/examples/showcases/sia/wallet/dialog/controller/dialog.go +++ b/internal/examples/showcases/sia/wallet/dialog/controller/dialog.go @@ -4,18 +4,21 @@ import ( "errors" "fmt" "math/big" - "net/http" "strings" "github.com/therecipe/qt/core" - "github.com/NebulousLabs/Sia/node/api" "github.com/NebulousLabs/Sia/types" maincontroller "github.com/therecipe/qt/internal/examples/showcases/sia/controller" _ "github.com/therecipe/qt/internal/examples/showcases/sia/view/controller" ) +func init() { + if maincontroller.Controller != nil { + } +} + var Controller *dialogController type dialogController struct { @@ -39,58 +42,19 @@ func (c *dialogController) init() { } func (c *dialogController) receive() string { - wag, err := maincontroller.Client.WalletAddressGet() - if err != nil { - println(err.Error()) - return fmt.Sprintf("Could not get address: %v", err.Error()) - } - return wag.Address.String() + return "" } func (c *dialogController) send(amount, dest string) *core.QVariant { - if !strings.HasSuffix(amount, "SC") { - amount += "SC" - } - - hastings, errC := parseCurrency(amount) - if errC != nil { - println(errC.Error()) - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(false), core.NewQVariant14(fmt.Sprintf("Could not parse amount: %v", errC.Error()))}) - } - - b, _ := new(big.Int).SetString(hastings, 10) - var destH types.UnlockHash - destH.LoadString(dest) - _, errW := maincontroller.Client.WalletSiacoinsPost(types.NewCurrency(b), destH) - if errW != nil { - println(errW.Error()) - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(false), core.NewQVariant14(fmt.Sprintf("Could not send siacoins: %v", errW.Error()))}) - } - - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(true), core.NewQVariant14(fmt.Sprintf("Sent %s hastings to %s\n", hastings, dest))}) + return core.NewQVariant() } func (c *dialogController) unlock(password string) *core.QVariant { - err := maincontroller.Client.WalletUnlockPost(password) - if err != nil { - println(err.Error()) - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(false), core.NewQVariant14(fmt.Sprintf("Could not unlock your wallet: %v", err.Error()))}) - } - - maincontroller.Controller.SetLocked(false) - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(true)}) + return core.NewQVariant() } func (c *dialogController) recover(seed string) *core.QVariant { - var swp api.WalletSweepPOST - req, _ := maincontroller.Client.NewRequest("POST", "/wallet/sweep/seed", strings.NewReader(fmt.Sprintf("seed=%s&dictionary=%s", seed, "english"))) //TODO: - res, err := http.DefaultClient.Do(req) - if err != nil { - println(err.Error()) - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(false), core.NewQVariant14(fmt.Sprintf("Could not sweep seed: %v", err.Error()))}) - } - res.Body.Close() - return core.NewQVariant24([]*core.QVariant{core.NewQVariant11(true), core.NewQVariant14(fmt.Sprintf("Swept %v and %v SF from seed.", currencyUnits(swp.Coins), swp.Funds))}) + return core.NewQVariant() } // currencyUnits converts a types.Currency to a string with human-readable diff --git a/internal/examples/showcases/sia/wallet/model/wallet.go b/internal/examples/showcases/sia/wallet/model/wallet.go index fbfc4b69..734cf6f6 100644 --- a/internal/examples/showcases/sia/wallet/model/wallet.go +++ b/internal/examples/showcases/sia/wallet/model/wallet.go @@ -23,6 +23,7 @@ type WalletModel struct { func (m *WalletModel) init() { m.ConnectRowCount(m.rowCount) + m.ConnectColumnCount(func(*core.QModelIndex) int { return 6 }) m.ConnectData(m.data) m.ConnectRoleNames(m.roleNames) } diff --git a/location/location.cpp b/location/location.cpp index 3af14a94..ce7057df 100644 --- a/location/location.cpp +++ b/location/location.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -400,8 +398,6 @@ void* QGeoRouteReply_NewQGeoRouteReply(long long error, struct QtLocation_Packed return new MyQGeoRouteReply(static_cast(error), QString::fromUtf8(errorString.data, errorString.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRouteReply(static_cast(error), QString::fromUtf8(errorString.data, errorString.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoRouteReply(static_cast(error), QString::fromUtf8(errorString.data, errorString.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRouteReply(static_cast(error), QString::fromUtf8(errorString.data, errorString.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -441,8 +437,6 @@ void* QGeoRouteReply_NewQGeoRouteReply2(void* request, void* parent) return new MyQGeoRouteReply(*static_cast(request), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRouteReply(*static_cast(request), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoRouteReply(*static_cast(request), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRouteReply(*static_cast(request), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1632,8 +1626,6 @@ void* QGeoRoutingManagerEngine_NewQGeoRoutingManagerEngine(void* parameters, voi return new MyQGeoRoutingManagerEngine(({ QMap* tmpP = static_cast*>(parameters); QMap tmpV = *tmpP; tmpP->~QMap(); free(tmpP); tmpV; }), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRoutingManagerEngine(({ QMap* tmpP = static_cast*>(parameters); QMap tmpV = *tmpP; tmpP->~QMap(); free(tmpP); tmpV; }), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoRoutingManagerEngine(({ QMap* tmpP = static_cast*>(parameters); QMap tmpV = *tmpP; tmpP->~QMap(); free(tmpP); tmpV; }), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoRoutingManagerEngine(({ QMap* tmpP = static_cast*>(parameters); QMap tmpV = *tmpP; tmpP->~QMap(); free(tmpP); tmpV; }), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/macextras/macextras.cpp b/macextras/macextras.cpp index 6e0673b4..bc15fb6c 100644 --- a/macextras/macextras.cpp +++ b/macextras/macextras.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -209,8 +207,6 @@ void* QMacToolBar_NewQMacToolBar(void* parent) return new MyQMacToolBar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBar(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMacToolBar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -250,8 +246,6 @@ void* QMacToolBar_NewQMacToolBar2(struct QtMacExtras_PackedString identifier, vo return new MyQMacToolBar(QString::fromUtf8(identifier.data, identifier.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBar(QString::fromUtf8(identifier.data, identifier.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMacToolBar(QString::fromUtf8(identifier.data, identifier.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBar(QString::fromUtf8(identifier.data, identifier.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -559,8 +553,6 @@ void* QMacToolBarItem_NewQMacToolBarItem(void* parent) return new MyQMacToolBarItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBarItem(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMacToolBarItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMacToolBarItem(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/multimedia/multimedia.cpp b/multimedia/multimedia.cpp index c75f671a..a70dbe9f 100644 --- a/multimedia/multimedia.cpp +++ b/multimedia/multimedia.cpp @@ -5,6 +5,7 @@ #include "multimedia.h" #include "_cgo_export.h" +#include "private/qvideoframe_p.h" #include #include @@ -80,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -135,7 +135,6 @@ #include #include #include -#include #include #include #include @@ -1505,8 +1504,6 @@ void* QAbstractVideoFilter_NewQAbstractVideoFilter(void* parent) return new MyQAbstractVideoFilter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractVideoFilter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractVideoFilter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractVideoFilter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1803,8 +1800,6 @@ void* QAbstractVideoSurface_NewQAbstractVideoSurface(void* parent) return new MyQAbstractVideoSurface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractVideoSurface(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractVideoSurface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractVideoSurface(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2331,8 +2326,6 @@ void* QAudioDecoder_NewQAudioDecoder(void* parent) return new MyQAudioDecoder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioDecoder(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioDecoder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioDecoder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2660,8 +2653,6 @@ void* QAudioDecoderControl_NewQAudioDecoderControl(void* parent) return new MyQAudioDecoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioDecoderControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioDecoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioDecoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3290,8 +3281,6 @@ void* QAudioEncoderSettingsControl_NewQAudioEncoderSettingsControl(void* parent) return new MyQAudioEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioEncoderSettingsControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3523,8 +3512,6 @@ void* QAudioInput_NewQAudioInput2(void* audioDevice, void* format, void* parent) return new MyQAudioInput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioInput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioInput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioInput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3564,8 +3551,6 @@ void* QAudioInput_NewQAudioInput(void* format, void* parent) return new MyQAudioInput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioInput(*static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioInput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioInput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4050,8 +4035,6 @@ void* QAudioOutput_NewQAudioOutput2(void* audioDevice, void* format, void* paren return new MyQAudioOutput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioOutput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioOutput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioOutput(*static_cast(audioDevice), *static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4091,8 +4074,6 @@ void* QAudioOutput_NewQAudioOutput(void* format, void* parent) return new MyQAudioOutput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioOutput(*static_cast(format), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioOutput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioOutput(*static_cast(format), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4587,8 +4568,6 @@ void* QAudioProbe_NewQAudioProbe(void* parent) return new MyQAudioProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioProbe(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4925,8 +4904,6 @@ void* QAudioRecorder_NewQAudioRecorder(void* parent) return new MyQAudioRecorder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioRecorder(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioRecorder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioRecorder(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5063,8 +5040,6 @@ void* QAudioRoleControl_NewQAudioRoleControl(void* parent) return new MyQAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioRoleControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5203,8 +5178,6 @@ void* QAudioSystemPlugin_NewQAudioSystemPlugin(void* parent) return new MyQAudioSystemPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioSystemPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAudioSystemPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAudioSystemPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5524,8 +5497,6 @@ void* QCamera_NewQCamera4(long long position, void* parent) return new MyQCamera(static_cast(position), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(static_cast(position), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCamera(static_cast(position), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(static_cast(position), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5565,8 +5536,6 @@ void* QCamera_NewQCamera(void* parent) return new MyQCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5606,8 +5575,6 @@ void* QCamera_NewQCamera2(void* deviceName, void* parent) return new MyQCamera(*static_cast(deviceName), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(*static_cast(deviceName), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCamera(*static_cast(deviceName), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(*static_cast(deviceName), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5647,8 +5614,6 @@ void* QCamera_NewQCamera3(void* cameraInfo, void* parent) return new MyQCamera(*static_cast(cameraInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(*static_cast(cameraInfo), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCamera(*static_cast(cameraInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCamera(*static_cast(cameraInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6109,8 +6074,6 @@ void* QCameraCaptureBufferFormatControl_NewQCameraCaptureBufferFormatControl(voi return new MyQCameraCaptureBufferFormatControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraCaptureBufferFormatControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraCaptureBufferFormatControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraCaptureBufferFormatControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6234,8 +6197,6 @@ void* QCameraCaptureDestinationControl_NewQCameraCaptureDestinationControl(void* return new MyQCameraCaptureDestinationControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraCaptureDestinationControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraCaptureDestinationControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraCaptureDestinationControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6350,8 +6311,6 @@ void* QCameraControl_NewQCameraControl(void* parent) return new MyQCameraControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7121,8 +7080,6 @@ void* QCameraExposureControl_NewQCameraExposureControl(void* parent) return new MyQCameraExposureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraExposureControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraExposureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraExposureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7287,8 +7244,6 @@ void* QCameraFeedbackControl_NewQCameraFeedbackControl(void* parent) return new MyQCameraFeedbackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraFeedbackControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraFeedbackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraFeedbackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7391,8 +7346,6 @@ void* QCameraFlashControl_NewQCameraFlashControl(void* parent) return new MyQCameraFlashControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraFlashControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraFlashControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraFlashControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8644,8 +8597,6 @@ void* QCameraImageCaptureControl_NewQCameraImageCaptureControl(void* parent) return new MyQCameraImageCaptureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraImageCaptureControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraImageCaptureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraImageCaptureControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9162,8 +9113,6 @@ void* QCameraImageProcessingControl_NewQCameraImageProcessingControl(void* paren return new MyQCameraImageProcessingControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraImageProcessingControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraImageProcessingControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraImageProcessingControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9329,8 +9278,6 @@ void* QCameraInfoControl_NewQCameraInfoControl(void* parent) return new MyQCameraInfoControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraInfoControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraInfoControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraInfoControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9418,8 +9365,6 @@ void* QCameraLocksControl_NewQCameraLocksControl(void* parent) return new MyQCameraLocksControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraLocksControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraLocksControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraLocksControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9618,8 +9563,6 @@ void* QCameraViewfinderSettingsControl_NewQCameraViewfinderSettingsControl(void* return new MyQCameraViewfinderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraViewfinderSettingsControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraViewfinderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraViewfinderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9710,8 +9653,6 @@ void* QCameraViewfinderSettingsControl2_NewQCameraViewfinderSettingsControl2(voi return new MyQCameraViewfinderSettingsControl2(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraViewfinderSettingsControl2(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraViewfinderSettingsControl2(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraViewfinderSettingsControl2(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9828,8 +9769,6 @@ void* QCameraZoomControl_NewQCameraZoomControl(void* parent) return new MyQCameraZoomControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraZoomControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCameraZoomControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCameraZoomControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10031,8 +9970,6 @@ void* QCustomAudioRoleControl_NewQCustomAudioRoleControl(void* parent) return new MyQCustomAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustomAudioRoleControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCustomAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCustomAudioRoleControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10140,8 +10077,6 @@ void* QImageEncoderControl_NewQImageEncoderControl(void* parent) return new MyQImageEncoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQImageEncoderControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQImageEncoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQImageEncoderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10407,8 +10342,6 @@ void* QMediaAudioProbeControl_NewQMediaAudioProbeControl(void* parent) return new MyQMediaAudioProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaAudioProbeControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaAudioProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaAudioProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10513,8 +10446,6 @@ void* QMediaAvailabilityControl_NewQMediaAvailabilityControl(void* parent) return new MyQMediaAvailabilityControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaAvailabilityControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaAvailabilityControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaAvailabilityControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10665,8 +10596,6 @@ void* QMediaContainerControl_NewQMediaContainerControl(void* parent) return new MyQMediaContainerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaContainerControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaContainerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaContainerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10861,8 +10790,6 @@ void* QMediaControl_NewQMediaControl(void* parent) return new MyQMediaControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12326,8 +12253,6 @@ void* QMediaGaplessPlaybackControl_NewQMediaGaplessPlaybackControl(void* parent) return new MyQMediaGaplessPlaybackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaGaplessPlaybackControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaGaplessPlaybackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaGaplessPlaybackControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12557,8 +12482,6 @@ void* QMediaObject_NewQMediaObject(void* parent, void* service) return new MyQMediaObject(static_cast(parent), static_cast(service)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaObject(static_cast(parent), static_cast(service)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaObject(static_cast(parent), static_cast(service)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaObject(static_cast(parent), static_cast(service)); } else if (dynamic_cast(static_cast(parent))) { @@ -13372,8 +13295,6 @@ void* QMediaPlayer_NewQMediaPlayer(void* parent, long long flags) return new MyQMediaPlayer(static_cast(parent), static_cast(flags)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaPlayer(static_cast(parent), static_cast(flags)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaPlayer(static_cast(parent), static_cast(flags)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaPlayer(static_cast(parent), static_cast(flags)); } else if (dynamic_cast(static_cast(parent))) { @@ -14008,8 +13929,6 @@ void* QMediaPlayerControl_NewQMediaPlayerControl(void* parent) return new MyQMediaPlayerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaPlayerControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaPlayerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaPlayerControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -15967,8 +15886,6 @@ void* QMediaRecorderControl_NewQMediaRecorderControl(void* parent) return new MyQMediaRecorderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaRecorderControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaRecorderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaRecorderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -16425,8 +16342,6 @@ void* QMediaService_NewQMediaService(void* parent) return new MyQMediaService(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaService(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaService(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaService(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17081,8 +16996,6 @@ void* QMediaStreamsControl_NewQMediaStreamsControl(void* parent) return new MyQMediaStreamsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaStreamsControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaStreamsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaStreamsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17363,8 +17276,6 @@ void* QMediaVideoProbeControl_NewQMediaVideoProbeControl(void* parent) return new MyQMediaVideoProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaVideoProbeControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMediaVideoProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMediaVideoProbeControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17473,8 +17384,6 @@ void* QMetaDataReaderControl_NewQMetaDataReaderControl(void* parent) return new MyQMetaDataReaderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMetaDataReaderControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMetaDataReaderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMetaDataReaderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17616,8 +17525,6 @@ void* QMetaDataWriterControl_NewQMetaDataWriterControl(void* parent) return new MyQMetaDataWriterControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMetaDataWriterControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMetaDataWriterControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMetaDataWriterControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18273,8 +18180,6 @@ void* QRadioDataControl_NewQRadioDataControl(void* parent) return new MyQRadioDataControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRadioDataControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRadioDataControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRadioDataControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18531,8 +18436,6 @@ void* QRadioTuner_NewQRadioTuner(void* parent) return new MyQRadioTuner(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRadioTuner(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRadioTuner(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRadioTuner(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -19323,8 +19226,6 @@ void* QSound_NewQSound(struct QtMultimedia_PackedString filename, void* parent) return new MyQSound(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSound(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSound(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSound(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -19653,8 +19554,6 @@ void* QSoundEffect_NewQSoundEffect(void* parent) return new MyQSoundEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSoundEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSoundEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSoundEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -20161,8 +20060,6 @@ void* QVideoDeviceSelectorControl_NewQVideoDeviceSelectorControl(void* parent) return new MyQVideoDeviceSelectorControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoDeviceSelectorControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoDeviceSelectorControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoDeviceSelectorControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -20495,8 +20392,6 @@ void* QVideoEncoderSettingsControl_NewQVideoEncoderSettingsControl(void* parent) return new MyQVideoEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoEncoderSettingsControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoEncoderSettingsControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -20634,7 +20529,7 @@ char QVideoFrame_Map(void* ptr, long long mode) struct QtMultimedia_PackedString QVideoFrame_Bits(void* ptr) { - return ({ char* t262dd0 = static_cast(static_cast(static_cast(ptr)->bits())); QtMultimedia_PackedString { t262dd0, -1 }; }); + return ({ char* t262dd0 = static_cast(static_cast(static_cast(ptr)->bits())); QtMultimedia_PackedString { t262dd0, static_cast(ptr)->mappedBytes() }; }); } struct QtMultimedia_PackedString QVideoFrame_Bits2(void* ptr, int plane) @@ -20734,7 +20629,7 @@ char QVideoFrame_IsWritable(void* ptr) struct QtMultimedia_PackedString QVideoFrame_Bits3(void* ptr) { - return ({ char* t262dd0 = static_cast(static_cast(const_cast(static_cast(ptr)->bits()))); QtMultimedia_PackedString { t262dd0, -1 }; }); + return ({ char* t262dd0 = static_cast(static_cast(const_cast(static_cast(ptr)->bits()))); QtMultimedia_PackedString { t262dd0, static_cast(ptr)->mappedBytes() }; }); } struct QtMultimedia_PackedString QVideoFrame_Bits4(void* ptr, int plane) @@ -20782,6 +20677,11 @@ long long QVideoFrame_StartTime(void* ptr) return static_cast(ptr)->startTime(); } +void* QVideoFrame_QVideoFrame_Qt_imageFromVideoFrame(void* frame) +{ + return new QImage(qt_imageFromVideoFrame(*static_cast(frame))); +} + void* QVideoFrame___availableMetaData_atList(void* ptr, struct QtMultimedia_PackedString v, int i) { return new QVariant(({ QVariant tmp = static_cast*>(ptr)->value(QString::fromUtf8(v.data, v.len)); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QMap(); free(ptr); }; tmp; })); @@ -20883,8 +20783,6 @@ void* QVideoProbe_NewQVideoProbe(void* parent) return new MyQVideoProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoProbe(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoProbe(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -21189,8 +21087,6 @@ void* QVideoRendererControl_NewQVideoRendererControl(void* parent) return new MyQVideoRendererControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoRendererControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoRendererControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoRendererControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -22599,8 +22495,6 @@ void* QVideoWidgetControl_NewQVideoWidgetControl(void* parent) return new MyQVideoWidgetControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoWidgetControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoWidgetControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoWidgetControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -22837,8 +22731,6 @@ void* QVideoWindowControl_NewQVideoWindowControl(void* parent) return new MyQVideoWindowControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoWindowControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQVideoWindowControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQVideoWindowControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/multimedia/multimedia.go b/multimedia/multimedia.go index 8ec6fb8a..b86f8300 100644 --- a/multimedia/multimedia.go +++ b/multimedia/multimedia.go @@ -43784,6 +43784,18 @@ func (ptr *QVideoFrame) StartTime() int64 { return 0 } +func QVideoFrame_Qt_imageFromVideoFrame(frame QVideoFrame_ITF) *gui.QImage { + tmpValue := gui.NewQImageFromPointer(C.QVideoFrame_QVideoFrame_Qt_imageFromVideoFrame(PointerFromQVideoFrame(frame))) + runtime.SetFinalizer(tmpValue, (*gui.QImage).DestroyQImage) + return tmpValue +} + +func (ptr *QVideoFrame) Qt_imageFromVideoFrame(frame QVideoFrame_ITF) *gui.QImage { + tmpValue := gui.NewQImageFromPointer(C.QVideoFrame_QVideoFrame_Qt_imageFromVideoFrame(PointerFromQVideoFrame(frame))) + runtime.SetFinalizer(tmpValue, (*gui.QImage).DestroyQImage) + return tmpValue +} + func (ptr *QVideoFrame) __availableMetaData_atList(v string, i int) *core.QVariant { if ptr.Pointer() != nil { var vC *C.char diff --git a/multimedia/multimedia.h b/multimedia/multimedia.h index 6b01d379..f6917035 100644 --- a/multimedia/multimedia.h +++ b/multimedia/multimedia.h @@ -2752,6 +2752,7 @@ int QVideoFrame_PlaneCount(void* ptr); int QVideoFrame_Width(void* ptr); long long QVideoFrame_EndTime(void* ptr); long long QVideoFrame_StartTime(void* ptr); +void* QVideoFrame_QVideoFrame_Qt_imageFromVideoFrame(void* frame); void* QVideoFrame___availableMetaData_atList(void* ptr, struct QtMultimedia_PackedString v, int i); void QVideoFrame___availableMetaData_setList(void* ptr, struct QtMultimedia_PackedString key, void* i); void* QVideoFrame___availableMetaData_newList(void* ptr); diff --git a/network/network.cpp b/network/network.cpp index 6ea57671..07579c3f 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -71,7 +70,6 @@ #include #include #include -#include #include #include #include @@ -155,8 +153,6 @@ void* QAbstractNetworkCache_NewQAbstractNetworkCache(void* parent) return new MyQAbstractNetworkCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractNetworkCache(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractNetworkCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractNetworkCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -477,8 +473,6 @@ void* QAbstractSocket_NewQAbstractSocket(long long socketType, void* parent) return new MyQAbstractSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractSocket(static_cast(socketType), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractSocket(static_cast(socketType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1530,8 +1524,6 @@ void* QDnsLookup_NewQDnsLookup2(long long ty, struct QtNetwork_PackedString name return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1571,8 +1563,6 @@ void* QDnsLookup_NewQDnsLookup3(long long ty, struct QtNetwork_PackedString name return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), *static_cast(nameserver), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), *static_cast(nameserver), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), *static_cast(nameserver), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(ty), QString::fromUtf8(name.data, name.len), *static_cast(nameserver), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1612,8 +1602,6 @@ void* QDnsLookup_NewQDnsLookup(void* parent) return new MyQDnsLookup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDnsLookup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDnsLookup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2579,8 +2567,6 @@ void* QHttpMultiPart_NewQHttpMultiPart2(long long contentType, void* parent) return new MyQHttpMultiPart(static_cast(contentType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHttpMultiPart(static_cast(contentType), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHttpMultiPart(static_cast(contentType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHttpMultiPart(static_cast(contentType), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2620,8 +2606,6 @@ void* QHttpMultiPart_NewQHttpMultiPart(void* parent) return new MyQHttpMultiPart(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHttpMultiPart(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHttpMultiPart(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHttpMultiPart(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2893,8 +2877,6 @@ void* QLocalServer_NewQLocalServer(void* parent) return new MyQLocalServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLocalServer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLocalServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLocalServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3239,8 +3221,6 @@ void* QLocalSocket_NewQLocalSocket(void* parent) return new MyQLocalSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLocalSocket(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLocalSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLocalSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3682,8 +3662,6 @@ void* QNetworkAccessManager_NewQNetworkAccessManager(void* parent) return new MyQNetworkAccessManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkAccessManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkAccessManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkAccessManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4524,8 +4502,6 @@ void* QNetworkConfigurationManager_NewQNetworkConfigurationManager(void* parent) return new MyQNetworkConfigurationManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkConfigurationManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkConfigurationManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkConfigurationManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4996,8 +4972,6 @@ void* QNetworkCookieJar_NewQNetworkCookieJar(void* parent) return new MyQNetworkCookieJar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkCookieJar(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkCookieJar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkCookieJar(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5493,8 +5467,6 @@ void* QNetworkDiskCache_NewQNetworkDiskCache(void* parent) return new MyQNetworkDiskCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkDiskCache(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkDiskCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkDiskCache(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6181,8 +6153,6 @@ void* QNetworkReply_NewQNetworkReply(void* parent) return new MyQNetworkReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkReply(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkReply(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7013,8 +6983,6 @@ void* QNetworkSession_NewQNetworkSession(void* connectionConfig, void* parent) return new MyQNetworkSession(*static_cast(connectionConfig), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkSession(*static_cast(connectionConfig), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNetworkSession(*static_cast(connectionConfig), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNetworkSession(*static_cast(connectionConfig), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -8761,8 +8729,6 @@ void* QSslSocket_NewQSslSocket(void* parent) return new MyQSslSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSslSocket(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSslSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSslSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9467,8 +9433,6 @@ void* QTcpServer_NewQTcpServer(void* parent) return new MyQTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTcpServer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9830,8 +9794,6 @@ void* QTcpSocket_NewQTcpSocket(void* parent) return new MyQTcpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTcpSocket(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTcpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTcpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9946,8 +9908,6 @@ void* QUdpSocket_NewQUdpSocket(void* parent) return new MyQUdpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUdpSocket(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQUdpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUdpSocket(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/nfc/nfc.cpp b/nfc/nfc.cpp index 8fe42a13..3f62b5e9 100644 --- a/nfc/nfc.cpp +++ b/nfc/nfc.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -138,166 +136,6 @@ void* QNdefMessage___QNdefMessage_records_newList4(void* ptr) return new QList(); } -void* QNdefMessage___QList_other_atList3(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___QList_other_setList3(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___QList_other_newList3(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___QList_other_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___QList_other_setList2(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___QList_other_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___fromSet_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___fromSet_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___fromSet_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___fromStdList_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___fromStdList_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___fromStdList_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___fromVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___fromVector_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___fromVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___fromVector_vector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___fromVector_vector_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___fromVector_vector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___append_value_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___append_value_setList2(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___append_value_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___swap_other_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___swap_other_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___swap_other_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___mid_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___mid_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___mid_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QNdefMessage___toVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QNdefMessage___toVector_setList(void* ptr, void* i) -{ - static_cast*>(ptr)->append(static_cast(i)); -} - -void* QNdefMessage___toVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - void* QNdefNfcSmartPosterRecord_NewQNdefNfcSmartPosterRecord() { return new QNdefNfcSmartPosterRecord(); @@ -671,8 +509,6 @@ void* QNearFieldManager_NewQNearFieldManager(void* parent) return new MyQNearFieldManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNearFieldManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -958,8 +794,6 @@ void* QNearFieldShareManager_NewQNearFieldShareManager(void* parent) return new MyQNearFieldShareManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldShareManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNearFieldShareManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldShareManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1487,8 +1321,6 @@ void* QNearFieldTarget_NewQNearFieldTarget(void* parent) return new MyQNearFieldTarget(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldTarget(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNearFieldTarget(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNearFieldTarget(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1837,8 +1669,6 @@ void* QQmlNdefRecord_NewQQmlNdefRecord(void* parent) return new MyQQmlNdefRecord(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlNdefRecord(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlNdefRecord(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlNdefRecord(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1878,8 +1708,6 @@ void* QQmlNdefRecord_NewQQmlNdefRecord2(void* record, void* parent) return new MyQQmlNdefRecord(*static_cast(record), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlNdefRecord(*static_cast(record), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlNdefRecord(*static_cast(record), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlNdefRecord(*static_cast(record), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/nfc/nfc.go b/nfc/nfc.go index cc339411..2b2f49c8 100644 --- a/nfc/nfc.go +++ b/nfc/nfc.go @@ -157,11 +157,10 @@ func (ptr *QNdefFilter) RecordCount() int { } type QNdefMessage struct { - core.QList + ptr unsafe.Pointer } type QNdefMessage_ITF interface { - core.QList_ITF QNdefMessage_PTR() *QNdefMessage } @@ -171,14 +170,14 @@ func (ptr *QNdefMessage) QNdefMessage_PTR() *QNdefMessage { func (ptr *QNdefMessage) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QNdefMessage) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } @@ -273,216 +272,6 @@ func (ptr *QNdefMessage) __QNdefMessage_records_newList4() unsafe.Pointer { return C.QNdefMessage___QNdefMessage_records_newList4(ptr.Pointer()) } -func (ptr *QNdefMessage) __QList_other_atList3(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___QList_other_atList3(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __QList_other_setList3(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___QList_other_setList3(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __QList_other_newList3() unsafe.Pointer { - return C.QNdefMessage___QList_other_newList3(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __QList_other_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___QList_other_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __QList_other_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___QList_other_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __QList_other_newList2() unsafe.Pointer { - return C.QNdefMessage___QList_other_newList2(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __fromSet_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___fromSet_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __fromSet_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___fromSet_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __fromSet_newList() unsafe.Pointer { - return C.QNdefMessage___fromSet_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __fromStdList_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___fromStdList_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __fromStdList_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___fromStdList_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __fromStdList_newList() unsafe.Pointer { - return C.QNdefMessage___fromStdList_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __fromVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___fromVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __fromVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___fromVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __fromVector_newList() unsafe.Pointer { - return C.QNdefMessage___fromVector_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __fromVector_vector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___fromVector_vector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __fromVector_vector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___fromVector_vector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __fromVector_vector_newList() unsafe.Pointer { - return C.QNdefMessage___fromVector_vector_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __append_value_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___append_value_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __append_value_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___append_value_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __append_value_newList2() unsafe.Pointer { - return C.QNdefMessage___append_value_newList2(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __swap_other_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___swap_other_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __swap_other_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___swap_other_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __swap_other_newList() unsafe.Pointer { - return C.QNdefMessage___swap_other_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __mid_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___mid_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __mid_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___mid_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __mid_newList() unsafe.Pointer { - return C.QNdefMessage___mid_newList(ptr.Pointer()) -} - -func (ptr *QNdefMessage) __toVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QNdefMessage___toVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QNdefMessage) __toVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QNdefMessage___toVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QNdefMessage) __toVector_newList() unsafe.Pointer { - return C.QNdefMessage___toVector_newList(ptr.Pointer()) -} - type QNdefNfcSmartPosterRecord struct { QNdefRecord } diff --git a/nfc/nfc.h b/nfc/nfc.h index 99b615e5..bf2c06d4 100644 --- a/nfc/nfc.h +++ b/nfc/nfc.h @@ -35,36 +35,6 @@ void* QNdefMessage_ToByteArray(void* ptr); void* QNdefMessage___QNdefMessage_records_atList4(void* ptr, int i); void QNdefMessage___QNdefMessage_records_setList4(void* ptr, void* i); void* QNdefMessage___QNdefMessage_records_newList4(void* ptr); -void* QNdefMessage___QList_other_atList3(void* ptr, int i); -void QNdefMessage___QList_other_setList3(void* ptr, void* i); -void* QNdefMessage___QList_other_newList3(void* ptr); -void* QNdefMessage___QList_other_atList2(void* ptr, int i); -void QNdefMessage___QList_other_setList2(void* ptr, void* i); -void* QNdefMessage___QList_other_newList2(void* ptr); -void* QNdefMessage___fromSet_atList(void* ptr, int i); -void QNdefMessage___fromSet_setList(void* ptr, void* i); -void* QNdefMessage___fromSet_newList(void* ptr); -void* QNdefMessage___fromStdList_atList(void* ptr, int i); -void QNdefMessage___fromStdList_setList(void* ptr, void* i); -void* QNdefMessage___fromStdList_newList(void* ptr); -void* QNdefMessage___fromVector_atList(void* ptr, int i); -void QNdefMessage___fromVector_setList(void* ptr, void* i); -void* QNdefMessage___fromVector_newList(void* ptr); -void* QNdefMessage___fromVector_vector_atList(void* ptr, int i); -void QNdefMessage___fromVector_vector_setList(void* ptr, void* i); -void* QNdefMessage___fromVector_vector_newList(void* ptr); -void* QNdefMessage___append_value_atList2(void* ptr, int i); -void QNdefMessage___append_value_setList2(void* ptr, void* i); -void* QNdefMessage___append_value_newList2(void* ptr); -void* QNdefMessage___swap_other_atList(void* ptr, int i); -void QNdefMessage___swap_other_setList(void* ptr, void* i); -void* QNdefMessage___swap_other_newList(void* ptr); -void* QNdefMessage___mid_atList(void* ptr, int i); -void QNdefMessage___mid_setList(void* ptr, void* i); -void* QNdefMessage___mid_newList(void* ptr); -void* QNdefMessage___toVector_atList(void* ptr, int i); -void QNdefMessage___toVector_setList(void* ptr, void* i); -void* QNdefMessage___toVector_newList(void* ptr); void* QNdefNfcSmartPosterRecord_NewQNdefNfcSmartPosterRecord(); void* QNdefNfcSmartPosterRecord_NewQNdefNfcSmartPosterRecord3(void* other); void* QNdefNfcSmartPosterRecord_NewQNdefNfcSmartPosterRecord2(void* other); diff --git a/positioning/positioning.cpp b/positioning/positioning.cpp index f52dca11..1a5f2dfc 100644 --- a/positioning/positioning.cpp +++ b/positioning/positioning.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -49,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -402,8 +400,6 @@ void* QGeoAreaMonitorSource_NewQGeoAreaMonitorSource(void* parent) return new MyQGeoAreaMonitorSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoAreaMonitorSource(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoAreaMonitorSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoAreaMonitorSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1313,8 +1309,6 @@ void* QGeoPositionInfoSource_NewQGeoPositionInfoSource(void* parent) return new MyQGeoPositionInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoPositionInfoSource(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoPositionInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoPositionInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1952,8 +1946,6 @@ void* QGeoSatelliteInfoSource_NewQGeoSatelliteInfoSource(void* parent) return new MyQGeoSatelliteInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoSatelliteInfoSource(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGeoSatelliteInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGeoSatelliteInfoSource(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2366,8 +2358,6 @@ void* QNmeaPositionInfoSource_NewQNmeaPositionInfoSource(long long updateMode, v return new MyQNmeaPositionInfoSource(static_cast(updateMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNmeaPositionInfoSource(static_cast(updateMode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQNmeaPositionInfoSource(static_cast(updateMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQNmeaPositionInfoSource(static_cast(updateMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/printsupport/printsupport.cpp b/printsupport/printsupport.cpp index 54353078..96fc19d3 100644 --- a/printsupport/printsupport.cpp +++ b/printsupport/printsupport.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/purchasing/purchasing.cpp b/purchasing/purchasing.cpp index e502867e..56a2695c 100644 --- a/purchasing/purchasing.cpp +++ b/purchasing/purchasing.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -284,8 +282,6 @@ void* QInAppStore_NewQInAppStore(void* parent) return new MyQInAppStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQInAppStore(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQInAppStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQInAppStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/qml/qml.cpp b/qml/qml.cpp index 7baffb2c..274d9141 100644 --- a/qml/qml.cpp +++ b/qml/qml.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -57,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -126,8 +124,6 @@ void* QJSEngine_NewQJSEngine2(void* parent) return new MyQJSEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQJSEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQJSEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQJSEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -757,8 +753,6 @@ void* QQmlApplicationEngine_NewQQmlApplicationEngine(void* parent) return new MyQQmlApplicationEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlApplicationEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -798,8 +792,6 @@ void* QQmlApplicationEngine_NewQQmlApplicationEngine3(struct QtQml_PackedString return new MyQQmlApplicationEngine(QString::fromUtf8(filePath.data, filePath.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(QString::fromUtf8(filePath.data, filePath.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlApplicationEngine(QString::fromUtf8(filePath.data, filePath.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(QString::fromUtf8(filePath.data, filePath.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -839,8 +831,6 @@ void* QQmlApplicationEngine_NewQQmlApplicationEngine2(void* url, void* parent) return new MyQQmlApplicationEngine(*static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(*static_cast(url), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlApplicationEngine(*static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlApplicationEngine(*static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1027,8 +1017,6 @@ void* QQmlComponent_NewQQmlComponent(void* engine, void* parent) return new MyQQmlComponent(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlComponent(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1068,8 +1056,6 @@ void* QQmlComponent_NewQQmlComponent3(void* engine, struct QtQml_PackedString fi return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1109,8 +1095,6 @@ void* QQmlComponent_NewQQmlComponent4(void* engine, struct QtQml_PackedString fi return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(mode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), QString::fromUtf8(fileName.data, fileName.len), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1150,8 +1134,6 @@ void* QQmlComponent_NewQQmlComponent5(void* engine, void* url, void* parent) return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1191,8 +1173,6 @@ void* QQmlComponent_NewQQmlComponent6(void* engine, void* url, long long mode, v return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(mode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlComponent(static_cast(engine), *static_cast(url), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1539,8 +1519,6 @@ void* QQmlContext_NewQQmlContext2(void* parentContext, void* parent) return new MyQQmlContext(static_cast(parentContext), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlContext(static_cast(parentContext), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlContext(static_cast(parentContext), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlContext(static_cast(parentContext), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1580,8 +1558,6 @@ void* QQmlContext_NewQQmlContext(void* engine, void* parent) return new MyQQmlContext(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlContext(static_cast(engine), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlContext(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlContext(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1864,8 +1840,6 @@ void* QQmlEngine_NewQQmlEngine(void* parent) return new MyQQmlEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2257,8 +2231,6 @@ void* QQmlExpression_NewQQmlExpression2(void* ctxt, void* scope, struct QtQml_Pa return new MyQQmlExpression(static_cast(ctxt), static_cast(scope), QString::fromUtf8(expression.data, expression.len), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { return new MyQQmlExpression(static_cast(ctxt), static_cast(scope), QString::fromUtf8(expression.data, expression.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(static_cast(ctxt), static_cast(scope), QString::fromUtf8(expression.data, expression.len), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { return new MyQQmlExpression(static_cast(ctxt), static_cast(scope), QString::fromUtf8(expression.data, expression.len), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { @@ -2298,8 +2270,6 @@ void* QQmlExpression_NewQQmlExpression3(void* script, void* ctxt, void* scope, v return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); - } else if (dynamic_cast(static_cast(scope))) { - return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { return new MyQQmlExpression(*static_cast(script), static_cast(ctxt), static_cast(scope), static_cast(parent)); } else if (dynamic_cast(static_cast(scope))) { @@ -2599,8 +2569,6 @@ void* QQmlExtensionPlugin_NewQQmlExtensionPlugin(void* parent) return new MyQQmlExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlExtensionPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2822,8 +2790,6 @@ void* QQmlFileSelector_NewQQmlFileSelector(void* engine, void* parent) return new MyQQmlFileSelector(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlFileSelector(static_cast(engine), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlFileSelector(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlFileSelector(static_cast(engine), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3187,8 +3153,6 @@ void* QQmlListReference_NewQQmlListReference2(void* object, char* property, void return new QQmlListReference(static_cast(object), const_cast(property), static_cast(engine)); } else if (dynamic_cast(static_cast(object))) { return new QQmlListReference(static_cast(object), const_cast(property), static_cast(engine)); - } else if (dynamic_cast(static_cast(object))) { - return new QQmlListReference(static_cast(object), const_cast(property), static_cast(engine)); } else if (dynamic_cast(static_cast(object))) { return new QQmlListReference(static_cast(object), const_cast(property), static_cast(engine)); } else if (dynamic_cast(static_cast(object))) { @@ -3344,8 +3308,6 @@ void* QQmlProperty_NewQQmlProperty2(void* obj) return new QQmlProperty(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj)); } else if (dynamic_cast(static_cast(obj))) { @@ -3385,8 +3347,6 @@ void* QQmlProperty_NewQQmlProperty3(void* obj, void* ctxt) return new QQmlProperty(static_cast(obj), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), static_cast(ctxt)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { @@ -3426,8 +3386,6 @@ void* QQmlProperty_NewQQmlProperty4(void* obj, void* engine) return new QQmlProperty(static_cast(obj), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), static_cast(engine)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { @@ -3467,8 +3425,6 @@ void* QQmlProperty_NewQQmlProperty5(void* obj, struct QtQml_PackedString name) return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len)); } else if (dynamic_cast(static_cast(obj))) { @@ -3508,8 +3464,6 @@ void* QQmlProperty_NewQQmlProperty6(void* obj, struct QtQml_PackedString name, v return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(ctxt)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(ctxt)); } else if (dynamic_cast(static_cast(obj))) { @@ -3549,8 +3503,6 @@ void* QQmlProperty_NewQQmlProperty7(void* obj, struct QtQml_PackedString name, v return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(engine)); - } else if (dynamic_cast(static_cast(obj))) { - return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { return new QQmlProperty(static_cast(obj), QString::fromUtf8(name.data, name.len), static_cast(engine)); } else if (dynamic_cast(static_cast(obj))) { @@ -3754,8 +3706,6 @@ void* QQmlPropertyMap_NewQQmlPropertyMap(void* parent) return new MyQQmlPropertyMap(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlPropertyMap(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQmlPropertyMap(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQmlPropertyMap(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/quick/quick.cpp b/quick/quick.cpp index fc8cca4c..32dec65c 100644 --- a/quick/quick.cpp +++ b/quick/quick.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -111,7 +110,6 @@ #include #include #include -#include #include #include #include @@ -2518,8 +2516,6 @@ void* QQuickRenderControl_NewQQuickRenderControl(void* parent) return new MyQQuickRenderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickRenderControl(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQuickRenderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickRenderControl(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5742,8 +5738,6 @@ void* QSGEngine_NewQSGEngine(void* parent) return new MyQSGEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSGEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSGEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSGEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/remoteobjects/remoteobjects.cpp b/remoteobjects/remoteobjects.cpp index 7c5c1e99..ec44a98f 100644 --- a/remoteobjects/remoteobjects.cpp +++ b/remoteobjects/remoteobjects.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -108,8 +106,6 @@ void* QRemoteObjectAbstractPersistedStore_NewQRemoteObjectAbstractPersistedStore return new MyQRemoteObjectAbstractPersistedStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectAbstractPersistedStore(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectAbstractPersistedStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectAbstractPersistedStore(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -406,8 +402,6 @@ void* QRemoteObjectHost_NewQRemoteObjectHost(void* parent) return new MyQRemoteObjectHost(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectHost(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -447,8 +441,6 @@ void* QRemoteObjectHost_NewQRemoteObjectHost3(void* address, void* parent) return new MyQRemoteObjectHost(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(*static_cast(address), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectHost(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(*static_cast(address), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -488,8 +480,6 @@ void* QRemoteObjectHost_NewQRemoteObjectHost2(void* address, void* registryAddre return new MyQRemoteObjectHost(*static_cast(address), *static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(*static_cast(address), *static_cast(registryAddress), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectHost(*static_cast(address), *static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectHost(*static_cast(address), *static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -647,8 +637,6 @@ void* QRemoteObjectNode_NewQRemoteObjectNode(void* parent) return new MyQRemoteObjectNode(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectNode(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectNode(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectNode(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -688,8 +676,6 @@ void* QRemoteObjectNode_NewQRemoteObjectNode2(void* registryAddress, void* paren return new MyQRemoteObjectNode(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectNode(*static_cast(registryAddress), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectNode(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectNode(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1178,8 +1164,6 @@ void* QRemoteObjectRegistryHost_NewQRemoteObjectRegistryHost(void* registryAddre return new MyQRemoteObjectRegistryHost(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectRegistryHost(*static_cast(registryAddress), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRemoteObjectRegistryHost(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRemoteObjectRegistryHost(*static_cast(registryAddress), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/sailfish/sailfish_sailfish.cpp b/sailfish/sailfish_sailfish.cpp index 50a5130a..250bae0e 100644 --- a/sailfish/sailfish_sailfish.cpp +++ b/sailfish/sailfish_sailfish.cpp @@ -7,7 +7,6 @@ #include "_cgo_export.h" #include -#include #include #include #include diff --git a/script/script.cpp b/script/script.cpp index 83bd1537..2bdec9fa 100644 --- a/script/script.cpp +++ b/script/script.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -46,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -406,8 +404,6 @@ void* QScriptEngine_NewQScriptEngine2(void* parent) return new MyQScriptEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScriptEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -986,8 +982,6 @@ void* QScriptExtensionPlugin_NewQScriptExtensionPlugin(void* parent) return new MyQScriptExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptExtensionPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScriptExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptExtensionPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/scripttools/scripttools.cpp b/scripttools/scripttools.cpp index 95c4c03a..0e6bc2c2 100644 --- a/scripttools/scripttools.cpp +++ b/scripttools/scripttools.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -32,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -99,8 +97,6 @@ void* QScriptEngineDebugger_NewQScriptEngineDebugger(void* parent) return new MyQScriptEngineDebugger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptEngineDebugger(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScriptEngineDebugger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScriptEngineDebugger(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/scxml/scxml.cpp b/scxml/scxml.cpp index 58a77149..1c3d2fd8 100644 --- a/scxml/scxml.cpp +++ b/scxml/scxml.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -45,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -605,8 +603,6 @@ void* QScxmlEcmaScriptDataModel_NewQScxmlEcmaScriptDataModel(void* parent) return new MyQScxmlEcmaScriptDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlEcmaScriptDataModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScxmlEcmaScriptDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlEcmaScriptDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1323,8 +1319,6 @@ void* QScxmlNullDataModel_NewQScxmlNullDataModel(void* parent) return new MyQScxmlNullDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlNullDataModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScxmlNullDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlNullDataModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1467,8 +1461,6 @@ void* QScxmlStateMachine_NewQScxmlStateMachine(void* metaObject, void* parent) return new MyQScxmlStateMachine(static_cast(metaObject), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlStateMachine(static_cast(metaObject), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQScxmlStateMachine(static_cast(metaObject), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQScxmlStateMachine(static_cast(metaObject), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/sensors/sensors.cpp b/sensors/sensors.cpp index 5e1688ed..8565f1c2 100644 --- a/sensors/sensors.cpp +++ b/sensors/sensors.cpp @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -93,7 +92,6 @@ #include #include #include -#include #include #include #include @@ -178,8 +176,6 @@ void* QAccelerometer_NewQAccelerometer(void* parent) return new MyQAccelerometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccelerometer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAccelerometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccelerometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -300,8 +296,6 @@ void* QAccelerometerReading_NewQAccelerometerReading(void* parent) return new MyQAccelerometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccelerometerReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAccelerometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAccelerometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -430,8 +424,6 @@ void* QAltimeter_NewQAltimeter(void* parent) return new MyQAltimeter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAltimeter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAltimeter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAltimeter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -526,8 +518,6 @@ void* QAltimeterReading_NewQAltimeterReading(void* parent) return new MyQAltimeterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAltimeterReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAltimeterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAltimeterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -632,8 +622,6 @@ void* QAmbientLightReading_NewQAmbientLightReading(void* parent) return new MyQAmbientLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientLightReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAmbientLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -742,8 +730,6 @@ void* QAmbientLightSensor_NewQAmbientLightSensor(void* parent) return new MyQAmbientLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientLightSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAmbientLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -838,8 +824,6 @@ void* QAmbientTemperatureReading_NewQAmbientTemperatureReading(void* parent) return new MyQAmbientTemperatureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientTemperatureReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAmbientTemperatureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientTemperatureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -948,8 +932,6 @@ void* QAmbientTemperatureSensor_NewQAmbientTemperatureSensor(void* parent) return new MyQAmbientTemperatureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientTemperatureSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAmbientTemperatureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAmbientTemperatureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1048,8 +1030,6 @@ void* QCompass_NewQCompass(void* parent) return new MyQCompass(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompass(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCompass(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompass(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1144,8 +1124,6 @@ void* QCompassReading_NewQCompassReading(void* parent) return new MyQCompassReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompassReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCompassReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompassReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1260,8 +1238,6 @@ void* QDistanceReading_NewQDistanceReading(void* parent) return new MyQDistanceReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDistanceReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDistanceReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDistanceReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1370,8 +1346,6 @@ void* QDistanceSensor_NewQDistanceSensor(void* parent) return new MyQDistanceSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDistanceSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDistanceSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDistanceSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1470,8 +1444,6 @@ void* QGyroscope_NewQGyroscope(void* parent) return new MyQGyroscope(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGyroscope(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGyroscope(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGyroscope(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1566,8 +1538,6 @@ void* QGyroscopeReading_NewQGyroscopeReading(void* parent) return new MyQGyroscopeReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGyroscopeReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGyroscopeReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGyroscopeReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1692,8 +1662,6 @@ void* QHolsterReading_NewQHolsterReading(void* parent) return new MyQHolsterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHolsterReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHolsterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHolsterReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1802,8 +1770,6 @@ void* QHolsterSensor_NewQHolsterSensor(void* parent) return new MyQHolsterSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHolsterSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHolsterSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHolsterSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1898,8 +1864,6 @@ void* QHumidityReading_NewQHumidityReading(void* parent) return new MyQHumidityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHumidityReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHumidityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHumidityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2018,8 +1982,6 @@ void* QHumiditySensor_NewQHumiditySensor(void* parent) return new MyQHumiditySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHumiditySensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQHumiditySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQHumiditySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2114,8 +2076,6 @@ void* QIRProximityReading_NewQIRProximityReading(void* parent) return new MyQIRProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIRProximityReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIRProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIRProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2224,8 +2184,6 @@ void* QIRProximitySensor_NewQIRProximitySensor(void* parent) return new MyQIRProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIRProximitySensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQIRProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQIRProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2322,8 +2280,6 @@ void* QLidReading_NewQLidReading(void* parent) return new MyQLidReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLidReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLidReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLidReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2472,8 +2428,6 @@ void* QLidSensor_NewQLidSensor(void* parent) return new MyQLidSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLidSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLidSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLidSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2568,8 +2522,6 @@ void* QLightReading_NewQLightReading(void* parent) return new MyQLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLightReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLightReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2679,8 +2631,6 @@ void* QLightSensor_NewQLightSensor(void* parent) return new MyQLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLightSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQLightSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2805,8 +2755,6 @@ void* QMagnetometer_NewQMagnetometer(void* parent) return new MyQMagnetometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMagnetometer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMagnetometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMagnetometer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2926,8 +2874,6 @@ void* QMagnetometerReading_NewQMagnetometerReading(void* parent) return new MyQMagnetometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMagnetometerReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMagnetometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMagnetometerReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3062,8 +3008,6 @@ void* QOrientationReading_NewQOrientationReading(void* parent) return new MyQOrientationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOrientationReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOrientationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOrientationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3172,8 +3116,6 @@ void* QOrientationSensor_NewQOrientationSensor(void* parent) return new MyQOrientationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOrientationSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQOrientationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQOrientationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3268,8 +3210,6 @@ void* QPressureReading_NewQPressureReading(void* parent) return new MyQPressureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPressureReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPressureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPressureReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3388,8 +3328,6 @@ void* QPressureSensor_NewQPressureSensor(void* parent) return new MyQPressureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPressureSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQPressureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQPressureSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3484,8 +3422,6 @@ void* QProximityReading_NewQProximityReading(void* parent) return new MyQProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQProximityReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQProximityReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3594,8 +3530,6 @@ void* QProximitySensor_NewQProximitySensor(void* parent) return new MyQProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQProximitySensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQProximitySensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3690,8 +3624,6 @@ void* QRotationReading_NewQRotationReading(void* parent) return new MyQRotationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRotationReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRotationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRotationReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3811,8 +3743,6 @@ void* QRotationSensor_NewQRotationSensor(void* parent) return new MyQRotationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRotationSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQRotationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQRotationSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3951,8 +3881,6 @@ void* QSensor_NewQSensor(void* ty, void* parent) return new MyQSensor(*static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensor(*static_cast(ty), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSensor(*static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensor(*static_cast(ty), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5341,8 +5269,6 @@ void* QSensorGesture_NewQSensorGesture(struct QtSensors_PackedString ids, void* return new MyQSensorGesture(QString::fromUtf8(ids.data, ids.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGesture(QString::fromUtf8(ids.data, ids.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSensorGesture(QString::fromUtf8(ids.data, ids.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGesture(QString::fromUtf8(ids.data, ids.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5592,8 +5518,6 @@ void* QSensorGestureManager_NewQSensorGestureManager(void* parent) return new MyQSensorGestureManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGestureManager(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSensorGestureManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGestureManager(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5899,8 +5823,6 @@ void* QSensorGestureRecognizer_NewQSensorGestureRecognizer(void* parent) return new MyQSensorGestureRecognizer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGestureRecognizer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSensorGestureRecognizer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSensorGestureRecognizer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6751,8 +6673,6 @@ void* QTapReading_NewQTapReading(void* parent) return new MyQTapReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTapReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTapReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTapReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6872,8 +6792,6 @@ void* QTapSensor_NewQTapSensor(void* parent) return new MyQTapSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTapSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTapSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTapSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6993,8 +6911,6 @@ void* QTiltReading_NewQTiltReading(void* parent) return new MyQTiltReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTiltReading(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTiltReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTiltReading(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -7113,8 +7029,6 @@ void* QTiltSensor_NewQTiltSensor(void* parent) return new MyQTiltSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTiltSensor(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTiltSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTiltSensor(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/serialbus/serialbus.cpp b/serialbus/serialbus.cpp index 8f7376b7..c81f6ee9 100644 --- a/serialbus/serialbus.cpp +++ b/serialbus/serialbus.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -314,8 +312,6 @@ void* QCanBusDevice_NewQCanBusDevice(void* parent) return new MyQCanBusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCanBusDevice(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCanBusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCanBusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -977,8 +973,6 @@ void* QModbusClient_NewQModbusClient(void* parent) return new MyQModbusClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusClient(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1318,8 +1312,6 @@ void* QModbusDevice_NewQModbusDevice(void* parent) return new MyQModbusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusDevice(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusDevice(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2025,8 +2017,6 @@ void* QModbusReply_NewQModbusReply(long long ty, int serverAddress, void* parent return new MyQModbusReply(static_cast(ty), serverAddress, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusReply(static_cast(ty), serverAddress, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusReply(static_cast(ty), serverAddress, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusReply(static_cast(ty), serverAddress, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2363,8 +2353,6 @@ void* QModbusRtuSerialMaster_NewQModbusRtuSerialMaster(void* parent) return new MyQModbusRtuSerialMaster(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusRtuSerialMaster(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusRtuSerialMaster(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusRtuSerialMaster(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2470,8 +2458,6 @@ void* QModbusRtuSerialSlave_NewQModbusRtuSerialSlave(void* parent) return new MyQModbusRtuSerialSlave(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusRtuSerialSlave(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusRtuSerialSlave(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusRtuSerialSlave(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2607,8 +2593,6 @@ void* QModbusServer_NewQModbusServer(void* parent) return new MyQModbusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusServer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2835,8 +2819,6 @@ void* QModbusTcpClient_NewQModbusTcpClient(void* parent) return new MyQModbusTcpClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusTcpClient(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusTcpClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusTcpClient(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2941,8 +2923,6 @@ void* QModbusTcpServer_NewQModbusTcpServer(void* parent) return new MyQModbusTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusTcpServer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQModbusTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQModbusTcpServer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/serialport/serialport.cpp b/serialport/serialport.cpp index aeb726a8..bc03019e 100644 --- a/serialport/serialport.cpp +++ b/serialport/serialport.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -33,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -126,8 +124,6 @@ void* QSerialPort_NewQSerialPort(void* parent) return new MyQSerialPort(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSerialPort(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -167,8 +163,6 @@ void* QSerialPort_NewQSerialPort3(void* serialPortInfo, void* parent) return new MyQSerialPort(*static_cast(serialPortInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(*static_cast(serialPortInfo), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSerialPort(*static_cast(serialPortInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(*static_cast(serialPortInfo), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -208,8 +202,6 @@ void* QSerialPort_NewQSerialPort2(struct QtSerialPort_PackedString name, void* p return new MyQSerialPort(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(QString::fromUtf8(name.data, name.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSerialPort(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSerialPort(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/speech/speech.cpp b/speech/speech.cpp index 60fb3c00..fbe0a5b6 100644 --- a/speech/speech.cpp +++ b/speech/speech.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -32,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -127,8 +125,6 @@ void* QTextToSpeech_NewQTextToSpeech(void* parent) return new MyQTextToSpeech(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeech(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTextToSpeech(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeech(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -168,8 +164,6 @@ void* QTextToSpeech_NewQTextToSpeech2(struct QtSpeech_PackedString engine, void* return new MyQTextToSpeech(QString::fromUtf8(engine.data, engine.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeech(QString::fromUtf8(engine.data, engine.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTextToSpeech(QString::fromUtf8(engine.data, engine.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeech(QString::fromUtf8(engine.data, engine.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -622,8 +616,6 @@ void* QTextToSpeechEngine_NewQTextToSpeechEngine(void* parent) return new MyQTextToSpeechEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeechEngine(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQTextToSpeechEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQTextToSpeechEngine(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/sql/sql.cpp b/sql/sql.cpp index 5f8189b8..3a88cb8f 100644 --- a/sql/sql.cpp +++ b/sql/sql.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -384,8 +382,6 @@ void* QSqlDriver_NewQSqlDriver(void* parent) return new MyQSqlDriver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlDriver(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlDriver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlDriver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -882,8 +878,6 @@ void* QSqlDriverPlugin_NewQSqlDriverPlugin(void* parent) return new MyQSqlDriverPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlDriverPlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlDriverPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlDriverPlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1691,8 +1685,6 @@ void* QSqlQueryModel_NewQSqlQueryModel(void* parent) return new MyQSqlQueryModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlQueryModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlQueryModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlQueryModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2904,8 +2896,6 @@ void* QSqlRelationalDelegate_NewQSqlRelationalDelegate(void* parent) return new MyQSqlRelationalDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlRelationalDelegate(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlRelationalDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlRelationalDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -3245,8 +3235,6 @@ void* QSqlRelationalTableModel_NewQSqlRelationalTableModel(void* parent, void* d return new MyQSqlRelationalTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlRelationalTableModel(static_cast(parent), *static_cast(db)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlRelationalTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlRelationalTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { @@ -3811,8 +3799,6 @@ void* QSqlTableModel_NewQSqlTableModel(void* parent, void* db) return new MyQSqlTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlTableModel(static_cast(parent), *static_cast(db)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSqlTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSqlTableModel(static_cast(parent), *static_cast(db)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/svg/svg.cpp b/svg/svg.cpp index 40b273f9..c9a6215a 100644 --- a/svg/svg.cpp +++ b/svg/svg.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -68,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -766,8 +764,6 @@ void* QSvgRenderer_NewQSvgRenderer(void* parent) return new MyQSvgRenderer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSvgRenderer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -807,8 +803,6 @@ void* QSvgRenderer_NewQSvgRenderer4(void* contents, void* parent) return new MyQSvgRenderer(static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(static_cast(contents), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSvgRenderer(static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -848,8 +842,6 @@ void* QSvgRenderer_NewQSvgRenderer3(void* contents, void* parent) return new MyQSvgRenderer(*static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(*static_cast(contents), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSvgRenderer(*static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(*static_cast(contents), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -889,8 +881,6 @@ void* QSvgRenderer_NewQSvgRenderer2(struct QtSvg_PackedString filename, void* pa return new MyQSvgRenderer(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSvgRenderer(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSvgRenderer(QString::fromUtf8(filename.data, filename.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/testlib/testlib.cpp b/testlib/testlib.cpp index 609387e0..3919d988 100644 --- a/testlib/testlib.cpp +++ b/testlib/testlib.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -81,8 +80,6 @@ void* QAbstractItemModelTester_NewQAbstractItemModelTester2(void* model, long lo return new MyQAbstractItemModelTester(static_cast(model), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModelTester(static_cast(model), static_cast(mode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractItemModelTester(static_cast(model), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModelTester(static_cast(model), static_cast(mode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -122,8 +119,6 @@ void* QAbstractItemModelTester_NewQAbstractItemModelTester(void* model, void* pa return new MyQAbstractItemModelTester(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModelTester(static_cast(model), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractItemModelTester(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemModelTester(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -181,355 +176,168 @@ int QSignalSpy_QSignalSpy_QRegisterMetaType(){qRegisterMetaType(); void* QSignalSpy_NewQSignalSpy(void* object, char* sign) { - return new MyQSignalSpy(static_cast(object), const_cast(sign)); + if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else if (dynamic_cast(static_cast(object))) { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } else { + return new MyQSignalSpy(static_cast(object), const_cast(sign)); + } } char QSignalSpy_Wait(void* ptr, int timeout) { - return static_cast(ptr)->wait(timeout); + return static_cast(ptr)->wait(timeout); } void* QSignalSpy_Signal(void* ptr) { - return new QByteArray(static_cast(ptr)->signal()); + return new QByteArray(static_cast(ptr)->signal()); } char QSignalSpy_IsValid(void* ptr) { - return static_cast(ptr)->isValid(); + return static_cast(ptr)->isValid(); } int QSignalSpy___args_atList(void* ptr, int i) { - return ({int tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QVector(); free(ptr); }; tmp; }); + return ({int tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QVector(); free(ptr); }; tmp; }); } void QSignalSpy___args_setList(void* ptr, int i) { - static_cast*>(ptr)->append(i); + static_cast*>(ptr)->append(i); } void* QSignalSpy___args_newList(void* ptr) { Q_UNUSED(ptr); - return new QVector(); + return new QVector(); } int QSignalSpy___setArgs__atList(void* ptr, int i) { - return ({int tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QVector(); free(ptr); }; tmp; }); + return ({int tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QVector(); free(ptr); }; tmp; }); } void QSignalSpy___setArgs__setList(void* ptr, int i) { - static_cast*>(ptr)->append(i); + static_cast*>(ptr)->append(i); } void* QSignalSpy___setArgs__newList(void* ptr) { Q_UNUSED(ptr); - return new QVector(); + return new QVector(); } void* QSignalSpy___dynamicPropertyNames_atList(void* ptr, int i) { - return new QByteArray(({QByteArray tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; })); + return new QByteArray(({QByteArray tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; })); } void QSignalSpy___dynamicPropertyNames_setList(void* ptr, void* i) { - static_cast*>(ptr)->append(*static_cast(i)); + static_cast*>(ptr)->append(*static_cast(i)); } void* QSignalSpy___dynamicPropertyNames_newList(void* ptr) { Q_UNUSED(ptr); - return new QList(); + return new QList(); } void* QSignalSpy___findChildren_atList2(void* ptr, int i) { - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); + return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); } void QSignalSpy___findChildren_setList2(void* ptr, void* i) { - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } + static_cast*>(ptr)->append(static_cast(i)); } void* QSignalSpy___findChildren_newList2(void* ptr) { Q_UNUSED(ptr); - return new QList(); + return new QList(); } void* QSignalSpy___findChildren_atList3(void* ptr, int i) { - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); + return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); } void QSignalSpy___findChildren_setList3(void* ptr, void* i) { - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } + static_cast*>(ptr)->append(static_cast(i)); } void* QSignalSpy___findChildren_newList3(void* ptr) { Q_UNUSED(ptr); - return new QList(); + return new QList(); } void* QSignalSpy___findChildren_atList(void* ptr, int i) { - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); + return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); } void QSignalSpy___findChildren_setList(void* ptr, void* i) { - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } + static_cast*>(ptr)->append(static_cast(i)); } void* QSignalSpy___findChildren_newList(void* ptr) { Q_UNUSED(ptr); - return new QList(); + return new QList(); } void* QSignalSpy___children_atList(void* ptr, int i) { - return ({QObject * tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); + return ({QObject * tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); } void QSignalSpy___children_setList(void* ptr, void* i) { - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } + static_cast*>(ptr)->append(static_cast(i)); } void* QSignalSpy___children_newList(void* ptr) { Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___QList_other_atList3(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___QList_other_setList3(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___QList_other_newList3(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___QList_other_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___QList_other_setList2(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___QList_other_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___fromSet_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___fromSet_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___fromSet_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___fromStdList_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___fromStdList_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___fromStdList_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___fromVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___fromVector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___fromVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___fromVector_vector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___fromVector_vector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___fromVector_vector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___append_value_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___append_value_setList2(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___append_value_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___swap_other_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___swap_other_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___swap_other_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___mid_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___mid_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___mid_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QSignalSpy___toVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QSignalSpy___toVector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QSignalSpy___toVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -char QSignalSpy_Event(void* ptr, void* e) -{ - return static_cast(ptr)->event(static_cast(e)); + return new QList(); } char QSignalSpy_EventDefault(void* ptr, void* e) @@ -537,27 +345,9 @@ char QSignalSpy_EventDefault(void* ptr, void* e) return static_cast(ptr)->QSignalSpy::event(static_cast(e)); } -char QSignalSpy_EventFilter(void* ptr, void* watched, void* event) -{ - if (dynamic_cast(static_cast(watched))) { - return static_cast(ptr)->eventFilter(static_cast(watched), static_cast(event)); - } else { - return static_cast(ptr)->eventFilter(static_cast(watched), static_cast(event)); - } -} - char QSignalSpy_EventFilterDefault(void* ptr, void* watched, void* event) { - if (dynamic_cast(static_cast(watched))) { - return static_cast(ptr)->QSignalSpy::eventFilter(static_cast(watched), static_cast(event)); - } else { return static_cast(ptr)->QSignalSpy::eventFilter(static_cast(watched), static_cast(event)); - } -} - -void QSignalSpy_ChildEvent(void* ptr, void* event) -{ - static_cast(ptr)->childEvent(static_cast(event)); } void QSignalSpy_ChildEventDefault(void* ptr, void* event) @@ -565,61 +355,31 @@ void QSignalSpy_ChildEventDefault(void* ptr, void* event) static_cast(ptr)->QSignalSpy::childEvent(static_cast(event)); } -void QSignalSpy_ConnectNotify(void* ptr, void* sign) -{ - static_cast(ptr)->connectNotify(*static_cast(sign)); -} - void QSignalSpy_ConnectNotifyDefault(void* ptr, void* sign) { static_cast(ptr)->QSignalSpy::connectNotify(*static_cast(sign)); } -void QSignalSpy_CustomEvent(void* ptr, void* event) -{ - static_cast(ptr)->customEvent(static_cast(event)); -} - void QSignalSpy_CustomEventDefault(void* ptr, void* event) { static_cast(ptr)->QSignalSpy::customEvent(static_cast(event)); } -void QSignalSpy_DeleteLater(void* ptr) -{ - QMetaObject::invokeMethod(static_cast(ptr), "deleteLater"); -} - void QSignalSpy_DeleteLaterDefault(void* ptr) { static_cast(ptr)->QSignalSpy::deleteLater(); } -void QSignalSpy_DisconnectNotify(void* ptr, void* sign) -{ - static_cast(ptr)->disconnectNotify(*static_cast(sign)); -} - void QSignalSpy_DisconnectNotifyDefault(void* ptr, void* sign) { static_cast(ptr)->QSignalSpy::disconnectNotify(*static_cast(sign)); } -void QSignalSpy_TimerEvent(void* ptr, void* event) -{ - static_cast(ptr)->timerEvent(static_cast(event)); -} - void QSignalSpy_TimerEventDefault(void* ptr, void* event) { static_cast(ptr)->QSignalSpy::timerEvent(static_cast(event)); } -void* QSignalSpy_MetaObject(void* ptr) -{ - return const_cast(static_cast(ptr)->metaObject()); -} - void* QSignalSpy_MetaObjectDefault(void* ptr) { return const_cast(static_cast(ptr)->QSignalSpy::metaObject()); @@ -700,6 +460,11 @@ void QTestEventList_AddMouseRelease(void* ptr, long long button, long long modif static_cast(ptr)->addMouseRelease(static_cast(button), static_cast(modifiers), *static_cast(pos), delay); } +void QTestEventList_Clear(void* ptr) +{ + static_cast(ptr)->clear(); +} + void QTestEventList_Simulate(void* ptr, void* w) { static_cast(ptr)->simulate(static_cast(w)); @@ -710,203 +475,3 @@ void QTestEventList_DestroyQTestEventList(void* ptr) static_cast(ptr)->~QTestEventList(); } -void* QTestEventList___QList_other_atList3(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___QList_other_setList3(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___QList_other_newList3(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___QList_other_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___QList_other_setList2(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___QList_other_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___fromSet_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___fromSet_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___fromSet_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___fromStdList_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___fromStdList_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___fromStdList_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___fromVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___fromVector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___fromVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___fromVector_vector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___fromVector_vector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___fromVector_vector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___append_value_atList2(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___append_value_setList2(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___append_value_newList2(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___swap_other_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___swap_other_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___swap_other_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___mid_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___mid_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___mid_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - -void* QTestEventList___toVector_atList(void* ptr, int i) -{ - return ({QObject* tmp = static_cast*>(ptr)->at(i); if (i == static_cast*>(ptr)->size()-1) { static_cast*>(ptr)->~QList(); free(ptr); }; tmp; }); -} - -void QTestEventList___toVector_setList(void* ptr, void* i) -{ - if (dynamic_cast(static_cast(i))) { - static_cast*>(ptr)->append(static_cast(i)); - } else { - static_cast*>(ptr)->append(static_cast(i)); - } -} - -void* QTestEventList___toVector_newList(void* ptr) -{ - Q_UNUSED(ptr); - return new QList(); -} - diff --git a/testlib/testlib.go b/testlib/testlib.go index a2a58d18..2132d1f6 100644 --- a/testlib/testlib.go +++ b/testlib/testlib.go @@ -200,12 +200,10 @@ func (ptr *QAbstractItemModelTester) MetaObjectDefault() *core.QMetaObject { type QSignalSpy struct { core.QObject - core.QList } type QSignalSpy_ITF interface { core.QObject_ITF - core.QList_ITF QSignalSpy_PTR() *QSignalSpy } @@ -223,7 +221,6 @@ func (ptr *QSignalSpy) Pointer() unsafe.Pointer { func (ptr *QSignalSpy) SetPointer(p unsafe.Pointer) { if ptr != nil { ptr.QObject_PTR().SetPointer(p) - ptr.QList_PTR().SetPointer(p) } } @@ -412,216 +409,6 @@ func (ptr *QSignalSpy) __children_newList() unsafe.Pointer { return C.QSignalSpy___children_newList(ptr.Pointer()) } -func (ptr *QSignalSpy) __QList_other_atList3(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___QList_other_atList3(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __QList_other_setList3(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___QList_other_setList3(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __QList_other_newList3() unsafe.Pointer { - return C.QSignalSpy___QList_other_newList3(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __QList_other_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___QList_other_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __QList_other_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___QList_other_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __QList_other_newList2() unsafe.Pointer { - return C.QSignalSpy___QList_other_newList2(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __fromSet_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___fromSet_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __fromSet_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___fromSet_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __fromSet_newList() unsafe.Pointer { - return C.QSignalSpy___fromSet_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __fromStdList_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___fromStdList_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __fromStdList_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___fromStdList_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __fromStdList_newList() unsafe.Pointer { - return C.QSignalSpy___fromStdList_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __fromVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___fromVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __fromVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___fromVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __fromVector_newList() unsafe.Pointer { - return C.QSignalSpy___fromVector_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __fromVector_vector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___fromVector_vector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __fromVector_vector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___fromVector_vector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __fromVector_vector_newList() unsafe.Pointer { - return C.QSignalSpy___fromVector_vector_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __append_value_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___append_value_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __append_value_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___append_value_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __append_value_newList2() unsafe.Pointer { - return C.QSignalSpy___append_value_newList2(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __swap_other_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___swap_other_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __swap_other_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___swap_other_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __swap_other_newList() unsafe.Pointer { - return C.QSignalSpy___swap_other_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __mid_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___mid_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __mid_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___mid_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __mid_newList() unsafe.Pointer { - return C.QSignalSpy___mid_newList(ptr.Pointer()) -} - -func (ptr *QSignalSpy) __toVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QSignalSpy___toVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QSignalSpy) __toVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy___toVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QSignalSpy) __toVector_newList() unsafe.Pointer { - return C.QSignalSpy___toVector_newList(ptr.Pointer()) -} - //export callbackQSignalSpy_Event func callbackQSignalSpy_Event(ptr unsafe.Pointer, e unsafe.Pointer) C.char { if signal := qt.GetSignal(ptr, "event"); signal != nil { @@ -631,13 +418,6 @@ func callbackQSignalSpy_Event(ptr unsafe.Pointer, e unsafe.Pointer) C.char { return C.char(int8(qt.GoBoolToInt(NewQSignalSpyFromPointer(ptr).EventDefault(core.NewQEventFromPointer(e))))) } -func (ptr *QSignalSpy) Event(e core.QEvent_ITF) bool { - if ptr.Pointer() != nil { - return C.QSignalSpy_Event(ptr.Pointer(), core.PointerFromQEvent(e)) != 0 - } - return false -} - func (ptr *QSignalSpy) EventDefault(e core.QEvent_ITF) bool { if ptr.Pointer() != nil { return C.QSignalSpy_EventDefault(ptr.Pointer(), core.PointerFromQEvent(e)) != 0 @@ -654,13 +434,6 @@ func callbackQSignalSpy_EventFilter(ptr unsafe.Pointer, watched unsafe.Pointer, return C.char(int8(qt.GoBoolToInt(NewQSignalSpyFromPointer(ptr).EventFilterDefault(core.NewQObjectFromPointer(watched), core.NewQEventFromPointer(event))))) } -func (ptr *QSignalSpy) EventFilter(watched core.QObject_ITF, event core.QEvent_ITF) bool { - if ptr.Pointer() != nil { - return C.QSignalSpy_EventFilter(ptr.Pointer(), core.PointerFromQObject(watched), core.PointerFromQEvent(event)) != 0 - } - return false -} - func (ptr *QSignalSpy) EventFilterDefault(watched core.QObject_ITF, event core.QEvent_ITF) bool { if ptr.Pointer() != nil { return C.QSignalSpy_EventFilterDefault(ptr.Pointer(), core.PointerFromQObject(watched), core.PointerFromQEvent(event)) != 0 @@ -677,12 +450,6 @@ func callbackQSignalSpy_ChildEvent(ptr unsafe.Pointer, event unsafe.Pointer) { } } -func (ptr *QSignalSpy) ChildEvent(event core.QChildEvent_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy_ChildEvent(ptr.Pointer(), core.PointerFromQChildEvent(event)) - } -} - func (ptr *QSignalSpy) ChildEventDefault(event core.QChildEvent_ITF) { if ptr.Pointer() != nil { C.QSignalSpy_ChildEventDefault(ptr.Pointer(), core.PointerFromQChildEvent(event)) @@ -698,12 +465,6 @@ func callbackQSignalSpy_ConnectNotify(ptr unsafe.Pointer, sign unsafe.Pointer) { } } -func (ptr *QSignalSpy) ConnectNotify(sign core.QMetaMethod_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy_ConnectNotify(ptr.Pointer(), core.PointerFromQMetaMethod(sign)) - } -} - func (ptr *QSignalSpy) ConnectNotifyDefault(sign core.QMetaMethod_ITF) { if ptr.Pointer() != nil { C.QSignalSpy_ConnectNotifyDefault(ptr.Pointer(), core.PointerFromQMetaMethod(sign)) @@ -719,12 +480,6 @@ func callbackQSignalSpy_CustomEvent(ptr unsafe.Pointer, event unsafe.Pointer) { } } -func (ptr *QSignalSpy) CustomEvent(event core.QEvent_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy_CustomEvent(ptr.Pointer(), core.PointerFromQEvent(event)) - } -} - func (ptr *QSignalSpy) CustomEventDefault(event core.QEvent_ITF) { if ptr.Pointer() != nil { C.QSignalSpy_CustomEventDefault(ptr.Pointer(), core.PointerFromQEvent(event)) @@ -740,14 +495,6 @@ func callbackQSignalSpy_DeleteLater(ptr unsafe.Pointer) { } } -func (ptr *QSignalSpy) DeleteLater() { - if ptr.Pointer() != nil { - C.QSignalSpy_DeleteLater(ptr.Pointer()) - ptr.SetPointer(nil) - runtime.SetFinalizer(ptr, nil) - } -} - func (ptr *QSignalSpy) DeleteLaterDefault() { if ptr.Pointer() != nil { C.QSignalSpy_DeleteLaterDefault(ptr.Pointer()) @@ -773,12 +520,6 @@ func callbackQSignalSpy_DisconnectNotify(ptr unsafe.Pointer, sign unsafe.Pointer } } -func (ptr *QSignalSpy) DisconnectNotify(sign core.QMetaMethod_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy_DisconnectNotify(ptr.Pointer(), core.PointerFromQMetaMethod(sign)) - } -} - func (ptr *QSignalSpy) DisconnectNotifyDefault(sign core.QMetaMethod_ITF) { if ptr.Pointer() != nil { C.QSignalSpy_DisconnectNotifyDefault(ptr.Pointer(), core.PointerFromQMetaMethod(sign)) @@ -802,12 +543,6 @@ func callbackQSignalSpy_TimerEvent(ptr unsafe.Pointer, event unsafe.Pointer) { } } -func (ptr *QSignalSpy) TimerEvent(event core.QTimerEvent_ITF) { - if ptr.Pointer() != nil { - C.QSignalSpy_TimerEvent(ptr.Pointer(), core.PointerFromQTimerEvent(event)) - } -} - func (ptr *QSignalSpy) TimerEventDefault(event core.QTimerEvent_ITF) { if ptr.Pointer() != nil { C.QSignalSpy_TimerEventDefault(ptr.Pointer(), core.PointerFromQTimerEvent(event)) @@ -823,13 +558,6 @@ func callbackQSignalSpy_MetaObject(ptr unsafe.Pointer) unsafe.Pointer { return core.PointerFromQMetaObject(NewQSignalSpyFromPointer(ptr).MetaObjectDefault()) } -func (ptr *QSignalSpy) MetaObject() *core.QMetaObject { - if ptr.Pointer() != nil { - return core.NewQMetaObjectFromPointer(C.QSignalSpy_MetaObject(ptr.Pointer())) - } - return nil -} - func (ptr *QSignalSpy) MetaObjectDefault() *core.QMetaObject { if ptr.Pointer() != nil { return core.NewQMetaObjectFromPointer(C.QSignalSpy_MetaObjectDefault(ptr.Pointer())) @@ -994,11 +722,10 @@ const ( ) type QTestEventList struct { - core.QList + ptr unsafe.Pointer } type QTestEventList_ITF interface { - core.QList_ITF QTestEventList_PTR() *QTestEventList } @@ -1008,14 +735,14 @@ func (ptr *QTestEventList) QTestEventList_PTR() *QTestEventList { func (ptr *QTestEventList) Pointer() unsafe.Pointer { if ptr != nil { - return ptr.QList_PTR().Pointer() + return ptr.ptr } return nil } func (ptr *QTestEventList) SetPointer(p unsafe.Pointer) { if ptr != nil { - ptr.QList_PTR().SetPointer(p) + ptr.ptr = p } } @@ -1141,6 +868,12 @@ func (ptr *QTestEventList) AddMouseRelease(button core.Qt__MouseButton, modifier } } +func (ptr *QTestEventList) Clear() { + if ptr.Pointer() != nil { + C.QTestEventList_Clear(ptr.Pointer()) + } +} + func (ptr *QTestEventList) Simulate(w widgets.QWidget_ITF) { if ptr.Pointer() != nil { C.QTestEventList_Simulate(ptr.Pointer(), widgets.PointerFromQWidget(w)) @@ -1154,213 +887,3 @@ func (ptr *QTestEventList) DestroyQTestEventList() { runtime.SetFinalizer(ptr, nil) } } - -func (ptr *QTestEventList) __QList_other_atList3(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___QList_other_atList3(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __QList_other_setList3(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___QList_other_setList3(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __QList_other_newList3() unsafe.Pointer { - return C.QTestEventList___QList_other_newList3(ptr.Pointer()) -} - -func (ptr *QTestEventList) __QList_other_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___QList_other_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __QList_other_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___QList_other_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __QList_other_newList2() unsafe.Pointer { - return C.QTestEventList___QList_other_newList2(ptr.Pointer()) -} - -func (ptr *QTestEventList) __fromSet_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___fromSet_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __fromSet_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___fromSet_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __fromSet_newList() unsafe.Pointer { - return C.QTestEventList___fromSet_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __fromStdList_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___fromStdList_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __fromStdList_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___fromStdList_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __fromStdList_newList() unsafe.Pointer { - return C.QTestEventList___fromStdList_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __fromVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___fromVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __fromVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___fromVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __fromVector_newList() unsafe.Pointer { - return C.QTestEventList___fromVector_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __fromVector_vector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___fromVector_vector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __fromVector_vector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___fromVector_vector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __fromVector_vector_newList() unsafe.Pointer { - return C.QTestEventList___fromVector_vector_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __append_value_atList2(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___append_value_atList2(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __append_value_setList2(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___append_value_setList2(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __append_value_newList2() unsafe.Pointer { - return C.QTestEventList___append_value_newList2(ptr.Pointer()) -} - -func (ptr *QTestEventList) __swap_other_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___swap_other_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __swap_other_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___swap_other_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __swap_other_newList() unsafe.Pointer { - return C.QTestEventList___swap_other_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __mid_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___mid_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __mid_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___mid_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __mid_newList() unsafe.Pointer { - return C.QTestEventList___mid_newList(ptr.Pointer()) -} - -func (ptr *QTestEventList) __toVector_atList(i int) *core.QObject { - if ptr.Pointer() != nil { - tmpValue := core.NewQObjectFromPointer(C.QTestEventList___toVector_atList(ptr.Pointer(), C.int(int32(i)))) - if !qt.ExistsSignal(tmpValue.Pointer(), "destroyed") { - tmpValue.ConnectDestroyed(func(*core.QObject) { tmpValue.SetPointer(nil) }) - } - return tmpValue - } - return nil -} - -func (ptr *QTestEventList) __toVector_setList(i core.QObject_ITF) { - if ptr.Pointer() != nil { - C.QTestEventList___toVector_setList(ptr.Pointer(), core.PointerFromQObject(i)) - } -} - -func (ptr *QTestEventList) __toVector_newList() unsafe.Pointer { - return C.QTestEventList___toVector_newList(ptr.Pointer()) -} diff --git a/testlib/testlib.h b/testlib/testlib.h index f4e2a1e3..789f22b8 100644 --- a/testlib/testlib.h +++ b/testlib/testlib.h @@ -46,53 +46,14 @@ void* QSignalSpy___findChildren_newList(void* ptr); void* QSignalSpy___children_atList(void* ptr, int i); void QSignalSpy___children_setList(void* ptr, void* i); void* QSignalSpy___children_newList(void* ptr); -void* QSignalSpy___QList_other_atList3(void* ptr, int i); -void QSignalSpy___QList_other_setList3(void* ptr, void* i); -void* QSignalSpy___QList_other_newList3(void* ptr); -void* QSignalSpy___QList_other_atList2(void* ptr, int i); -void QSignalSpy___QList_other_setList2(void* ptr, void* i); -void* QSignalSpy___QList_other_newList2(void* ptr); -void* QSignalSpy___fromSet_atList(void* ptr, int i); -void QSignalSpy___fromSet_setList(void* ptr, void* i); -void* QSignalSpy___fromSet_newList(void* ptr); -void* QSignalSpy___fromStdList_atList(void* ptr, int i); -void QSignalSpy___fromStdList_setList(void* ptr, void* i); -void* QSignalSpy___fromStdList_newList(void* ptr); -void* QSignalSpy___fromVector_atList(void* ptr, int i); -void QSignalSpy___fromVector_setList(void* ptr, void* i); -void* QSignalSpy___fromVector_newList(void* ptr); -void* QSignalSpy___fromVector_vector_atList(void* ptr, int i); -void QSignalSpy___fromVector_vector_setList(void* ptr, void* i); -void* QSignalSpy___fromVector_vector_newList(void* ptr); -void* QSignalSpy___append_value_atList2(void* ptr, int i); -void QSignalSpy___append_value_setList2(void* ptr, void* i); -void* QSignalSpy___append_value_newList2(void* ptr); -void* QSignalSpy___swap_other_atList(void* ptr, int i); -void QSignalSpy___swap_other_setList(void* ptr, void* i); -void* QSignalSpy___swap_other_newList(void* ptr); -void* QSignalSpy___mid_atList(void* ptr, int i); -void QSignalSpy___mid_setList(void* ptr, void* i); -void* QSignalSpy___mid_newList(void* ptr); -void* QSignalSpy___toVector_atList(void* ptr, int i); -void QSignalSpy___toVector_setList(void* ptr, void* i); -void* QSignalSpy___toVector_newList(void* ptr); -char QSignalSpy_Event(void* ptr, void* e); char QSignalSpy_EventDefault(void* ptr, void* e); -char QSignalSpy_EventFilter(void* ptr, void* watched, void* event); char QSignalSpy_EventFilterDefault(void* ptr, void* watched, void* event); -void QSignalSpy_ChildEvent(void* ptr, void* event); void QSignalSpy_ChildEventDefault(void* ptr, void* event); -void QSignalSpy_ConnectNotify(void* ptr, void* sign); void QSignalSpy_ConnectNotifyDefault(void* ptr, void* sign); -void QSignalSpy_CustomEvent(void* ptr, void* event); void QSignalSpy_CustomEventDefault(void* ptr, void* event); -void QSignalSpy_DeleteLater(void* ptr); void QSignalSpy_DeleteLaterDefault(void* ptr); -void QSignalSpy_DisconnectNotify(void* ptr, void* sign); void QSignalSpy_DisconnectNotifyDefault(void* ptr, void* sign); -void QSignalSpy_TimerEvent(void* ptr, void* event); void QSignalSpy_TimerEventDefault(void* ptr, void* event); -void* QSignalSpy_MetaObject(void* ptr); void* QSignalSpy_MetaObjectDefault(void* ptr); void* QTestEventList_NewQTestEventList(); void* QTestEventList_NewQTestEventList2(void* other); @@ -109,38 +70,9 @@ void QTestEventList_AddMouseDClick(void* ptr, long long button, long long modifi void QTestEventList_AddMouseMove(void* ptr, void* pos, int delay); void QTestEventList_AddMousePress(void* ptr, long long button, long long modifiers, void* pos, int delay); void QTestEventList_AddMouseRelease(void* ptr, long long button, long long modifiers, void* pos, int delay); +void QTestEventList_Clear(void* ptr); void QTestEventList_Simulate(void* ptr, void* w); void QTestEventList_DestroyQTestEventList(void* ptr); -void* QTestEventList___QList_other_atList3(void* ptr, int i); -void QTestEventList___QList_other_setList3(void* ptr, void* i); -void* QTestEventList___QList_other_newList3(void* ptr); -void* QTestEventList___QList_other_atList2(void* ptr, int i); -void QTestEventList___QList_other_setList2(void* ptr, void* i); -void* QTestEventList___QList_other_newList2(void* ptr); -void* QTestEventList___fromSet_atList(void* ptr, int i); -void QTestEventList___fromSet_setList(void* ptr, void* i); -void* QTestEventList___fromSet_newList(void* ptr); -void* QTestEventList___fromStdList_atList(void* ptr, int i); -void QTestEventList___fromStdList_setList(void* ptr, void* i); -void* QTestEventList___fromStdList_newList(void* ptr); -void* QTestEventList___fromVector_atList(void* ptr, int i); -void QTestEventList___fromVector_setList(void* ptr, void* i); -void* QTestEventList___fromVector_newList(void* ptr); -void* QTestEventList___fromVector_vector_atList(void* ptr, int i); -void QTestEventList___fromVector_vector_setList(void* ptr, void* i); -void* QTestEventList___fromVector_vector_newList(void* ptr); -void* QTestEventList___append_value_atList2(void* ptr, int i); -void QTestEventList___append_value_setList2(void* ptr, void* i); -void* QTestEventList___append_value_newList2(void* ptr); -void* QTestEventList___swap_other_atList(void* ptr, int i); -void QTestEventList___swap_other_setList(void* ptr, void* i); -void* QTestEventList___swap_other_newList(void* ptr); -void* QTestEventList___mid_atList(void* ptr, int i); -void QTestEventList___mid_setList(void* ptr, void* i); -void* QTestEventList___mid_newList(void* ptr); -void* QTestEventList___toVector_atList(void* ptr, int i); -void QTestEventList___toVector_setList(void* ptr, void* i); -void* QTestEventList___toVector_newList(void* ptr); #ifdef __cplusplus } diff --git a/uitools/uitools.cpp b/uitools/uitools.cpp index 1dda0d9d..657e73ef 100644 --- a/uitools/uitools.cpp +++ b/uitools/uitools.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -139,8 +137,6 @@ void* QUiLoader_NewQUiLoader(void* parent) return new MyQUiLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUiLoader(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQUiLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUiLoader(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/webchannel/webchannel.cpp b/webchannel/webchannel.cpp index c4716089..521e927e 100644 --- a/webchannel/webchannel.cpp +++ b/webchannel/webchannel.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -32,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -107,8 +105,6 @@ void* QWebChannel_NewQWebChannel(void* parent) return new MyQWebChannel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebChannel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebChannel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebChannel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -457,8 +453,6 @@ void* QWebChannelAbstractTransport_NewQWebChannelAbstractTransport(void* parent) return new MyQWebChannelAbstractTransport(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebChannelAbstractTransport(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebChannelAbstractTransport(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebChannelAbstractTransport(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/webengine/webengine.cpp b/webengine/webengine.cpp index 02944fa5..b7c37827 100644 --- a/webengine/webengine.cpp +++ b/webengine/webengine.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -63,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -161,8 +159,6 @@ void* QQuickWebEngineProfile_NewQQuickWebEngineProfile(void* parent) return new MyQQuickWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickWebEngineProfile(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQuickWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -679,8 +675,6 @@ void* QQuickWebEngineScript_NewQQuickWebEngineScript(void* parent) return new MyQQuickWebEngineScript(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickWebEngineScript(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQQuickWebEngineScript(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQQuickWebEngineScript(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1456,8 +1450,6 @@ void* QWebEnginePage_NewQWebEnginePage(void* parent) return new MyQWebEnginePage(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEnginePage(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebEnginePage(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEnginePage(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1497,8 +1489,6 @@ void* QWebEnginePage_NewQWebEnginePage2(void* profile, void* parent) return new MyQWebEnginePage(static_cast(profile), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEnginePage(static_cast(profile), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebEnginePage(static_cast(profile), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEnginePage(static_cast(profile), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2287,8 +2277,6 @@ void* QWebEngineProfile_NewQWebEngineProfile(void* parent) return new MyQWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineProfile(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineProfile(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2328,8 +2316,6 @@ void* QWebEngineProfile_NewQWebEngineProfile2(struct QtWebEngine_PackedString na return new MyQWebEngineProfile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineProfile(QString::fromUtf8(name.data, name.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebEngineProfile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineProfile(QString::fromUtf8(name.data, name.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -2973,8 +2959,6 @@ void* QWebEngineUrlRequestInterceptor_NewQWebEngineUrlRequestInterceptor(void* p return new MyQWebEngineUrlRequestInterceptor(static_cast(p)); } else if (dynamic_cast(static_cast(p))) { return new MyQWebEngineUrlRequestInterceptor(static_cast(p)); - } else if (dynamic_cast(static_cast(p))) { - return new MyQWebEngineUrlRequestInterceptor(static_cast(p)); } else if (dynamic_cast(static_cast(p))) { return new MyQWebEngineUrlRequestInterceptor(static_cast(p)); } else if (dynamic_cast(static_cast(p))) { @@ -3362,8 +3346,6 @@ void* QWebEngineUrlSchemeHandler_NewQWebEngineUrlSchemeHandler(void* parent) return new MyQWebEngineUrlSchemeHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineUrlSchemeHandler(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebEngineUrlSchemeHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebEngineUrlSchemeHandler(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/websockets/websockets.cpp b/websockets/websockets.cpp index 5f70bffd..62909fc5 100644 --- a/websockets/websockets.cpp +++ b/websockets/websockets.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -106,8 +104,6 @@ void* QMaskGenerator_NewQMaskGenerator(void* parent) return new MyQMaskGenerator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMaskGenerator(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQMaskGenerator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQMaskGenerator(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -345,8 +341,6 @@ void* QWebSocket_NewQWebSocket(struct QtWebSockets_PackedString origin, long lon return new MyQWebSocket(QString::fromUtf8(origin.data, origin.len), static_cast(version), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebSocket(QString::fromUtf8(origin.data, origin.len), static_cast(version), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebSocket(QString::fromUtf8(origin.data, origin.len), static_cast(version), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebSocket(QString::fromUtf8(origin.data, origin.len), static_cast(version), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -1082,8 +1076,6 @@ void* QWebSocketServer_NewQWebSocketServer(struct QtWebSockets_PackedString serv return new MyQWebSocketServer(QString::fromUtf8(serverName.data, serverName.len), static_cast(secureMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebSocketServer(QString::fromUtf8(serverName.data, serverName.len), static_cast(secureMode), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWebSocketServer(QString::fromUtf8(serverName.data, serverName.len), static_cast(secureMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWebSocketServer(QString::fromUtf8(serverName.data, serverName.len), static_cast(secureMode), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/widgets/widgets.cpp b/widgets/widgets.cpp index a927305b..41c49762 100644 --- a/widgets/widgets.cpp +++ b/widgets/widgets.cpp @@ -156,7 +156,6 @@ #include #include #include -#include #include #include #include @@ -228,7 +227,6 @@ #include #include #include -#include #include #include #include @@ -977,8 +975,6 @@ void* QAbstractItemDelegate_NewQAbstractItemDelegate(void* parent) return new MyQAbstractItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemDelegate(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4540,8 +4536,6 @@ void* QAction_NewQAction(void* parent) return new MyQAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4581,8 +4575,6 @@ void* QAction_NewQAction3(void* icon, struct QtWidgets_PackedString text, void* return new MyQAction(*static_cast(icon), QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(*static_cast(icon), QString::fromUtf8(text.data, text.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAction(*static_cast(icon), QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(*static_cast(icon), QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -4622,8 +4614,6 @@ void* QAction_NewQAction2(struct QtWidgets_PackedString text, void* parent) return new MyQAction(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(QString::fromUtf8(text.data, text.len), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAction(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAction(QString::fromUtf8(text.data, text.len), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -5415,8 +5405,6 @@ void* QActionGroup_NewQActionGroup(void* parent) return new MyQActionGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQActionGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQActionGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQActionGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -6660,8 +6648,6 @@ void* QButtonGroup_NewQButtonGroup(void* parent) return new MyQButtonGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQButtonGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQButtonGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQButtonGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9400,8 +9386,6 @@ void* QCompleter_NewQCompleter2(void* model, void* parent) return new MyQCompleter(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(static_cast(model), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCompleter(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(static_cast(model), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9441,8 +9425,6 @@ void* QCompleter_NewQCompleter(void* parent) return new MyQCompleter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCompleter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -9482,8 +9464,6 @@ void* QCompleter_NewQCompleter3(struct QtWidgets_PackedString list, void* parent return new MyQCompleter(QString::fromUtf8(list.data, list.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(QString::fromUtf8(list.data, list.len).split("|", QString::SkipEmptyParts), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQCompleter(QString::fromUtf8(list.data, list.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQCompleter(QString::fromUtf8(list.data, list.len).split("|", QString::SkipEmptyParts), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -10000,8 +9980,6 @@ void* QDataWidgetMapper_NewQDataWidgetMapper(void* parent) return new MyQDataWidgetMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDataWidgetMapper(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDataWidgetMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDataWidgetMapper(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12076,8 +12054,6 @@ void* QDirModel_NewQDirModel2(void* parent) return new MyQDirModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDirModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDirModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDirModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -12117,8 +12093,6 @@ void* QDirModel_NewQDirModel(struct QtWidgets_PackedString nameFilters, long lon return new MyQDirModel(QString::fromUtf8(nameFilters.data, nameFilters.len).split("|", QString::SkipEmptyParts), static_cast(filters), static_cast(sort), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDirModel(QString::fromUtf8(nameFilters.data, nameFilters.len).split("|", QString::SkipEmptyParts), static_cast(filters), static_cast(sort), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQDirModel(QString::fromUtf8(nameFilters.data, nameFilters.len).split("|", QString::SkipEmptyParts), static_cast(filters), static_cast(sort), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQDirModel(QString::fromUtf8(nameFilters.data, nameFilters.len).split("|", QString::SkipEmptyParts), static_cast(filters), static_cast(sort), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -14432,8 +14406,6 @@ void* QFileSystemModel_NewQFileSystemModel(void* parent) return new MyQFileSystemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemModel(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQFileSystemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQFileSystemModel(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -16262,8 +16234,6 @@ void* QGesture_NewQGesture(void* parent) return new MyQGesture(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGesture(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGesture(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGesture(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17537,8 +17507,6 @@ void* QGraphicsBlurEffect_NewQGraphicsBlurEffect(void* parent) return new MyQGraphicsBlurEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsBlurEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsBlurEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsBlurEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17691,8 +17659,6 @@ void* QGraphicsColorizeEffect_NewQGraphicsColorizeEffect(void* parent) return new MyQGraphicsColorizeEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsColorizeEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsColorizeEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsColorizeEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -17851,8 +17817,6 @@ void* QGraphicsDropShadowEffect_NewQGraphicsDropShadowEffect(void* parent) return new MyQGraphicsDropShadowEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsDropShadowEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsDropShadowEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsDropShadowEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -18081,8 +18045,6 @@ void* QGraphicsEffect_NewQGraphicsEffect(void* parent) return new MyQGraphicsEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -23227,8 +23189,6 @@ void* QGraphicsItemAnimation_NewQGraphicsItemAnimation(void* parent) return new MyQGraphicsItemAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsItemAnimation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsItemAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsItemAnimation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -25666,8 +25626,6 @@ void* QGraphicsOpacityEffect_NewQGraphicsOpacityEffect(void* parent) return new MyQGraphicsOpacityEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsOpacityEffect(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsOpacityEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsOpacityEffect(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -26432,8 +26390,6 @@ void* QGraphicsRotation_NewQGraphicsRotation(void* parent) return new MyQGraphicsRotation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsRotation(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsRotation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsRotation(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -26603,8 +26559,6 @@ void* QGraphicsScale_NewQGraphicsScale(void* parent) return new MyQGraphicsScale(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScale(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsScale(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScale(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -26888,8 +26842,6 @@ void* QGraphicsScene_NewQGraphicsScene(void* parent) return new MyQGraphicsScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -26929,8 +26881,6 @@ void* QGraphicsScene_NewQGraphicsScene2(void* sceneRect, void* parent) return new MyQGraphicsScene(*static_cast(sceneRect), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(*static_cast(sceneRect), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsScene(*static_cast(sceneRect), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(*static_cast(sceneRect), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -26970,8 +26920,6 @@ void* QGraphicsScene_NewQGraphicsScene3(double x, double y, double width, double return new MyQGraphicsScene(x, y, width, height, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(x, y, width, height, static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsScene(x, y, width, height, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsScene(x, y, width, height, static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -28914,8 +28862,6 @@ void* QGraphicsTransform_NewQGraphicsTransform(void* parent) return new MyQGraphicsTransform(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsTransform(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQGraphicsTransform(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQGraphicsTransform(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -32532,8 +32478,6 @@ void* QItemDelegate_NewQItemDelegate(void* parent) return new MyQItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemDelegate(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -32860,8 +32804,6 @@ void* QKeyEventTransition_NewQKeyEventTransition2(void* object, long long ty, in return new MyQKeyEventTransition(static_cast(object), static_cast(ty), key, static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQKeyEventTransition(static_cast(object), static_cast(ty), key, static_cast(sourceState)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQKeyEventTransition(static_cast(object), static_cast(ty), key, static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQKeyEventTransition(static_cast(object), static_cast(ty), key, static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { @@ -39475,8 +39417,6 @@ void* QMouseEventTransition_NewQMouseEventTransition2(void* object, long long ty return new MyQMouseEventTransition(static_cast(object), static_cast(ty), static_cast(button), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQMouseEventTransition(static_cast(object), static_cast(ty), static_cast(button), static_cast(sourceState)); - } else if (dynamic_cast(static_cast(object))) { - return new MyQMouseEventTransition(static_cast(object), static_cast(ty), static_cast(button), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { return new MyQMouseEventTransition(static_cast(object), static_cast(ty), static_cast(button), static_cast(sourceState)); } else if (dynamic_cast(static_cast(object))) { @@ -48012,8 +47952,6 @@ void* QStylePlugin_NewQStylePlugin(void* parent) return new MyQStylePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStylePlugin(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStylePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStylePlugin(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -48275,8 +48213,6 @@ void* QStyledItemDelegate_NewQStyledItemDelegate(void* parent) return new MyQStyledItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStyledItemDelegate(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQStyledItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQStyledItemDelegate(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -48469,8 +48405,6 @@ void* QSystemTrayIcon_NewQSystemTrayIcon(void* parent) return new MyQSystemTrayIcon(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSystemTrayIcon(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSystemTrayIcon(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSystemTrayIcon(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -48510,8 +48444,6 @@ void* QSystemTrayIcon_NewQSystemTrayIcon2(void* icon, void* parent) return new MyQSystemTrayIcon(*static_cast(icon), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSystemTrayIcon(*static_cast(icon), static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQSystemTrayIcon(*static_cast(icon), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQSystemTrayIcon(*static_cast(icon), static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -56357,8 +56289,6 @@ void* QUndoGroup_NewQUndoGroup(void* parent) return new MyQUndoGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUndoGroup(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQUndoGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUndoGroup(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -56854,8 +56784,6 @@ void* QUndoStack_NewQUndoStack(void* parent) return new MyQUndoStack(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUndoStack(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQUndoStack(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQUndoStack(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { @@ -71167,8 +71095,6 @@ void* QWidgetAction_NewQWidgetAction(void* parent) return new MyQWidgetAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWidgetAction(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQWidgetAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQWidgetAction(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { diff --git a/xmlpatterns/xmlpatterns.cpp b/xmlpatterns/xmlpatterns.cpp index 2496a7d3..35dd6281 100644 --- a/xmlpatterns/xmlpatterns.cpp +++ b/xmlpatterns/xmlpatterns.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -280,8 +278,6 @@ void* QAbstractUriResolver_NewQAbstractUriResolver(void* parent) return new MyQAbstractUriResolver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractUriResolver(static_cast(parent)); - } else if (dynamic_cast(static_cast(parent))) { - return new MyQAbstractUriResolver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) { return new MyQAbstractUriResolver(static_cast(parent)); } else if (dynamic_cast(static_cast(parent))) {