normalise signal/slot signatures [QtCore tests]

Normalise all signal/slot signatures in tests/*/corelib,
except in tst_QObject, where they might be test data.

Change-Id: Id4e101f285b1676bb583b0afae06d235e599e24b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

3 files changed, 38 insertions, 38 deletions

diff --git a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.cpp b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.cpp
index 86c810fe15..964f5cd26b 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.cpp
+++ b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.cpp
@@ -99,9 +99,9 @@ void Disconnector::received ()
 
     if (::Step == 5)
     {
-        disconnect (s, SIGNAL (fired ()), s->d, SLOT (received ()));
+        disconnect (s, SIGNAL(fired()), s->d, SLOT(received()));
 
-        connect (&RandomSender, SIGNAL (fired ()), s->d, SLOT (received ()));
+        connect (&RandomSender, SIGNAL(fired()), s->d, SLOT(received()));
     }
 
     TRACE (stepCopy, "ends Disconnector::received()");
@@ -113,9 +113,9 @@ Sender::Sender (Receiver *r, Disconnector *d)
 {
     this->r = r; this->d = d;
     if (r)
-        connect (this, SIGNAL (fired ()), r, SLOT (received ()));
+        connect (this, SIGNAL(fired()), r, SLOT(received()));
     if (d)
-        connect (this, SIGNAL (fired ()), d, SLOT (received ()));
+        connect (this, SIGNAL(fired()), d, SLOT(received()));
 };
 
 void Sender::fire ()
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 4ae28d1210..0cabc46390 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -257,11 +257,11 @@ void tst_QObject::disconnect()
     ReceiverObject *r1 = new ReceiverObject;
     ReceiverObject *r2 = new ReceiverObject;
 
-    connect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) );
+    connect( s, SIGNAL(signal1()), r1, SLOT(slot1()) );
 
-    connect( s, SIGNAL( signal2() ), r1, SLOT( slot2() ) );
-    connect( s, SIGNAL( signal3() ), r1, SLOT( slot3() ) );
-    connect( s, SIGNAL( signal4() ), r1, SLOT( slot4() ) );
+    connect( s, SIGNAL(signal2()), r1, SLOT(slot2()) );
+    connect( s, SIGNAL(signal3()), r1, SLOT(slot3()) );
+    connect( s, SIGNAL(signal4()), r1, SLOT(slot4()) );
 
     s->emitSignal1();
     s->emitSignal2();
@@ -275,7 +275,7 @@ void tst_QObject::disconnect()
     r1->reset();
 
     // usual disconnect with all parameters given
-    bool ret = QObject::disconnect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) );
+    bool ret = QObject::disconnect( s, SIGNAL(signal1()), r1, SLOT(slot1()) );
 
     s->emitSignal1();
 
@@ -283,7 +283,7 @@ void tst_QObject::disconnect()
     r1->reset();
 
     QVERIFY(ret);
-    ret = QObject::disconnect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) );
+    ret = QObject::disconnect( s, SIGNAL(signal1()), r1, SLOT(slot1()) );
     QVERIFY(!ret);
 
     // disconnect all signals from s from all slots from r1
@@ -298,13 +298,13 @@ void tst_QObject::disconnect()
     QVERIFY(!r1->called(4));
     r1->reset();
 
-    connect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) );
-    connect( s, SIGNAL( signal1() ), r1, SLOT( slot2() ) );
-    connect( s, SIGNAL( signal1() ), r1, SLOT( slot3() ) );
-    connect( s, SIGNAL( signal2() ), r1, SLOT( slot4() ) );
+    connect( s, SIGNAL(signal1()), r1, SLOT(slot1()) );
+    connect( s, SIGNAL(signal1()), r1, SLOT(slot2()) );
+    connect( s, SIGNAL(signal1()), r1, SLOT(slot3()) );
+    connect( s, SIGNAL(signal2()), r1, SLOT(slot4()) );
 
     // disconnect s's signal1() from all slots of r1
-    QObject::disconnect( s, SIGNAL( signal1() ), r1, 0 );
+    QObject::disconnect( s, SIGNAL(signal1()), r1, 0 );
 
     s->emitSignal1();
     s->emitSignal2();
@@ -317,15 +317,15 @@ void tst_QObject::disconnect()
     // make sure all is disconnected again
     QObject::disconnect( s, 0, r1, 0 );
 
-    connect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) );
-    connect( s, SIGNAL( signal1() ), r2, SLOT( slot1() ) );
-    connect( s, SIGNAL( signal2() ), r1, SLOT( slot2() ) );
-    connect( s, SIGNAL( signal2() ), r2, SLOT( slot2() ) );
-    connect( s, SIGNAL( signal3() ), r1, SLOT( slot3() ) );
-    connect( s, SIGNAL( signal3() ), r2, SLOT( slot3() ) );
+    connect( s, SIGNAL(signal1()), r1, SLOT(slot1()) );
+    connect( s, SIGNAL(signal1()), r2, SLOT(slot1()) );
+    connect( s, SIGNAL(signal2()), r1, SLOT(slot2()) );
+    connect( s, SIGNAL(signal2()), r2, SLOT(slot2()) );
+    connect( s, SIGNAL(signal3()), r1, SLOT(slot3()) );
+    connect( s, SIGNAL(signal3()), r2, SLOT(slot3()) );
 
     // disconnect signal1() from all receivers
-    QObject::disconnect( s, SIGNAL( signal1() ), 0, 0 );
+    QObject::disconnect( s, SIGNAL(signal1()), 0, 0 );
     s->emitSignal1();
     s->emitSignal2();
     s->emitSignal3();
@@ -3378,7 +3378,7 @@ void tst_QObject::disconnectSelfInSlotAndDeleteAfterEmit()
 void tst_QObject::dumpObjectInfo()
 {
     QObject a, b;
-    QObject::connect(&a, SIGNAL(destroyed(QObject *)), &b, SLOT(deleteLater()));
+    QObject::connect(&a, SIGNAL(destroyed(QObject*)), &b, SLOT(deleteLater()));
     a.disconnect(&b);
 #ifdef QT_DEBUG
     QTest::ignoreMessage(QtDebugMsg, "OBJECT QObject::unnamed");
@@ -3442,10 +3442,10 @@ void tst_QObject::uniqConnection()
     r2->reset();
     ReceiverObject::sequence = 0;
 
-    QVERIFY( connect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) , Qt::UniqueConnection) );
-    QVERIFY( connect( s, SIGNAL( signal1() ), r2, SLOT( slot1() ) , Qt::UniqueConnection) );
-    QVERIFY( connect( s, SIGNAL( signal1() ), r1, SLOT( slot3() ) , Qt::UniqueConnection) );
-    QVERIFY( connect( s, SIGNAL( signal3() ), r1, SLOT( slot3() ) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal1()), r1, SLOT(slot1()) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal1()), r2, SLOT(slot1()) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal1()), r1, SLOT(slot3()) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal3()), r1, SLOT(slot3()) , Qt::UniqueConnection) );
 
     s->emitSignal1();
     s->emitSignal2();
@@ -3468,11 +3468,11 @@ void tst_QObject::uniqConnection()
     r2->reset();
     ReceiverObject::sequence = 0;
 
-    QVERIFY( connect( s, SIGNAL( signal4() ), r1, SLOT( slot4() ) , Qt::UniqueConnection) );
-    QVERIFY( connect( s, SIGNAL( signal4() ), r2, SLOT( slot4() ) , Qt::UniqueConnection) );
-    QVERIFY(!connect( s, SIGNAL( signal4() ), r2, SLOT( slot4() ) , Qt::UniqueConnection) );
-    QVERIFY( connect( s, SIGNAL( signal1() ), r2, SLOT( slot4() ) , Qt::UniqueConnection) );
-    QVERIFY(!connect( s, SIGNAL( signal4() ), r1, SLOT( slot4() ) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal4()), r1, SLOT(slot4()) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal4()), r2, SLOT(slot4()) , Qt::UniqueConnection) );
+    QVERIFY(!connect( s, SIGNAL(signal4()), r2, SLOT(slot4()) , Qt::UniqueConnection) );
+    QVERIFY( connect( s, SIGNAL(signal1()), r2, SLOT(slot4()) , Qt::UniqueConnection) );
+    QVERIFY(!connect( s, SIGNAL(signal4()), r1, SLOT(slot4()) , Qt::UniqueConnection) );
 
     s->emitSignal4();
     QCOMPARE( r1->count_slot4, 1 );
@@ -3484,7 +3484,7 @@ void tst_QObject::uniqConnection()
     r2->reset();
     ReceiverObject::sequence = 0;
 
-    connect( s, SIGNAL( signal4() ), r1, SLOT( slot4() ) );
+    connect( s, SIGNAL(signal4()), r1, SLOT(slot4()) );
 
     s->emitSignal4();
     QCOMPARE( r1->count_slot4, 2 );
@@ -3637,11 +3637,11 @@ void tst_QObject::overloads()
     obj2.s_num = 0;
 
     connect (&obj1, SIGNAL(sig(int)) , &obj1, SLOT(slo(int)));
-    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *)) , &obj1, SLOT(slo(QObject * , QObject *, QObject *)));
+    connect (&obj1, SIGNAL(sig(QObject*,QObject*,QObject*)) , &obj1, SLOT(slo(QObject*,QObject*,QObject*)));
 
-    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *, QObject *)) , &obj2, SLOT(slo(QObject * , QObject *, QObject *)));
-    connect (&obj1, SIGNAL(sig(QObject *)) , &obj2, SLOT(slo()));
-    connect (&obj1, SIGNAL(sig(int, int)) , &obj2, SLOT(slo(int, int)));
+    connect (&obj1, SIGNAL(sig(QObject*,QObject*,QObject*,QObject*)) , &obj2, SLOT(slo(QObject*,QObject*,QObject*)));
+    connect (&obj1, SIGNAL(sig(QObject*)) , &obj2, SLOT(slo()));
+    connect (&obj1, SIGNAL(sig(int,int)) , &obj2, SLOT(slo(int,int)));
 
     emit obj1.sig(0.5); //connected to nothing
     emit obj1.sig(1, 'a'); //connected to nothing
diff --git a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
index 472be15512..4b188368ee 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
@@ -102,7 +102,7 @@ void tst_QSignalMapper::mapped()
     mapper.setMapping(&src3, "three");
 
     connect(&mapper, SIGNAL(mapped(int)), &target, SLOT(myslot(int)));
-    connect(&mapper, SIGNAL(mapped(const QString &)), &target, SLOT(myslot(const QString &)));
+    connect(&mapper, SIGNAL(mapped(QString)), &target, SLOT(myslot(QString)));
 
     src1.emit_mysignal(20);
     QVERIFY(target.id == 1);