diff --git a/scripts/mkqtdecl6/mkqtdecl.conf b/scripts/mkqtdecl6/mkqtdecl.conf index ef5ebbcd7..1ec889db0 100644 --- a/scripts/mkqtdecl6/mkqtdecl.conf +++ b/scripts/mkqtdecl6/mkqtdecl.conf @@ -368,6 +368,8 @@ drop_method "QColormap", /QColormap::initialize/ # Must not hide Ruby's initiali drop_method "QAccessible", /QAccessible::initialize/ # Must not hide Ruby's initialize and is not public drop_method "QEasingCurve", /QEasingCurve::setCustomType/ # requires function * drop_method "QEasingCurve", /QEasingCurve::customType/ # requires function * +drop_method "QEasingCurve", /::operator\s*==/ # no longer supported on Qt 6.8 +drop_method "QEasingCurve", /::operator\s*!=/ # no longer supported on Qt 6.8 drop_method "QLibrary", /QLibrary::resolve/ # requires function * drop_method "QLoggingCategory", /QLoggingCategory::installFilter/ # requires function * drop_method "QMetaObject", /QMetaObject::cast\(/ # internal @@ -473,6 +475,30 @@ drop_method "QDebug", /QDebug::operator\s*<<\((?!const\s+QString\s*&)/ # don't m drop_method "", /::operator\s*<<\(QDebug\s*\w*\s*,\s*(?!const\s+QString\s*&)/ # don't map the others right now - too many (TODO: how to map?) drop_method "QNoDebug", /QNoDebug::operator<", "", "", "" ] include "QThread", [ "", "" ] diff --git a/src/gsiqt/qt6/QtCore/gsiDeclQEasingCurve.cc b/src/gsiqt/qt6/QtCore/gsiDeclQEasingCurve.cc index bfad06037..db6218522 100644 --- a/src/gsiqt/qt6/QtCore/gsiDeclQEasingCurve.cc +++ b/src/gsiqt/qt6/QtCore/gsiDeclQEasingCurve.cc @@ -35,6 +35,12 @@ // ----------------------------------------------------------------------- // class QEasingCurve + static bool QEasingCurve_operator_eq(const QEasingCurve *a, const QEasingCurve &b) { + return *a == b; + } + static bool QEasingCurve_operator_ne(const QEasingCurve *a, const QEasingCurve &b) { + return !(*a == b); + } // Constructor QEasingCurve::QEasingCurve(QEasingCurve::Type type) @@ -144,25 +150,6 @@ static void _call_f_amplitude_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } -// bool QEasingCurve::operator!=(const QEasingCurve &other) - - -static void _init_f_operator_excl__eq__c2510 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("other"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_operator_excl__eq__c2510 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QEasingCurve &arg1 = gsi::arg_reader() (args, heap); - ret.write ((bool)((QEasingCurve *)cls)->operator!= (arg1)); -} - - // QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other) @@ -182,25 +169,6 @@ static void _call_f_operator_eq__2510 (const qt_gsi::GenericMethod * /*decl*/, v } -// bool QEasingCurve::operator==(const QEasingCurve &other) - - -static void _init_f_operator_eq__eq__c2510 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("other"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_operator_eq__eq__c2510 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QEasingCurve &arg1 = gsi::arg_reader() (args, heap); - ret.write ((bool)((QEasingCurve *)cls)->operator== (arg1)); -} - - // double QEasingCurve::overshoot() @@ -391,9 +359,7 @@ static gsi::Methods methods_QEasingCurve () { methods += new qt_gsi::GenericMethod ("addCubicBezierSegment", "@brief Method void QEasingCurve::addCubicBezierSegment(const QPointF &c1, const QPointF &c2, const QPointF &endPoint)\n", false, &_init_f_addCubicBezierSegment_5742, &_call_f_addCubicBezierSegment_5742); methods += new qt_gsi::GenericMethod ("addTCBSegment", "@brief Method void QEasingCurve::addTCBSegment(const QPointF &nextPoint, double t, double c, double b)\n", false, &_init_f_addTCBSegment_4875, &_call_f_addTCBSegment_4875); methods += new qt_gsi::GenericMethod (":amplitude", "@brief Method double QEasingCurve::amplitude()\n", true, &_init_f_amplitude_c0, &_call_f_amplitude_c0); - methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QEasingCurve::operator!=(const QEasingCurve &other)\n", true, &_init_f_operator_excl__eq__c2510, &_call_f_operator_excl__eq__c2510); methods += new qt_gsi::GenericMethod ("assign", "@brief Method QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other)\n", false, &_init_f_operator_eq__2510, &_call_f_operator_eq__2510); - methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QEasingCurve::operator==(const QEasingCurve &other)\n", true, &_init_f_operator_eq__eq__c2510, &_call_f_operator_eq__eq__c2510); methods += new qt_gsi::GenericMethod (":overshoot", "@brief Method double QEasingCurve::overshoot()\n", true, &_init_f_overshoot_c0, &_call_f_overshoot_c0); methods += new qt_gsi::GenericMethod (":period", "@brief Method double QEasingCurve::period()\n", true, &_init_f_period_c0, &_call_f_period_c0); methods += new qt_gsi::GenericMethod ("setAmplitude|amplitude=", "@brief Method void QEasingCurve::setAmplitude(double amplitude)\n", false, &_init_f_setAmplitude_1071, &_call_f_setAmplitude_1071); @@ -408,6 +374,9 @@ static gsi::Methods methods_QEasingCurve () { } gsi::Class decl_QEasingCurve ("QtCore", "QEasingCurve", + gsi::method_ext("==", &QEasingCurve_operator_eq, gsi::arg ("other"), "@brief Method bool QEasingCurve::operator==(const QEasingCurve &) const") + + gsi::method_ext("!=", &QEasingCurve_operator_ne, gsi::arg ("other"), "@brief Method bool QEasingCurve::operator!=(const QEasingCurve &) const") ++ methods_QEasingCurve (), "@qt\n@brief Binding of QEasingCurve"); diff --git a/src/gsiqt/qt6/QtCore/gsiDeclQTimeZone.cc b/src/gsiqt/qt6/QtCore/gsiDeclQTimeZone.cc index 4e89b5465..d0b2645f9 100644 --- a/src/gsiqt/qt6/QtCore/gsiDeclQTimeZone.cc +++ b/src/gsiqt/qt6/QtCore/gsiDeclQTimeZone.cc @@ -36,6 +36,12 @@ // ----------------------------------------------------------------------- // class QTimeZone + static bool QTimeZone_operator_eq(const QTimeZone *a, const QTimeZone &b) { + return *a == b; + } + static bool QTimeZone_operator_ne(const QTimeZone *a, const QTimeZone &b) { + return !(*a == b); + } // Constructor QTimeZone::QTimeZone() @@ -776,6 +782,9 @@ static gsi::Methods methods_QTimeZone () { } gsi::Class decl_QTimeZone ("QtCore", "QTimeZone", + gsi::method_ext("==", &QTimeZone_operator_eq, gsi::arg ("other"), "@brief Method bool QTimeZone::operator==(const QTimeZone &) const") + + gsi::method_ext("!=", &QTimeZone_operator_ne, gsi::arg ("other"), "@brief Method bool QTimeZone::operator!=(const QTimeZone &) const") ++ methods_QTimeZone (), "@qt\n@brief Binding of QTimeZone");