diff --git a/src/libs/ssh/sshremoteprocessrunner.cpp b/src/libs/ssh/sshremoteprocessrunner.cpp index 848ff0910dd..a6cc6b6ba0d 100644 --- a/src/libs/ssh/sshremoteprocessrunner.cpp +++ b/src/libs/ssh/sshremoteprocessrunner.cpp @@ -148,7 +148,7 @@ void SshRemoteProcessRunner::handleProcessFinished() d->m_exitCode = d->m_process->exitCode(); d->m_errorString = d->m_process->errorString(); setState(Inactive); - emit processClosed(d->m_errorString); + emit processClosed(); } void SshRemoteProcessRunner::setState(int newState) diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h index 9003bba3e92..c4174007ab0 100644 --- a/src/libs/ssh/sshremoteprocessrunner.h +++ b/src/libs/ssh/sshremoteprocessrunner.h @@ -57,7 +57,7 @@ signals: void processStarted(); void readyReadStandardOutput(); void readyReadStandardError(); - void processClosed(const QString &error); + void processClosed(); private: void handleConnected(); diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp index 20192d6aad6..dcd1dbc7794 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp @@ -66,8 +66,9 @@ void QdbMakeDefaultAppService::handleStdErr() emit stdErrData(QString::fromUtf8(d->processRunner->readAllStandardError())); } -void QdbMakeDefaultAppService::handleProcessFinished(const QString &error) +void QdbMakeDefaultAppService::handleProcessFinished() { + const QString error = d->processRunner->errorString(); if (!error.isEmpty()) { emit errorMessage(tr("Remote process failed: %1").arg(error)); stopDeployment(); diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.h b/src/plugins/boot2qt/qdbmakedefaultappservice.h index cab4b4cb331..f66ee0fc808 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.h +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.h @@ -42,7 +42,7 @@ public: private: void handleStdErr(); - void handleProcessFinished(const QString &error); + void handleProcessFinished(); bool isDeploymentNecessary() const final { return true; } diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp index fb03b55bb6e..5d8ecb6cc96 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp @@ -73,8 +73,9 @@ void SshDeviceProcessList::handleConnectionError() reportError(tr("Connection failure: %1").arg(d->process.lastConnectionErrorString())); } -void SshDeviceProcessList::handleListProcessFinished(const QString &error) +void SshDeviceProcessList::handleListProcessFinished() { + const QString error = d->process.errorString(); setFinished(); if (!error.isEmpty()) { handleProcessError(error); diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h index 60937e65cc0..79af7adca82 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h @@ -40,7 +40,7 @@ public: private: void handleConnectionError(); - void handleListProcessFinished(const QString &error); + void handleListProcessFinished(); void handleKillProcessFinished(const QString &errorString); virtual QString listProcessesCommandLine() const = 0; diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp index a7edee9c158..5b328ec5643 100644 --- a/src/plugins/qnx/qnxdevicetester.cpp +++ b/src/plugins/qnx/qnxdevicetester.cpp @@ -145,8 +145,9 @@ void QnxDeviceTester::handleVarRunProcessFinished(const QString &error) testNextCommand(); } -void QnxDeviceTester::handleProcessFinished(const QString &error) +void QnxDeviceTester::handleProcessFinished() { + const QString error = m_processRunner->errorString(); if (m_state == VarRunTest) { handleVarRunProcessFinished(error); return; diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h index 21c555e5381..e5f3a413209 100644 --- a/src/plugins/qnx/qnxdevicetester.h +++ b/src/plugins/qnx/qnxdevicetester.h @@ -45,8 +45,7 @@ public: private slots: void handleGenericTestFinished(ProjectExplorer::DeviceTester::TestResult result); - - void handleProcessFinished(const QString &error); + void handleProcessFinished(); void handleConnectionError(); private: diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index 8e6ca8eb9b6..41613633ba8 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -115,8 +115,9 @@ void RemoteLinuxCustomCommandDeployService::handleStderr() emit stdErrData(QString::fromUtf8(d->runner->readAllStandardError())); } -void RemoteLinuxCustomCommandDeployService::handleProcessClosed(const QString &error) +void RemoteLinuxCustomCommandDeployService::handleProcessClosed() { + const QString error = d->runner->errorString(); QTC_ASSERT(d->state == Running, return); if (!error.isEmpty()) { diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h index ee0ff0ebcc1..c6f07ff99c3 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h @@ -50,7 +50,7 @@ protected: private: void handleStdout(); void handleStderr(); - void handleProcessClosed(const QString &error); + void handleProcessClosed(); Internal::RemoteLinuxCustomCommandDeployservicePrivate *d; }; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp index 33d40950987..69ad1b0eb3f 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp @@ -99,8 +99,9 @@ void AbstractRemoteLinuxPackageInstaller::handleConnectionError() setFinished(); } -void AbstractRemoteLinuxPackageInstaller::handleInstallationFinished(const QString &error) +void AbstractRemoteLinuxPackageInstaller::handleInstallationFinished() { + const QString error = d->installer->errorString(); if (!d->isRunning) return; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h index ddf713eda28..3f4ce9d7ccb 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h @@ -54,7 +54,7 @@ protected: private: void handleConnectionError(); - void handleInstallationFinished(const QString &error); + void handleInstallationFinished(); void handleInstallerOutput(); void handleInstallerErrorOutput();