Added QObject::connect overload taking QMetaMethod as parameter

Added QObject::connect() and QObject::disconnect() functions
implementations which use QMetaMethod to specify signals and slots to be
connected or disconnected.

Merge-request: 636
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Task-number: QTBUG-10637

1 files changed, 219 insertions, 0 deletions

diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 08b7c19..5caac15 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -129,6 +129,12 @@ private slots:
     void qMetaObjectConnect();
     void qMetaObjectDisconnectOne();
     void sameName();
+    void connectByMetaMethods();
+    void connectByMetaMethodSlotInsteadOfSignal();
+    void connectConstructorByMetaMethod();
+    void disconnectByMetaMethod();
+    void disconnectNotSignalMetaMethod();
+
 protected:
 };
 
@@ -727,6 +733,24 @@ void tst_QObject::connectDisconnectNotify()
     // Test disconnectNotify for a complete disconnect
     ((SenderObject*)s)->disconnect((ReceiverObject*)r);
 
+    // Obtaining meta methods
+    int signalIndx = ((SenderObject*)s)->metaObject()->indexOfSignal(
+            QMetaObject::normalizedSignature(a_signal.toLatin1().constData()+1).constData());
+    int methodIndx = ((ReceiverObject*)r)->metaObject()->indexOfMethod(
+            QMetaObject::normalizedSignature(a_slot.toLatin1().constData()+1).constData());
+    QMetaMethod signal = ((SenderObject*)s)->metaObject()->method(signalIndx);
+    QMetaMethod method = ((ReceiverObject*)r)->metaObject()->method(methodIndx);
+
+    // Test connectNotify when connecting by QMetaMethod
+    connect( (SenderObject*)s, signal, (ReceiverObject*)r, method );
+    QCOMPARE( s->org_signal, s->nw_signal );
+    QCOMPARE( s->org_signal.toLatin1(), QMetaObject::normalizedSignature(a_signal.toLatin1().constData()) );
+
+    // Test disconnectNotify when disconnecting by QMetaMethod
+    QObject::disconnect( (SenderObject*)s, signal, (ReceiverObject*)r, method );
+    QCOMPARE( s->org_signal, s->nw_signal );
+    QCOMPARE( s->org_signal.toLatin1(), QMetaObject::normalizedSignature(a_signal.toLatin1().constData()) );
+
     delete s;
     delete r;
 }
@@ -3610,5 +3634,200 @@ void tst_QObject::sameName()
     QCOMPARE(c1.s, 4);
 }
 
