diff options
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 18 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.h | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp | 37 |
3 files changed, 62 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 2439c22f74..359dbfcf23 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1477,6 +1477,24 @@ bool QMetaObject::invokeMethod(QObject *obj, invoked), otherwise returns false. */ +/*! \fn bool operator==(const QMetaMethod &m1, const QMetaMethod &m2) + \since 5.0 + \relates QMetaMethod + \overload + + Returns true if method \a m1 is equal to method \a m2, + otherwise returns false. +*/ + +/*! \fn bool operator!=(const QMetaMethod &m1, const QMetaMethod &m2) + \since 5.0 + \relates QMetaMethod + \overload + + Returns true if method \a m1 is not equal to method \a m2, + otherwise returns false. +*/ + /*! \fn const QMetaObject *QMetaMethod::enclosingMetaObject() const \internal diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 095b196dca..5204f04ca3 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -155,9 +155,16 @@ private: friend struct QMetaObject; friend struct QMetaObjectPrivate; friend class QObject; + friend bool operator==(const QMetaMethod &m1, const QMetaMethod &m2); + friend bool operator!=(const QMetaMethod &m1, const QMetaMethod &m2); }; Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE); +inline bool operator==(const QMetaMethod &m1, const QMetaMethod &m2) +{ return m1.mobj == m2.mobj && m1.handle == m2.handle; } +inline bool operator!=(const QMetaMethod &m1, const QMetaMethod &m2) +{ return !(m1 == m2); } + class Q_CORE_EXPORT QMetaEnum { public: diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp index 55997a3ca0..b5ab61443c 100644 --- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp +++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp @@ -54,6 +54,8 @@ private slots: void method(); void invalidMethod(); + + void comparisonOperators(); }; struct CustomType { }; @@ -672,5 +674,40 @@ void tst_QMetaMethod::invalidMethod() QVERIFY(!method3.isValid()); } +void tst_QMetaMethod::comparisonOperators() +{ + static const QMetaObject *mo = &MethodTestObject::staticMetaObject; + for (int x = 0; x < 2; ++x) { + int count = x ? mo->constructorCount() : mo->methodCount(); + for (int i = 0; i < count; ++i) { + QMetaMethod method = x ? mo->constructor(i) : mo->method(i); + const QMetaObject *methodMo = method.enclosingMetaObject(); + for (int j = 0; j < count; ++j) { + QMetaMethod other = x ? mo->constructor(j) : mo->method(j); + bool expectedEqual = ((methodMo == other.enclosingMetaObject()) + && (i == j)); + QCOMPARE(method == other, expectedEqual); + QCOMPARE(method != other, !expectedEqual); + QCOMPARE(other == method, expectedEqual); + QCOMPARE(other != method, !expectedEqual); + } + + QVERIFY(method != QMetaMethod()); + QVERIFY(QMetaMethod() != method); + QVERIFY(!(method == QMetaMethod())); + QVERIFY(!(QMetaMethod() == method)); + } + } + + // Constructors and normal methods with identical index should not + // compare equal + for (int i = 0; i < qMin(mo->methodCount(), mo->constructorCount()); ++i) { + QMetaMethod method = mo->method(i); + QMetaMethod constructor = mo->constructor(i); + QVERIFY(method != constructor); + QVERIFY(!(method == constructor)); + } +} + QTEST_MAIN(tst_QMetaMethod) #include "tst_qmetamethod.moc" |