Clazy: old-style-connect

7 files changed, 64 insertions, 64 deletions

diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
index 4f796c9bc..3176f9d82 100644
--- a/test/testchecksumvalidator.cpp
+++ b/test/testchecksumvalidator.cpp
@@ -119,7 +119,7 @@ using namespace OCC::Utility;
         _expectedType = "Adler32";
         vali->setChecksumType(_expectedType);
 
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), SLOT(slotUpValidated(QByteArray,QByteArray)));
+        connect(vali, &ComputeChecksum::done, this, &TestChecksumValidator::slotUpValidated);
 
         auto file = new QFile(_testfile, vali);
         file->open(QIODevice::ReadOnly);
@@ -128,7 +128,7 @@ using namespace OCC::Utility;
         vali->start(_testfile);
 
         QEventLoop loop;
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
+        connect(vali, &ComputeChecksum::done, &loop, &QEventLoop::quit, Qt::QueuedConnection);
         loop.exec();
 
         delete vali;
@@ -140,7 +140,7 @@ using namespace OCC::Utility;
         ComputeChecksum *vali = new ComputeChecksum(this);
         _expectedType = OCC::checkSumMD5C;
         vali->setChecksumType(_expectedType);
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), this, SLOT(slotUpValidated(QByteArray,QByteArray)));
+        connect(vali, &ComputeChecksum::done, this, &TestChecksumValidator::slotUpValidated);
 
         auto file = new QFile(_testfile, vali);
         file->open(QIODevice::ReadOnly);
@@ -148,7 +148,7 @@ using namespace OCC::Utility;
         vali->start(_testfile);
 
         QEventLoop loop;
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
+        connect(vali, &ComputeChecksum::done, &loop, &QEventLoop::quit, Qt::QueuedConnection);
         loop.exec();
 
         delete vali;
@@ -159,7 +159,7 @@ using namespace OCC::Utility;
         ComputeChecksum *vali = new ComputeChecksum(this);
         _expectedType = OCC::checkSumSHA1C;
         vali->setChecksumType(_expectedType);
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), this, SLOT(slotUpValidated(QByteArray,QByteArray)));
+        connect(vali, &ComputeChecksum::done, this, &TestChecksumValidator::slotUpValidated);
 
         auto file = new QFile(_testfile, vali);
         file->open(QIODevice::ReadOnly);
@@ -168,7 +168,7 @@ using namespace OCC::Utility;
         vali->start(_testfile);
 
         QEventLoop loop;
-        connect(vali, SIGNAL(done(QByteArray,QByteArray)), &loop, SLOT(quit()), Qt::QueuedConnection);
+        connect(vali, &ComputeChecksum::done, &loop, &QEventLoop::quit, Qt::QueuedConnection);
         loop.exec();
 
         delete vali;
@@ -179,8 +179,8 @@ using namespace OCC::Utility;
         QSKIP("ZLIB not found.", SkipSingle);
 #else
         ValidateChecksumHeader *vali = new ValidateChecksumHeader(this);
-        connect(vali, SIGNAL(validated(QByteArray,QByteArray)), this, SLOT(slotDownValidated()));
-        connect(vali, SIGNAL(validationFailed(QString)), this, SLOT(slotDownError(QString)));
+        connect(vali, &ValidateChecksumHeader::validated, this, &TestChecksumValidator::slotDownValidated);
+        connect(vali, &ValidateChecksumHeader::validationFailed, this, &TestChecksumValidator::slotDownError);
 
         auto file = new QFile(_testfile, vali);
         file->open(QIODevice::ReadOnly);
diff --git a/test/testdownload.cpp b/test/testdownload.cpp
index cd0635ad6..b37cb807d 100644
--- a/test/testdownload.cpp
+++ b/test/testdownload.cpp
@@ -61,7 +61,7 @@ private slots:
     {
         FakeFolder fakeFolder{ FileInfo::A12_B12_C12_S12() };
         fakeFolder.syncEngine().setIgnoreHiddenFiles(true);
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), &SyncEngine::itemCompleted);
         auto size = 30 * 1000 * 1000;
         fakeFolder.remoteModifier().insert("A/a0", size);
 
@@ -96,7 +96,7 @@ private slots:
 
         FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
         fakeFolder.syncEngine().setIgnoreHiddenFiles(true);
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), &SyncEngine::itemCompleted);
         auto size = 3'500'000;
         fakeFolder.remoteModifier().insert("A/broken", size);
 
@@ -236,7 +236,7 @@ private slots:
         resendActual = 0;
         resendExpected = 10;
 
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), &SyncEngine::itemCompleted);
         QVERIFY(!fakeFolder.syncOnce());
         QCOMPARE(resendActual, 4); // the 4th fails because it only resends 3 times
         QCOMPARE(getItem(completeSpy, "A/resendme")->_status, SyncFileItem::NormalError);
diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp
index 98fa321a7..2c227c64c 100644
--- a/test/testfolderwatcher.cpp
+++ b/test/testfolderwatcher.cpp
@@ -121,7 +121,7 @@ public:
 
         _watcher.reset(new FolderWatcher);
         _watcher->init(_rootPath);
-        _pathChangedSpy.reset(new QSignalSpy(_watcher.data(), SIGNAL(pathChanged(QString))));
+        _pathChangedSpy.reset(new QSignalSpy(_watcher.data(), &FolderWatcher::pathChanged));
     }
 
     int countFolders(const QString &path)
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index 07c307c7c..a0f69c0ef 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -216,7 +216,7 @@ private slots:
 
     void abortAfterFailedMkdir() {
         FakeFolder fakeFolder{FileInfo{}};
-        QSignalSpy finishedSpy(&fakeFolder.syncEngine(), SIGNAL(finished(bool)));
+        QSignalSpy finishedSpy(&fakeFolder.syncEngine(), &SyncEngine::finished);
         fakeFolder.serverErrorPaths().append("NewFolder");
         fakeFolder.localModifier().mkdir("NewFolder");
         // This should be aborted and would otherwise fail in FileInfo::create.
@@ -230,7 +230,7 @@ private slots:
      * etag stored in the database yet. */
     void testDirEtagAfterIncompleteSync() {
         FakeFolder fakeFolder{FileInfo{}};
-        QSignalSpy finishedSpy(&fakeFolder.syncEngine(), SIGNAL(finished(bool)));
+        QSignalSpy finishedSpy(&fakeFolder.syncEngine(), &SyncEngine::finished);
         fakeFolder.serverErrorPaths().append("NewFolder/foo");
         fakeFolder.remoteModifier().mkdir("NewFolder");
         fakeFolder.remoteModifier().insert("NewFolder/foo");
diff --git a/test/testutils/syncenginetestutils.cpp b/test/testutils/syncenginetestutils.cpp
index 77fdf16d6..f15515c88 100644
--- a/test/testutils/syncenginetestutils.cpp
+++ b/test/testutils/syncenginetestutils.cpp
@@ -975,7 +975,7 @@ void FakeFolder::execUntilBeforePropagation()
 
 void FakeFolder::execUntilItemCompleted(const QString &relativePath)
 {
-    QSignalSpy spy(_syncEngine.get(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+    QSignalSpy spy(_syncEngine.get(), &OCC::SyncEngine::itemCompleted);
     QElapsedTimer t;
     t.start();
     while (t.elapsed() < 5000) {
diff --git a/test/testutils/syncenginetestutils.h b/test/testutils/syncenginetestutils.h
index 98c0759ec..9f8f31a2f 100644
--- a/test/testutils/syncenginetestutils.h
+++ b/test/testutils/syncenginetestutils.h
@@ -511,7 +511,7 @@ public:
 
     bool execUntilFinished()
     {
-        QSignalSpy spy(_syncEngine.get(), SIGNAL(finished(bool)));
+        QSignalSpy spy(_syncEngine.get(), &OCC::SyncEngine::finished);
         bool ok = spy.wait(3600000);
         Q_ASSERT(ok && "Sync timed out");
         return spy[0][0].toBool();
diff --git a/test/testxmlparse.cpp b/test/testxmlparse.cpp
index 6c0945554..e244bdc9f 100644
--- a/test/testxmlparse.cpp
+++ b/test/testxmlparse.cpp
@@ -102,12 +102,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
@@ -176,12 +176,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" )); // verify false
@@ -199,12 +199,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" )); // verify false
@@ -221,12 +221,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" )); // verify false
@@ -260,12 +260,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(!parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
@@ -325,12 +325,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
@@ -390,12 +390,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/webdav/sharefolder" ));
@@ -454,12 +454,12 @@ private slots:
 
         LsColXMLParser parser;
 
-        connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)),
-                 this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) );
-        connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-                 this, SLOT(slotDirectoryListingIterated(const QString&, const QMap<QString,QString>&)) );
-        connect( &parser, SIGNAL(finishedWithoutError()),
-                 this, SLOT(slotFinishedSuccessfully()) );
+        connect(&parser, &LsColXMLParser::directoryListingSubfolders,
+            this, &TestXmlParse::slotDirectoryListingSubFolders);
+        connect(&parser, &LsColXMLParser::directoryListingIterated,
+            this, &TestXmlParse::slotDirectoryListingIterated);
+        connect(&parser, &LsColXMLParser::finishedWithoutError,
+            this, &TestXmlParse::slotFinishedSuccessfully);
 
         QHash <QString, qint64> sizes;
         QVERIFY(parser.parse( testXml, &sizes, QString::fromUtf8("/ä") ));