Port to new signal-slot syntax what cannot be done automatically

Some slot were protected or private but needed to be public.
Some needed a static_cast (can't use qOverload because it is in Qt 5.7)

This is not only a partial change.

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 63ad888609c5ebc770ed83286a80808f0bfddd1c..580f3b31ee1bd10333f9438aa8bf722201f309bd 100644 (file)
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -201,8 +201,8 @@ void AccountState::checkConnectivity()
 
     ConnectionValidator *conValidator = new ConnectionValidator(account());
     _connectionValidator = conValidator;
-    connect(conValidator, SIGNAL(connectionResult(ConnectionValidator::Status, QStringList)),
-        SLOT(slotConnectionValidatorResult(ConnectionValidator::Status, QStringList)));
+    connect(conValidator, &ConnectionValidator::connectionResult,
+        this, &AccountState::slotConnectionValidatorResult);
     if (isConnected()) {
         // Use a small authed propfind as a minimal ping when we're
         // already connected.

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 9091b80bc913de53a40644835fbe97352670f43c..b089fef9baf4f05f470af9c1b661a5313356fa8d 100644 (file)
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -90,8 +90,7 @@ ActivityWidget::ActivityWidget(QWidget *parent)
 
     connect(_model, &QAbstractItemModel::rowsInserted, this, &ActivityWidget::rowsInserted);
 
-    connect(_ui->_activityList, SIGNAL(activated(QModelIndex)), this,
-        SLOT(slotOpenFile(QModelIndex)));
+    connect(_ui->_activityList, &QListView::activated, this, &ActivityWidget::slotOpenFile);
 
     connect(&_removeTimer, &QTimer::timeout, this, &ActivityWidget::slotCheckToCleanWidgets);
     _removeTimer.setInterval(1000);
@@ -113,8 +112,8 @@ void ActivityWidget::slotRefreshNotifications(AccountState *ptr)
     // are running
     if (_notificationRequestsRunning == 0) {
         ServerNotificationHandler *snh = new ServerNotificationHandler;
-        connect(snh, SIGNAL(newNotificationList(ActivityList)), this,
-            SLOT(slotBuildNotificationDisplay(ActivityList)));
+        connect(snh, &ServerNotificationHandler::newNotificationList,
+            this, &ActivityWidget::slotBuildNotificationDisplay);
 
         snh->slotFetchNotifications(ptr);
     } else {
@@ -388,8 +387,8 @@ void ActivityWidget::slotSendNotificationRequest(const QString &accountName, con
             job->setWidget(theSender);
             connect(job, &AbstractNetworkJob::networkError,
                 this, &ActivityWidget::slotNotifyNetworkError);
-            connect(job, SIGNAL(jobFinished(QString, int)),
-                this, SLOT(slotNotifyServerFinished(QString, int)));
+            connect(job, &NotificationConfirmJob::jobFinished,
+                this, &ActivityWidget::slotNotifyServerFinished);
             job->start();
 
             // count the number of running notification requests. If this member var

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 73f79d0b93b7a0781a357f1d35050eba6dc84f1d..3f58f0bfc33bc46473adad0036ad0a712a9603e1 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -208,8 +208,8 @@ Application::Application(int &argc, char **argv)
     QTimer::singleShot(0, this, &Application::slotCheckConnection);
 
     // Can't use onlineStateChanged because it is always true on modern systems because of many interfaces
-    connect(&_networkConfigurationManager, SIGNAL(configurationChanged(QNetworkConfiguration)),
-        this, SLOT(slotSystemOnlineConfigurationChanged(QNetworkConfiguration)));
+    connect(&_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged,
+        this, &Application::slotSystemOnlineConfigurationChanged);
 
     // Update checks
     UpdaterScheduler *updaterScheduler = new UpdaterScheduler(this);

diff --git a/src/gui/application.h b/src/gui/application.h
index 099053def054fa2f0bdb9f40367a3f471604e9dc..47f7bee504dd4454a9112c530934188dc8c025d2 100644 (file)
--- a/src/gui/application.h
+++ b/src/gui/application.h
@@ -71,6 +71,7 @@ public:
 public slots:
     // TODO: this should not be public
     void slotownCloudWizardDone(int);
+    void slotCrash();
 
 protected:
     void parseOptions(const QStringList &);
@@ -90,7 +91,6 @@ protected slots:
     void slotCleanup();
     void slotAccountStateAdded(AccountState *accountState);
     void slotAccountStateRemoved(AccountState *accountState);
-    void slotCrash();
     void slotSystemOnlineConfigurationChanged(QNetworkConfiguration);
 
 private:

diff --git a/src/gui/creds/shibboleth/shibbolethwebview.cpp b/src/gui/creds/shibboleth/shibbolethwebview.cpp
index dbcd340b622609600e7822b030b7296b7b91fb80..4332cb95b7f263ea5f1bc35378d48e209bbb6357 100644 (file)
--- a/src/gui/creds/shibboleth/shibbolethwebview.cpp
+++ b/src/gui/creds/shibboleth/shibbolethwebview.cpp
@@ -29,6 +29,7 @@
 #include "accessmanager.h"
 #include "theme.h"
 #include "configfile.h"
+#include "cookiejar.h"
 
 namespace {
 const char ShibbolethWebViewGeometryC[] = "ShibbolethWebView/Geometry";
@@ -69,14 +70,13 @@ ShibbolethWebView::ShibbolethWebView(AccountPtr account, QWidget *parent)
         this, &ShibbolethWebView::slotLoadFinished);
 
     // Make sure to accept the same SSL certificate issues as the regular QNAM we use for syncing
-    QObject::connect(page->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
-        _account.data(), SLOT(slotHandleSslErrors(QNetworkReply *, QList<QSslError>)));
+    QObject::connect(page->networkAccessManager(), &QNetworkAccessManager::sslErrors,
+        _account.data(), &Account::slotHandleSslErrors);
 
     // The Account keeps ownership of the cookie jar, it must outlive this webview.
     account->lendCookieJarTo(page->networkAccessManager());
-    connect(page->networkAccessManager()->cookieJar(),
-        SIGNAL(newCookiesForUrl(QList<QNetworkCookie>, QUrl)),
-        this, SLOT(onNewCookiesForUrl(QList<QNetworkCookie>, QUrl)));
+    connect(static_cast<CookieJar *>(page->networkAccessManager()->cookieJar()), &CookieJar::newCookiesForUrl,
+        this, &ShibbolethWebView::onNewCookiesForUrl);
 
     page->mainFrame()->load(account->url());
     this->setPage(page);

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 6418cd70b1aa4e182763297d09726b0762613abf..b819e75692e2ccc0c1cc9cfc3d2c455555a34d16 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -117,8 +117,8 @@ void FolderMan::unloadFolder(Folder *f)
         this, &FolderMan::slotForwardFolderSyncStateChange);
     disconnect(f, &Folder::syncPausedChanged,
         this, &FolderMan::slotFolderSyncPaused);
-    disconnect(&f->syncEngine().syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString &, SyncFileStatus)),
-        _socketApi.data(), SLOT(broadcastStatusPushMessage(const QString &, SyncFileStatus)));
+    disconnect(&f->syncEngine().syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged,
+        _socketApi.data(), &SocketApi::broadcastStatusPushMessage);
     disconnect(f, &Folder::watchedFileChangedExternally,
         &f->syncEngine().syncFileStatusTracker(), &SyncFileStatusTracker::slotPathTouched);
 }
