Merge pull request #95 from mappu/miqt-more-libraries

Draft: Add bindings for Qt5Svg, Qt6Svg, Qt5Script, Qt5Webkit

.gitignore

@@ -33,6 +33,9 @@ examples/libraries/extras-scintillaedit/extras-scintillaedit
 examples/libraries/qt-multimedia/qt-multimedia
 examples/libraries/qt-network/qt-network
 examples/libraries/qt-printsupport/qt-printsupport
+examples/libraries/qt-script/qt-script
+examples/libraries/qt-svg/qt-svg
+examples/libraries/qt-webkit/qt-webkit
 examples/libraries/qt6-multimedia/qt6-multimedia
 examples/libraries/restricted-extras-qscintilla/restricted-extras-qscintilla
 

cmd/genbindings/config-allowlist.go

@@ -34,6 +34,14 @@ func InsertTypedefs(qt6 bool) {
 	KnownTypedefs["QFileDevice::Permissions"] = lookupResultTypedef{pp, CppTypedef{"QFile::Permissions", parseSingleTypeString("QFlags<QFileDevice::Permission>")}}
 	KnownTypedefs["QIODevice::OpenMode"] = lookupResultTypedef{pp, CppTypedef{"QIODevice::OpenMode", parseSingleTypeString("QIODeviceBase::OpenMode")}}
 
+	// Qt 5 WebKit - use of an empty enum (should be possible to support?)
+	KnownEnums["QWebPluginFactory::Extension"] = lookupResultEnum{"qt/webkit", CppEnum{
+		EnumName: "QWebPluginFactory::Extension",
+		UnderlyingType: CppParameter{
+			ParameterType: "int",
+		},
+	}}
+
 	if qt6 {
 		// Qt 6 QVariant helper types - needs investigation
 		KnownTypedefs["QVariantHash"] = lookupResultTypedef{"qt6", CppTypedef{"QVariantHash", parseSingleTypeString("QHash<QString,QVariant>")}}
@@ -231,6 +239,14 @@ func AllowVirtualForClass(className string) bool {
 		return false
 	}
 
+	// Qt 5 QWebkit: undefined reference to typeinfo
+	if className == "QWebNotificationPresenter" {
+		return false
+	}
+	if className == "QWebHapticFeedbackPlayer" {
+		return false
+	}
+
 	return true
 }
 
@@ -492,6 +508,8 @@ func AllowType(p CppParameter, isReturnType bool) error {
 		"QPostEventList",                  // Qt QCoreApplication: private headers required
 		"QMetaCallEvent",                  // ..
 		"QPostEvent",                      // ..
+		"QWebFrameAdapter",                // Qt 5 Webkit: Used by e.g. qwebframe.h but never defined anywhere
+		"QWebPageAdapter",                 // ...
 		"____last____":
 		return ErrTooComplex
 	}

cmd/genbindings/config-libraries.go

@@ -62,6 +62,18 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) {
 		ClangMatchSameHeaderDefinitionOnly,
 	)
 
