Merge pull request #91 from mappu/miqt-qt68

Qt 6.8 compatibility

.github/workflows/miqt.yml

@@ -67,7 +67,7 @@ jobs:
     - name: Linux64 bindings compile
       run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/linux64:qt64 /bin/bash -c 'cd qt6 && go build'
     
-  miqt_linux64_qt6_7:
+  miqt_linux64_qt6_8:
     runs-on: ubuntu-24.04
     
     steps:
@@ -75,16 +75,16 @@ jobs:
       uses: actions/checkout@v4
     
     - name: Linux64 docker build
-      run: docker build -t miqt/linux64:qt67 -f docker/linux64-go1.22-qt6.7-dynamic.Dockerfile .
+      run: docker build -t miqt/linux64:qt68 -f docker/linux64-go1.23-qt6.8-dynamic.Dockerfile .
     
     - name: Cache GOCACHE
       uses: actions/cache@v4
       with:
         path: ~/.cache/go-build
-        key: linux64-qt67-gocache
+        key: linux64-qt68-gocache
     
     - name: Linux64 bindings compile
-      run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/linux64:qt67 /bin/bash -c 'cd qt6 && go build'
+      run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/linux64:qt68 /bin/bash -c 'cd qt6 && go build'
     
   miqt_win64_qt5:
     runs-on: ubuntu-24.04

cmd/genbindings/config-allowlist.go

@@ -234,6 +234,11 @@ func AllowMethod(className string, mm CppMethod) error {
 		return ErrTooComplex
 	}
 
+	if className == "QXmlStreamEntityResolver" && mm.MethodName == "operator=" {
+		// Present in Qt 6.7, but marked as =delete by Q_DISABLE_COPY_MOVE in Qt 6.8
+		return ErrTooComplex
+	}
+
 	return nil // OK, allow
 }
 

cmd/genbindings/emitcabi.go

