diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-02 11:32:29 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 10:08:49 +0100 |
commit | d286f5bf75dd67dde71f6c0366b208d564301251 (patch) | |
tree | 968c867a168efb7a9121da81fd51ecb527efde8b /tests/auto/qml | |
parent | 5ca26a1c6166af2750fdf3c1333f1d7b389e8b85 (diff) |
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>
Diffstat (limited to 'tests/auto/qml')
4 files changed, 7 insertions, 7 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); |