+	generate(
+		"qt/svg",
+		[]string{
+			"/usr/include/x86_64-linux-gnu/qt5/QtSvg",
+		},
+		AllowAllHeaders,
+		clangBin,
+		pkgConfigCflags("Qt5Svg"),
+		outDir,
+		ClangMatchSameHeaderDefinitionOnly,
+	)
+
 	generate(
 		"qt/network",
 		[]string{
@@ -90,6 +102,33 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) {
 		ClangMatchSameHeaderDefinitionOnly,
 	)
 
+	generate(
+		"qt/script",
+		[]string{
+			"/usr/include/x86_64-linux-gnu/qt5/QtScript",
+		},
+		AllowAllHeaders,
+		clangBin,
+		pkgConfigCflags("Qt5Script"),
+		outDir,
+		ClangMatchSameHeaderDefinitionOnly,
+	)
+
+	// Qt 5 QWebkit: depends on Qt5PrintSupport but only at runtime, not at
+	// codegen time
+	generate(
+		"qt/webkit",
+		[]string{
+			"/usr/include/x86_64-linux-gnu/qt5/QtWebKit",
+			"/usr/include/x86_64-linux-gnu/qt5/QtWebKitWidgets",
+		},
+		AllowAllHeaders,
+		clangBin,
+		pkgConfigCflags("Qt5WebKitWidgets"),
+		outDir,
+		ClangMatchSameHeaderDefinitionOnly,
+	)
+
 	// Depends on QtCore/Gui/Widgets, QPrintSupport
 	generate(
 		"qt-restricted-extras/qscintilla",
@@ -173,6 +212,20 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) {
 		ClangMatchSameHeaderDefinitionOnly,
 	)
 
+	// Qt 6 SVG
+	generate(
+		"qt6/svg",
+		[]string{
+			"/usr/include/x86_64-linux-gnu/qt6/QtSvg",
+			"/usr/include/x86_64-linux-gnu/qt6/QtSvgWidgets",
+		},
+		AllowAllHeaders,
+		clangBin,
+		"--std=c++17 "+pkgConfigCflags("Qt6SvgWidgets"),
+		outDir,
+		ClangMatchSameHeaderDefinitionOnly,
+	)
+
 	// Qt 6 QtNetwork
 	generate(
 		"qt6/network",

cmd/genbindings/emitcabi.go

@@ -299,7 +299,8 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for
 			p.ParameterType == "qulonglong" ||
 			p.GetQtCppType().ParameterType == "qintptr" ||
 			p.GetQtCppType().ParameterType == "qsizetype" || // Qt 6 qversionnumber.h: invalid ‘static_cast’ from type ‘ptrdiff_t*’ {aka ‘long int*’} to type ‘qsizetype*’ {aka ‘long long int*’}
-			p.ParameterType == "qint8" {
+			p.ParameterType == "qint8" ||
+			(p.IsFlagType() && p.ByRef) {
 			// QDataStream::operator>>() by reference (qint64)
 			// QLockFile::getLockInfo() by pointer
 			// QTextStream::operator>>() by reference (qlonglong + qulonglong)
@@ -556,24 +557,28 @@ func getReferencedTypes(src *CppParsedHeader) []string {
 
 	foundTypes := map[string]struct{}{}
 
-	maybeAddType := func(p CppParameter) {
+	var maybeAddType func(p CppParameter)
+	maybeAddType = func(p CppParameter) {
 		if p.QtClassType() {
 			foundTypes[p.ParameterType] = struct{}{}
 		}
 		if t, ok := p.QListOf(); ok {
 			foundTypes["QList"] = struct{}{} // FIXME or QVector?
-			if t.QtClassType() {
-				foundTypes[t.ParameterType] = struct{}{}
-			}
+			maybeAddType(t)
 		}
 		if kType, vType, ok := p.QMapOf(); ok {
 			foundTypes["QMap"] = struct{}{} // FIXME or QHash?
-			if kType.QtClassType() {
-				foundTypes[kType.ParameterType] = struct{}{}
+			maybeAddType(kType)
+			maybeAddType(vType)
 		}
-			if vType.QtClassType() {
-				foundTypes[vType.ParameterType] = struct{}{}
+		if kType, vType, ok := p.QPairOf(); ok {
+			foundTypes["QPair"] = struct{}{}
+			maybeAddType(kType)
+			maybeAddType(vType)
 		}
+		if t, ok := p.QSetOf(); ok {
+			foundTypes["QSet"] = struct{}{}
+			maybeAddType(t)
 		}
 	}
 
@@ -639,7 +644,7 @@ func cabiClassName(className string) string {
 
 func cabiPreventStructDeclaration(className string) bool {
 	switch className {
-	case "QList", "QString", "QSet", "QMap", "QHash":
+	case "QList", "QString", "QSet", "QMap", "QHash", "QPair", "QVector", "QByteArray":
 		return true // These types are reprojected
 	default:
 		return false

docker/genbindings.Dockerfile

@@ -5,8 +5,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
         golang-go \
         qtbase5-dev \
         qtmultimedia5-dev \
+        qtscript5-dev \
+        libqt5svg5-dev \
+        libqt5webkit5-dev \
         qt6-base-dev \
         qt6-multimedia-dev \
+        qt6-svg-dev \
         libqscintilla2-qt5-dev \
         libqscintilla2-qt6-dev \
         clang \

examples/libraries/qt-script/main.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/mappu/miqt/qt"
+	"github.com/mappu/miqt/qt/script"
+)
+
+func main() {
+
+	qt.NewQApplication(os.Args)
+
+	inputProgram := "1 + 2"
+
+	eng := script.NewQScriptEngine()
+	result := eng.Evaluate(inputProgram)
+
+	fmt.Printf("%s = %1.f\n", inputProgram, result.ToNumber())
+
+	// qt.QApplication_Exec()
+}

examples/libraries/qt-svg/main.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"os"
+
+	"github.com/mappu/miqt/qt"
+	"github.com/mappu/miqt/qt/svg"
+)
+
+func main() {
+
+	qt.NewQApplication(os.Args)
+
+	w := svg.NewQSvgWidget3("../../../doc/logo.svg")
+	w.Show()
+
+	qt.QApplication_Exec()
+}

examples/libraries/qt-webkit/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"os"
+
+	"github.com/mappu/miqt/qt"
+	"github.com/mappu/miqt/qt/webkit"
+)
+
+func main() {
+
+	qt.NewQApplication(os.Args)
+
+	w := webkit.NewQWebView2()
+	w.Load(qt.NewQUrl3("https://www.github.com/mappu/miqt"))
+	w.Show()
+
+	qt.QApplication_Exec()
+}

qt-extras/scintillaedit/gen_ScintillaEdit.cpp

@@ -18,6 +18,7 @@
 #include <QObject>
 #include <QPaintDevice>
 #include <QPaintEvent>
+#include <QPair>
 #include <QRect>
 #include <QResizeEvent>
 #include <QSize>

qt-extras/scintillaedit/gen_ScintillaEdit.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractScrollArea;
-class QByteArray;
 class QChildEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -213,7 +212,6 @@ class ScintillaEdit;
 class ScintillaEditBase;
 #else
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt-restricted-extras/qscintilla/gen_qsciscintilla.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractScrollArea;
-class QByteArray;
 class QColor;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -53,7 +52,6 @@ class QsciStyle;
 class QsciStyledText;
 #else
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt-restricted-extras/qscintilla/gen_qsciscintillabase.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractScrollArea;
-class QByteArray;
 class QColor;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -48,7 +47,6 @@ class QWidget;
 class QsciScintillaBase;
 #else
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt-restricted-extras/qscintilla6/gen_qsciscintilla.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractScrollArea;
-class QByteArray;
 class QColor;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -53,7 +52,6 @@ class QsciStyle;
 class QsciStyledText;
 #else
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt-restricted-extras/qscintilla6/gen_qsciscintillabase.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractScrollArea;
-class QByteArray;
 class QColor;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -48,7 +47,6 @@ class QWidget;
 class QsciScintillaBase;
 #else
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/cbor/gen_qcbormap.cpp

@@ -6,6 +6,7 @@
 #include <QJsonObject>
 #include <QList>
 #include <QMap>
+#include <QPair>
 #include <QString>
 #include <QByteArray>
 #include <cstring>

qt/cbor/gen_qcborstreamreader.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QCborError;
 class QCborStreamReader;
 class QIODevice;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QCborError QCborError;
 typedef struct QCborStreamReader QCborStreamReader;
 typedef struct QIODevice QIODevice;

qt/cbor/gen_qcborstreamwriter.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QCborStreamWriter;
 class QIODevice;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QCborStreamWriter QCborStreamWriter;
 typedef struct QIODevice QIODevice;
 #endif

qt/cbor/gen_qcborvalue.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QCborArray;
 class QCborMap;
 class QCborParserError;
@@ -30,7 +29,6 @@ class QUrl;
 class QUuid;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QCborArray QCborArray;
 typedef struct QCborMap QCborMap;
 typedef struct QCborParserError QCborParserError;

qt/gen_qabstractbutton.h

@@ -18,7 +18,6 @@ extern "C" {
 class QAbstractButton;
 class QActionEvent;
 class QButtonGroup;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -53,7 +52,6 @@ class QWidget;
 typedef struct QAbstractButton QAbstractButton;
 typedef struct QActionEvent QActionEvent;
 typedef struct QButtonGroup QButtonGroup;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qabstracteventdispatcher.h

@@ -22,7 +22,6 @@ typedef QAbstractEventDispatcher::TimerInfo QAbstractEventDispatcher__TimerInfo;
 class QAbstractEventDispatcher__TimerInfo;
 #endif
 class QAbstractNativeEventFilter;
-class QByteArray;
 class QMetaObject;
 class QObject;
 class QSocketNotifier;
@@ -31,7 +30,6 @@ class QThread;
 typedef struct QAbstractEventDispatcher QAbstractEventDispatcher;
 typedef struct QAbstractEventDispatcher__TimerInfo QAbstractEventDispatcher__TimerInfo;
 typedef struct QAbstractNativeEventFilter QAbstractNativeEventFilter;
-typedef struct QByteArray QByteArray;
 typedef struct QMetaObject QMetaObject;
 typedef struct QObject QObject;
 typedef struct QSocketNotifier QSocketNotifier;

qt/gen_qabstractitemmodel.h

@@ -18,7 +18,6 @@ extern "C" {
 class QAbstractItemModel;
 class QAbstractListModel;
 class QAbstractTableModel;
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QMetaMethod;
@@ -34,7 +33,6 @@ class QVariant;
 typedef struct QAbstractItemModel QAbstractItemModel;
 typedef struct QAbstractListModel QAbstractListModel;
 typedef struct QAbstractTableModel QAbstractTableModel;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QMetaMethod QMetaMethod;

qt/gen_qabstractnativeeventfilter.h

@@ -16,10 +16,8 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractNativeEventFilter;
-class QByteArray;
 #else
 typedef struct QAbstractNativeEventFilter QAbstractNativeEventFilter;
-typedef struct QByteArray QByteArray;
 #endif
 
 void QAbstractNativeEventFilter_new(QAbstractNativeEventFilter** outptr_QAbstractNativeEventFilter);

qt/gen_qabstractproxymodel.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractItemModel;
 class QAbstractProxyModel;
-class QByteArray;
 class QItemSelection;
 class QMetaObject;
 class QMimeData;
@@ -28,7 +27,6 @@ class QVariant;
 #else
 typedef struct QAbstractItemModel QAbstractItemModel;
 typedef struct QAbstractProxyModel QAbstractProxyModel;
-typedef struct QByteArray QByteArray;
 typedef struct QItemSelection QItemSelection;
 typedef struct QMetaObject QMetaObject;
 typedef struct QMimeData QMimeData;

qt/gen_qabstractslider.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractSlider;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -49,7 +48,6 @@ class QWidget;
 #else
 typedef struct QAbstractSlider QAbstractSlider;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qabstractspinbox.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractSpinBox;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -49,7 +48,6 @@ class QWidget;
 #else
 typedef struct QAbstractSpinBox QAbstractSpinBox;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qaccessible.cpp

@@ -21,6 +21,7 @@
 #include <QColor>
 #include <QList>
 #include <QObject>
+#include <QPair>
 #include <QPoint>
 #include <QRect>
 #include <QSize>

qt/gen_qaccessiblewidget.cpp

@@ -5,6 +5,7 @@
 #include <QAccessibleWidget>
 #include <QColor>
 #include <QList>
+#include <QPair>
 #include <QRect>
 #include <QString>
 #include <QByteArray>

qt/gen_qbrush.cpp

@@ -8,6 +8,7 @@
 #include <QLinearGradient>
 #include <QList>
 #include <QMatrix>
+#include <QPair>
 #include <QPixmap>
 #include <QPointF>
 #include <QRadialGradient>

qt/gen_qbuffer.h

@@ -16,14 +16,12 @@ extern "C" {
 
 #ifdef __cplusplus
 class QBuffer;
-class QByteArray;
 class QIODevice;
 class QMetaMethod;
 class QMetaObject;
 class QObject;
 #else
 typedef struct QBuffer QBuffer;
-typedef struct QByteArray QByteArray;
 typedef struct QIODevice QIODevice;
 typedef struct QMetaMethod QMetaMethod;
 typedef struct QMetaObject QMetaObject;

qt/gen_qbytearraymatcher.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QByteArrayMatcher;
 class QStaticByteArrayMatcherBase;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QByteArrayMatcher QByteArrayMatcher;
 typedef struct QStaticByteArrayMatcherBase QStaticByteArrayMatcherBase;
 #endif

qt/gen_qcalendarwidget.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCalendar;
 class QCalendarWidget;
 class QCloseEvent;
@@ -51,7 +50,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCalendar QCalendar;
 typedef struct QCalendarWidget QCalendarWidget;
 typedef struct QCloseEvent QCloseEvent;

qt/gen_qcolorspace.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QColorSpace;
 class QColorTransform;
 class QPointF;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QColorSpace QColorSpace;
 typedef struct QColorTransform QColorTransform;
 typedef struct QPointF QPointF;

qt/gen_qcombobox.h

@@ -19,7 +19,6 @@ class QAbstractItemDelegate;
 class QAbstractItemModel;
 class QAbstractItemView;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QComboBox;
 class QCompleter;
@@ -58,7 +57,6 @@ typedef struct QAbstractItemDelegate QAbstractItemDelegate;
 typedef struct QAbstractItemModel QAbstractItemModel;
 typedef struct QAbstractItemView QAbstractItemView;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QComboBox QComboBox;
 typedef struct QCompleter QCompleter;

qt/gen_qconcatenatetablesproxymodel.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractItemModel;
-class QByteArray;
 class QConcatenateTablesProxyModel;
 class QMetaObject;
 class QMimeData;
@@ -26,7 +25,6 @@ class QSize;
 class QVariant;
 #else
 typedef struct QAbstractItemModel QAbstractItemModel;
-typedef struct QByteArray QByteArray;
 typedef struct QConcatenateTablesProxyModel QConcatenateTablesProxyModel;
 typedef struct QMetaObject QMetaObject;
 typedef struct QMimeData QMimeData;

qt/gen_qcoreevent.h

@@ -15,14 +15,12 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QDynamicPropertyChangeEvent;
 class QEvent;
 class QObject;
 class QTimerEvent;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QDynamicPropertyChangeEvent QDynamicPropertyChangeEvent;
 typedef struct QEvent QEvent;

qt/gen_qcryptographichash.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QCryptographicHash;
 class QIODevice;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QCryptographicHash QCryptographicHash;
 typedef struct QIODevice QIODevice;
 #endif

qt/gen_qdatastream.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QDataStream;
 class QIODevice;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QDataStream QDataStream;
 typedef struct QIODevice QIODevice;
 #endif

qt/gen_qdatawidgetmapper.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractItemDelegate;
 class QAbstractItemModel;
-class QByteArray;
 class QChildEvent;
 class QDataWidgetMapper;
 class QEvent;
@@ -30,7 +29,6 @@ class QWidget;
 #else
 typedef struct QAbstractItemDelegate QAbstractItemDelegate;
 typedef struct QAbstractItemModel QAbstractItemModel;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QDataWidgetMapper QDataWidgetMapper;
 typedef struct QEvent QEvent;

qt/gen_qdebug.h

@@ -15,14 +15,12 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChar;
 class QDebug;
 class QDebugStateSaver;
 class QIODevice;
 class QNoDebug;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChar QChar;
 typedef struct QDebug QDebug;
 typedef struct QDebugStateSaver QDebugStateSaver;

qt/gen_qdesktopwidget.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDesktopWidget;
@@ -48,7 +47,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDesktopWidget QDesktopWidget;

qt/gen_qdialog.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDialog;
@@ -47,7 +46,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDialog QDialog;

qt/gen_qdialogbuttonbox.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractButton;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDialogButtonBox;
@@ -50,7 +49,6 @@ class QWidget;
 #else
 typedef struct QAbstractButton QAbstractButton;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDialogButtonBox QDialogButtonBox;

qt/gen_qdirmodel.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractItemModel;
-class QByteArray;
 class QDirModel;
 class QFileIconProvider;
 class QFileInfo;
@@ -29,7 +28,6 @@ class QSize;
 class QVariant;
 #else
 typedef struct QAbstractItemModel QAbstractItemModel;
-typedef struct QByteArray QByteArray;
 typedef struct QDirModel QDirModel;
 typedef struct QFileIconProvider QFileIconProvider;
 typedef struct QFileInfo QFileInfo;

qt/gen_qdockwidget.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAction;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDockWidget;
@@ -49,7 +48,6 @@ class QWidget;
 #else
 typedef struct QAction QAction;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDockWidget QDockWidget;

qt/gen_qfile.h

@@ -15,14 +15,12 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QFile;
 class QFileDevice;
 class QIODevice;
 class QMetaObject;
 class QObject;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QFile QFile;
 typedef struct QFileDevice QFileDevice;
 typedef struct QIODevice QIODevice;

qt/gen_qfiledialog.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractItemDelegate;
 class QAbstractProxyModel;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDialog;
@@ -37,7 +36,6 @@ class QWidget;
 #else
 typedef struct QAbstractItemDelegate QAbstractItemDelegate;
 typedef struct QAbstractProxyModel QAbstractProxyModel;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDialog QDialog;

qt/gen_qfilesystemmodel.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractItemModel;
-class QByteArray;
 class QDateTime;
 class QDir;
 class QEvent;
@@ -33,7 +32,6 @@ class QTimerEvent;
 class QVariant;
 #else
 typedef struct QAbstractItemModel QAbstractItemModel;
-typedef struct QByteArray QByteArray;
 typedef struct QDateTime QDateTime;
 typedef struct QDir QDir;
 typedef struct QEvent QEvent;

qt/gen_qfocusframe.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -47,7 +46,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qfontdatabase.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QFont;
 class QFontDatabase;
 class QFontInfo;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QFont QFont;
 typedef struct QFontDatabase QFontDatabase;
 typedef struct QFontInfo QFontInfo;

qt/gen_qframe.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -48,7 +47,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qgraphicsitemanimation.cpp

@@ -7,6 +7,7 @@
 #include <QMetaMethod>
 #include <QMetaObject>
 #include <QObject>
+#include <QPair>
 #include <QPointF>
 #include <QString>
 #include <QByteArray>

qt/gen_qgroupbox.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QChildEvent;
 class QCloseEvent;
 class QContextMenuEvent;
@@ -48,7 +47,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qheaderview.h

@@ -18,7 +18,6 @@ extern "C" {
 class QAbstractItemModel;
 class QAbstractItemView;
 class QAbstractScrollArea;
-class QByteArray;
 class QDragEnterEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
@@ -51,7 +50,6 @@ class QWidget;
 typedef struct QAbstractItemModel QAbstractItemModel;
 typedef struct QAbstractItemView QAbstractItemView;
 typedef struct QAbstractScrollArea QAbstractScrollArea;
-typedef struct QByteArray QByteArray;
 typedef struct QDragEnterEvent QDragEnterEvent;
 typedef struct QDragLeaveEvent QDragLeaveEvent;
 typedef struct QDragMoveEvent QDragMoveEvent;

qt/gen_qimage.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QColor;
 class QColorSpace;
 class QColorTransform;
@@ -31,7 +30,6 @@ class QRect;
 class QSize;
 class QTransform;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QColorSpace QColorSpace;
 typedef struct QColorTransform QColorTransform;

qt/gen_qimageiohandler.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QIODevice;
@@ -29,7 +28,6 @@ class QRect;
 class QTimerEvent;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QIODevice QIODevice;

qt/gen_qimagereader.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QColor;
 class QIODevice;
 class QImage;
@@ -23,7 +22,6 @@ class QImageReader;
 class QRect;
 class QSize;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QIODevice QIODevice;
 typedef struct QImage QImage;

qt/gen_qimagewriter.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QIODevice;
 class QImage;
 class QImageWriter;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QIODevice QIODevice;
 typedef struct QImage QImage;
 typedef struct QImageWriter QImageWriter;

qt/gen_qiodevice.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QIODevice;
@@ -24,7 +23,6 @@ class QMetaObject;
 class QObject;
 class QTimerEvent;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QIODevice QIODevice;

qt/gen_qitemeditorfactory.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QItemEditorCreatorBase;
 class QItemEditorFactory;
 class QWidget;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QItemEditorCreatorBase QItemEditorCreatorBase;
 typedef struct QItemEditorFactory QItemEditorFactory;
 typedef struct QWidget QWidget;

qt/gen_qjsondocument.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QJsonArray;
 class QJsonDocument;
 class QJsonObject;
@@ -23,7 +22,6 @@ class QJsonParseError;
 class QJsonValue;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QJsonArray QJsonArray;
 typedef struct QJsonDocument QJsonDocument;
 typedef struct QJsonObject QJsonObject;

qt/gen_qkeysequenceedit.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -49,7 +48,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qlineedit.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAction;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QCompleter;
 class QContextMenuEvent;
@@ -54,7 +53,6 @@ class QWidget;
 #else
 typedef struct QAction QAction;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QCompleter QCompleter;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qmainwindow.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDockWidget;
@@ -52,7 +51,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDockWidget QDockWidget;

qt/gen_qmdisubwindow.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QChildEvent;
 class QCloseEvent;
 class QContextMenuEvent;
@@ -51,7 +50,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qmenu.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAction;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -52,7 +51,6 @@ class QWidget;
 #else
 typedef struct QAction QAction;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qmenubar.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAction;
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -53,7 +52,6 @@ class QWidget;
 #else
 typedef struct QAction QAction;
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qmessageauthenticationcode.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QIODevice;
 class QMessageAuthenticationCode;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QIODevice QIODevice;
 typedef struct QMessageAuthenticationCode QMessageAuthenticationCode;
 #endif

qt/gen_qmetaobject.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QGenericArgument;
 class QGenericReturnArgument;
 class QMetaClassInfo;
@@ -26,7 +25,6 @@ class QMetaProperty;
 class QObject;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QGenericArgument QGenericArgument;
 typedef struct QGenericReturnArgument QGenericReturnArgument;
 typedef struct QMetaClassInfo QMetaClassInfo;

qt/gen_qmetatype.h

@@ -15,13 +15,11 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QDataStream;
 class QDebug;
 class QMetaObject;
 class QMetaType;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QDataStream QDataStream;
 typedef struct QDebug QDebug;
 typedef struct QMetaObject QMetaObject;

qt/gen_qmimedata.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QMetaMethod;
@@ -26,7 +25,6 @@ class QTimerEvent;
 class QUrl;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QMetaMethod QMetaMethod;

qt/gen_qmimedatabase.h

@@ -15,14 +15,12 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QFileInfo;
 class QIODevice;
 class QMimeDatabase;
 class QMimeType;
 class QUrl;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QFileInfo QFileInfo;
 typedef struct QIODevice QIODevice;
 typedef struct QMimeDatabase QMimeDatabase;

qt/gen_qmovie.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QColor;
 class QEvent;
@@ -30,7 +29,6 @@ class QRect;
 class QSize;
 class QTimerEvent;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QColor QColor;
 typedef struct QEvent QEvent;

qt/gen_qobject.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QMetaMethod;
@@ -33,7 +32,6 @@ class QThread;
 class QTimerEvent;
 class QVariant;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QMetaMethod QMetaMethod;

qt/gen_qobjectdefs.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QGenericArgument;
 class QGenericReturnArgument;
 class QMetaClassInfo;
@@ -35,7 +34,6 @@ class QMetaObject__SuperData;
 class QMetaProperty;
 class QObject;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QGenericArgument QGenericArgument;
 typedef struct QGenericReturnArgument QGenericReturnArgument;
 typedef struct QMetaClassInfo QMetaClassInfo;

qt/gen_qpdfwriter.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChildEvent;
 class QEvent;
 class QIODevice;
@@ -34,7 +33,6 @@ class QPdfWriter;
 class QSizeF;
 class QTimerEvent;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;
 typedef struct QIODevice QIODevice;

qt/gen_qpicture.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QIODevice;
 class QPaintDevice;
 class QPaintEngine;
@@ -25,7 +24,6 @@ class QPictureIO;
 class QPoint;
 class QRect;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QIODevice QIODevice;
 typedef struct QPaintDevice QPaintDevice;
 typedef struct QPaintEngine QPaintEngine;

qt/gen_qpixmap.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QBitmap;
-class QByteArray;
 class QColor;
 class QIODevice;
 class QImage;
@@ -34,7 +33,6 @@ class QSize;
 class QTransform;
 #else
 typedef struct QBitmap QBitmap;
-typedef struct QByteArray QByteArray;
 typedef struct QColor QColor;
 typedef struct QIODevice QIODevice;
 typedef struct QImage QImage;

qt/gen_qprocess.h

@@ -15,14 +15,12 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QIODevice;
 class QMetaObject;
 class QObject;
 class QProcess;
 class QProcessEnvironment;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QIODevice QIODevice;
 typedef struct QMetaObject QMetaObject;
 typedef struct QObject QObject;

qt/gen_qprogressbar.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -47,7 +46,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qpropertyanimation.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractAnimation;
-class QByteArray;
 class QEvent;
 class QMetaObject;
 class QObject;
@@ -25,7 +24,6 @@ class QVariant;
 class QVariantAnimation;
 #else
 typedef struct QAbstractAnimation QAbstractAnimation;
-typedef struct QByteArray QByteArray;
 typedef struct QEvent QEvent;
 typedef struct QMetaObject QMetaObject;
 typedef struct QObject QObject;

qt/gen_qrawfont.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChar;
 class QFont;
 class QImage;
@@ -25,7 +24,6 @@ class QRawFont;
 class QRectF;
 class QTransform;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChar QChar;
 typedef struct QFont QFont;
 typedef struct QImage QImage;

qt/gen_qresource.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QDateTime;
 class QLocale;
 class QResource;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QDateTime QDateTime;
 typedef struct QLocale QLocale;
 typedef struct QResource QResource;

qt/gen_qrubberband.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -48,7 +47,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qsignaltransition.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QAbstractTransition;
-class QByteArray;
 class QEvent;
 class QMetaObject;
 class QObject;
@@ -24,7 +23,6 @@ class QSignalTransition;
 class QState;
 #else
 typedef struct QAbstractTransition QAbstractTransition;
-typedef struct QByteArray QByteArray;
 typedef struct QEvent QEvent;
 typedef struct QMetaObject QMetaObject;
 typedef struct QObject QObject;

qt/gen_qsizegrip.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -47,7 +46,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qsplashscreen.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QColor;
 class QContextMenuEvent;
@@ -50,7 +49,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qsplitter.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QChildEvent;
 class QCloseEvent;
 class QContextMenuEvent;
@@ -50,7 +49,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QChildEvent QChildEvent;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qstandarditemmodel.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractItemModel;
 class QBrush;
-class QByteArray;
 class QDataStream;
 class QFont;
 class QIcon;
@@ -32,7 +31,6 @@ class QVariant;
 #else
 typedef struct QAbstractItemModel QAbstractItemModel;
 typedef struct QBrush QBrush;
-typedef struct QByteArray QByteArray;
 typedef struct QDataStream QDataStream;
 typedef struct QFont QFont;
 typedef struct QIcon QIcon;

qt/gen_qstatemachine.cpp

@@ -4,6 +4,7 @@
 #include <QList>
 #include <QMetaObject>
 #include <QObject>
+#include <QSet>
 #include <QState>
 #include <QStateMachine>
 #define WORKAROUND_INNER_CLASS_DEFINITION_QStateMachine__SignalEvent

qt/gen_qstatusbar.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -47,7 +46,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qstorageinfo.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QDir;
 class QStorageInfo;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QDir QDir;
 typedef struct QStorageInfo QStorageInfo;
 #endif

qt/gen_qstringview.h

@@ -15,11 +15,9 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChar;
 class QStringView;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChar QChar;
 typedef struct QStringView QStringView;
 #endif

qt/gen_qsurfaceformat.cpp

@@ -1,3 +1,4 @@
+#include <QPair>
 #include <QSurfaceFormat>
 #include <qsurfaceformat.h>
 #include "gen_qsurfaceformat.h"

qt/gen_qtabbar.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QColor;
 class QContextMenuEvent;
@@ -51,7 +50,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QColor QColor;
 typedef struct QContextMenuEvent QContextMenuEvent;

qt/gen_qtabwidget.h

@@ -16,7 +16,6 @@ extern "C" {
 
 #ifdef __cplusplus
 class QActionEvent;
-class QByteArray;
 class QCloseEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
@@ -49,7 +48,6 @@ class QWheelEvent;
 class QWidget;
 #else
 typedef struct QActionEvent QActionEvent;
-typedef struct QByteArray QByteArray;
 typedef struct QCloseEvent QCloseEvent;
 typedef struct QContextMenuEvent QContextMenuEvent;
 typedef struct QDragEnterEvent QDragEnterEvent;

qt/gen_qtextcodec.h

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QChar;
 class QTextCodec;
 #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QTextCodec__ConverterState)
@@ -26,7 +25,6 @@ class QTextCodec__ConverterState;
 class QTextDecoder;
 class QTextEncoder;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QChar QChar;
 typedef struct QTextCodec QTextCodec;
 typedef struct QTextCodec__ConverterState QTextCodec__ConverterState;

qt/gen_qtextdocument.h

@@ -17,7 +17,6 @@ extern "C" {
 #ifdef __cplusplus
 class QAbstractTextDocumentLayout;
 class QAbstractUndoItem;
-class QByteArray;
 class QChar;
 class QChildEvent;
 class QEvent;
@@ -44,7 +43,6 @@ class QVariant;
 #else
 typedef struct QAbstractTextDocumentLayout QAbstractTextDocumentLayout;
 typedef struct QAbstractUndoItem QAbstractUndoItem;
-typedef struct QByteArray QByteArray;
 typedef struct QChar QChar;
 typedef struct QChildEvent QChildEvent;
 typedef struct QEvent QEvent;

qt/gen_qtextdocumentfragment.h

@@ -15,12 +15,10 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-class QByteArray;
 class QTextCursor;
 class QTextDocument;
 class QTextDocumentFragment;
 #else
-typedef struct QByteArray QByteArray;
 typedef struct QTextCursor QTextCursor;
 typedef struct QTextDocument QTextDocument;
 typedef struct QTextDocumentFragment QTextDocumentFragment;