SshRemoteProcessRunner: Unify API

Make the API more similar to QtcProcess API.
Drop process prefix for getters.

Change-Id: I21b99bb5b11956d923c0e526c08bbea9686e5c95
Reviewed-by: hjk <[email protected]>
Reviewed-by: <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

7 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
index 32d58dc5dce..fb03b55bb6e 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
@@ -80,14 +80,14 @@ void SshDeviceProcessList::handleListProcessFinished(const QString &error)
         handleProcessError(error);
         return;
     }
-    if (d->process.processExitCode() == 0) {
+    if (d->process.exitCode() == 0) {
         const QByteArray remoteStdout = d->process.readAllStandardOutput();
         const QString stdoutString
                 = QString::fromUtf8(remoteStdout.data(), remoteStdout.count());
         reportProcessListUpdated(buildProcessList(stdoutString));
     } else {
         handleProcessError(tr("Process listing command failed with exit code %1.")
-                           .arg(d->process.processExitCode()));
+                           .arg(d->process.exitCode()));
     }
 }
 
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index c2b704a3bad..a63ef4046bc 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -201,7 +201,7 @@ void QnxDeployQtLibrariesDialog::handleRemoteProcessCompleted()
 
     if (m_state == CheckingRemoteDirectory) {
         // Directory exists
-        if (m_processRunner->processExitCode() == 0) {
+        if (m_processRunner->exitCode() == 0) {
             int answer = QMessageBox::question(this, windowTitle(),
                                                tr("The remote directory \"%1\" already exists. "
                                                   "Deploying to that directory will remove any files "
@@ -217,7 +217,7 @@ void QnxDeployQtLibrariesDialog::handleRemoteProcessCompleted()
             startUpload();
         }
     } else if (m_state == RemovingRemoteDirectory) {
-        QTC_ASSERT(m_processRunner->processExitCode() == 0, return);
+        QTC_ASSERT(m_processRunner->exitCode() == 0, return);
 
         startUpload();
     }
diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp
index 17787274c0f..a7edee9c158 100644
--- a/src/plugins/qnx/qnxdevicetester.cpp
+++ b/src/plugins/qnx/qnxdevicetester.cpp
@@ -124,7 +124,7 @@ void QnxDeviceTester::handleVarRunProcessFinished(const QString &error)
     QTC_ASSERT(m_state == VarRunTest, return);
 
     if (error.isEmpty()) {
-        if (m_processRunner->processExitCode() == 0) {
+        if (m_processRunner->exitCode() == 0) {
             emit progressMessage(tr("Files can be created in /var/run.") + QLatin1Char('\n'));
         } else {
             emit errorMessage(tr("Files cannot be created in /var/run.") + QLatin1Char('\n'));
@@ -156,7 +156,7 @@ void QnxDeviceTester::handleProcessFinished(const QString &error)
 
     const QString command = m_commandsToTest[m_currentCommandIndex];
     if (error.isEmpty()) {
-        if (m_processRunner->processExitCode() == 0) {
+        if (m_processRunner->exitCode() == 0) {
             emit progressMessage(tr("%1 found.").arg(command) + QLatin1Char('\n'));
         } else {
             emit errorMessage(tr("%1 not found.").arg(command) + QLatin1Char('\n'));
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
index 7b7f59efd5c..8e6ca8eb9b6 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
@@ -121,9 +121,9 @@ void RemoteLinuxCustomCommandDeployService::handleProcessClosed(const QString &e
 
     if (!error.isEmpty()) {
         emit errorMessage(tr("Remote process failed: %1").arg(error));
-    } else if (d->runner->processExitCode() != 0) {
+    } else if (d->runner->exitCode() != 0) {
         emit errorMessage(tr("Remote process finished with exit code %1.")
-            .arg(d->runner->processExitCode()));
+            .arg(d->runner->exitCode()));
     } else {
         emit progressMessage(tr("Remote command finished successfully."));
     }
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
index e61a0bb7e9d..33d40950987 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
@@ -104,7 +104,7 @@ void AbstractRemoteLinuxPackageInstaller::handleInstallationFinished(const QStri
     if (!d->isRunning)
         return;
 
-    if (!error.isEmpty() || d->installer->processExitCode() != 0)
+    if (!error.isEmpty() || d->installer->exitCode() != 0)
         emit finished(tr("Installing package failed."));
     else if (!errorString().isEmpty())
         emit finished(errorString());
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
index cbe3b6f9d5e..6328a478809 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
@@ -115,10 +115,10 @@ void RemoteLinuxSignalOperation::interruptProcess(const QString &filePath)
 void RemoteLinuxSignalOperation::runnerProcessFinished()
 {
     m_errorMessage.clear();
-    if (m_runner->processExitStatus() != QProcess::NormalExit) {
-        m_errorMessage = m_runner->processErrorString();
-    } else if (m_runner->processExitCode() != 0) {
-        m_errorMessage = tr("Exit code is %1. stderr:").arg(m_runner->processExitCode())
+    if (m_runner->exitStatus() != QProcess::NormalExit) {
+        m_errorMessage = m_runner->errorString();
+    } else if (m_runner->exitCode() != 0) {
+        m_errorMessage = tr("Exit code is %1. stderr:").arg(m_runner->exitCode())
                 + QLatin1Char(' ')
                 + QString::fromLatin1(m_runner->readAllStandardError());
     }
diff --git a/src/plugins/remotelinux/sshkeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp
index 9d5435ed4bf..89fc2b4f07b 100644
--- a/src/plugins/remotelinux/sshkeydeployer.cpp
+++ b/src/plugins/remotelinux/sshkeydeployer.cpp
@@ -83,8 +83,8 @@ void SshKeyDeployer::handleConnectionFailure()
 
 void SshKeyDeployer::handleKeyUploadFinished()
 {
-    const int exitCode = d->deployProcess.processExitCode();
-    const QString errorMsg = d->deployProcess.processErrorString();
+    const int exitCode = d->deployProcess.exitCode();
+    const QString errorMsg = d->deployProcess.errorString();
     cleanup();
     if (errorMsg.isEmpty() && exitCode == 0) {
         emit finishedSuccessfully();