diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index 14f54e89cd2..89cca7dd664 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -53,7 +53,7 @@ WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl, WinRtRunnerHelper * , m_debugRunControl(runControl) , m_runner(runner) { - connect(m_debugRunControl, SIGNAL(finished()), this, SLOT(finish())); + connect(m_debugRunControl, &RunControl::finished, this, &WinRtDebugSupport::finish); } bool WinRtDebugSupport::useQmlDebugging(WinRtRunConfiguration *runConfig) diff --git a/src/plugins/winrt/winrtdebugsupport.h b/src/plugins/winrt/winrtdebugsupport.h index 82705576fa1..32869bba3bb 100644 --- a/src/plugins/winrt/winrtdebugsupport.h +++ b/src/plugins/winrt/winrtdebugsupport.h @@ -47,14 +47,13 @@ public: private: WinRtDebugSupport(ProjectExplorer::RunControl *runControl, WinRtRunnerHelper *runner); + void finish(); + static bool useQmlDebugging(WinRtRunConfiguration *runConfig); static bool getFreePort(Utils::Port &qmlDebuggerPort, QString *errorMessage); ProjectExplorer::RunControl *m_debugRunControl; WinRtRunnerHelper *m_runner; - -private slots: - void finish(); }; } // namespace Internal diff --git a/src/plugins/winrt/winrtdevicefactory.cpp b/src/plugins/winrt/winrtdevicefactory.cpp index 900d88faf1d..1462534af9d 100644 --- a/src/plugins/winrt/winrtdevicefactory.cpp +++ b/src/plugins/winrt/winrtdevicefactory.cpp @@ -102,9 +102,12 @@ void WinRtDeviceFactory::autoDetect() if (!m_process) { m_process = new Utils::QtcProcess(this); - connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(onProcessError())); - connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(onProcessFinished(int,QProcess::ExitStatus))); + connect(m_process, + static_cast(&QProcess::error), + this, &WinRtDeviceFactory::onProcessError); + connect(m_process, + static_cast(&QProcess::finished), + this, &WinRtDeviceFactory::onProcessFinished); } const QString args = QStringLiteral("--list-devices"); diff --git a/src/plugins/winrt/winrtdevicefactory.h b/src/plugins/winrt/winrtdevicefactory.h index edb938e806f..a3729de0888 100644 --- a/src/plugins/winrt/winrtdevicefactory.h +++ b/src/plugins/winrt/winrtdevicefactory.h @@ -43,15 +43,13 @@ public: bool canRestore(const QVariantMap &map) const; ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const; -public slots: void autoDetect(); void onPrerequisitesLoaded(); -private slots: +private: void onProcessError(); void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); -private: static bool allPrerequisitesLoaded(); QString findRunnerFilePath() const; void parseRunnerOutput(const QByteArray &output) const; diff --git a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h index 14be99b2dca..31a30aaff6a 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h +++ b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h @@ -44,11 +44,10 @@ public: virtual QString summaryText() const; virtual QString displayName() const; -private slots: +private: void on_btnRestoreDefaultArgs_clicked(); void on_leArguments_textChanged(QString str); -private: Ui::WinRtPackageDeploymentStepWidget *m_ui; WinRtPackageDeploymentStep *m_step; }; diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h index bfff934ffb5..dc4d6e15e60 100644 --- a/src/plugins/winrt/winrtrunconfiguration.h +++ b/src/plugins/winrt/winrtrunconfiguration.h @@ -45,14 +45,12 @@ public: const QString &proFilePath() const { return m_proFilePath; } QString arguments() const; bool uninstallAfterStop() const { return m_uninstallAfterStop; } + void setUninstallAfterStop(bool b); signals: void argumentsChanged(QString); void uninstallAfterStopChanged(bool); -public slots: - void setUninstallAfterStop(bool b); - private: QString m_proFilePath; bool m_uninstallAfterStop; diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp index 900b9ea49da..9bb06b086a4 100644 --- a/src/plugins/winrt/winrtruncontrol.cpp +++ b/src/plugins/winrt/winrtruncontrol.cpp @@ -108,9 +108,9 @@ bool WinRtRunControl::startWinRtRunner() { QTC_ASSERT(!m_runner, return false); m_runner = new WinRtRunnerHelper(this); - connect(m_runner, SIGNAL(started()), SLOT(onProcessStarted())); - connect(m_runner, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(onProcessFinished())); - connect(m_runner, SIGNAL(error(QProcess::ProcessError)), SLOT(onProcessError())); + connect(m_runner, &WinRtRunnerHelper::started, this, &WinRtRunControl::onProcessStarted); + connect(m_runner, &WinRtRunnerHelper::finished, this, &WinRtRunControl::onProcessFinished); + connect(m_runner, &WinRtRunnerHelper::error, this, &WinRtRunControl::onProcessError); m_state = StartingState; m_runner->start(); return true; diff --git a/src/plugins/winrt/winrtruncontrol.h b/src/plugins/winrt/winrtruncontrol.h index e7238d7cad2..7f69fc5af16 100644 --- a/src/plugins/winrt/winrtruncontrol.h +++ b/src/plugins/winrt/winrtruncontrol.h @@ -54,13 +54,12 @@ public: StopResult stop() override; bool isRunning() const override; -private slots: +private: + enum State { StartingState, StartedState, StoppedState }; + void onProcessStarted(); void onProcessFinished(); void onProcessError(); - -private: - enum State { StartingState, StartedState, StoppedState }; bool startWinRtRunner(); WinRtRunConfiguration *m_runConfiguration; diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp index f8d591a1d11..038e35a8507 100644 --- a/src/plugins/winrt/winrtrunnerhelper.cpp +++ b/src/plugins/winrt/winrtrunnerhelper.cpp @@ -228,13 +228,14 @@ void WinRtRunnerHelper::startWinRtRunner(const RunConf &conf) appendMessage(QStringLiteral("winrtrunner ") + runnerArgs + QLatin1Char('\n'), NormalMessageFormat); if (connectProcess) { - connect(process, SIGNAL(started()), SIGNAL(started())); - connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(onProcessFinished(int,QProcess::ExitStatus))); - connect(process, SIGNAL(error(QProcess::ProcessError)), - SLOT(onProcessError(QProcess::ProcessError))); - connect(process, SIGNAL(readyReadStandardOutput()), SLOT(onProcessReadyReadStdOut())); - connect(process, SIGNAL(readyReadStandardError()), SLOT(onProcessReadyReadStdErr())); + connect(process, &QProcess::started, this, &WinRtRunnerHelper::started); + connect(process, + static_cast(&QProcess::finished), + this, &WinRtRunnerHelper::onProcessFinished); + connect(process, static_cast(&QProcess::error), + this, &WinRtRunnerHelper::onProcessError); + connect(process, &QProcess::readyReadStandardOutput, this, &WinRtRunnerHelper::onProcessReadyReadStdOut); + connect(process, &QProcess::readyReadStandardError, this, &WinRtRunnerHelper::onProcessReadyReadStdErr); } process->setUseCtrlCStub(true); diff --git a/src/plugins/winrt/winrtrunnerhelper.h b/src/plugins/winrt/winrtrunnerhelper.h index 0963ff0b1be..743b5dc8c0e 100644 --- a/src/plugins/winrt/winrtrunnerhelper.h +++ b/src/plugins/winrt/winrtrunnerhelper.h @@ -63,14 +63,14 @@ signals: void finished(int exitCode, QProcess::ExitStatus exitStatus); void error(QProcess::ProcessError error); -private slots: +private: + enum RunConf { Start, Stop, Debug }; + void onProcessReadyReadStdOut(); void onProcessReadyReadStdErr(); void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); void onProcessError(QProcess::ProcessError processError); -private: - enum RunConf { Start, Stop, Debug }; void startWinRtRunner(const RunConf &conf); bool init(WinRtRunConfiguration *runConfiguration, QString *errorMessage); void appendMessage(const QString &message, Utils::OutputFormat format);