diff --git a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp index 1f1d4f30c..2fef068ba 100644 --- a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp +++ b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp @@ -82,7 +82,7 @@ public: }); } }); - QTimer::singleShot(100, &loop, SLOT(quit())); // add a timeout to be sure we don't freeze dolphin + QTimer::singleShot(100, &loop, &QEventLoop::quit); // add a timeout to be sure we don't freeze dolphin helper->sendCommand(QByteArray("GET_MENU_ITEMS:" + files + "\n")); loop.exec(QEventLoop::ExcludeUserInputEvents); disconnect(con); diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.cpp b/src/3rdparty/kmessagewidget/kmessagewidget.cpp index de2989926..70d594139 100644 --- a/src/3rdparty/kmessagewidget/kmessagewidget.cpp +++ b/src/3rdparty/kmessagewidget/kmessagewidget.cpp @@ -72,8 +72,8 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr) // Note: when changing the value 500, also update KMessageWidgetTest timeLine = new QTimeLine(500, q); - QObject::connect(timeLine, SIGNAL(valueChanged(qreal)), q, SLOT(slotTimeLineChanged(qreal))); - QObject::connect(timeLine, SIGNAL(finished()), q, SLOT(slotTimeLineFinished())); + QObject::connect(timeLine, &QTimeLine::valueChanged, q, [this] (qreal value) { slotTimeLineChanged(value); }); + QObject::connect(timeLine, &QTimeLine::finished, q, [this] () { slotTimeLineFinished(); }); content = new QFrame(q); content->setObjectName(QStringLiteral("contentWidget")); diff --git a/src/gui/application.cpp b/src/gui/application.cpp index e43b0317c..3b6b797e1 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -187,7 +187,7 @@ bool Application::configVersionMigration() box.exec(); if (box.clickedButton() != continueBtn) { - QTimer::singleShot(0, qApp, SLOT(quit())); + QTimer::singleShot(0, qApp, &QCoreApplication::quit); return false; } @@ -379,7 +379,7 @@ Application::Application(int &argc, char **argv) "file at %1. Please make sure the file can be accessed by your system account.") .arg(ConfigFile().configFile()), tr("Quit %1").arg(Theme::instance()->appNameGUI())); - QTimer::singleShot(0, qApp, SLOT(quit())); + QTimer::singleShot(0, qApp, &QCoreApplication::quit); return; } } diff --git a/src/gui/cloudproviders/cloudprovidermanager.cpp b/src/gui/cloudproviders/cloudprovidermanager.cpp index 35ff2a5c8..45b5cd359 100644 --- a/src/gui/cloudproviders/cloudprovidermanager.cpp +++ b/src/gui/cloudproviders/cloudprovidermanager.cpp @@ -44,7 +44,8 @@ void on_name_lost (GDBusConnection *connection, const gchar *name, gpointer user void CloudProviderManager::registerSignals() { OCC::FolderMan *folderManager = OCC::FolderMan::instance(); - connect(folderManager, SIGNAL(folderListChanged(const Folder::Map &)), SLOT(slotFolderListChanged(const Folder::Map &))); + connect(folderManager, &OCC::FolderMan::folderListChanged, + this, &CloudProviderManager::slotFolderListChanged); slotFolderListChanged(folderManager->map()); } diff --git a/src/gui/cloudproviders/cloudproviderwrapper.cpp b/src/gui/cloudproviders/cloudproviderwrapper.cpp index bbf65876b..fe719ec88 100644 --- a/src/gui/cloudproviders/cloudproviderwrapper.cpp +++ b/src/gui/cloudproviders/cloudproviderwrapper.cpp @@ -50,10 +50,10 @@ CloudProviderWrapper::CloudProviderWrapper(QObject *parent, Folder *folder, int action_group = getActionGroup(); cloud_providers_account_exporter_set_action_group (_cloudProviderAccount, action_group); - connect(ProgressDispatcher::instance(), SIGNAL(progressInfo(QString, ProgressInfo)), this, SLOT(slotUpdateProgress(QString, ProgressInfo))); - connect(_folder, SIGNAL(syncStarted()), this, SLOT(slotSyncStarted())); - connect(_folder, SIGNAL(syncFinished(SyncResult)), this, SLOT(slotSyncFinished(const SyncResult))); - connect(_folder, SIGNAL(syncPausedChanged(Folder*,bool)), this, SLOT(slotSyncPausedChanged(Folder*, bool))); + connect(ProgressDispatcher::instance(), &ProgressDispatcher::progressInfo, this, &CloudProviderWrapper::slotUpdateProgress); + connect(_folder, &Folder::syncStarted, this, &CloudProviderWrapper::slotSyncStarted); + connect(_folder, &Folder::syncFinished, this, &CloudProviderWrapper::slotSyncFinished); + connect(_folder, &Folder::syncPausedChanged, this, &CloudProviderWrapper::slotSyncPausedChanged); _paused = _folder->syncPaused(); updatePauseStatus(); diff --git a/src/gui/remotewipe.cpp b/src/gui/remotewipe.cpp index 362ab0386..c22d49569 100644 --- a/src/gui/remotewipe.cpp +++ b/src/gui/remotewipe.cpp @@ -58,8 +58,8 @@ void RemoteWipe::startCheckJobWithAppPassword(QString pwd){ QUrlQuery arguments(QString("token=%1").arg(_appPassword)); requestBody->setData(arguments.query(QUrl::FullyEncoded).toLatin1()); _networkReplyCheck = _networkManager.post(request, requestBody); - QObject::connect(&_networkManager, SIGNAL(sslErrors(QNetworkReply *, QList)), - _account.data(), SLOT(slotHandleSslErrors(QNetworkReply *, QList))); + QObject::connect(&_networkManager, &QNetworkAccessManager::sslErrors, + _account.data(), &Account::slotHandleSslErrors); QObject::connect(_networkReplyCheck, &QNetworkReply::finished, this, &RemoteWipe::checkJobSlot); } diff --git a/src/gui/wizard/slideshow.cpp b/src/gui/wizard/slideshow.cpp index 34c702978..742322721 100644 --- a/src/gui/wizard/slideshow.cpp +++ b/src/gui/wizard/slideshow.cpp @@ -74,7 +74,7 @@ void SlideShow::setCurrentSlide(int index) _animation->setDuration(SlideDuration); _animation->setEasingCurve(QEasingCurve::OutCubic); _animation->setStartValue(static_cast(_currentIndex)); - connect(_animation.data(), SIGNAL(valueChanged(QVariant)), this, SLOT(update())); + connect(_animation.data(), &QVariantAnimation::valueChanged, this, qOverload<>(&SlideShow::update)); } _animation->setEndValue(static_cast(index)); _animation->start(QAbstractAnimation::DeleteWhenStopped); diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 9840431cf..f9f343787 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -267,8 +267,8 @@ void Account::setCredentials(AbstractCredentials *cred) if (proxy.type() != QNetworkProxy::DefaultProxy) { _am->setProxy(proxy); } - connect(_am.data(), SIGNAL(sslErrors(QNetworkReply *, QList)), - SLOT(slotHandleSslErrors(QNetworkReply *, QList))); + connect(_am.data(), &QNetworkAccessManager::sslErrors, + this, &Account::slotHandleSslErrors); connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &Account::proxyAuthenticationRequired); connect(_credentials.data(), &AbstractCredentials::fetched, @@ -376,8 +376,8 @@ void Account::resetNetworkAccessManager() _am->setCookieJar(jar); // takes ownership of the old cookie jar _am->setProxy(proxy); // Remember proxy (issue #2108) - connect(_am.data(), SIGNAL(sslErrors(QNetworkReply *, QList)), - SLOT(slotHandleSslErrors(QNetworkReply *, QList))); + connect(_am.data(), &QNetworkAccessManager::sslErrors, + this, &Account::slotHandleSslErrors); connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &Account::proxyAuthenticationRequired); } diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index 1b4ca98b6..e1754a63a 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -538,7 +538,7 @@ public: Q_ARG(PropagatorJob::AbortType, PropagatorJob::AbortType::Asynchronous)); // Give asynchronous abort 5000 msec to finish on its own - QTimer::singleShot(5000, this, SLOT(abortTimeout())); + QTimer::singleShot(5000, this, &OwncloudPropagator::abortTimeout); } else { // No root job, call emitFinished emitFinished(SyncFileItem::NormalError); diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 8d24e2863..8e5460d86 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -559,7 +559,7 @@ public: void execUntilItemCompleted(const QString &relativePath); 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/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp index 3d2bb076d..c72e0e7bd 100644 --- a/test/testchecksumvalidator.cpp +++ b/test/testchecksumvalidator.cpp @@ -125,7 +125,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); @@ -134,7 +134,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; @@ -146,7 +146,7 @@ using namespace OCC::Utility; auto *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); @@ -154,7 +154,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; @@ -165,7 +165,7 @@ using namespace OCC::Utility; auto *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); @@ -174,7 +174,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; diff --git a/test/testdownload.cpp b/test/testdownload.cpp index 9c0431cf8..0f2f65164 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 35828796a..d57358d37 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 9509c7573..16b941638 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -341,7 +341,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. @@ -355,7 +355,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/testsyncfilestatustracker.cpp b/test/testsyncfilestatustracker.cpp index 8abaea6b4..1bf80d0fa 100644 --- a/test/testsyncfilestatustracker.cpp +++ b/test/testsyncfilestatustracker.cpp @@ -16,7 +16,7 @@ class StatusPushSpy : public QSignalSpy SyncEngine &_syncEngine; public: StatusPushSpy(SyncEngine &syncEngine) - : QSignalSpy(&syncEngine.syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString&, SyncFileStatus))) + : QSignalSpy(&syncEngine.syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged) , _syncEngine(syncEngine) { } diff --git a/test/testxmlparse.cpp b/test/testxmlparse.cpp index 8bc987a52..9d186cb7f 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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(!parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/dav/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&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(false == parser.parse( testXml, &sizes, "/oc/remote.php/dav/sharefolder" )); @@ -455,12 +455,12 @@ private slots: LsColXMLParser parser; - connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)), - this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) ); - connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(parser.parse( testXml, &sizes, "/oc/remote.php/dav/sharefolder" )); @@ -529,12 +529,12 @@ private slots: LsColXMLParser parser; - connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)), - this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) ); - connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(!parser.parse( testXml, &sizes, "/oc/remote.php/dav/sharefolder" )); @@ -594,12 +594,12 @@ private slots: LsColXMLParser parser; - connect( &parser, SIGNAL(directoryListingSubfolders(const QStringList&)), - this, SLOT(slotDirectoryListingSubFolders(const QStringList&)) ); - connect( &parser, SIGNAL(directoryListingIterated(const QString&, const QMap&)), - this, SLOT(slotDirectoryListingIterated(const QString&, const QMap&)) ); - 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 sizes; QVERIFY(parser.parse( testXml, &sizes, QString::fromUtf8("/รค") ));