Convert to Qt 5 connect syntax

Convert to new signal/slot syntax where it does not make things more
complicated: connections where the signal or slot is an overloaded
method, or where the receiver method is not in a QObject, are left alone.

The new syntax allows compile-time checking of the connection.

Change-Id: I2cc3c93b9812797bd67f64a8728569491eeec668
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

4 files changed, 23 insertions, 16 deletions

diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 15c9bb1f5..2f916a81d 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -87,7 +87,8 @@ MaintenanceGui::MaintenanceGui(PackageManagerCore *core)
     }
 
     IntroductionPage *intro = new IntroductionPage(core);
-    connect(intro, SIGNAL(packageManagerCoreTypeChanged()), this, SLOT(updateRestartPage()));
+    connect(intro, &IntroductionPage::packageManagerCoreTypeChanged,
+            this, &MaintenanceGui::updateRestartPage);
 
     setPage(PackageManagerCore::Introduction, intro);
     setPage(PackageManagerCore::ComponentSelection, new ComponentSelectionPage(core));
@@ -97,7 +98,7 @@ MaintenanceGui::MaintenanceGui(PackageManagerCore *core)
     setPage(PackageManagerCore::InstallationFinished, new FinishedPage(core));
 
     RestartPage *p = new RestartPage(core);
-    connect(p, SIGNAL(restart()), this, SIGNAL(gotRestarted()));
+    connect(p, &RestartPage::restart, this, &PackageManagerGui::gotRestarted);
     setPage(PackageManagerCore::InstallationFinished + 1, p);
 
     if (core->isUninstaller())
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index cda9c932a..5ae5a7f29 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 #endif
 
         QInstaller::RemoteServer *server = new QInstaller::RemoteServer;
-        QObject::connect(server, SIGNAL(destroyed()), &app, SLOT(quit()));
+        QObject::connect(server, &QInstaller::RemoteServer::destroyed, &app, &decltype(app)::quit);
         server->init(socketName, key, (production ? QInstaller::Protocol::Mode::Production
             : QInstaller::Protocol::Mode::Debug));
 
diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index 6fd54244a..229568931 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -227,13 +227,18 @@ SettingsDialog::SettingsDialog(PackageManagerCore *core, QWidget *parent)
     m_ui->m_httpProxy->setText(httpProxy.hostName());
     m_ui->m_httpProxyPort->setValue(httpProxy.port());
 
-    connect(m_ui->m_addRepository, SIGNAL(clicked()), this, SLOT(addRepository()));
-    connect(m_ui->m_showPasswords, SIGNAL(clicked()), this, SLOT(updatePasswords()));
-    connect(m_ui->m_removeRepository, SIGNAL(clicked()), this, SLOT(removeRepository()));
-    connect(m_ui->m_useTmpRepositories, SIGNAL(clicked(bool)), this, SLOT(useTmpRepositoriesOnly(bool)));
-    connect(m_ui->m_repositoriesView, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-        this, SLOT(currentRepositoryChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
-    connect(m_ui->m_testRepository, SIGNAL(clicked()), this, SLOT(testRepository()));
+    connect(m_ui->m_addRepository, &QAbstractButton::clicked,
+            this, &SettingsDialog::addRepository);
+    connect(m_ui->m_showPasswords, &QAbstractButton::clicked,
+            this, &SettingsDialog::updatePasswords);
+    connect(m_ui->m_removeRepository, &QAbstractButton::clicked,
+            this, &SettingsDialog::removeRepository);
+    connect(m_ui->m_useTmpRepositories, &QAbstractButton::clicked,
+            this, &SettingsDialog::useTmpRepositoriesOnly);
+    connect(m_ui->m_repositoriesView, &QTreeWidget::currentItemChanged,
+        this, &SettingsDialog::currentRepositoryChanged);
+    connect(m_ui->m_testRepository, &QAbstractButton::clicked,
+            this, &SettingsDialog::testRepository);
 
     useTmpRepositoriesOnly(settings.hasReplacementRepos());
     m_ui->m_useTmpRepositories->setChecked(settings.hasReplacementRepos());
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index 80eb29ed5..394f953fa 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -95,7 +95,7 @@ TabController::~TabController()
 void TabController::setGui(QInstaller::PackageManagerGui *gui)
 {
     d->m_gui = gui;
-    connect(d->m_gui, SIGNAL(gotRestarted()), this, SLOT(restartWizard()));
+    connect(d->m_gui, &PackageManagerGui::gotRestarted, this, &TabController::restartWizard);
 }
 
 void TabController::setControlScript(const QString &script)
@@ -125,8 +125,9 @@ int TabController::init()
             qDebug() << "Using control script:" << d->m_controlScript;
         }
 
-        connect(d->m_gui, SIGNAL(currentIdChanged(int)), this, SLOT(onCurrentIdChanged(int)));
-        connect(d->m_gui, SIGNAL(settingsButtonClicked()), this, SLOT(onSettingsButtonClicked()));
+        connect(d->m_gui, &QWizard::currentIdChanged, this, &TabController::onCurrentIdChanged);
+        connect(d->m_gui, &PackageManagerGui::settingsButtonClicked,
+                this, &TabController::onSettingsButtonClicked);
     }
 
     IntroductionPage *page =
@@ -169,14 +170,14 @@ void TabController::restartWizard()
     d->m_core->writeMaintenanceTool();
 
     // restart and switch back to intro page
-    QTimer::singleShot(0, this, SLOT(init()));
+    QTimer::singleShot(0, this, &TabController::init);
 }
 
 void TabController::onSettingsButtonClicked()
 {
     SettingsDialog dialog(d->m_core);
-    connect (&dialog, SIGNAL(networkSettingsChanged(QInstaller::Settings)), this,
-        SLOT(onNetworkSettingsChanged(QInstaller::Settings)));
+    connect(&dialog, &SettingsDialog::networkSettingsChanged,
+            this, &TabController::onNetworkSettingsChanged);
     dialog.exec();
 
     if (d->m_networkSettingsChanged) {