Index: autotests/libs/changerecordertest.cpp =================================================================== --- autotests/libs/changerecordertest.cpp +++ autotests/libs/changerecordertest.cpp @@ -136,9 +136,9 @@ void replayNextAndProcess(ChangeRecorder *rec, Akonadi::Item::Id expectedUid) { - QSignalSpy nothingSpy(rec, SIGNAL(nothingToReplay())); + QSignalSpy nothingSpy(rec, &ChangeRecorder::nothingToReplay); QVERIFY(nothingSpy.isValid()); - QSignalSpy itemChangedSpy(rec, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy itemChangedSpy(rec, &Monitor::itemChanged); QVERIFY(itemChangedSpy.isValid()); rec->replayNext(); @@ -155,9 +155,9 @@ void replayNextAndExpectNothing(ChangeRecorder *rec) { - QSignalSpy nothingSpy(rec, SIGNAL(nothingToReplay())); + QSignalSpy nothingSpy(rec, &ChangeRecorder::nothingToReplay); QVERIFY(nothingSpy.isValid()); - QSignalSpy itemChangedSpy(rec, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy itemChangedSpy(rec, &Monitor::itemChanged); QVERIFY(itemChangedSpy.isValid()); rec->replayNext(); // emits nothingToReplay immediately @@ -176,7 +176,7 @@ rec->itemFetchScope().setCacheOnly(true); // Ensure we listen to a signal, otherwise MonitorPrivate::isLazilyIgnored will ignore notifications - QSignalSpy *spy = new QSignalSpy(rec, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy *spy = new QSignalSpy(rec, &Monitor::itemChanged); spy->setParent(rec); return rec; Index: autotests/libs/collectionjobtest.cpp =================================================================== --- autotests/libs/collectionjobtest.cpp +++ autotests/libs/collectionjobtest.cpp @@ -134,7 +134,7 @@ { // recursive list of physical folders CollectionFetchJob *job = new CollectionFetchJob(Collection(res1ColId), CollectionFetchJob::Recursive); - QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List))); + QSignalSpy spy(job, &CollectionFetchJob::collectionsReceived); QVERIFY(spy.isValid()); AKVERIFYEXEC(job); Collection::List list = job->collections(); @@ -192,8 +192,8 @@ toFetch << Collection(res2ColId); CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::Recursive); ResultSignalTester spy; - connect(job, SIGNAL(collectionsReceived(Akonadi::Collection::List)), &spy, SLOT(onCollectionsReceived(Akonadi::Collection::List))); - connect(job, SIGNAL(result(KJob*)), &spy, SLOT(onCollectionRetrievalDone(KJob*))); + connect(job, &CollectionFetchJob::collectionsReceived, &spy, &ResultSignalTester::onCollectionsReceived); + connect(job, &KJob::result, &spy, &ResultSignalTester::onCollectionRetrievalDone); AKVERIFYEXEC(job); QCOMPARE(spy.receivedSignals.size(), 2); @@ -639,7 +639,7 @@ toFetch << Collection(res1ColId); toFetch << Collection(res2ColId); CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::Recursive); - QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List))); + QSignalSpy spy(job, &CollectionFetchJob::collectionsReceived); QVERIFY(spy.isValid()); AKVERIFYEXEC(job); @@ -671,7 +671,7 @@ toFetch << Collection(res1ColId); toFetch << Collection(res2ColId); CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::NonOverlappingRoots); - QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List))); + QSignalSpy spy(job, &CollectionFetchJob::collectionsReceived); QVERIFY(spy.isValid()); AKVERIFYEXEC(job); Index: autotests/libs/collectionsynctest.cpp =================================================================== --- autotests/libs/collectionsynctest.cpp +++ autotests/libs/collectionsynctest.cpp @@ -196,7 +196,7 @@ CollectionSync *syncer = new CollectionSync(resource, this); syncer->setHierarchicalRemoteIds(hierarchicalRIDs); syncer->setAutoDelete(false); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); QTest::qWait(10); @@ -308,7 +308,7 @@ CollectionSync *syncer = new CollectionSync(resource, this); syncer->setHierarchicalRemoteIds(hierarchicalRIDs); syncer->setAutoDelete(false); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); QTest::qWait(10); Index: autotests/libs/entitycachetest.cpp =================================================================== --- autotests/libs/entitycachetest.cpp +++ autotests/libs/entitycachetest.cpp @@ -133,7 +133,7 @@ void testItemCache() { ItemCache cache(1); - QSignalSpy spy(&cache, SIGNAL(dataAvailable())); + QSignalSpy spy(&cache, &EntityCacheBase::dataAvailable); QVERIFY(spy.isValid()); ItemFetchScope scope; @@ -153,7 +153,7 @@ ItemFetchScope scope; EntityListCache cache(3); - QSignalSpy spy(&cache, SIGNAL(dataAvailable())); + QSignalSpy spy(&cache, &EntityCacheBase::dataAvailable); QVERIFY(spy.isValid()); cache.request(QList() << 1 << 2 << 3, scope); Index: autotests/libs/etmpopulationtest.cpp =================================================================== --- autotests/libs/etmpopulationtest.cpp +++ autotests/libs/etmpopulationtest.cpp @@ -39,12 +39,12 @@ public: explicit ModelSignalSpy(QAbstractItemModel &model) { - connect(&model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(onRowsInserted(QModelIndex,int,int))); - connect(&model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(onRowsRemoved(QModelIndex,int,int))); - connect(&model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), this, SLOT(onRowsMoved(QModelIndex,int,int,QModelIndex,int))); - connect(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(onDataChanged(QModelIndex,QModelIndex))); - connect(&model, SIGNAL(layoutChanged()), this, SLOT(onLayoutChanged())); - connect(&model, SIGNAL(modelReset()), this, SLOT(onModelReset())); + connect(&model, &QAbstractItemModel::rowsInserted, this, &ModelSignalSpy::onRowsInserted); + connect(&model, &QAbstractItemModel::rowsRemoved, this, &ModelSignalSpy::onRowsRemoved); + connect(&model, &QAbstractItemModel::rowsMoved, this, &ModelSignalSpy::onRowsMoved); + connect(&model, &QAbstractItemModel::dataChanged, this, &ModelSignalSpy::onDataChanged); + connect(&model, &QAbstractItemModel::layoutChanged, this, &ModelSignalSpy::onLayoutChanged); + connect(&model, &QAbstractItemModel::modelReset, this, &ModelSignalSpy::onModelReset); } QStringList mSignals; Index: autotests/libs/favoriteproxytest.cpp =================================================================== --- autotests/libs/favoriteproxytest.cpp +++ autotests/libs/favoriteproxytest.cpp @@ -145,7 +145,7 @@ //Survive a reset { - QSignalSpy resetSpy(model, SIGNAL(modelReset())); + QSignalSpy resetSpy(model, &QAbstractItemModel::modelReset); model->reset(); QTRY_COMPARE(resetSpy.count(), 1); //the collection is in the favorites model Index: autotests/libs/inspectablemonitor.cpp =================================================================== --- autotests/libs/inspectablemonitor.cpp +++ autotests/libs/inspectablemonitor.cpp @@ -34,20 +34,20 @@ { // Make sure signals don't get optimized away. // TODO: Make this parametrizable in the test class. - connect(this, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(itemChanged(Akonadi::Item,QSet)), SIGNAL(dummySignal())); - connect(this, SIGNAL(itemLinked(Akonadi::Item,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(itemRemoved(Akonadi::Item)), SIGNAL(dummySignal())); - connect(this, SIGNAL(itemUnlinked(Akonadi::Item,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection)), SIGNAL(dummySignal())); + connect(this, &Akonadi::Monitor::itemAdded, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::itemChanged, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::itemLinked, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::itemMoved, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::itemRemoved, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::itemUnlinked, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::collectionAdded, this, &InspectableMonitor::dummySignal); connect(this, SIGNAL(collectionChanged(Akonadi::Collection)), SIGNAL(dummySignal())); connect(this, SIGNAL(collectionChanged(Akonadi::Collection,QSet)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionMoved(Akonadi::Collection,Akonadi::Collection,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionRemoved(Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionSubscribed(Akonadi::Collection,Akonadi::Collection)), SIGNAL(dummySignal())); - connect(this, SIGNAL(collectionUnsubscribed(Akonadi::Collection)), SIGNAL(dummySignal())); + connect(this, &Akonadi::Monitor::collectionMoved, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::collectionRemoved, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::collectionStatisticsChanged, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::collectionSubscribed, this, &InspectableMonitor::dummySignal); + connect(this, &Akonadi::Monitor::collectionUnsubscribed, this, &InspectableMonitor::dummySignal); QTimer::singleShot(0, this, [this]() { doConnectToNotificationManager(); }); } Index: autotests/libs/itemfetchtest.cpp =================================================================== --- autotests/libs/itemfetchtest.cpp +++ autotests/libs/itemfetchtest.cpp @@ -58,7 +58,7 @@ // listing of a non-empty folder job = new ItemFetchJob(Collection(colId2), this); - QSignalSpy spy(job, SIGNAL(itemsReceived(Akonadi::Item::List))); + QSignalSpy spy(job, &ItemFetchJob::itemsReceived); QVERIFY(spy.isValid()); AKVERIFYEXEC(job); Item::List items = job->items(); Index: autotests/libs/itemsynctest.cpp =================================================================== --- autotests/libs/itemsynctest.cpp +++ autotests/libs/itemsynctest.cpp @@ -112,16 +112,16 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setFullSyncItems(origItems); AKVERIFYEXEC(syncer); @@ -158,21 +158,21 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setTransactionMode(transactionMode); syncer->setBatchSize(1); syncer->setAutoDelete(false); syncer->setStreamingEnabled(true); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setTotalItems(origItems.count()); QTest::qWait(0); @@ -226,16 +226,16 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); { ItemSync *syncer = new ItemSync(col); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setTransactionMode(ItemSync::SingleTransaction); syncer->setIncrementalSyncItems(origItems, Item::List()); @@ -270,7 +270,7 @@ { ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setIncrementalSyncItems(resultItems, delItems); AKVERIFYEXEC(syncer); @@ -299,19 +299,19 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setAutoDelete(false); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); QTest::qWait(0); @@ -353,16 +353,16 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setIncrementalSyncItems(Item::List(), Item::List()); AKVERIFYEXEC(syncer); @@ -386,17 +386,17 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); syncer->setTransactionMode(ItemSync::MultipleTransactions); @@ -498,9 +498,9 @@ Item::List origItems = fetchItems(col); ItemSync *syncer = new ItemSync(col); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); syncer->setTransactionMode(ItemSync::MultipleTransactions); @@ -555,9 +555,9 @@ origItems = fetchItems(col); ItemSync *syncer = new ItemSync(col); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); - QSignalSpy spy(syncer, SIGNAL(result(KJob*))); + QSignalSpy spy(syncer, &KJob::result); QVERIFY(spy.isValid()); syncer->setStreamingEnabled(true); syncer->setTransactionMode(ItemSync::MultipleTransactions); @@ -608,16 +608,16 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setFullSyncItems(origItems); QVERIFY(!syncer->exec()); @@ -643,7 +643,7 @@ Akonadi::Monitor monitor; monitor.setCollectionMonitored(col); - QSignalSpy addedSpy(&monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(&monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); const int itemCount = 1000; @@ -654,15 +654,15 @@ const Item::List origItems = fetchItems(col); QCOMPARE(origItems.size(), itemCount); - QSignalSpy deletedSpy(&monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy deletedSpy(&monitor, &Monitor::itemRemoved); QVERIFY(deletedSpy.isValid()); - QSignalSpy changedSpy(&monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); + QSignalSpy changedSpy(&monitor, &Monitor::itemChanged); QVERIFY(changedSpy.isValid()); QBENCHMARK { ItemSync *syncer = new ItemSync(col); syncer->setTransactionMode(ItemSync::SingleTransaction); - QSignalSpy transactionSpy(syncer, SIGNAL(transactionCommitted())); + QSignalSpy transactionSpy(syncer, &ItemSync::transactionCommitted); QVERIFY(transactionSpy.isValid()); syncer->setFullSyncItems(origItems); Index: autotests/libs/jobtest.cpp =================================================================== --- autotests/libs/jobtest.cpp +++ autotests/libs/jobtest.cpp @@ -54,15 +54,15 @@ { FakeSession session("fakeSession", FakeSession::EndJobsManually); - QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*))); + QSignalSpy sessionQueueSpy(&session, &FakeSession::jobAdded); QVERIFY(sessionQueueSpy.isValid()); FakeJob *job1 = new FakeJob(&session); - QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*))); + QSignalSpy job1DoneSpy(job1, &KJob::result); QVERIFY(job1DoneSpy.isValid()); FakeJob *job2 = new FakeJob(&session); - QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*))); + QSignalSpy job2DoneSpy(job2, &KJob::result); QVERIFY(job2DoneSpy.isValid()); QCOMPARE(sessionQueueSpy.size(), 2); @@ -89,17 +89,17 @@ { FakeSession session("fakeSession", FakeSession::EndJobsManually); - QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*))); + QSignalSpy sessionQueueSpy(&session, &FakeSession::jobAdded); QVERIFY(sessionQueueSpy.isValid()); - QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected())); + QSignalSpy sessionReconnectSpy(&session, &Session::reconnected); QVERIFY(sessionReconnectSpy.isValid()); FakeJob *job1 = new FakeJob(&session); - QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*))); + QSignalSpy job1DoneSpy(job1, &KJob::result); QVERIFY(job1DoneSpy.isValid()); FakeJob *job2 = new FakeJob(&session); - QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*))); + QSignalSpy job2DoneSpy(job2, &KJob::result); QVERIFY(job2DoneSpy.isValid()); QCOMPARE(sessionQueueSpy.size(), 2); @@ -119,17 +119,17 @@ { FakeSession session("fakeSession", FakeSession::EndJobsManually); - QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*))); + QSignalSpy sessionQueueSpy(&session, &FakeSession::jobAdded); QVERIFY(sessionQueueSpy.isValid()); - QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected())); + QSignalSpy sessionReconnectSpy(&session, &Session::reconnected); QVERIFY(sessionReconnectSpy.isValid()); FakeJob *job1 = new FakeJob(&session); - QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*))); + QSignalSpy job1DoneSpy(job1, &KJob::result); QVERIFY(job1DoneSpy.isValid()); FakeJob *job2 = new FakeJob(&session); - QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*))); + QSignalSpy job2DoneSpy(job2, &KJob::result); QVERIFY(job2DoneSpy.isValid()); QCOMPARE(sessionQueueSpy.size(), 2); @@ -152,17 +152,17 @@ { FakeSession session("fakeSession", FakeSession::EndJobsManually); - QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*))); + QSignalSpy sessionQueueSpy(&session, &FakeSession::jobAdded); QVERIFY(sessionQueueSpy.isValid()); - QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected())); + QSignalSpy sessionReconnectSpy(&session, &Session::reconnected); QVERIFY(sessionReconnectSpy.isValid()); FakeJob *job1 = new FakeJob(&session); - QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*))); + QSignalSpy job1DoneSpy(job1, &KJob::result); QVERIFY(job1DoneSpy.isValid()); FakeJob *job2 = new FakeJob(&session); - QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*))); + QSignalSpy job2DoneSpy(job2, &KJob::result); QVERIFY(job2DoneSpy.isValid()); QCOMPARE(sessionQueueSpy.size(), 2); Index: autotests/libs/lazypopulationtest.cpp =================================================================== --- autotests/libs/lazypopulationtest.cpp +++ autotests/libs/lazypopulationtest.cpp @@ -286,7 +286,7 @@ //Create another item, it should not be added to the ETM although the signal is emitted from the monitor, but we should be able to fetchMore { - QSignalSpy addedSpy(changeRecorder, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(changeRecorder, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); Item item2; item2.setMimeType(QStringLiteral("application/octet-stream")); @@ -332,7 +332,7 @@ QVERIFY(monitorIndex.isValid()); //fetch the collection so we remember the empty status - QSignalSpy populatedSpy(model, SIGNAL(collectionPopulated(Akonadi::Collection::Id))); + QSignalSpy populatedSpy(model, &EntityTreeModel::collectionPopulated); model->setData(monitorIndex, QVariant(), EntityTreeModel::CollectionRefRole); model->fetchMore(monitorIndex); //Wait for collection to be fetched @@ -344,7 +344,7 @@ //create an item { - QSignalSpy addedSpy(monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); + QSignalSpy addedSpy(monitor, &Monitor::itemAdded); QVERIFY(addedSpy.isValid()); Item item1; item1.setMimeType(QStringLiteral("application/octet-stream")); Index: autotests/libs/linktest.cpp =================================================================== --- autotests/libs/linktest.cpp +++ autotests/libs/linktest.cpp @@ -76,8 +76,8 @@ qRegisterMetaType(); qRegisterMetaType(); - QSignalSpy lspy(monitor, SIGNAL(itemLinked(Akonadi::Item,Akonadi::Collection))); - QSignalSpy uspy(monitor, SIGNAL(itemUnlinked(Akonadi::Item,Akonadi::Collection))); + QSignalSpy lspy(monitor, &Monitor::itemLinked); + QSignalSpy uspy(monitor, &Monitor::itemUnlinked); QVERIFY(lspy.isValid()); QVERIFY(uspy.isValid()); Index: autotests/libs/modelspy.cpp =================================================================== --- autotests/libs/modelspy.cpp +++ autotests/libs/modelspy.cpp @@ -105,58 +105,58 @@ // If a signal is connected to a slot multiple times, the slot gets called multiple times. // As we're doing start and stop spying all the time, we disconnect here first to make sure. - disconnect(m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(rowsInserted(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), - this, SLOT(rowsRemoved(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)), - this, SLOT(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))); - disconnect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), - this, SLOT(rowsMoved(QModelIndex,int,int,QModelIndex,int))); - - disconnect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(dataChanged(QModelIndex,QModelIndex))); - - connect(m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), - SLOT(rowsAboutToBeInserted(QModelIndex,int,int))); - connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), - SLOT(rowsInserted(QModelIndex,int,int))); - connect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), - SLOT(rowsAboutToBeRemoved(QModelIndex,int,int))); - connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), - SLOT(rowsRemoved(QModelIndex,int,int))); - connect(m_model, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)), - SLOT(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))); - connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), - SLOT(rowsMoved(QModelIndex,int,int,QModelIndex,int))); - - connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - SLOT(dataChanged(QModelIndex,QModelIndex))); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeInserted, + this, &ModelSpy::rowsAboutToBeInserted); + disconnect(m_model, &QAbstractItemModel::rowsInserted, + this, &ModelSpy::rowsInserted); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeRemoved, + this, &ModelSpy::rowsAboutToBeRemoved); + disconnect(m_model, &QAbstractItemModel::rowsRemoved, + this, &ModelSpy::rowsRemoved); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeMoved, + this, &ModelSpy::rowsAboutToBeMoved); + disconnect(m_model, &QAbstractItemModel::rowsMoved, + this, &ModelSpy::rowsMoved); + + disconnect(m_model, &QAbstractItemModel::dataChanged, + this, &ModelSpy::dataChanged); + + connect(m_model, &QAbstractItemModel::rowsAboutToBeInserted, + this, &ModelSpy::rowsAboutToBeInserted); + connect(m_model, &QAbstractItemModel::rowsInserted, + this, &ModelSpy::rowsInserted); + connect(m_model, &QAbstractItemModel::rowsAboutToBeRemoved, + this, &ModelSpy::rowsAboutToBeRemoved); + connect(m_model, &QAbstractItemModel::rowsRemoved, + this, &ModelSpy::rowsRemoved); + connect(m_model, &QAbstractItemModel::rowsAboutToBeMoved, + this, &ModelSpy::rowsAboutToBeMoved); + connect(m_model, &QAbstractItemModel::rowsMoved, + this, &ModelSpy::rowsMoved); + + connect(m_model, &QAbstractItemModel::dataChanged, + this, &ModelSpy::dataChanged); } void ModelSpy::stopSpying() { m_isSpying = false; - disconnect(m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(rowsInserted(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), - this, SLOT(rowsRemoved(QModelIndex,int,int))); - disconnect(m_model, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)), - this, SLOT(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))); - disconnect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), - this, SLOT(rowsMoved(QModelIndex,int,int,QModelIndex,int))); - - disconnect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(dataChanged(QModelIndex,QModelIndex))); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeInserted, + this, &ModelSpy::rowsAboutToBeInserted); + disconnect(m_model, &QAbstractItemModel::rowsInserted, + this, &ModelSpy::rowsInserted); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeRemoved, + this, &ModelSpy::rowsAboutToBeRemoved); + disconnect(m_model, &QAbstractItemModel::rowsRemoved, + this, &ModelSpy::rowsRemoved); + disconnect(m_model, &QAbstractItemModel::rowsAboutToBeMoved, + this, &ModelSpy::rowsAboutToBeMoved); + disconnect(m_model, &QAbstractItemModel::rowsMoved, + this, &ModelSpy::rowsMoved); + + disconnect(m_model, &QAbstractItemModel::dataChanged, + this, &ModelSpy::dataChanged); } Index: autotests/libs/monitortest.cpp =================================================================== --- autotests/libs/monitortest.cpp +++ autotests/libs/monitortest.cpp @@ -107,17 +107,17 @@ qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType >(); - QSignalSpy caddspy(monitor, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection))); + QSignalSpy caddspy(monitor, &Monitor::collectionAdded); QSignalSpy cmodspy(monitor, SIGNAL(collectionChanged(Akonadi::Collection,QSet))); - QSignalSpy cmvspy(monitor, SIGNAL(collectionMoved(Akonadi::Collection,Akonadi::Collection,Akonadi::Collection))); - QSignalSpy crmspy(monitor, SIGNAL(collectionRemoved(Akonadi::Collection))); - QSignalSpy cstatspy(monitor, SIGNAL(collectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics))); - QSignalSpy cSubscribedSpy(monitor, SIGNAL(collectionSubscribed(Akonadi::Collection,Akonadi::Collection))); - QSignalSpy cUnsubscribedSpy(monitor, SIGNAL(collectionUnsubscribed(Akonadi::Collection))); - QSignalSpy iaddspy(monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection))); - QSignalSpy imodspy(monitor, SIGNAL(itemChanged(Akonadi::Item,QSet))); - QSignalSpy imvspy(monitor, SIGNAL(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection))); - QSignalSpy irmspy(monitor, SIGNAL(itemRemoved(Akonadi::Item))); + QSignalSpy cmvspy(monitor, &Monitor::collectionMoved); + QSignalSpy crmspy(monitor, &Monitor::collectionRemoved); + QSignalSpy cstatspy(monitor, &Monitor::collectionStatisticsChanged); + QSignalSpy cSubscribedSpy(monitor, &Monitor::collectionSubscribed); + QSignalSpy cUnsubscribedSpy(monitor, &Monitor::collectionUnsubscribed); + QSignalSpy iaddspy(monitor, &Monitor::itemAdded); + QSignalSpy imodspy(monitor, &Monitor::itemChanged); + QSignalSpy imvspy(monitor, &Monitor::itemMoved); + QSignalSpy irmspy(monitor, &Monitor::itemRemoved); QVERIFY(caddspy.isValid()); QVERIFY(cmodspy.isValid()); @@ -438,7 +438,7 @@ Monitor *monitor = new Monitor(this); monitor->setCollectionMonitored(Collection(1)); // top-level 'Search' collection - QSignalSpy caddspy(monitor, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection))); + QSignalSpy caddspy(monitor, &Monitor::collectionAdded); QVERIFY(caddspy.isValid()); SearchCreateJob *job = new SearchCreateJob(QStringLiteral("Test search collection"), Akonadi::SearchQuery(), this); Index: autotests/libs/relationtest.cpp =================================================================== --- autotests/libs/relationtest.cpp +++ autotests/libs/relationtest.cpp @@ -139,7 +139,7 @@ Relation rel(Relation::GENERIC, item1, item2); { - QSignalSpy addedSpy(&monitor, SIGNAL(relationAdded(Akonadi::Relation))); + QSignalSpy addedSpy(&monitor, &Monitor::relationAdded); QVERIFY(addedSpy.isValid()); RelationCreateJob *createjob = new RelationCreateJob(rel, this); @@ -151,7 +151,7 @@ } { - QSignalSpy removedSpy(&monitor, SIGNAL(relationRemoved(Akonadi::Relation))); + QSignalSpy removedSpy(&monitor, &Monitor::relationRemoved); QVERIFY(removedSpy.isValid()); RelationDeleteJob *deleteJob = new RelationDeleteJob(rel, this); AKVERIFYEXEC(deleteJob); Index: autotests/libs/resourcetest.cpp =================================================================== --- autotests/libs/resourcetest.cpp +++ autotests/libs/resourcetest.cpp @@ -38,9 +38,9 @@ void testResourceManagement() { qRegisterMetaType(); - QSignalSpy spyAddInstance(AgentManager::self(), SIGNAL(instanceAdded(Akonadi::AgentInstance))); + QSignalSpy spyAddInstance(AgentManager::self(), &AgentManager::instanceAdded); QVERIFY(spyAddInstance.isValid()); - QSignalSpy spyRemoveInstance(AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance))); + QSignalSpy spyRemoveInstance(AgentManager::self(), &AgentManager::instanceRemoved); QVERIFY(spyRemoveInstance.isValid()); AgentType type = AgentManager::self()->type(QStringLiteral("akonadi_knut_resource")); Index: autotests/libs/statisticsproxymodeltest.cpp =================================================================== --- autotests/libs/statisticsproxymodeltest.cpp +++ autotests/libs/statisticsproxymodeltest.cpp @@ -213,7 +213,7 @@ // Given a extra-columns proxy with three extra columns StatisticsProxyModel pm; pm.setSourceModel(&m_model); - QSignalSpy dataChangedSpy(&pm, SIGNAL(dataChanged(QModelIndex,QModelIndex))); + QSignalSpy dataChangedSpy(&pm, &QAbstractItemModel::dataChanged); // When ETM says the collection changed m_model.item(0, 0)->setData(QStringLiteral("a"), Qt::EditRole); @@ -230,7 +230,7 @@ // Given a extra-columns proxy with three extra columns StatisticsProxyModel pm; pm.setSourceModel(&m_model); - QSignalSpy dataChangedSpy(&pm, SIGNAL(dataChanged(QModelIndex,QModelIndex))); + QSignalSpy dataChangedSpy(&pm, &QAbstractItemModel::dataChanged); // When the proxy wants to signal a change in an extra column Akonadi::Collection c1(1); Index: autotests/libs/tagtest.cpp =================================================================== --- autotests/libs/tagtest.cpp +++ autotests/libs/tagtest.cpp @@ -244,7 +244,7 @@ { Akonadi::Monitor monitor; monitor.setTypeMonitored(Monitor::Tags); - QSignalSpy spy(&monitor, SIGNAL(tagRemoved(Akonadi::Tag))); + QSignalSpy spy(&monitor, &Monitor::tagRemoved); Tag tag1; { @@ -312,7 +312,7 @@ Akonadi::Monitor monitor; monitor.setTypeMonitored(Akonadi::Monitor::Tags); - QSignalSpy signalSpy(&monitor, SIGNAL(tagRemoved(Akonadi::Tag))); + QSignalSpy signalSpy(&monitor, &Monitor::tagRemoved); TagDeleteJob *deleteJob = new TagDeleteJob(tag, this); AKVERIFYEXEC(deleteJob); @@ -524,7 +524,7 @@ item1.setTag(tag); - QSignalSpy tagsSpy(&monitor, SIGNAL(itemsTagsChanged(Akonadi::Item::List,QSet,QSet))); + QSignalSpy tagsSpy(&monitor, &Monitor::itemsTagsChanged); QVERIFY(tagsSpy.isValid()); ItemModifyJob *modJob = new ItemModifyJob(item1, this); @@ -747,7 +747,7 @@ Akonadi::Tag createdTag; { - QSignalSpy addedSpy(&monitor, SIGNAL(tagAdded(Akonadi::Tag))); + QSignalSpy addedSpy(&monitor, &Monitor::tagAdded); QVERIFY(addedSpy.isValid()); Tag tag; tag.setGid("gid2"); @@ -770,7 +770,7 @@ } { - QSignalSpy modifiedSpy(&monitor, SIGNAL(tagChanged(Akonadi::Tag))); + QSignalSpy modifiedSpy(&monitor, &Monitor::tagChanged); QVERIFY(modifiedSpy.isValid()); createdTag.setName(QStringLiteral("name3")); @@ -787,7 +787,7 @@ } { - QSignalSpy removedSpy(&monitor, SIGNAL(tagRemoved(Akonadi::Tag))); + QSignalSpy removedSpy(&monitor, &Monitor::tagRemoved); QVERIFY(removedSpy.isValid()); TagDeleteJob *deletejob = new TagDeleteJob(createdTag, this); AKVERIFYEXEC(deletejob); Index: autotests/libs/test_utils.h =================================================================== --- autotests/libs/test_utils.h +++ autotests/libs/test_utils.h @@ -70,7 +70,7 @@ } else { bool ok = false; [&]() { - QSignalSpy spy(Akonadi::ServerManager::self(), SIGNAL(started())); + QSignalSpy spy(Akonadi::ServerManager::self(), &Akonadi::ServerManager::started); QTRY_VERIFY_WITH_TIMEOUT(spy.count() > 0, 10000); ok = true; }(); Index: src/widgets/tagwidget.cpp =================================================================== --- src/widgets/tagwidget.cpp +++ src/widgets/tagwidget.cpp @@ -63,7 +63,7 @@ } QMenu menu; - menu.addAction(i18n("Clear"), this, SIGNAL(clearTags())); + menu.addAction(i18n("Clear"), this, &TagView::clearTags); menu.exec(event->globalPos()); }