@@ -1026,6 +1026,14 @@ func emitBindingCpp(src *CppParsedHeader, filename string) (string, error) {
 
 			callTarget += m.CppCallTarget() + "(" + forwarding + ")"
 
+			// Qt 6.8 moved many operator== implementations from class methods
+			// into global operators.
+			// By using infix syntax, either can be called
+			if m.IsReadonlyOperator() && len(m.Parameters) == 1 {
+				operator := m.CppCallTarget()[8:]
+				callTarget = "(*self " + operator + " " + forwarding + ")"
+			}
+
 			if m.LinuxOnly {
 				ret.WriteString(fmt.Sprintf(
 					"%s %s_%s(%s) {\n"+

cmd/genbindings/intermediate.go

@@ -348,6 +348,16 @@ func (nm CppMethod) SafeMethodName() string {
 	return tmp
 }
 
+func (nm CppMethod) IsReadonlyOperator() bool {
+	targ := nm.CppCallTarget()
+	switch targ {
+	case "operator==", "operator!=",
+		"operator<", "operator<=", "operator>", "operator>=":
+		return true
+	}
+	return false
+}
+
 type CppEnumEntry struct {
 	EntryName  string
 	EntryValue string

docker/linux64-go1.23-qt6.8-dynamic.Dockerfile

@@ -0,0 +1,5 @@
+FROM fedora:41
+
+RUN dnf -y --setopt=install_weak_deps=False install \
+	qt6-qtbase-devel.x86_64 \
+	golang.x86_64

qt-extras/scintillaedit/gen_ScintillaEdit.cpp

@@ -88,11 +88,11 @@ Scintilla__Internal__Point* Scintilla__Internal__Point_FromInts(int x_, int y_)
 }
 
 bool Scintilla__Internal__Point_OperatorEqual(const Scintilla__Internal__Point* self, Scintilla__Internal__Point* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool Scintilla__Internal__Point_OperatorNotEqual(const Scintilla__Internal__Point* self, Scintilla__Internal__Point* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 Scintilla__Internal__Point* Scintilla__Internal__Point_OperatorPlus(const Scintilla__Internal__Point* self, Scintilla__Internal__Point* other) {
@@ -112,7 +112,7 @@ void Scintilla__Internal__Point_Delete(Scintilla__Internal__Point* self, bool is
 }
 
 bool Scintilla__Internal__Interval_OperatorEqual(const Scintilla__Internal__Interval* self, Scintilla__Internal__Interval* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 double Scintilla__Internal__Interval_Width(const Scintilla__Internal__Interval* self) {
@@ -175,7 +175,7 @@ Scintilla__Internal__PRectangle* Scintilla__Internal__PRectangle_FromInts(int le
 }
 
 bool Scintilla__Internal__PRectangle_OperatorEqual(const Scintilla__Internal__PRectangle* self, Scintilla__Internal__PRectangle* rc) {
-	return self->operator==(*rc);
+	return (*self == *rc);
 }
 
 bool Scintilla__Internal__PRectangle_Contains(const Scintilla__Internal__PRectangle* self, Scintilla__Internal__Point* pt) {
@@ -331,7 +331,7 @@ float Scintilla__Internal__ColourRGBA_GetAlphaComponent(const Scintilla__Interna
 }
 
 bool Scintilla__Internal__ColourRGBA_OperatorEqual(const Scintilla__Internal__ColourRGBA* self, Scintilla__Internal__ColourRGBA* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool Scintilla__Internal__ColourRGBA_IsOpaque(const Scintilla__Internal__ColourRGBA* self) {

qt/cbor/gen_qcborarray.cpp

@@ -128,15 +128,15 @@ int QCborArray_Compare(const QCborArray* self, QCborArray* other) {
 }
 
 bool QCborArray_OperatorEqual(const QCborArray* self, QCborArray* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborArray_OperatorNotEqual(const QCborArray* self, QCborArray* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborArray_OperatorLesser(const QCborArray* self, QCborArray* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborArray__Iterator* QCborArray_Begin(QCborArray* self) {
@@ -277,51 +277,51 @@ QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self
 }
 
 bool QCborArray__Iterator_OperatorEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__Iterator_OperatorNotEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__Iterator_OperatorLesser(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__Iterator_OperatorLesserOrEqual(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__Iterator_OperatorGreater(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterOrEqual(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborArray__Iterator_OperatorEqualWithQCborArrayConstIterator(const QCborArray__Iterator* self, QCborArray__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__Iterator_OperatorNotEqualWithQCborArrayConstIterator(const QCborArray__Iterator* self, QCborArray__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__Iterator_OperatorLesserWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__Iterator_OperatorLesserOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self) {
@@ -404,51 +404,51 @@ QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIter
 }
 
 bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__ConstIterator_OperatorNotEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__ConstIterator_OperatorLesser(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserOrEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreater(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterOrEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorEqualWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__ConstIterator_OperatorNotEqualWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self) {

qt/cbor/gen_qcbormap.cpp

@@ -145,15 +145,15 @@ int QCborMap_Compare(const QCborMap* self, QCborMap* other) {
 }
 
 bool QCborMap_OperatorEqual(const QCborMap* self, QCborMap* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborMap_OperatorNotEqual(const QCborMap* self, QCborMap* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborMap_OperatorLesser(const QCborMap* self, QCborMap* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborMap__Iterator* QCborMap_Begin(QCborMap* self) {
@@ -399,51 +399,51 @@ QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self) {
 }
 
 bool QCborMap__Iterator_OperatorEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__Iterator_OperatorNotEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__Iterator_OperatorLesser(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__Iterator_OperatorLesserOrEqual(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__Iterator_OperatorGreater(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterOrEqual(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborMap__Iterator_OperatorEqualWithQCborMapConstIterator(const QCborMap__Iterator* self, QCborMap__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__Iterator_OperatorNotEqualWithQCborMapConstIterator(const QCborMap__Iterator* self, QCborMap__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__Iterator_OperatorLesserWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__Iterator_OperatorLesserOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self) {
@@ -540,51 +540,51 @@ QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self
 }
 
 bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__ConstIterator_OperatorNotEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__ConstIterator_OperatorLesser(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserOrEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreater(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterOrEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorEqualWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__ConstIterator_OperatorNotEqualWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self) {

qt/cbor/gen_qcborvalue.cpp

@@ -345,15 +345,15 @@ int QCborValue_Compare(const QCborValue* self, QCborValue* other) {
 }
 
 bool QCborValue_OperatorEqual(const QCborValue* self, QCborValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborValue_OperatorNotEqual(const QCborValue* self, QCborValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborValue_OperatorLesser(const QCborValue* self, QCborValue* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborValue* QCborValue_FromVariant(QVariant* variant) {
@@ -718,15 +718,15 @@ int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other) {
 }
 
 bool QCborValueRef_OperatorEqual(const QCborValueRef* self, QCborValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborValueRef_OperatorNotEqual(const QCborValueRef* self, QCborValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborValueRef_OperatorLesser(const QCborValueRef* self, QCborValue* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QVariant* QCborValueRef_ToVariant(const QCborValueRef* self) {

qt/gen_qabstractitemmodel.cpp

@@ -83,15 +83,15 @@ bool QModelIndex_IsValid(const QModelIndex* self) {
 }
 
 bool QModelIndex_OperatorEqual(const QModelIndex* self, QModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QModelIndex_OperatorNotEqual(const QModelIndex* self, QModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QModelIndex_OperatorLesser(const QModelIndex* self, QModelIndex* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QVariant* QModelIndex_Data1(const QModelIndex* self, int role) {
@@ -122,15 +122,15 @@ void QPersistentModelIndex_new3(QPersistentModelIndex* other, QPersistentModelIn
 }
 
 bool QPersistentModelIndex_OperatorLesser(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QPersistentModelIndex_OperatorEqual(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QPersistentModelIndex_OperatorNotEqual(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QPersistentModelIndex_OperatorAssign(QPersistentModelIndex* self, QPersistentModelIndex* other) {
@@ -142,11 +142,11 @@ void QPersistentModelIndex_Swap(QPersistentModelIndex* self, QPersistentModelInd
 }
 
 bool QPersistentModelIndex_OperatorEqualWithOther(const QPersistentModelIndex* self, QModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QPersistentModelIndex_OperatorNotEqualWithOther(const QPersistentModelIndex* self, QModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QPersistentModelIndex_OperatorAssignWithOther(QPersistentModelIndex* self, QModelIndex* other) {

qt/gen_qbitarray.cpp

@@ -121,11 +121,11 @@ void QBitArray_OperatorBitwiseNotAssign(QBitArray* self, QBitArray* param1) {
 }
 
 bool QBitArray_OperatorEqual(const QBitArray* self, QBitArray* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QBitArray_OperatorNotEqual(const QBitArray* self, QBitArray* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QBitArray_Fill(QBitArray* self, bool val) {

qt/gen_qbrush.cpp

@@ -150,11 +150,11 @@ bool QBrush_IsOpaque(const QBrush* self) {
 }
 
 bool QBrush_OperatorEqual(const QBrush* self, QBrush* b) {
-	return self->operator==(*b);
+	return (*self == *b);
 }
 
 bool QBrush_OperatorNotEqual(const QBrush* self, QBrush* b) {
-	return self->operator!=(*b);
+	return (*self != *b);
 }
 
 bool QBrush_IsDetached(const QBrush* self) {
@@ -276,11 +276,11 @@ void QGradient_SetInterpolationMode(QGradient* self, int mode) {
 }
 
 bool QGradient_OperatorEqual(const QGradient* self, QGradient* gradient) {
-	return self->operator==(*gradient);
+	return (*self == *gradient);
 }
 
 bool QGradient_OperatorNotEqual(const QGradient* self, QGradient* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QGradient_Delete(QGradient* self, bool isSubclass) {

qt/gen_qcolor.cpp

@@ -496,11 +496,11 @@ QColor* QColor_Darker(const QColor* self) {
 }
 
 bool QColor_OperatorEqual(const QColor* self, QColor* c) {
-	return self->operator==(*c);
+	return (*self == *c);
 }
 
 bool QColor_OperatorNotEqual(const QColor* self, QColor* c) {
-	return self->operator!=(*c);
+	return (*self != *c);
 }
 
 bool QColor_IsValidColor(struct miqt_string name) {

qt/gen_qdatetime.cpp

@@ -246,27 +246,27 @@ long long QDate_DaysTo(const QDate* self, QDate* param1) {
 }
 
 bool QDate_OperatorEqual(const QDate* self, QDate* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QDate_OperatorNotEqual(const QDate* self, QDate* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QDate_OperatorLesser(const QDate* self, QDate* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QDate_OperatorLesserOrEqual(const QDate* self, QDate* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QDate_OperatorGreater(const QDate* self, QDate* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QDate_OperatorGreaterOrEqual(const QDate* self, QDate* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QDate* QDate_CurrentDate() {
@@ -488,27 +488,27 @@ int QTime_MsecsTo(const QTime* self, QTime* param1) {
 }
 
 bool QTime_OperatorEqual(const QTime* self, QTime* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QTime_OperatorNotEqual(const QTime* self, QTime* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QTime_OperatorLesser(const QTime* self, QTime* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QTime_OperatorLesserOrEqual(const QTime* self, QTime* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QTime_OperatorGreater(const QTime* self, QTime* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QTime_OperatorGreaterOrEqual(const QTime* self, QTime* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QTime* QTime_FromMSecsSinceStartOfDay(int msecs) {
@@ -793,27 +793,27 @@ long long QDateTime_MsecsTo(const QDateTime* self, QDateTime* param1) {
 }
 
 bool QDateTime_OperatorEqual(const QDateTime* self, QDateTime* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QDateTime_OperatorNotEqual(const QDateTime* self, QDateTime* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QDateTime_OperatorLesser(const QDateTime* self, QDateTime* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QDateTime_OperatorLesserOrEqual(const QDateTime* self, QDateTime* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QDateTime_OperatorGreater(const QDateTime* self, QDateTime* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QDateTime_OperatorGreaterOrEqual(const QDateTime* self, QDateTime* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 void QDateTime_SetUtcOffset(QDateTime* self, int seconds) {

qt/gen_qdir.cpp

@@ -450,11 +450,11 @@ bool QDir_MakeAbsolute(QDir* self) {
 }
 
 bool QDir_OperatorEqual(const QDir* self, QDir* dir) {
-	return self->operator==(*dir);
+	return (*self == *dir);
 }
 
 bool QDir_OperatorNotEqual(const QDir* self, QDir* dir) {
-	return self->operator!=(*dir);
+	return (*self != *dir);
 }
 
 bool QDir_Remove(QDir* self, struct miqt_string fileName) {

qt/gen_qeasingcurve.cpp

@@ -29,11 +29,11 @@ void QEasingCurve_Swap(QEasingCurve* self, QEasingCurve* other) {
 }
 
 bool QEasingCurve_OperatorEqual(const QEasingCurve* self, QEasingCurve* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QEasingCurve_OperatorNotEqual(const QEasingCurve* self, QEasingCurve* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 double QEasingCurve_Amplitude(const QEasingCurve* self) {

qt/gen_qelapsedtimer.cpp

@@ -64,11 +64,11 @@ long long QElapsedTimer_SecsTo(const QElapsedTimer* self, QElapsedTimer* other)
 }
 
 bool QElapsedTimer_OperatorEqual(const QElapsedTimer* self, QElapsedTimer* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QElapsedTimer_OperatorNotEqual(const QElapsedTimer* self, QElapsedTimer* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QElapsedTimer_Delete(QElapsedTimer* self, bool isSubclass) {

qt/gen_qfileinfo.cpp

@@ -45,11 +45,11 @@ void QFileInfo_Swap(QFileInfo* self, QFileInfo* other) {
 }
 
 bool QFileInfo_OperatorEqual(const QFileInfo* self, QFileInfo* fileinfo) {
-	return self->operator==(*fileinfo);
+	return (*self == *fileinfo);
 }
 
 bool QFileInfo_OperatorNotEqual(const QFileInfo* self, QFileInfo* fileinfo) {
-	return self->operator!=(*fileinfo);
+	return (*self != *fileinfo);
 }
 
 void QFileInfo_SetFile(QFileInfo* self, struct miqt_string file) {

qt/gen_qfont.cpp

@@ -301,15 +301,15 @@ void QFont_OperatorAssign(QFont* self, QFont* param1) {
 }
 
 bool QFont_OperatorEqual(const QFont* self, QFont* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QFont_OperatorNotEqual(const QFont* self, QFont* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 bool QFont_OperatorLesser(const QFont* self, QFont* param1) {
-	return self->operator<(*param1);
+	return (*self < *param1);
 }
 
 bool QFont_IsCopyOf(const QFont* self, QFont* param1) {

qt/gen_qfontmetrics.cpp

@@ -188,11 +188,11 @@ double QFontMetrics_FontDpi(const QFontMetrics* self) {
 }
 
 bool QFontMetrics_OperatorEqual(const QFontMetrics* self, QFontMetrics* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string param1, int lenVal) {
@@ -444,11 +444,11 @@ double QFontMetricsF_FontDpi(const QFontMetricsF* self) {
 }
 
 bool QFontMetricsF_OperatorEqual(const QFontMetricsF* self, QFontMetricsF* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string stringVal, int length) {

qt/gen_qfutureinterface.cpp

@@ -179,11 +179,11 @@ QMutex* QFutureInterfaceBase_MutexWithInt(const QFutureInterfaceBase* self, int
 }
 
 bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QFutureInterfaceBase_OperatorNotEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other) {

qt/gen_qglyphrun.cpp

@@ -88,11 +88,11 @@ void QGlyphRun_Clear(QGlyphRun* self) {
 }
 
 bool QGlyphRun_OperatorEqual(const QGlyphRun* self, QGlyphRun* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QGlyphRun_OperatorNotEqual(const QGlyphRun* self, QGlyphRun* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QGlyphRun_SetOverline(QGlyphRun* self, bool overline) {

qt/gen_qimage.cpp

@@ -255,11 +255,11 @@ int QImage_DevType(const QImage* self) {
 }
 
 bool QImage_OperatorEqual(const QImage* self, QImage* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QImage_OperatorNotEqual(const QImage* self, QImage* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 void QImage_Detach(QImage* self) {

qt/gen_qitemselectionmodel.cpp

@@ -106,15 +106,15 @@ QItemSelectionRange* QItemSelectionRange_Intersected(const QItemSelectionRange*
 }
 
 bool QItemSelectionRange_OperatorEqual(const QItemSelectionRange* self, QItemSelectionRange* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QItemSelectionRange_OperatorNotEqual(const QItemSelectionRange* self, QItemSelectionRange* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QItemSelectionRange_OperatorLesser(const QItemSelectionRange* self, QItemSelectionRange* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QItemSelectionRange_IsValid(const QItemSelectionRange* self) {

qt/gen_qjsonarray.cpp

@@ -107,11 +107,11 @@ QJsonValue* QJsonArray_OperatorSubscriptWithInt(const QJsonArray* self, int i) {
 }
 
 bool QJsonArray_OperatorEqual(const QJsonArray* self, QJsonArray* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonArray_OperatorNotEqual(const QJsonArray* self, QJsonArray* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QJsonArray_Swap(QJsonArray* self, QJsonArray* other) {
@@ -230,51 +230,51 @@ QJsonValueRef* QJsonArray__iterator_OperatorSubscript(const QJsonArray__iterator
 }
 
 bool QJsonArray__iterator_OperatorEqual(const QJsonArray__iterator* self, QJsonArray__iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QJsonArray__iterator_OperatorNotEqual(const QJsonArray__iterator* self, QJsonArray__iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QJsonArray__iterator_OperatorLesser(const QJsonArray__iterator* self, QJsonArray__iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonArray__iterator_OperatorLesserOrEqual(const QJsonArray__iterator* self, QJsonArray__iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonArray__iterator_OperatorGreater(const QJsonArray__iterator* self, QJsonArray__iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonArray__iterator_OperatorGreaterOrEqual(const QJsonArray__iterator* self, QJsonArray__iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QJsonArray__iterator_OperatorEqualWithQJsonArrayconstIterator(const QJsonArray__iterator* self, QJsonArray__const_iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QJsonArray__iterator_OperatorNotEqualWithQJsonArrayconstIterator(const QJsonArray__iterator* self, QJsonArray__const_iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QJsonArray__iterator_OperatorLesserWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonArray__iterator_OperatorLesserOrEqualWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonArray__iterator_OperatorGreaterWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonArray__iterator_OperatorGreaterOrEqualWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator* self) {
@@ -362,27 +362,27 @@ QJsonValue* QJsonArray__const_iterator_OperatorSubscript(const QJsonArray__const
 }
 
 bool QJsonArray__const_iterator_OperatorEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QJsonArray__const_iterator_OperatorNotEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QJsonArray__const_iterator_OperatorLesser(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonArray__const_iterator_OperatorLesserOrEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonArray__const_iterator_OperatorGreater(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonArray__const_iterator_OperatorGreaterOrEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArray__const_iterator* self) {

qt/gen_qjsondocument.cpp

@@ -150,11 +150,11 @@ QJsonValue* QJsonDocument_OperatorSubscriptWithInt(const QJsonDocument* self, in
 }
 
 bool QJsonDocument_OperatorEqual(const QJsonDocument* self, QJsonDocument* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonDocument_OperatorNotEqual(const QJsonDocument* self, QJsonDocument* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonDocument_IsNull(const QJsonDocument* self) {

qt/gen_qjsonobject.cpp

@@ -173,11 +173,11 @@ bool QJsonObject_Contains(const QJsonObject* self, struct miqt_string key) {
 }
 
 bool QJsonObject_OperatorEqual(const QJsonObject* self, QJsonObject* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonObject_OperatorNotEqual(const QJsonObject* self, QJsonObject* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 QJsonObject__iterator* QJsonObject_Begin(QJsonObject* self) {
@@ -283,27 +283,27 @@ QJsonValueRef* QJsonObject__iterator_OperatorSubscript(QJsonObject__iterator* se
 }
 
 bool QJsonObject__iterator_OperatorEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonObject__iterator_OperatorNotEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonObject__iterator_OperatorLesser(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonObject__iterator_OperatorLesserOrEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonObject__iterator_OperatorGreater(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonObject__iterator_OperatorGreaterOrEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__iterator* self) {
@@ -351,27 +351,27 @@ int QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(const QJsonObject
 }
 
 bool QJsonObject__iterator_OperatorEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonObject__iterator_OperatorNotEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonObject__iterator_OperatorLesserWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonObject__iterator_OperatorLesserOrEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonObject__iterator_OperatorGreaterWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonObject__iterator_OperatorGreaterOrEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 void QJsonObject__iterator_Delete(QJsonObject__iterator* self, bool isSubclass) {
@@ -430,27 +430,27 @@ QJsonValue* QJsonObject__const_iterator_OperatorSubscript(QJsonObject__const_ite
 }
 
 bool QJsonObject__const_iterator_OperatorEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonObject__const_iterator_OperatorNotEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonObject__const_iterator_OperatorLesser(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonObject__const_iterator_OperatorLesserOrEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonObject__const_iterator_OperatorGreater(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonObject__const_iterator_OperatorGreaterOrEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonObject__const_iterator* self) {
@@ -498,27 +498,27 @@ int QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(const
 }
 
 bool QJsonObject__const_iterator_OperatorEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonObject__const_iterator_OperatorNotEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonObject__const_iterator_OperatorLesserWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QJsonObject__const_iterator_OperatorLesserOrEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QJsonObject__const_iterator_OperatorGreaterWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QJsonObject__const_iterator_OperatorGreaterOrEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 void QJsonObject__const_iterator_Delete(QJsonObject__const_iterator* self, bool isSubclass) {

qt/gen_qjsonvalue.cpp

@@ -178,11 +178,11 @@ QJsonValue* QJsonValue_OperatorSubscriptWithInt(const QJsonValue* self, int i) {
 }
 
 bool QJsonValue_OperatorEqual(const QJsonValue* self, QJsonValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonValue_OperatorNotEqual(const QJsonValue* self, QJsonValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QJsonValue_ToBool1(const QJsonValue* self, bool defaultValue) {
@@ -321,11 +321,11 @@ struct miqt_string QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* s
 }
 
 bool QJsonValueRef_OperatorEqual(const QJsonValueRef* self, QJsonValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QJsonValueRef_OperatorNotEqual(const QJsonValueRef* self, QJsonValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QJsonValueRef_Delete(QJsonValueRef* self, bool isSubclass) {

qt/gen_qkeysequence.cpp

@@ -145,27 +145,27 @@ void QKeySequence_Swap(QKeySequence* self, QKeySequence* other) {
 }
 
 bool QKeySequence_OperatorEqual(const QKeySequence* self, QKeySequence* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QKeySequence_OperatorNotEqual(const QKeySequence* self, QKeySequence* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QKeySequence_OperatorLesser(const QKeySequence* self, QKeySequence* ks) {
-	return self->operator<(*ks);
+	return (*self < *ks);
 }
 
 bool QKeySequence_OperatorGreater(const QKeySequence* self, QKeySequence* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QKeySequence_OperatorLesserOrEqual(const QKeySequence* self, QKeySequence* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QKeySequence_OperatorGreaterOrEqual(const QKeySequence* self, QKeySequence* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QKeySequence_IsDetached(const QKeySequence* self) {

qt/gen_qline.cpp

@@ -99,11 +99,11 @@ void QLine_SetLine(QLine* self, int x1, int y1, int x2, int y2) {
 }
 
 bool QLine_OperatorEqual(const QLine* self, QLine* d) {
-	return self->operator==(*d);
+	return (*self == *d);
 }
 
 bool QLine_OperatorNotEqual(const QLine* self, QLine* d) {
-	return self->operator!=(*d);
+	return (*self != *d);
 }
 
 void QLine_Delete(QLine* self, bool isSubclass) {
@@ -272,11 +272,11 @@ void QLineF_SetLine(QLineF* self, double x1, double y1, double x2, double y2) {
 }
 
 bool QLineF_OperatorEqual(const QLineF* self, QLineF* d) {
-	return self->operator==(*d);
+	return (*self == *d);
 }
 
 bool QLineF_OperatorNotEqual(const QLineF* self, QLineF* d) {
-	return self->operator!=(*d);
+	return (*self != *d);
 }
 
 QLine* QLineF_ToLine(const QLineF* self) {

qt/gen_qlistwidget.cpp

@@ -466,7 +466,7 @@ void QListWidgetItem_SetData(QListWidgetItem* self, int role, QVariant* value) {
 }
 
 bool QListWidgetItem_OperatorLesser(const QListWidgetItem* self, QListWidgetItem* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 void QListWidgetItem_Read(QListWidgetItem* self, QDataStream* in) {

qt/gen_qlocale.cpp

@@ -782,11 +782,11 @@ struct miqt_array /* of struct miqt_string */  QLocale_UiLanguages(const QLocale
 }
 
 bool QLocale_OperatorEqual(const QLocale* self, QLocale* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 struct miqt_string QLocale_LanguageToString(int language) {

qt/gen_qmatrix.cpp

@@ -155,11 +155,11 @@ QMatrix* QMatrix_Inverted(const QMatrix* self) {
 }
 
 bool QMatrix_OperatorEqual(const QMatrix* self, QMatrix* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QMatrix_OperatorNotEqual(const QMatrix* self, QMatrix* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 QMatrix* QMatrix_OperatorMultiplyAssign(QMatrix* self, QMatrix* param1) {

qt/gen_qmatrix4x4.cpp

@@ -127,11 +127,11 @@ QMatrix4x4* QMatrix4x4_OperatorDivideAssign(QMatrix4x4* self, float divisor) {
 }
 
 bool QMatrix4x4_OperatorEqual(const QMatrix4x4* self, QMatrix4x4* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QMatrix4x4_OperatorNotEqual(const QMatrix4x4* self, QMatrix4x4* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QMatrix4x4_Scale(QMatrix4x4* self, QVector3D* vector) {

qt/gen_qmimetype.cpp

@@ -26,11 +26,11 @@ void QMimeType_Swap(QMimeType* self, QMimeType* other) {
 }
 
 bool QMimeType_OperatorEqual(const QMimeType* self, QMimeType* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QMimeType_OperatorNotEqual(const QMimeType* self, QMimeType* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QMimeType_IsValid(const QMimeType* self) {

qt/gen_qpainterpath.cpp

@@ -289,11 +289,11 @@ QPainterPath* QPainterPath_Simplified(const QPainterPath* self) {
 }
 
 bool QPainterPath_OperatorEqual(const QPainterPath* self, QPainterPath* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QPainterPath_OperatorNotEqual(const QPainterPath* self, QPainterPath* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 QPainterPath* QPainterPath_OperatorBitwiseAnd(const QPainterPath* self, QPainterPath* other) {
@@ -464,11 +464,11 @@ bool QPainterPath__Element_IsCurveTo(const QPainterPath__Element* self) {
 }
 
 bool QPainterPath__Element_OperatorEqual(const QPainterPath__Element* self, QPainterPath__Element* e) {
-	return self->operator==(*e);
+	return (*self == *e);
 }
 
 bool QPainterPath__Element_OperatorNotEqual(const QPainterPath__Element* self, QPainterPath__Element* e) {
-	return self->operator!=(*e);
+	return (*self != *e);
 }
 
 void QPainterPath__Element_Delete(QPainterPath__Element* self, bool isSubclass) {

qt/gen_qpalette.cpp

@@ -242,11 +242,11 @@ QBrush* QPalette_Background(const QPalette* self) {
 }
 
 bool QPalette_OperatorEqual(const QPalette* self, QPalette* p) {
-	return self->operator==(*p);
+	return (*self == *p);
 }
 
 bool QPalette_OperatorNotEqual(const QPalette* self, QPalette* p) {
-	return self->operator!=(*p);
+	return (*self != *p);
 }
 
 bool QPalette_IsCopyOf(const QPalette* self, QPalette* p) {

qt/gen_qpen.cpp

@@ -168,11 +168,11 @@ void QPen_SetCosmetic(QPen* self, bool cosmetic) {
 }
 
 bool QPen_OperatorEqual(const QPen* self, QPen* p) {
-	return self->operator==(*p);
+	return (*self == *p);
 }
 
 bool QPen_OperatorNotEqual(const QPen* self, QPen* p) {
-	return self->operator!=(*p);
+	return (*self != *p);
 }
 
 bool QPen_IsDetached(QPen* self) {

qt/gen_qpixmapcache.cpp

@@ -80,11 +80,11 @@ void QPixmapCache__Key_new2(QPixmapCache__Key* other, QPixmapCache__Key** outptr
 }
 
 bool QPixmapCache__Key_OperatorEqual(const QPixmapCache__Key* self, QPixmapCache__Key* key) {
-	return self->operator==(*key);
+	return (*self == *key);
 }
 
 bool QPixmapCache__Key_OperatorNotEqual(const QPixmapCache__Key* self, QPixmapCache__Key* key) {
-	return self->operator!=(*key);
+	return (*self != *key);
 }
 
 void QPixmapCache__Key_OperatorAssign(QPixmapCache__Key* self, QPixmapCache__Key* other) {

qt/gen_qprocess.cpp

@@ -31,11 +31,11 @@ void QProcessEnvironment_Swap(QProcessEnvironment* self, QProcessEnvironment* ot
 }
 
 bool QProcessEnvironment_OperatorEqual(const QProcessEnvironment* self, QProcessEnvironment* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QProcessEnvironment_OperatorNotEqual(const QProcessEnvironment* self, QProcessEnvironment* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QProcessEnvironment_IsEmpty(const QProcessEnvironment* self) {

qt/gen_qrawfont.cpp

@@ -62,11 +62,11 @@ bool QRawFont_IsValid(const QRawFont* self) {
 }
 
 bool QRawFont_OperatorEqual(const QRawFont* self, QRawFont* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QRawFont_OperatorNotEqual(const QRawFont* self, QRawFont* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 struct miqt_string QRawFont_FamilyName(const QRawFont* self) {

qt/gen_qregexp.cpp

@@ -44,11 +44,11 @@ void QRegExp_Swap(QRegExp* self, QRegExp* other) {
 }
 
 bool QRegExp_OperatorEqual(const QRegExp* self, QRegExp* rx) {
-	return self->operator==(*rx);
+	return (*self == *rx);
 }
 
 bool QRegExp_OperatorNotEqual(const QRegExp* self, QRegExp* rx) {
-	return self->operator!=(*rx);
+	return (*self != *rx);
 }
 
 bool QRegExp_IsEmpty(const QRegExp* self) {

qt/gen_qregion.cpp

@@ -222,11 +222,11 @@ void QRegion_OperatorBitwiseNotAssign(QRegion* self, QRegion* r) {
 }
 
 bool QRegion_OperatorEqual(const QRegion* self, QRegion* r) {
-	return self->operator==(*r);
+	return (*self == *r);
 }
 
 bool QRegion_OperatorNotEqual(const QRegion* self, QRegion* r) {
-	return self->operator!=(*r);
+	return (*self != *r);
 }
 
 void QRegion_Delete(QRegion* self, bool isSubclass) {

qt/gen_qregularexpression.cpp

@@ -158,11 +158,11 @@ struct miqt_string QRegularExpression_AnchoredPattern(struct miqt_string express
 }
 
 bool QRegularExpression_OperatorEqual(const QRegularExpression* self, QRegularExpression* re) {
-	return self->operator==(*re);
+	return (*self == *re);
 }
 
 bool QRegularExpression_OperatorNotEqual(const QRegularExpression* self, QRegularExpression* re) {
-	return self->operator!=(*re);
+	return (*self != *re);
 }
 
 QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string subject, int offset) {

qt/gen_qscrollerproperties.cpp

@@ -19,11 +19,11 @@ void QScrollerProperties_OperatorAssign(QScrollerProperties* self, QScrollerProp
 }
 
 bool QScrollerProperties_OperatorEqual(const QScrollerProperties* self, QScrollerProperties* sp) {
-	return self->operator==(*sp);
+	return (*self == *sp);
 }
 
 bool QScrollerProperties_OperatorNotEqual(const QScrollerProperties* self, QScrollerProperties* sp) {
-	return self->operator!=(*sp);
+	return (*self != *sp);
 }
 
 void QScrollerProperties_SetDefaultScrollerProperties(QScrollerProperties* sp) {

qt/gen_qsizepolicy.cpp

@@ -72,11 +72,11 @@ bool QSizePolicy_HasWidthForHeight(const QSizePolicy* self) {
 }
 
 bool QSizePolicy_OperatorEqual(const QSizePolicy* self, QSizePolicy* s) {
-	return self->operator==(*s);
+	return (*self == *s);
 }
 
 bool QSizePolicy_OperatorNotEqual(const QSizePolicy* self, QSizePolicy* s) {
-	return self->operator!=(*s);
+	return (*self != *s);
 }
 
 int QSizePolicy_HorizontalStretch(const QSizePolicy* self) {

qt/gen_qstandarditemmodel.cpp

@@ -674,7 +674,7 @@ void QStandardItem_Write(const QStandardItem* self, QDataStream* out) {
 }
 
 bool QStandardItem_OperatorLesser(const QStandardItem* self, QStandardItem* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QStandardItem* QStandardItem_Child2(const QStandardItem* self, int row, int column) {

qt/gen_qstatictext.cpp

@@ -94,11 +94,11 @@ int QStaticText_PerformanceHint(const QStaticText* self) {
 }
 
 bool QStaticText_OperatorEqual(const QStaticText* self, QStaticText* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QStaticText_OperatorNotEqual(const QStaticText* self, QStaticText* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 void QStaticText_Prepare1(QStaticText* self, QTransform* matrix) {

qt/gen_qtablewidget.cpp

@@ -467,7 +467,7 @@ void QTableWidgetItem_SetData(QTableWidgetItem* self, int role, QVariant* value)
 }
 
 bool QTableWidgetItem_OperatorLesser(const QTableWidgetItem* self, QTableWidgetItem* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 void QTableWidgetItem_Read(QTableWidgetItem* self, QDataStream* in) {

qt/gen_qtextcursor.cpp

@@ -312,27 +312,27 @@ void QTextCursor_EndEditBlock(QTextCursor* self) {
 }
 
 bool QTextCursor_OperatorNotEqual(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator!=(*rhs);
+	return (*self != *rhs);
 }
 
 bool QTextCursor_OperatorLesser(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator<(*rhs);
+	return (*self < *rhs);
 }
 
 bool QTextCursor_OperatorLesserOrEqual(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator<=(*rhs);
+	return (*self <= *rhs);
 }
 
 bool QTextCursor_OperatorEqual(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator==(*rhs);
+	return (*self == *rhs);
 }
 
 bool QTextCursor_OperatorGreaterOrEqual(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator>=(*rhs);
+	return (*self >= *rhs);
 }
 
 bool QTextCursor_OperatorGreater(const QTextCursor* self, QTextCursor* rhs) {
-	return self->operator>(*rhs);
+	return (*self > *rhs);
 }
 
 bool QTextCursor_IsCopyOf(const QTextCursor* self, QTextCursor* other) {

qt/gen_qtextformat.cpp

@@ -53,11 +53,11 @@ double QTextLength_RawValue(const QTextLength* self) {
 }
 
 bool QTextLength_OperatorEqual(const QTextLength* self, QTextLength* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QTextLength_OperatorNotEqual(const QTextLength* self, QTextLength* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QTextLength_Delete(QTextLength* self, bool isSubclass) {
@@ -281,11 +281,11 @@ QTextTableCellFormat* QTextFormat_ToTableCellFormat(const QTextFormat* self) {
 }
 
 bool QTextFormat_OperatorEqual(const QTextFormat* self, QTextFormat* rhs) {
-	return self->operator==(*rhs);
+	return (*self == *rhs);
 }
 
 bool QTextFormat_OperatorNotEqual(const QTextFormat* self, QTextFormat* rhs) {
-	return self->operator!=(*rhs);
+	return (*self != *rhs);
 }
 
 void QTextFormat_SetLayoutDirection(QTextFormat* self, int direction) {

qt/gen_qtextobject.cpp

@@ -380,15 +380,15 @@ bool QTextBlock_IsValid(const QTextBlock* self) {
 }
 
 bool QTextBlock_OperatorEqual(const QTextBlock* self, QTextBlock* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QTextBlock_OperatorNotEqual(const QTextBlock* self, QTextBlock* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QTextBlock_OperatorLesser(const QTextBlock* self, QTextBlock* o) {
-	return self->operator<(*o);
+	return (*self < *o);
 }
 
 int QTextBlock_Position(const QTextBlock* self) {
@@ -559,15 +559,15 @@ bool QTextFragment_IsValid(const QTextFragment* self) {
 }
 
 bool QTextFragment_OperatorEqual(const QTextFragment* self, QTextFragment* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QTextFragment_OperatorNotEqual(const QTextFragment* self, QTextFragment* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QTextFragment_OperatorLesser(const QTextFragment* self, QTextFragment* o) {
-	return self->operator<(*o);
+	return (*self < *o);
 }
 
 int QTextFragment_Position(const QTextFragment* self) {
@@ -679,11 +679,11 @@ bool QTextFrame__iterator_AtEnd(const QTextFrame__iterator* self) {
 }
 
 bool QTextFrame__iterator_OperatorEqual(const QTextFrame__iterator* self, QTextFrame__iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QTextFrame__iterator_OperatorNotEqual(const QTextFrame__iterator* self, QTextFrame__iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlus(QTextFrame__iterator* self) {
@@ -737,11 +737,11 @@ bool QTextBlock__iterator_AtEnd(const QTextBlock__iterator* self) {
 }
 
 bool QTextBlock__iterator_OperatorEqual(const QTextBlock__iterator* self, QTextBlock__iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QTextBlock__iterator_OperatorNotEqual(const QTextBlock__iterator* self, QTextBlock__iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlus(QTextBlock__iterator* self) {

qt/gen_qtextoption.cpp

@@ -162,11 +162,11 @@ void QTextOption__Tab_new4(double pos, int tabType, QChar* delim, QTextOption__T
 }
 
 bool QTextOption__Tab_OperatorEqual(const QTextOption__Tab* self, QTextOption__Tab* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QTextOption__Tab_OperatorNotEqual(const QTextOption__Tab* self, QTextOption__Tab* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QTextOption__Tab_Delete(QTextOption__Tab* self, bool isSubclass) {

qt/gen_qtexttable.cpp

@@ -75,11 +75,11 @@ int QTextTableCell_LastPosition(const QTextTableCell* self) {
 }
 
 bool QTextTableCell_OperatorEqual(const QTextTableCell* self, QTextTableCell* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QTextTableCell_OperatorNotEqual(const QTextTableCell* self, QTextTableCell* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 QTextFrame__iterator* QTextTableCell_Begin(const QTextTableCell* self) {

qt/gen_qtransform.cpp

@@ -192,11 +192,11 @@ QTransform* QTransform_RotateRadians(QTransform* self, double a) {
 }
 
 bool QTransform_OperatorEqual(const QTransform* self, QTransform* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QTransform_OperatorNotEqual(const QTransform* self, QTransform* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 QTransform* QTransform_OperatorMultiplyAssign(QTransform* self, QTransform* param1) {

qt/gen_qtreewidget.cpp

@@ -552,7 +552,7 @@ void QTreeWidgetItem_SetData(QTreeWidgetItem* self, int column, int role, QVaria
 }
 
 bool QTreeWidgetItem_OperatorLesser(const QTreeWidgetItem* self, QTreeWidgetItem* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 void QTreeWidgetItem_Read(QTreeWidgetItem* self, QDataStream* in) {

qt/gen_qurl.cpp

@@ -357,15 +357,15 @@ bool QUrl_IsDetached(const QUrl* self) {
 }
 
 bool QUrl_OperatorLesser(const QUrl* self, QUrl* url) {
-	return self->operator<(*url);
+	return (*self < *url);
 }
 
 bool QUrl_OperatorEqual(const QUrl* self, QUrl* url) {
-	return self->operator==(*url);
+	return (*self == *url);
 }
 
 bool QUrl_OperatorNotEqual(const QUrl* self, QUrl* url) {
-	return self->operator!=(*url);
+	return (*self != *url);
 }
 
 struct miqt_string QUrl_FromPercentEncoding(struct miqt_string param1) {

qt/gen_qurlquery.cpp

@@ -35,11 +35,11 @@ void QUrlQuery_OperatorAssign(QUrlQuery* self, QUrlQuery* other) {
 }
 
 bool QUrlQuery_OperatorEqual(const QUrlQuery* self, QUrlQuery* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QUrlQuery_OperatorNotEqual(const QUrlQuery* self, QUrlQuery* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QUrlQuery_Swap(QUrlQuery* self, QUrlQuery* other) {

qt/gen_quuid.cpp

@@ -98,19 +98,19 @@ bool QUuid_IsNull(const QUuid* self) {
 }
 
 bool QUuid_OperatorEqual(const QUuid* self, QUuid* orig) {
-	return self->operator==(*orig);
+	return (*self == *orig);
 }
 
 bool QUuid_OperatorNotEqual(const QUuid* self, QUuid* orig) {
-	return self->operator!=(*orig);
+	return (*self != *orig);
 }
 
 bool QUuid_OperatorLesser(const QUuid* self, QUuid* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QUuid_OperatorGreater(const QUuid* self, QUuid* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 QUuid* QUuid_CreateUuid() {

qt/gen_qvariant.cpp

@@ -588,27 +588,27 @@ const void* QVariant_Data2(const QVariant* self) {
 }
 
 bool QVariant_OperatorEqual(const QVariant* self, QVariant* v) {
-	return self->operator==(*v);
+	return (*self == *v);
 }
 
 bool QVariant_OperatorNotEqual(const QVariant* self, QVariant* v) {
-	return self->operator!=(*v);
+	return (*self != *v);
 }
 
 bool QVariant_OperatorLesser(const QVariant* self, QVariant* v) {
-	return self->operator<(*v);
+	return (*self < *v);
 }
 
 bool QVariant_OperatorLesserOrEqual(const QVariant* self, QVariant* v) {
-	return self->operator<=(*v);
+	return (*self <= *v);
 }
 
 bool QVariant_OperatorGreater(const QVariant* self, QVariant* v) {
-	return self->operator>(*v);
+	return (*self > *v);
 }
 
 bool QVariant_OperatorGreaterOrEqual(const QVariant* self, QVariant* v) {
-	return self->operator>=(*v);
+	return (*self >= *v);
 }
 
 int QVariant_ToInt1(const QVariant* self, bool* ok) {
@@ -691,11 +691,11 @@ QVariant* QSequentialIterable__const_iterator_OperatorMultiply(const QSequential
 }
 
 bool QSequentialIterable__const_iterator_OperatorEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self) {
@@ -768,11 +768,11 @@ QVariant* QAssociativeIterable__const_iterator_OperatorMultiply(const QAssociati
 }
 
 bool QAssociativeIterable__const_iterator_OperatorEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self) {

qt/gen_qxmlstream.cpp

@@ -106,11 +106,11 @@ bool QXmlStreamAttribute_IsDefault(const QXmlStreamAttribute* self) {
 }
 
 bool QXmlStreamAttribute_OperatorEqual(const QXmlStreamAttribute* self, QXmlStreamAttribute* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QXmlStreamAttribute_OperatorNotEqual(const QXmlStreamAttribute* self, QXmlStreamAttribute* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QXmlStreamAttribute_Delete(QXmlStreamAttribute* self, bool isSubclass) {
@@ -143,11 +143,11 @@ void QXmlStreamNamespaceDeclaration_OperatorAssign(QXmlStreamNamespaceDeclaratio
 }
 
 bool QXmlStreamNamespaceDeclaration_OperatorEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QXmlStreamNamespaceDeclaration_OperatorNotEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QXmlStreamNamespaceDeclaration_Delete(QXmlStreamNamespaceDeclaration* self, bool isSubclass) {
@@ -173,11 +173,11 @@ void QXmlStreamNotationDeclaration_OperatorAssign(QXmlStreamNotationDeclaration*
 }
 
 bool QXmlStreamNotationDeclaration_OperatorEqual(const QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QXmlStreamNotationDeclaration_OperatorNotEqual(const QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QXmlStreamNotationDeclaration_Delete(QXmlStreamNotationDeclaration* self, bool isSubclass) {
@@ -203,11 +203,11 @@ void QXmlStreamEntityDeclaration_OperatorAssign(QXmlStreamEntityDeclaration* sel
 }
 
 bool QXmlStreamEntityDeclaration_OperatorEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QXmlStreamEntityDeclaration_OperatorNotEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QXmlStreamEntityDeclaration_Delete(QXmlStreamEntityDeclaration* self, bool isSubclass) {
@@ -243,10 +243,6 @@ struct miqt_string QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEn
 	return _ms;
 }
 
-void QXmlStreamEntityResolver_OperatorAssign(QXmlStreamEntityResolver* self, QXmlStreamEntityResolver* param1) {
-	self->operator=(*param1);
-}
-
 void QXmlStreamEntityResolver_Delete(QXmlStreamEntityResolver* self, bool isSubclass) {
 	if (isSubclass) {
 		delete dynamic_cast<QXmlStreamEntityResolver*>( self );

qt/gen_qxmlstream.go

@@ -610,10 +610,6 @@ func (this *QXmlStreamEntityResolver) ResolveUndeclaredEntity(name string) strin
 	return _ret
 }
 
-func (this *QXmlStreamEntityResolver) OperatorAssign(param1 *QXmlStreamEntityResolver) {
-	C.QXmlStreamEntityResolver_OperatorAssign(this.h, param1.cPointer())
-}
-
 // Delete this object from C++ memory.
 func (this *QXmlStreamEntityResolver) Delete() {
 	C.QXmlStreamEntityResolver_Delete(this.h, C.bool(this.isSubclass))

qt/gen_qxmlstream.h

@@ -85,7 +85,6 @@ void QXmlStreamEntityDeclaration_Delete(QXmlStreamEntityDeclaration* self, bool
 
 struct miqt_string QXmlStreamEntityResolver_ResolveEntity(QXmlStreamEntityResolver* self, struct miqt_string publicId, struct miqt_string systemId);
 struct miqt_string QXmlStreamEntityResolver_ResolveUndeclaredEntity(QXmlStreamEntityResolver* self, struct miqt_string name);
-void QXmlStreamEntityResolver_OperatorAssign(QXmlStreamEntityResolver* self, QXmlStreamEntityResolver* param1);
 void QXmlStreamEntityResolver_Delete(QXmlStreamEntityResolver* self, bool isSubclass);
 
 void QXmlStreamReader_new(QXmlStreamReader** outptr_QXmlStreamReader);

qt/multimedia/gen_qaudiodeviceinfo.cpp

@@ -23,11 +23,11 @@ void QAudioDeviceInfo_OperatorAssign(QAudioDeviceInfo* self, QAudioDeviceInfo* o
 }
 
 bool QAudioDeviceInfo_OperatorEqual(const QAudioDeviceInfo* self, QAudioDeviceInfo* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QAudioDeviceInfo_OperatorNotEqual(const QAudioDeviceInfo* self, QAudioDeviceInfo* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QAudioDeviceInfo_IsNull(const QAudioDeviceInfo* self) {

qt/multimedia/gen_qaudioformat.cpp

@@ -21,11 +21,11 @@ void QAudioFormat_OperatorAssign(QAudioFormat* self, QAudioFormat* other) {
 }
 
 bool QAudioFormat_OperatorEqual(const QAudioFormat* self, QAudioFormat* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QAudioFormat_OperatorNotEqual(const QAudioFormat* self, QAudioFormat* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QAudioFormat_IsValid(const QAudioFormat* self) {

qt/multimedia/gen_qcamerafocus.cpp

@@ -37,11 +37,11 @@ void QCameraFocusZone_OperatorAssign(QCameraFocusZone* self, QCameraFocusZone* o
 }
 
 bool QCameraFocusZone_OperatorEqual(const QCameraFocusZone* self, QCameraFocusZone* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCameraFocusZone_OperatorNotEqual(const QCameraFocusZone* self, QCameraFocusZone* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCameraFocusZone_IsValid(const QCameraFocusZone* self) {

qt/multimedia/gen_qcamerainfo.cpp

@@ -35,11 +35,11 @@ void QCameraInfo_OperatorAssign(QCameraInfo* self, QCameraInfo* other) {
 }
 
 bool QCameraInfo_OperatorEqual(const QCameraInfo* self, QCameraInfo* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCameraInfo_OperatorNotEqual(const QCameraInfo* self, QCameraInfo* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCameraInfo_IsNull(const QCameraInfo* self) {

qt/multimedia/gen_qmediacontent.cpp

@@ -64,11 +64,11 @@ void QMediaContent_OperatorAssign(QMediaContent* self, QMediaContent* other) {
 }
 
 bool QMediaContent_OperatorEqual(const QMediaContent* self, QMediaContent* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QMediaContent_OperatorNotEqual(const QMediaContent* self, QMediaContent* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QMediaContent_IsNull(const QMediaContent* self) {

qt/multimedia/gen_qmediaencodersettings.cpp

@@ -26,11 +26,11 @@ void QAudioEncoderSettings_OperatorAssign(QAudioEncoderSettings* self, QAudioEnc
 }
 
 bool QAudioEncoderSettings_OperatorEqual(const QAudioEncoderSettings* self, QAudioEncoderSettings* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QAudioEncoderSettings_OperatorNotEqual(const QAudioEncoderSettings* self, QAudioEncoderSettings* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QAudioEncoderSettings_IsNull(const QAudioEncoderSettings* self) {
@@ -164,11 +164,11 @@ void QVideoEncoderSettings_OperatorAssign(QVideoEncoderSettings* self, QVideoEnc
 }
 
 bool QVideoEncoderSettings_OperatorEqual(const QVideoEncoderSettings* self, QVideoEncoderSettings* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QVideoEncoderSettings_OperatorNotEqual(const QVideoEncoderSettings* self, QVideoEncoderSettings* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QVideoEncoderSettings_IsNull(const QVideoEncoderSettings* self) {
@@ -307,11 +307,11 @@ void QImageEncoderSettings_OperatorAssign(QImageEncoderSettings* self, QImageEnc
 }
 
 bool QImageEncoderSettings_OperatorEqual(const QImageEncoderSettings* self, QImageEncoderSettings* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QImageEncoderSettings_OperatorNotEqual(const QImageEncoderSettings* self, QImageEncoderSettings* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QImageEncoderSettings_IsNull(const QImageEncoderSettings* self) {

qt/multimedia/gen_qmediaresource.cpp

@@ -50,11 +50,11 @@ bool QMediaResource_IsNull(const QMediaResource* self) {
 }
 
 bool QMediaResource_OperatorEqual(const QMediaResource* self, QMediaResource* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QMediaResource_OperatorNotEqual(const QMediaResource* self, QMediaResource* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 QUrl* QMediaResource_Url(const QMediaResource* self) {

qt/multimedia/gen_qmediaserviceproviderplugin.cpp

@@ -62,11 +62,11 @@ void QMediaServiceProviderHint_OperatorAssign(QMediaServiceProviderHint* self, Q
 }
 
 bool QMediaServiceProviderHint_OperatorEqual(const QMediaServiceProviderHint* self, QMediaServiceProviderHint* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QMediaServiceProviderHint_OperatorNotEqual(const QMediaServiceProviderHint* self, QMediaServiceProviderHint* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QMediaServiceProviderHint_IsNull(const QMediaServiceProviderHint* self) {

qt/multimedia/gen_qvideoframe.cpp

@@ -35,11 +35,11 @@ void QVideoFrame_OperatorAssign(QVideoFrame* self, QVideoFrame* other) {
 }
 
 bool QVideoFrame_OperatorEqual(const QVideoFrame* self, QVideoFrame* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QVideoFrame_OperatorNotEqual(const QVideoFrame* self, QVideoFrame* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QVideoFrame_IsValid(const QVideoFrame* self) {

qt/multimedia/gen_qvideosurfaceformat.cpp

@@ -33,11 +33,11 @@ void QVideoSurfaceFormat_OperatorAssign(QVideoSurfaceFormat* self, QVideoSurface
 }
 
 bool QVideoSurfaceFormat_OperatorEqual(const QVideoSurfaceFormat* self, QVideoSurfaceFormat* format) {
-	return self->operator==(*format);
+	return (*self == *format);
 }
 
 bool QVideoSurfaceFormat_OperatorNotEqual(const QVideoSurfaceFormat* self, QVideoSurfaceFormat* format) {
-	return self->operator!=(*format);
+	return (*self != *format);
 }
 
 bool QVideoSurfaceFormat_IsValid(const QVideoSurfaceFormat* self) {

qt/network/gen_qabstractnetworkcache.cpp

@@ -34,11 +34,11 @@ void QNetworkCacheMetaData_Swap(QNetworkCacheMetaData* self, QNetworkCacheMetaDa
 }
 
 bool QNetworkCacheMetaData_OperatorEqual(const QNetworkCacheMetaData* self, QNetworkCacheMetaData* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkCacheMetaData_OperatorNotEqual(const QNetworkCacheMetaData* self, QNetworkCacheMetaData* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QNetworkCacheMetaData_IsValid(const QNetworkCacheMetaData* self) {

qt/network/gen_qauthenticator.cpp

@@ -23,11 +23,11 @@ void QAuthenticator_OperatorAssign(QAuthenticator* self, QAuthenticator* other)
 }
 
 bool QAuthenticator_OperatorEqual(const QAuthenticator* self, QAuthenticator* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QAuthenticator_OperatorNotEqual(const QAuthenticator* self, QAuthenticator* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 struct miqt_string QAuthenticator_User(const QAuthenticator* self) {

qt/network/gen_qhostaddress.cpp

@@ -154,19 +154,19 @@ bool QHostAddress_IsEqual(const QHostAddress* self, QHostAddress* address) {
 }
 
 bool QHostAddress_OperatorEqual(const QHostAddress* self, QHostAddress* address) {
-	return self->operator==(*address);
+	return (*self == *address);
 }
 
 bool QHostAddress_OperatorEqualWithAddress(const QHostAddress* self, int address) {
-	return self->operator==(static_cast<QHostAddress::SpecialAddress>(address));
+	return (*self == static_cast<QHostAddress::SpecialAddress>(address));
 }
 
 bool QHostAddress_OperatorNotEqual(const QHostAddress* self, QHostAddress* address) {
-	return self->operator!=(*address);
+	return (*self != *address);
 }
 
 bool QHostAddress_OperatorNotEqualWithAddress(const QHostAddress* self, int address) {
-	return self->operator!=(static_cast<QHostAddress::SpecialAddress>(address));
+	return (*self != static_cast<QHostAddress::SpecialAddress>(address));
 }
 
 bool QHostAddress_IsNull(const QHostAddress* self) {

qt/network/gen_qhttpmultipart.cpp

@@ -35,11 +35,11 @@ void QHttpPart_Swap(QHttpPart* self, QHttpPart* other) {
 }
 
 bool QHttpPart_OperatorEqual(const QHttpPart* self, QHttpPart* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QHttpPart_OperatorNotEqual(const QHttpPart* self, QHttpPart* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QHttpPart_SetHeader(QHttpPart* self, int header, QVariant* value) {

qt/network/gen_qnetworkconfiguration.cpp

@@ -26,11 +26,11 @@ void QNetworkConfiguration_Swap(QNetworkConfiguration* self, QNetworkConfigurati
 }
 
 bool QNetworkConfiguration_OperatorEqual(const QNetworkConfiguration* self, QNetworkConfiguration* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkConfiguration_OperatorNotEqual(const QNetworkConfiguration* self, QNetworkConfiguration* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int QNetworkConfiguration_State(const QNetworkConfiguration* self) {

qt/network/gen_qnetworkcookie.cpp

@@ -42,11 +42,11 @@ void QNetworkCookie_Swap(QNetworkCookie* self, QNetworkCookie* other) {
 }
 
 bool QNetworkCookie_OperatorEqual(const QNetworkCookie* self, QNetworkCookie* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkCookie_OperatorNotEqual(const QNetworkCookie* self, QNetworkCookie* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QNetworkCookie_IsSecure(const QNetworkCookie* self) {

qt/network/gen_qnetworkinterface.cpp

@@ -29,11 +29,11 @@ void QNetworkAddressEntry_Swap(QNetworkAddressEntry* self, QNetworkAddressEntry*
 }
 
 bool QNetworkAddressEntry_OperatorEqual(const QNetworkAddressEntry* self, QNetworkAddressEntry* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkAddressEntry_OperatorNotEqual(const QNetworkAddressEntry* self, QNetworkAddressEntry* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int8_t QNetworkAddressEntry_DnsEligibility(const QNetworkAddressEntry* self) {

qt/network/gen_qnetworkproxy.cpp

@@ -126,11 +126,11 @@ void QNetworkProxyQuery_Swap(QNetworkProxyQuery* self, QNetworkProxyQuery* other
 }
 
 bool QNetworkProxyQuery_OperatorEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkProxyQuery_OperatorNotEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int QNetworkProxyQuery_QueryType(const QNetworkProxyQuery* self) {
@@ -265,11 +265,11 @@ void QNetworkProxy_Swap(QNetworkProxy* self, QNetworkProxy* other) {
 }
 
 bool QNetworkProxy_OperatorEqual(const QNetworkProxy* self, QNetworkProxy* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkProxy_OperatorNotEqual(const QNetworkProxy* self, QNetworkProxy* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QNetworkProxy_SetType(QNetworkProxy* self, int typeVal) {

qt/network/gen_qnetworkrequest.cpp

@@ -37,11 +37,11 @@ void QNetworkRequest_Swap(QNetworkRequest* self, QNetworkRequest* other) {
 }
 
 bool QNetworkRequest_OperatorEqual(const QNetworkRequest* self, QNetworkRequest* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QNetworkRequest_OperatorNotEqual(const QNetworkRequest* self, QNetworkRequest* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 QUrl* QNetworkRequest_Url(const QNetworkRequest* self) {

qt/network/gen_qsslcertificate.cpp

@@ -54,11 +54,11 @@ void QSslCertificate_Swap(QSslCertificate* self, QSslCertificate* other) {
 }
 
 bool QSslCertificate_OperatorEqual(const QSslCertificate* self, QSslCertificate* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QSslCertificate_OperatorNotEqual(const QSslCertificate* self, QSslCertificate* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QSslCertificate_IsNull(const QSslCertificate* self) {

qt/network/gen_qsslcipher.cpp

@@ -37,11 +37,11 @@ void QSslCipher_Swap(QSslCipher* self, QSslCipher* other) {
 }
 
 bool QSslCipher_OperatorEqual(const QSslCipher* self, QSslCipher* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QSslCipher_OperatorNotEqual(const QSslCipher* self, QSslCipher* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QSslCipher_IsNull(const QSslCipher* self) {

qt/network/gen_qsslconfiguration.cpp

@@ -33,11 +33,11 @@ void QSslConfiguration_Swap(QSslConfiguration* self, QSslConfiguration* other) {
 }
 
 bool QSslConfiguration_OperatorEqual(const QSslConfiguration* self, QSslConfiguration* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QSslConfiguration_OperatorNotEqual(const QSslConfiguration* self, QSslConfiguration* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QSslConfiguration_IsNull(const QSslConfiguration* self) {

qt/network/gen_qsslerror.cpp

@@ -36,11 +36,11 @@ void QSslError_OperatorAssign(QSslError* self, QSslError* other) {
 }
 
 bool QSslError_OperatorEqual(const QSslError* self, QSslError* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QSslError_OperatorNotEqual(const QSslError* self, QSslError* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int QSslError_Error(const QSslError* self) {

qt/network/gen_qsslkey.cpp

@@ -125,11 +125,11 @@ void* QSslKey_Handle(const QSslKey* self) {
 }
 
 bool QSslKey_OperatorEqual(const QSslKey* self, QSslKey* key) {
-	return self->operator==(*key);
+	return (*self == *key);
 }
 
 bool QSslKey_OperatorNotEqual(const QSslKey* self, QSslKey* key) {
-	return self->operator!=(*key);
+	return (*self != *key);
 }
 
 struct miqt_string QSslKey_ToPem1(const QSslKey* self, struct miqt_string passPhrase) {

qt6/cbor/gen_qcborarray.cpp

@@ -129,15 +129,15 @@ int QCborArray_Compare(const QCborArray* self, QCborArray* other) {
 }
 
 bool QCborArray_OperatorEqual(const QCborArray* self, QCborArray* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborArray_OperatorNotEqual(const QCborArray* self, QCborArray* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborArray_OperatorLesser(const QCborArray* self, QCborArray* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborArray__Iterator* QCborArray_Begin(QCborArray* self) {
@@ -282,51 +282,51 @@ QCborValueRef* QCborArray__Iterator_OperatorSubscript(const QCborArray__Iterator
 }
 
 bool QCborArray__Iterator_OperatorEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__Iterator_OperatorNotEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__Iterator_OperatorLesser(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__Iterator_OperatorLesserOrEqual(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__Iterator_OperatorGreater(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterOrEqual(const QCborArray__Iterator* self, QCborArray__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborArray__Iterator_OperatorEqualWithQCborArrayConstIterator(const QCborArray__Iterator* self, QCborArray__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__Iterator_OperatorNotEqualWithQCborArrayConstIterator(const QCborArray__Iterator* self, QCborArray__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__Iterator_OperatorLesserWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__Iterator_OperatorLesserOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self) {
@@ -409,51 +409,51 @@ QCborValueConstRef* QCborArray__ConstIterator_OperatorSubscript(const QCborArray
 }
 
 bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__ConstIterator_OperatorNotEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__ConstIterator_OperatorLesser(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserOrEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreater(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterOrEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorEqualWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborArray__ConstIterator_OperatorNotEqualWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborArray__ConstIterator_OperatorLesserOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self) {

qt6/cbor/gen_qcbormap.cpp

@@ -146,15 +146,15 @@ int QCborMap_Compare(const QCborMap* self, QCborMap* other) {
 }
 
 bool QCborMap_OperatorEqual(const QCborMap* self, QCborMap* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborMap_OperatorNotEqual(const QCborMap* self, QCborMap* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborMap_OperatorLesser(const QCborMap* self, QCborMap* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborMap__Iterator* QCborMap_Begin(QCborMap* self) {
@@ -418,51 +418,51 @@ QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self) {
 }
 
 bool QCborMap__Iterator_OperatorEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__Iterator_OperatorNotEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__Iterator_OperatorLesser(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__Iterator_OperatorLesserOrEqual(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__Iterator_OperatorGreater(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterOrEqual(const QCborMap__Iterator* self, QCborMap__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborMap__Iterator_OperatorEqualWithQCborMapConstIterator(const QCborMap__Iterator* self, QCborMap__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__Iterator_OperatorNotEqualWithQCborMapConstIterator(const QCborMap__Iterator* self, QCborMap__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__Iterator_OperatorLesserWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__Iterator_OperatorLesserOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self) {
@@ -573,51 +573,51 @@ QCborValueConstRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator*
 }
 
 bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__ConstIterator_OperatorNotEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__ConstIterator_OperatorLesser(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserOrEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreater(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterOrEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorEqualWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* o) {
-	return self->operator==(*o);
+	return (*self == *o);
 }
 
 bool QCborMap__ConstIterator_OperatorNotEqualWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* o) {
-	return self->operator!=(*o);
+	return (*self != *o);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QCborMap__ConstIterator_OperatorLesserOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator<=(*other);
+	return (*self <= *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>(*other);
+	return (*self > *other);
 }
 
 bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
-	return self->operator>=(*other);
+	return (*self >= *other);
 }
 
 QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self) {

qt6/cbor/gen_qcborvalue.cpp

@@ -346,15 +346,15 @@ int QCborValue_Compare(const QCborValue* self, QCborValue* other) {
 }
 
 bool QCborValue_OperatorEqual(const QCborValue* self, QCborValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborValue_OperatorNotEqual(const QCborValue* self, QCborValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborValue_OperatorLesser(const QCborValue* self, QCborValue* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QCborValue* QCborValue_FromVariant(QVariant* variant) {
@@ -707,15 +707,15 @@ int QCborValueConstRef_Compare(const QCborValueConstRef* self, QCborValue* other
 }
 
 bool QCborValueConstRef_OperatorEqual(const QCborValueConstRef* self, QCborValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborValueConstRef_OperatorNotEqual(const QCborValueConstRef* self, QCborValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborValueConstRef_OperatorLesser(const QCborValueConstRef* self, QCborValue* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QVariant* QCborValueConstRef_ToVariant(const QCborValueConstRef* self) {
@@ -1048,15 +1048,15 @@ int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other) {
 }
 
 bool QCborValueRef_OperatorEqual(const QCborValueRef* self, QCborValue* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QCborValueRef_OperatorNotEqual(const QCborValueRef* self, QCborValue* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QCborValueRef_OperatorLesser(const QCborValueRef* self, QCborValue* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QVariant* QCborValueRef_ToVariant(const QCborValueRef* self) {

qt6/gen_qabstractitemmodel.cpp

@@ -191,15 +191,15 @@ bool QModelIndex_IsValid(const QModelIndex* self) {
 }
 
 bool QModelIndex_OperatorEqual(const QModelIndex* self, QModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QModelIndex_OperatorNotEqual(const QModelIndex* self, QModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QModelIndex_OperatorLesser(const QModelIndex* self, QModelIndex* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 QVariant* QModelIndex_Data1(const QModelIndex* self, int role) {
@@ -230,15 +230,15 @@ void QPersistentModelIndex_new3(QPersistentModelIndex* other, QPersistentModelIn
 }
 
 bool QPersistentModelIndex_OperatorLesser(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator<(*other);
+	return (*self < *other);
 }
 
 bool QPersistentModelIndex_OperatorEqual(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QPersistentModelIndex_OperatorNotEqual(const QPersistentModelIndex* self, QPersistentModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QPersistentModelIndex_OperatorAssign(QPersistentModelIndex* self, QPersistentModelIndex* other) {
@@ -250,11 +250,11 @@ void QPersistentModelIndex_Swap(QPersistentModelIndex* self, QPersistentModelInd
 }
 
 bool QPersistentModelIndex_OperatorEqualWithOther(const QPersistentModelIndex* self, QModelIndex* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QPersistentModelIndex_OperatorNotEqualWithOther(const QPersistentModelIndex* self, QModelIndex* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QPersistentModelIndex_OperatorAssignWithOther(QPersistentModelIndex* self, QModelIndex* other) {

qt6/gen_qbitarray.cpp

@@ -116,11 +116,11 @@ void QBitArray_OperatorBitwiseNotAssign(QBitArray* self, QBitArray* param1) {
 }
 
 bool QBitArray_OperatorEqual(const QBitArray* self, QBitArray* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QBitArray_OperatorNotEqual(const QBitArray* self, QBitArray* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 bool QBitArray_Fill(QBitArray* self, bool val) {

qt6/gen_qbrush.cpp

@@ -139,11 +139,11 @@ bool QBrush_IsOpaque(const QBrush* self) {
 }
 
 bool QBrush_OperatorEqual(const QBrush* self, QBrush* b) {
-	return self->operator==(*b);
+	return (*self == *b);
 }
 
 bool QBrush_OperatorNotEqual(const QBrush* self, QBrush* b) {
-	return self->operator!=(*b);
+	return (*self != *b);
 }
 
 bool QBrush_IsDetached(const QBrush* self) {
@@ -265,11 +265,11 @@ void QGradient_SetInterpolationMode(QGradient* self, int mode) {
 }
 
 bool QGradient_OperatorEqual(const QGradient* self, QGradient* gradient) {
-	return self->operator==(*gradient);
+	return (*self == *gradient);
 }
 
 bool QGradient_OperatorNotEqual(const QGradient* self, QGradient* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QGradient_Delete(QGradient* self, bool isSubclass) {

qt6/gen_qcolor.cpp

@@ -454,11 +454,11 @@ QColor* QColor_Darker(const QColor* self) {
 }
 
 bool QColor_OperatorEqual(const QColor* self, QColor* c) {
-	return self->operator==(*c);
+	return (*self == *c);
 }
 
 bool QColor_OperatorNotEqual(const QColor* self, QColor* c) {
-	return self->operator!=(*c);
+	return (*self != *c);
 }
 
 bool QColor_IsValidColor(struct miqt_string name) {

qt6/gen_qdir.cpp

@@ -445,11 +445,11 @@ bool QDir_MakeAbsolute(QDir* self) {
 }
 
 bool QDir_OperatorEqual(const QDir* self, QDir* dir) {
-	return self->operator==(*dir);
+	return (*self == *dir);
 }
 
 bool QDir_OperatorNotEqual(const QDir* self, QDir* dir) {
-	return self->operator!=(*dir);
+	return (*self != *dir);
 }
 
 bool QDir_Remove(QDir* self, struct miqt_string fileName) {

qt6/gen_qeasingcurve.cpp

@@ -29,11 +29,11 @@ void QEasingCurve_Swap(QEasingCurve* self, QEasingCurve* other) {
 }
 
 bool QEasingCurve_OperatorEqual(const QEasingCurve* self, QEasingCurve* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QEasingCurve_OperatorNotEqual(const QEasingCurve* self, QEasingCurve* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 double QEasingCurve_Amplitude(const QEasingCurve* self) {

qt6/gen_qeventpoint.cpp

@@ -38,11 +38,11 @@ void QEventPoint_OperatorAssign(QEventPoint* self, QEventPoint* other) {
 }
 
 bool QEventPoint_OperatorEqual(const QEventPoint* self, QEventPoint* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QEventPoint_OperatorNotEqual(const QEventPoint* self, QEventPoint* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 void QEventPoint_Swap(QEventPoint* self, QEventPoint* other) {

qt6/gen_qfileinfo.cpp

@@ -45,11 +45,11 @@ void QFileInfo_Swap(QFileInfo* self, QFileInfo* other) {
 }
 
 bool QFileInfo_OperatorEqual(const QFileInfo* self, QFileInfo* fileinfo) {
-	return self->operator==(*fileinfo);
+	return (*self == *fileinfo);
 }
 
 bool QFileInfo_OperatorNotEqual(const QFileInfo* self, QFileInfo* fileinfo) {
-	return self->operator!=(*fileinfo);
+	return (*self != *fileinfo);
 }
 
 void QFileInfo_SetFile(QFileInfo* self, struct miqt_string file) {

qt6/gen_qfont.cpp

@@ -337,15 +337,15 @@ void QFont_OperatorAssign(QFont* self, QFont* param1) {
 }
 
 bool QFont_OperatorEqual(const QFont* self, QFont* param1) {
-	return self->operator==(*param1);
+	return (*self == *param1);
 }
 
 bool QFont_OperatorNotEqual(const QFont* self, QFont* param1) {
-	return self->operator!=(*param1);
+	return (*self != *param1);
 }
 
 bool QFont_OperatorLesser(const QFont* self, QFont* param1) {
-	return self->operator<(*param1);
+	return (*self < *param1);
 }
 
 bool QFont_IsCopyOf(const QFont* self, QFont* param1) {

qt6/gen_qfontmetrics.cpp

@@ -185,11 +185,11 @@ double QFontMetrics_FontDpi(const QFontMetrics* self) {
 }
 
 bool QFontMetrics_OperatorEqual(const QFontMetrics* self, QFontMetrics* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 int QFontMetrics_HorizontalAdvance22(const QFontMetrics* self, struct miqt_string param1, int lenVal) {
@@ -441,11 +441,11 @@ double QFontMetricsF_FontDpi(const QFontMetricsF* self) {
 }
 
 bool QFontMetricsF_OperatorEqual(const QFontMetricsF* self, QFontMetricsF* other) {
-	return self->operator==(*other);
+	return (*self == *other);
 }
 
 bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* other) {
-	return self->operator!=(*other);
+	return (*self != *other);
 }
 
 double QFontMetricsF_HorizontalAdvance22(const QFontMetricsF* self, struct miqt_string stringVal, int length) {