@@ -959,8 +959,8 @@ Folder *FolderMan::addFolderInternal(FolderDefinition folderDefinition,
     connect(folder, &Folder::syncStateChange, this, &FolderMan::slotForwardFolderSyncStateChange);
     connect(folder, &Folder::syncPausedChanged, this, &FolderMan::slotFolderSyncPaused);
     connect(folder, &Folder::canSyncChanged, this, &FolderMan::slotFolderCanSyncChanged);
-    connect(&folder->syncEngine().syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString &, SyncFileStatus)),
-        _socketApi.data(), SLOT(broadcastStatusPushMessage(const QString &, SyncFileStatus)));
+    connect(&folder->syncEngine().syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged,
+        _socketApi.data(), &SocketApi::broadcastStatusPushMessage);
     connect(folder, &Folder::watchedFileChangedExternally,
         &folder->syncEngine().syncFileStatusTracker(), &SyncFileStatusTracker::slotPathTouched);
 

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 2a244badd65deb12db0ad4f3c4075a3e5e670ed0..441ece4e08a775f8aa6a500a4576bff2fb60c5e1 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -198,8 +198,8 @@ void FolderWizardRemotePath::slotCreateRemoteFolder(const QString &folder)
 
     MkColJob *job = new MkColJob(_account, fullPath, this);
     /* check the owncloud configuration file and query the ownCloud */