+void tst_QObject::connectByMetaMethods()
+{
+    SenderObject s;
+    ReceiverObject r;
+    const QMetaObject *smeta = s.metaObject();
+    const QMetaObject *rmeta = r.metaObject();
+    int sigIndx = smeta->indexOfSignal(QMetaObject::normalizedSignature("signal1()"));
+    int slotIndx = rmeta->indexOfSlot(QMetaObject::normalizedSignature("slot1()"));
+    QVERIFY( sigIndx != -1 );
+    QVERIFY( slotIndx != -1 );
+    QMetaMethod signal = smeta->method(sigIndx);
+    QMetaMethod slot = rmeta->method(slotIndx);
+
+    QVERIFY(connect(&s,signal, &r,slot));
+
+    QVERIFY(!r.called(1));
+    s.emitSignal1();
+    QVERIFY(r.called(1));
+}
+
+void tst_QObject::connectByMetaMethodSlotInsteadOfSignal()
+{
+    SenderObject s;
+    ReceiverObject r;
+    const QMetaObject *smeta = s.metaObject();
+    const QMetaObject *rmeta = r.metaObject();
+    int badIndx = smeta->indexOfSlot(QMetaObject::normalizedSignature("aPublicSlot()"));
+    int slotIndx = rmeta->indexOfSlot(QMetaObject::normalizedSignature("slot1()"));
+    QVERIFY( badIndx != -1 );
+    QVERIFY( slotIndx != -1 );
+    QMetaMethod badMethod = smeta->method(badIndx);
+    QMetaMethod slot = rmeta->method(slotIndx);
+
+    QTest::ignoreMessage(QtWarningMsg,"QObject::connect: Cannot connect SenderObject::aPublicSlot() to ReceiverObject::slot1()");
+    QVERIFY(!connect(&s,badMethod, &r,slot));
+}
+
+class Constructable: public QObject
+{
+    Q_OBJECT
+
+public:
+    Q_INVOKABLE Constructable(){}
+
+};
+
+void tst_QObject::connectConstructorByMetaMethod()
+{
+    Constructable sc;
+    Constructable rc;
+    SenderObject s;
+    ReceiverObject r;
+
+    const QMetaObject cmeta = Constructable::staticMetaObject;
+    const QMetaObject *smeta = s.metaObject();
+    const QMetaObject *rmeta = r.metaObject();
+    int constructorIndx = cmeta.indexOfConstructor(QMetaObject::normalizedSignature("Constructable()"));
+    int sigIndx = smeta->indexOfSignal(QMetaObject::normalizedSignature("signal1()"));
+    int slotIndx = rmeta->indexOfSlot(QMetaObject::normalizedSignature("slot1()"));
+    QVERIFY( constructorIndx != -1 );
+    QVERIFY( sigIndx != -1 );
+    QVERIFY( slotIndx != -1 );
+
+    QMetaMethod constructor = cmeta.constructor(constructorIndx);
+    QMetaMethod signal = smeta->method(sigIndx);
+    QMetaMethod slot = rmeta->method(slotIndx);
+
+    QTest::ignoreMessage(QtWarningMsg,"QObject::connect: Cannot connect Constructable::Constructable() to ReceiverObject::slot1()");
+    QVERIFY(!connect(&sc,constructor, &r,slot));
+    QTest::ignoreMessage(QtWarningMsg,"QObject::connect: Cannot connect SenderObject::signal1() to Constructable::Constructable()");
+    QVERIFY(!connect(&s,signal, &rc,constructor));
+    QTest::ignoreMessage(QtWarningMsg,"QObject::connect: Cannot connect Constructable::Constructable() to Constructable::Constructable()");
+    QVERIFY(!connect(&sc,constructor, &rc,constructor));
+}
+
+void tst_QObject::disconnectByMetaMethod()
+{
+    SenderObject *s = new SenderObject;
+    ReceiverObject *r1 = new ReceiverObject;
+    ReceiverObject *r2 = new ReceiverObject;
+
+    QMetaMethod signal1 = s->metaObject()->method(
+            s->metaObject()->indexOfMethod("signal1()"));
+    QMetaMethod signal2 = s->metaObject()->method(
+            s->metaObject()->indexOfMethod("signal2()"));
+    QMetaMethod signal3 = s->metaObject()->method(
+            s->metaObject()->indexOfMethod("signal3()"));
+    QMetaMethod signal4 = s->metaObject()->method(
+            s->metaObject()->indexOfMethod("signal4()"));
+
+    QMetaMethod slot1 = r1->metaObject()->method(
+            r1->metaObject()->indexOfMethod("slot1()"));
+    QMetaMethod slot2 = r1->metaObject()->method(
+            r1->metaObject()->indexOfMethod("slot2()"));
+    QMetaMethod slot3 = r1->metaObject()->method(
+            r1->metaObject()->indexOfMethod("slot3()"));
+    QMetaMethod slot4 = r1->metaObject()->method(
+            r1->metaObject()->indexOfMethod("slot4()"));
+
+    connect(s, signal1, r1, slot1);
+
+    s->emitSignal1();
+
+    QVERIFY(r1->called(1));
+    r1->reset();
+
+    // usual disconnect with all parameters given
+    bool ret = QObject::disconnect(s, signal1, r1, slot1);
+
+    s->emitSignal1();
+
+    QVERIFY(!r1->called(1));
+    r1->reset();
+
+    QVERIFY(ret);
+    ret = QObject::disconnect(s, signal1, r1, slot1);
+    QVERIFY(!ret);
+
+    r1->reset();
+
+    connect( s, signal1, r1, slot1 );
+    connect( s, signal1, r1, slot2 );
+    connect( s, signal1, r1, slot3 );
+    connect( s, signal2, r1, slot4 );
+
+    // disconnect s's signal1() from all slots of r1
+    QObject::disconnect(s, signal1, r1, QMetaMethod());
+
+    s->emitSignal1();
+    s->emitSignal2();
+
+    QVERIFY(!r1->called(1));
+    QVERIFY(!r1->called(2));
+    QVERIFY(!r1->called(3));
+    QVERIFY(r1->called(4));
+    r1->reset();
+    // make sure all is disconnected again
+    QObject::disconnect(s, 0, r1, 0);
+
+    connect(s, signal1, r1, slot1);
+    connect(s, signal1, r2, slot1);
+    connect(s, signal2, r1, slot2);
+    connect(s, signal2, r2, slot2);
+    connect(s, signal3, r1, slot3);
+    connect(s, signal3, r2, slot3);
+
+    // disconnect signal1() from all receivers
+    QObject::disconnect(s, signal1, 0, QMetaMethod());
+    s->emitSignal1();
+    s->emitSignal2();
+    s->emitSignal3();
+
+    QVERIFY(!r1->called(1));
+    QVERIFY(!r2->called(1));
+    QVERIFY(r1->called(2));
+    QVERIFY(r2->called(2));
+    QVERIFY(r1->called(2));
+    QVERIFY(r2->called(2));
+
+    r1->reset();
+    r2->reset();
+
+    // disconnect all signals of s from all receivers
+    QObject::disconnect( s, 0, 0, 0 );
+
+    connect( s, signal1, r1, slot1 );
+    connect( s, signal1, r2, slot1 );
+
+    // disconnect all signals from slot1 of r1
+    QObject::disconnect(s, QMetaMethod(), r1, slot1);
+
+    s->emitSignal1();
+
+    QVERIFY(!r1->called(1));
+    QVERIFY(r2->called(1));
+
+    delete r2;
+    delete r1;
+    delete s;
+}
+
+void tst_QObject::disconnectNotSignalMetaMethod()
+{
+    SenderObject s;
+    ReceiverObject r;
+
+    connect(&s, SIGNAL(signal1()), &r, SLOT(slot1()));
+
+    QMetaMethod slot = s.metaObject()->method(
+            s.metaObject()->indexOfMethod("aPublicSlot()"));
+
+    QTest::ignoreMessage(QtWarningMsg,"Object::disconnect: Attempt to unbind non-signal SenderObject::aPublicSlot()");
+    QVERIFY(!QObject::disconnect(&s, slot, &r, QMetaMethod()));
+}
+
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"