Updated corelib's unit tests to use QSignalSpy's functor constructor

The intent is to provide compile time validation of signals and to help
detect signal overloading in the future.

Change-Id: I9d5d46ed4b70c5d0cd407deb5928b1e76d37e007
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

4 files changed, 51 insertions, 51 deletions

diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
index f6d9d2c14f..c0a3ae6114 100644
--- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
@@ -137,7 +137,7 @@ private:
 void tst_QAnimationGroup::emptyGroup()
 {
     QSequentialAnimationGroup group;
-    QSignalSpy groupStateChangedSpy(&group, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy groupStateChangedSpy(&group, &QSequentialAnimationGroup::stateChanged);
     QVERIFY(groupStateChangedSpy.isValid());
 
     QCOMPARE(group.state(), QAnimationGroup::Stopped);
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index 2021eefd8f..bbe9e1a816 100644
--- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -256,10 +256,10 @@ void tst_QParallelAnimationGroup::stateChanged()
     group.addAnimation(anim3);
     group.addAnimation(anim4);
 
-    QSignalSpy spy1(anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy spy2(anim2, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy spy3(anim3, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy spy4(anim4, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy spy1(anim1, &TestAnimation::stateChanged);
+    QSignalSpy spy2(anim2, &TestAnimation::stateChanged);
+    QSignalSpy spy3(anim3, &TestAnimation::stateChanged);
+    QSignalSpy spy4(anim4, &TestAnimation::stateChanged);
 
     QVERIFY(spy1.isValid());
     QVERIFY(spy2.isValid());
@@ -434,8 +434,8 @@ void tst_QParallelAnimationGroup::updateChildrenWithRunningGroup()
     anim.setEndValue(100);
     anim.setDuration(200);
 
-    QSignalSpy groupStateChangedSpy(&group, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy childStateChangedSpy(&anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy groupStateChangedSpy(&group, &QParallelAnimationGroup::stateChanged);
+    QSignalSpy childStateChangedSpy(&anim, &TestAnimation::stateChanged);
 
     QVERIFY(groupStateChangedSpy.isValid());
     QVERIFY(childStateChangedSpy.isValid());
@@ -601,8 +601,8 @@ void tst_QParallelAnimationGroup::startGroupWithRunningChild()
     anim2.setEndValue(100);
     anim2.setDuration(200);
 
-    QSignalSpy stateChangedSpy1(&anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy stateChangedSpy2(&anim2, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy stateChangedSpy1(&anim1, &TestAnimation::stateChanged);
+    QSignalSpy stateChangedSpy2(&anim2, &TestAnimation::stateChanged);
 
     QVERIFY(stateChangedSpy1.isValid());
     QVERIFY(stateChangedSpy2.isValid());
@@ -669,20 +669,20 @@ void tst_QParallelAnimationGroup::zeroDurationAnimation()
     anim3.setEndValue(100);
     anim3.setDuration(10);
 
-    QSignalSpy stateChangedSpy1(&anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy1(&anim1, SIGNAL(finished()));
+    QSignalSpy stateChangedSpy1(&anim1, &TestAnimation::stateChanged);
+    QSignalSpy finishedSpy1(&anim1, &TestAnimation::finished);
 
     QVERIFY(stateChangedSpy1.isValid());
     QVERIFY(finishedSpy1.isValid());
 
-    QSignalSpy stateChangedSpy2(&anim2, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy2(&anim2, SIGNAL(finished()));
+    QSignalSpy stateChangedSpy2(&anim2, &TestAnimation::stateChanged);
+    QSignalSpy finishedSpy2(&anim2, &TestAnimation::finished);
 
     QVERIFY(stateChangedSpy2.isValid());
     QVERIFY(finishedSpy2.isValid());
 
-    QSignalSpy stateChangedSpy3(&anim3, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy3(&anim3, SIGNAL(finished()));
+    QSignalSpy stateChangedSpy3(&anim3, &TestAnimation::stateChanged);
+    QSignalSpy finishedSpy3(&anim3, &TestAnimation::finished);
 
     QVERIFY(stateChangedSpy3.isValid());
     QVERIFY(finishedSpy3.isValid());
@@ -760,7 +760,7 @@ void tst_QParallelAnimationGroup::stopUncontrolledAnimations()
     loopsForever.setDuration(100);
     loopsForever.setLoopCount(-1);
 
-    QSignalSpy stateChangedSpy(&anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy stateChangedSpy(&anim1, &TestAnimation::stateChanged);
     QVERIFY(stateChangedSpy.isValid());
 
     group.addAnimation(&anim1);
@@ -968,7 +968,7 @@ void tst_QParallelAnimationGroup::pauseResume()
 {
     QParallelAnimationGroup group;
     TestAnimation2 *anim = new TestAnimation2(250, &group);      // 0, duration = 250;
-    QSignalSpy spy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy spy(anim, &TestAnimation::stateChanged);
     QVERIFY(spy.isValid());
     QCOMPARE(group.duration(), 250);
     group.start();
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
index dc731ee765..0dab56a9cc 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -230,9 +230,9 @@ void tst_QPropertyAnimation::statesAndSignals()
         anim = new DummyPropertyAnimation;
     anim->setDuration(100);
 
-    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
-    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy currentLoopSpy(anim, SIGNAL(currentLoopChanged(int)));
+    QSignalSpy finishedSpy(anim, &QPropertyAnimation::finished);
+    QSignalSpy runningSpy(anim, &QPropertyAnimation::stateChanged);
+    QSignalSpy currentLoopSpy(anim, &QPropertyAnimation::currentLoopChanged);
 
     QVERIFY(finishedSpy.isValid());
     QVERIFY(runningSpy.isValid());
@@ -311,8 +311,8 @@ void tst_QPropertyAnimation::deletion1()
     QPointer<QPropertyAnimation> anim = new QPropertyAnimation(object, "minimumWidth");
 
     //test that the animation is deleted correctly depending of the deletion flag passed in start()
-    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
+    QSignalSpy runningSpy(anim.data(), &QPropertyAnimation::stateChanged);
+    QSignalSpy finishedSpy(anim.data(), &QPropertyAnimation::finished);
     QVERIFY(runningSpy.isValid());
     QVERIFY(finishedSpy.isValid());
     anim->setStartValue(10);
@@ -355,8 +355,8 @@ void tst_QPropertyAnimation::deletion2()
     anim->setEndValue(20);
     anim->setDuration(200);
 
-    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
+    QSignalSpy runningSpy(anim.data(), &QPropertyAnimation::stateChanged);
+    QSignalSpy finishedSpy(anim.data(), &QPropertyAnimation::finished);
 
     QVERIFY(runningSpy.isValid());
     QVERIFY(finishedSpy.isValid());
@@ -389,8 +389,8 @@ void tst_QPropertyAnimation::deletion3()
     anim->setEndValue(20);
     anim->setDuration(200);
 
-    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
+    QSignalSpy runningSpy(anim, &QPropertyAnimation::stateChanged);
+    QSignalSpy finishedSpy(anim, &QPropertyAnimation::finished);
 
     QVERIFY(runningSpy.isValid());
     QVERIFY(finishedSpy.isValid());
@@ -490,7 +490,7 @@ void tst_QPropertyAnimation::startWhenAnotherIsRunning()
         //normal case: the animation finishes and is deleted
         QPointer<QVariantAnimation> anim = new QPropertyAnimation(&o, "ole");
         anim->setEndValue(100);
-        QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+        QSignalSpy runningSpy(anim.data(), &QVariantAnimation::stateChanged);
         QVERIFY(runningSpy.isValid());
         anim->start(QVariantAnimation::DeleteWhenStopped);
         QTest::qWait(anim->duration() + 100);
@@ -501,7 +501,7 @@ void tst_QPropertyAnimation::startWhenAnotherIsRunning()
     {
         QPointer<QVariantAnimation> anim = new QPropertyAnimation(&o, "ole");
         anim->setEndValue(100);
-        QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+        QSignalSpy runningSpy(anim.data(), &QVariantAnimation::stateChanged);
         QVERIFY(runningSpy.isValid());
         anim->start(QVariantAnimation::DeleteWhenStopped);
         QTest::qWait(anim->duration()/2);
@@ -850,7 +850,7 @@ void tst_QPropertyAnimation::setStartEndValues()
 void tst_QPropertyAnimation::zeroDurationStart()
 {
     DummyPropertyAnimation anim;
-    QSignalSpy spy(&anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy spy(&anim, &DummyPropertyAnimation::stateChanged);
     QVERIFY(spy.isValid());
     anim.setDuration(0);
     QCOMPARE(anim.state(), QAbstractAnimation::Stopped);
@@ -972,7 +972,7 @@ void tst_QPropertyAnimation::operationsInStates()
     o.setProperty("ole", 42);
     QPropertyAnimation anim(&o, "ole");
     anim.setEndValue(100);
-    QSignalSpy spy(&anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy spy(&anim, &QPropertyAnimation::stateChanged);
     QVERIFY(spy.isValid());
 
     anim.stop();
@@ -1132,7 +1132,7 @@ void tst_QPropertyAnimation::valueChanged()
     QPropertyAnimation anim(&o, "ole");
     anim.setEndValue(5);
     anim.setDuration(1000);
-    QSignalSpy spy(&anim, SIGNAL(valueChanged(QVariant)));
+    QSignalSpy spy(&anim, &QPropertyAnimation::valueChanged);
     QVERIFY(spy.isValid());
     anim.start();
 
@@ -1263,8 +1263,8 @@ void tst_QPropertyAnimation::zeroLoopCount()
     anim->setDuration(20);
     anim->setLoopCount(0);
 
-    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
+    QSignalSpy runningSpy(anim, &QPropertyAnimation::stateChanged);
+    QSignalSpy finishedSpy(anim, &QPropertyAnimation::finished);
 
     QVERIFY(runningSpy.isValid());
     QVERIFY(finishedSpy.isValid());
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
index 51f07993cd..cbd484c016 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -637,8 +637,8 @@ void tst_QSequentialAnimationGroup::pauseAndResume()
     sequence->addAnimation(a3_s_o1);
     sequence->setLoopCount(2);
 
-    QSignalSpy a1StateChangedSpy(a1_s_o1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy seqStateChangedSpy(sequence, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy a1StateChangedSpy(a1_s_o1, &QVariantAnimation::stateChanged);
+    QSignalSpy seqStateChangedSpy(sequence, &QAnimationGroup::stateChanged);
 
     QVERIFY(a1StateChangedSpy.isValid());
     QVERIFY(seqStateChangedSpy.isValid());
@@ -744,8 +744,8 @@ void tst_QSequentialAnimationGroup::restart()
 {
     // sequence operating on same object/property
     QAnimationGroup *sequence = new QSequentialAnimationGroup();
-    QSignalSpy seqCurrentAnimChangedSpy(sequence, SIGNAL(currentAnimationChanged(QAbstractAnimation*)));
-    QSignalSpy seqStateChangedSpy(sequence, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy seqCurrentAnimChangedSpy(static_cast<QSequentialAnimationGroup*>(sequence), &QSequentialAnimationGroup::currentAnimationChanged);
+    QSignalSpy seqStateChangedSpy(sequence, &QAnimationGroup::stateChanged);
 
     QVERIFY(seqCurrentAnimChangedSpy.isValid());
     QVERIFY(seqStateChangedSpy.isValid());
@@ -756,7 +756,7 @@ void tst_QSequentialAnimationGroup::restart()
     for (int i = 0; i < 3; i++) {
         anims[i] = new DummyPropertyAnimation;
         anims[i]->setDuration(100);
-        animsStateChanged[i] = new QSignalSpy(anims[i], SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+        animsStateChanged[i] = new QSignalSpy(anims[i], &QVariantAnimation::stateChanged);
         QVERIFY(animsStateChanged[i]->isValid());
     }
 
@@ -816,10 +816,10 @@ void tst_QSequentialAnimationGroup::looping()
     QAbstractAnimation *a2_s_o1 = new DummyPropertyAnimation;
     QAbstractAnimation *a3_s_o1 = new DummyPropertyAnimation;
 
-    QSignalSpy a1Spy(a1_s_o1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy a2Spy(a2_s_o1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy a3Spy(a3_s_o1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy seqSpy(sequence, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy a1Spy(a1_s_o1, &QAbstractAnimation::stateChanged);
+    QSignalSpy a2Spy(a2_s_o1, &QAbstractAnimation::stateChanged);
+    QSignalSpy a3Spy(a3_s_o1, &QAbstractAnimation::stateChanged);
+    QSignalSpy seqSpy(sequence, &QSequentialAnimationGroup::stateChanged);
 
     QVERIFY(a1Spy.isValid());
     QVERIFY(a2Spy.isValid());
@@ -833,7 +833,7 @@ void tst_QSequentialAnimationGroup::looping()
     sequence->setLoopCount(2);
 
     QSequentialAnimationGroup group;
-    QSignalSpy groupSpy(&group, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy groupSpy(&group, &QSequentialAnimationGroup::stateChanged);
     QVERIFY(groupSpy.isValid());
 
     group.addAnimation(sequence);
@@ -1101,8 +1101,8 @@ void tst_QSequentialAnimationGroup::updateChildrenWithRunningGroup()
     anim.setEndValue(100);
     anim.setDuration(200);
 
-    QSignalSpy groupStateChangedSpy(&group, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy childStateChangedSpy(&anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy groupStateChangedSpy(&group, &QSequentialAnimationGroup::stateChanged);
+    QSignalSpy childStateChangedSpy(&anim, &TestAnimation::stateChanged);
 
     QVERIFY(groupStateChangedSpy.isValid());
     QVERIFY(childStateChangedSpy.isValid());
@@ -1268,8 +1268,8 @@ void tst_QSequentialAnimationGroup::startGroupWithRunningChild()
     anim2->setEndValue(100);
     anim2->setDuration(200);
 
-    QSignalSpy stateChangedSpy1(anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
-    QSignalSpy stateChangedSpy2(anim2, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy stateChangedSpy1(anim1, &TestAnimation::stateChanged);
+    QSignalSpy stateChangedSpy2(anim2, &TestAnimation::stateChanged);
 
     QVERIFY(stateChangedSpy1.isValid());
     QVERIFY(stateChangedSpy2.isValid());
@@ -1345,7 +1345,7 @@ void tst_QSequentialAnimationGroup::zeroDurationAnimation()
     anim3->setEndValue(100);
     anim3->setDuration(0);
 
-    QSignalSpy stateChangedSpy(anim1, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy stateChangedSpy(anim1, &TestAnimation::stateChanged);
     QVERIFY(stateChangedSpy.isValid());
 
     group.addAnimation(anim1);
@@ -1417,7 +1417,7 @@ void tst_QSequentialAnimationGroup::finishWithUncontrolledAnimation()
     //first we test a group with one uncontrolled animation
     QSequentialAnimationGroup group;
     UncontrolledAnimation notTimeDriven(&o1, &group);
-    QSignalSpy spy(&group, SIGNAL(finished()));
+    QSignalSpy spy(&group, &QSequentialAnimationGroup::finished);
     QVERIFY(spy.isValid());
 
     group.start();
@@ -1437,7 +1437,7 @@ void tst_QSequentialAnimationGroup::finishWithUncontrolledAnimation()
     // lets make sure the seeking will work again
     spy.clear();
     DummyPropertyAnimation anim(&group);
-    QSignalSpy animStateChangedSpy(&anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy animStateChangedSpy(&anim, &DummyPropertyAnimation::stateChanged);
     QVERIFY(animStateChangedSpy.isValid());
 
     group.setCurrentTime(300);
@@ -1639,7 +1639,7 @@ void tst_QSequentialAnimationGroup::pauseResume()
     QPropertyAnimation *anim = new QPropertyAnimation(&dummy, "foo", &group);
     anim->setDuration(250);
     anim->setEndValue(250);
-    QSignalSpy spy(anim, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+    QSignalSpy spy(anim, &QPropertyAnimation::stateChanged);
     QVERIFY(spy.isValid());
     QCOMPARE(group.duration(), 250);
     group.start();