-    connect(job, SIGNAL(finished(QNetworkReply::NetworkError)),
-        SLOT(slotCreateRemoteFolderFinished(QNetworkReply::NetworkError)));
+    connect(job, static_cast<void (MkColJob::*)(QNetworkReply::NetworkError)>(&MkColJob::finished),
+        this, &FolderWizardRemotePath::slotCreateRemoteFolderFinished);
     connect(job, &AbstractNetworkJob::networkError, this, &FolderWizardRemotePath::slotHandleMkdirNetworkError);
     job->start();
 }

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 5a035c4c2fcec3cf43b741f0dd700125e7d200f7..91d3a0c1f3d3d2b77928c39694352e8867f52b14 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -66,7 +66,7 @@ GeneralSettings::GeneralSettings(QWidget *parent)
     connect(_ui->monoIconsCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings);
     connect(_ui->crashreporterCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings);
     connect(_ui->newFolderLimitCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings);
-    connect(_ui->newFolderLimitSpinBox, SIGNAL(valueChanged(int)), SLOT(saveMiscSettings()));
+    connect(_ui->newFolderLimitSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &GeneralSettings::saveMiscSettings);
     connect(_ui->newExternalStorage, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings);
 
 #ifndef WITH_CRASHREPORTER
@@ -126,7 +126,7 @@ void GeneralSettings::slotUpdateInfo()
     if (updater) {
         connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
         connect(_ui->restartButton, &QAbstractButton::clicked, updater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
-        connect(_ui->restartButton, SIGNAL(clicked()), qApp, SLOT(quit()), Qt::UniqueConnection);
+        connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
         _ui->updateStateLabel->setText(updater->statusString());
         _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
     } else {

diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp
index 267098541b771f2152d5156921daed499122bacb..edc984a7da2f5dd4e8be8aef77cc3e01a5a1186a 100644 (file)
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -56,9 +56,9 @@ IssuesWidget::IssuesWidget(QWidget *parent)
 
     connect(_ui->showIgnores, &QAbstractButton::toggled, this, &IssuesWidget::slotRefreshIssues);
     connect(_ui->showWarnings, &QAbstractButton::toggled, this, &IssuesWidget::slotRefreshIssues);
-    connect(_ui->filterAccount, SIGNAL(currentIndexChanged(int)), SLOT(slotRefreshIssues()));
-    connect(_ui->filterAccount, SIGNAL(currentIndexChanged(int)), SLOT(slotUpdateFolderFilters()));
-    connect(_ui->filterFolder, SIGNAL(currentIndexChanged(int)), SLOT(slotRefreshIssues()));
+    connect(_ui->filterAccount, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &IssuesWidget::slotRefreshIssues);
+    connect(_ui->filterAccount, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &IssuesWidget::slotUpdateFolderFilters);
+    connect(_ui->filterFolder, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &IssuesWidget::slotRefreshIssues);
     for (auto account : AccountManager::instance()->accounts()) {
         slotAccountAdded(account.data());
     }

diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
index eb19f7193b3dd1d636ea0f2f214eebb3a78de7d9..a981d80c553398563660aaa672e08f07d92a8492 100644 (file)
--- a/src/gui/networksettings.cpp
+++ b/src/gui/networksettings.cpp
@@ -57,8 +57,8 @@ NetworkSettings::NetworkSettings(QWidget *parent)
     loadBWLimitSettings();
 
     // proxy
-    connect(_ui->typeComboBox, SIGNAL(currentIndexChanged(int)), SLOT(saveProxySettings()));
-    connect(_ui->proxyButtonGroup, SIGNAL(buttonClicked(int)), SLOT(saveProxySettings()));
+    connect(_ui->typeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NetworkSettings::saveProxySettings);
+    connect(_ui->proxyButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &NetworkSettings::saveProxySettings);
     connect(_ui->hostLineEdit, &QLineEdit::editingFinished, this, &NetworkSettings::saveProxySettings);
     connect(_ui->userLineEdit, &QLineEdit::editingFinished, this, &NetworkSettings::saveProxySettings);
     connect(_ui->passwordLineEdit, &QLineEdit::editingFinished, this, &NetworkSettings::saveProxySettings);
@@ -71,8 +71,8 @@ NetworkSettings::NetworkSettings(QWidget *parent)
     connect(_ui->downloadLimitRadioButton, &QAbstractButton::clicked, this, &NetworkSettings::saveBWLimitSettings);
     connect(_ui->noDownloadLimitRadioButton, &QAbstractButton::clicked, this, &NetworkSettings::saveBWLimitSettings);
     connect(_ui->autoDownloadLimitRadioButton, &QAbstractButton::clicked, this, &NetworkSettings::saveBWLimitSettings);
-    connect(_ui->downloadSpinBox, SIGNAL(valueChanged(int)), SLOT(saveBWLimitSettings()));
-    connect(_ui->uploadSpinBox, SIGNAL(valueChanged(int)), SLOT(saveBWLimitSettings()));
+    connect(_ui->downloadSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &NetworkSettings::saveBWLimitSettings);
+    connect(_ui->uploadSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &NetworkSettings::saveBWLimitSettings);
 }
 
 NetworkSettings::~NetworkSettings()

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index ad9b7bf9def31a3a72490af8685bbf4a9ff2aa52..0d2fcffd189253e55cc50176720979dec4e59958 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -701,7 +701,7 @@ void ownCloudGui::setupActions()
 
     if (_app->debugMode()) {
         _actionCrash = new QAction(tr("Crash now", "Only shows in debug mode to allow testing the crash handler"), this);
-        connect(_actionCrash, SIGNAL(triggered()), _app, SLOT(slotCrash()));
+        connect(_actionCrash, &QAction::triggered, _app, &Application::slotCrash);
     } else {
         _actionCrash = 0;
     }

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 1457967f7e9f29931e1ed858a097d45da44f7dd1..87d2bdc22cfaf2a0abc2895a464e8e56da49d7b9 100644 (file)
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -460,7 +460,7 @@ void SelectiveSyncDialog::init(const AccountPtr &account)
     layout->addWidget(_selectiveSync);
     QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal);
     _okButton = buttonBox->addButton(QDialogButtonBox::Ok);
