Prefer to use normalised signal/slot signatures

Change-Id: I9856c110399c4b6b1ea6aba2d92392cecff04656
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

10 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
index 7811ce5e5b..e744cde15b 100644
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -78,7 +78,7 @@ void tst_qqmlapplicationengine::basicLoading()
     QVERIFY(test->rootObjects()[size -1]);
     QVERIFY(test->rootObjects()[size -1]->property("success").toBool());
 
-    QSignalSpy objectCreated(test, SIGNAL(objectCreated(QObject*,const QUrl&)));
+    QSignalSpy objectCreated(test, SIGNAL(objectCreated(QObject*,QUrl)));
     test->load(testFileUrl("basicTest.qml"));
     QCOMPARE(objectCreated.count(), size);//one less than rootObjects().size() because we missed the first one
     QCOMPARE(test->rootObjects().size(), ++size);
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index a39564bd19..60455c3acc 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -7101,7 +7101,7 @@ void tst_qqmlecmascript::threadSignal()
     QQmlComponent c(&engine, testFileUrl("threadSignal.2.qml"));
     QObject *object = c.create();
     QVERIFY(object != 0);
-    QSignalSpy doneSpy(object, SIGNAL(done(const QString &)));
+    QSignalSpy doneSpy(object, SIGNAL(done(QString)));
     QMetaObject::invokeMethod(object, "doIt");
     QTRY_VERIFY(object->property("passed").toBool());
     QCOMPARE(doneSpy.count(), 1);
diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
index 669ae7d5ea..b8c2ce4460 100644
--- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
+++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
@@ -203,7 +203,7 @@ void tst_QQmlPropertyMap::clear()
 void tst_QQmlPropertyMap::changed()
 {
     QQmlPropertyMap map;
-    QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&, const QVariant&)));
+    QSignalSpy spy(&map, SIGNAL(valueChanged(QString,QVariant)));
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
     QCOMPARE(spy.count(), 0);
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index 73e8a283c7..e03befe25a 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -169,8 +169,8 @@ void tst_qquickfolderlistmodel::resetFiltering()
     QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create());
     QVERIFY(flm != 0);
 
-    connect(flm, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
-            this, SLOT(removed(const QModelIndex&,int,int)));
+    connect(flm, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(removed(QModelIndex,int,int)));
 
     flm->setProperty("folder", testFileUrl("resetfiltering"));
     QTRY_COMPARE(flm->property("count").toInt(),1); // should just be "test.txt" visible
@@ -204,8 +204,8 @@ void tst_qquickfolderlistmodel::refresh()
 
     int count = flm->rowCount();
 
-    connect(flm, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
-            this, SLOT(removed(const QModelIndex&,int,int)));
+    connect(flm, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(removed(QModelIndex,int,int)));
 
     flm->setProperty("sortReversed", true);
 
diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
index c1a223c30d..d10963b579 100644
--- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
+++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
@@ -429,7 +429,7 @@ void tst_qquickanimatedimage::progressAndStatusChanges()
     QTRY_VERIFY(obj->progress() == 1.0);
 
     qRegisterMetaType<QQuickImageBase::Status>();
-    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(const QUrl &)));
+    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
     QSignalSpy progressSpy(obj, SIGNAL(progressChanged(qreal)));
     QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status)));
 
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index b795d23da4..4e7b6522dd 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -544,7 +544,7 @@ void tst_qquickborderimage::progressAndStatusChanges()
     QTRY_VERIFY(obj->progress() == 1.0);
 
     qRegisterMetaType<QQuickBorderImage::Status>();
-    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(const QUrl &)));
+    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
     QSignalSpy progressSpy(obj, SIGNAL(progressChanged(qreal)));
     QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status)));
 
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 7fa58036dd..b23591b593 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -538,7 +538,7 @@ void tst_qquickimage::noLoading()
     QVERIFY(obj != 0);
     QVERIFY(obj->status() == QQuickImage::Ready);
 
-    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(const QUrl &)));
+    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
     QSignalSpy progressSpy(obj, SIGNAL(progressChanged(qreal)));
     QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status)));
 
@@ -838,7 +838,7 @@ void tst_qquickimage::progressAndStatusChanges()
     QTRY_VERIFY(obj->progress() == 1.0);
 
     qRegisterMetaType<QQuickImageBase::Status>();
-    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(const QUrl &)));
+    QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
     QSignalSpy progressSpy(obj, SIGNAL(progressChanged(qreal)));
     QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status)));
 
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index 64795f9ebe..3ce18488df 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -2059,7 +2059,7 @@ void tst_QQuickItem::propertyChanges()
     QVERIFY(item);
     QVERIFY(parentItem);
 
-    QSignalSpy parentSpy(item, SIGNAL(parentChanged(QQuickItem *)));
+    QSignalSpy parentSpy(item, SIGNAL(parentChanged(QQuickItem*)));
     QSignalSpy widthSpy(item, SIGNAL(widthChanged()));
     QSignalSpy heightSpy(item, SIGNAL(heightChanged()));
     QSignalSpy baselineOffsetSpy(item, SIGNAL(baselineOffsetChanged(qreal)));
diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
index 18595133d0..b9d314b63e 100644
--- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
+++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
@@ -343,8 +343,8 @@ void tst_QQuickPinchArea::retouch()
     QQuickItem *root = qobject_cast<QQuickItem*>(window->rootObject());
     QVERIFY(root != 0);
 
-    QSignalSpy startedSpy(pinchArea, SIGNAL(pinchStarted(QQuickPinchEvent *)));
-    QSignalSpy finishedSpy(pinchArea, SIGNAL(pinchFinished(QQuickPinchEvent *)));
+    QSignalSpy startedSpy(pinchArea, SIGNAL(pinchStarted(QQuickPinchEvent*)));
+    QSignalSpy finishedSpy(pinchArea, SIGNAL(pinchFinished(QQuickPinchEvent*)));
 
     // target
     QQuickItem *blackRect = window->rootObject()->findChild<QQuickItem*>("blackrect");
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 3735947356..28945c4cb5 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -369,7 +369,7 @@ void tst_qquickwindow::openglContextCreatedSignal()
     qRegisterMetaType<QOpenGLContext *>();
 
     QQuickWindow window;
-    QSignalSpy spy(&window, SIGNAL(openglContextCreated(QOpenGLContext *)));
+    QSignalSpy spy(&window, SIGNAL(openglContextCreated(QOpenGLContext*)));
 
     window.show();
     QTest::qWaitForWindowExposed(&window);