-    connect(_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(_okButton, &QPushButton::clicked, this, &SelectiveSyncDialog::accept);
     QPushButton *button;
     button = buttonBox->addButton(QDialogButtonBox::Cancel);
     connect(button, &QAbstractButton::clicked, this, &QDialog::reject);

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index f67dcaca0a6b75651bef0f6a72adf15f62443d43..a266157db7aa759e1fd4723cecc7c498f2dbec29 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -93,7 +93,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     // People perceive this as a Window, so also make Ctrl+W work
     QAction *closeWindowAction = new QAction(this);
     closeWindowAction->setShortcut(QKeySequence("Ctrl+W"));
-    connect(closeWindowAction, SIGNAL(triggered()), SLOT(accept()));
+    connect(closeWindowAction, &QAction::triggered, this, &SettingsDialog::accept);
     addAction(closeWindowAction);
 
     setObjectName("Settings"); // required as group for saveGeometry call

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 3f542c0d38519d6b6fe8b26605e7219496454491..58d3ca474127f73a405ce59da18839d1f44e4f04 100644 (file)
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -170,7 +170,7 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
     if (sharingPossible) {
         _manager = new ShareManager(_account, this);
         connect(_manager, &ShareManager::sharesFetched, this, &ShareLinkWidget::slotSharesFetched);
-        connect(_manager, SIGNAL(linkShareCreated(QSharedPointer<LinkShare>)), SLOT(slotCreateShareFetched(const QSharedPointer<LinkShare>)));
+        connect(_manager, &ShareManager::linkShareCreated, this, &ShareLinkWidget::slotCreateShareFetched);
         connect(_manager, &ShareManager::linkShareRequiresPassword, this, &ShareLinkWidget::slotCreateShareRequiresPassword);
         connect(_manager, &ShareManager::serverError, this, &ShareLinkWidget::slotServerError);
     }
@@ -436,7 +436,7 @@ void ShareLinkWidget::slotDeleteShareFetched()
     getShares();
 }
 
-void ShareLinkWidget::slotCreateShareFetched(const QSharedPointer<LinkShare> share)
+void ShareLinkWidget::slotCreateShareFetched(const QSharedPointer<LinkShare> &share)
 {
     _pi_create->stopAnimation();
     _pi_password->stopAnimation();

diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h
index 1d8397505c54670b91c27b38b3e1690521eae4f2..e6773fb71087de7628df8881b14c2d36f292d467 100644 (file)
--- a/src/gui/sharelinkwidget.h
+++ b/src/gui/sharelinkwidget.h
@@ -74,7 +74,7 @@ private slots:
     void slotShareLinkActionTriggered(QAction *action);
 
     void slotDeleteShareFetched();
-    void slotCreateShareFetched(const QSharedPointer<LinkShare> share);
+    void slotCreateShareFetched(const QSharedPointer<LinkShare> &share);
     void slotCreateShareRequiresPassword(const QString &message);
     void slotPasswordSet();
     void slotExpireSet();

diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h
index 25eb3c72ddb25660035b56265662fdfca5ad839b..e50a68fb7bec61af41c41da8eda934718174f013 100644 (file)
--- a/src/gui/socketapi.h
+++ b/src/gui/socketapi.h
@@ -53,6 +53,7 @@ public slots:
     void slotUpdateFolderView(Folder *f);
     void slotUnregisterPath(const QString &alias);
     void slotRegisterPath(const QString &alias);
+    void broadcastStatusPushMessage(const QString &systemPath, SyncFileStatus fileStatus);
 
 signals:
     void shareCommandReceived(const QString &sharePath, const QString &localPath);
@@ -62,7 +63,6 @@ private slots:
     void onLostConnection();
     void slotSocketDestroyed(QObject *obj);
     void slotReadSocket();
-    void broadcastStatusPushMessage(const QString &systemPath, SyncFileStatus fileStatus);
 
     void copyPrivateLinkToClipboard(const QString &link) const;
     void emailPrivateLink(const QString &link) const;

diff --git a/src/libsync/account.h b/src/libsync/account.h
index 4f300ce975b3c953cec74ad8de2d3383dd2810a5..249ff403d33c900d7c38e99cc072e2b2daa9002b 100644 (file)
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -225,6 +225,7 @@ public:
 public slots:
     /// Used when forgetting credentials
     void clearQNAMCache();
+    void slotHandleSslErrors(QNetworkReply *, QList<QSslError>);
 
 signals:
     /// Emitted whenever there's network activity
@@ -247,7 +248,6 @@ signals:
     void accountChangedAvatar();
 
 protected Q_SLOTS:
-    void slotHandleSslErrors(QNetworkReply *, QList<QSslError>);
     void slotCredentialsFetched();
     void slotCredentialsAsked();