Utils/Ssh: Move SshRemoteProces::isRunning() to QtcProcess base

... and use it on a few places.

Change-Id: Id2cea709e355a46821a720e593740ac032888ced
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

11 files changed, 20 insertions, 20 deletions

diff --git a/src/libs/clangsupport/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp
index ff841f33d0..e2203f9a70 100644
--- a/src/libs/clangsupport/connectionclient.cpp
+++ b/src/libs/clangsupport/connectionclient.cpp
@@ -315,7 +315,7 @@ QIODevice *ConnectionClient::ioDevice()
 
 bool ConnectionClient::isProcessRunning(QtcProcess *process)
 {
-    return process && process->state() == QProcess::Running;
+    return process && process->isRunning();
 }
 
 void ConnectionClient::connectStandardOutputAndError(QtcProcess *process) const
diff --git a/src/libs/ssh/sftpsession.cpp b/src/libs/ssh/sftpsession.cpp
index 5abbe52bcc..8ecdfb374f 100644
--- a/src/libs/ssh/sftpsession.cpp
+++ b/src/libs/ssh/sftpsession.cpp
@@ -97,7 +97,7 @@ struct SftpSession::SftpSessionPrivate
             return;
         if (pendingCommands.empty())
             return;
-        QTC_ASSERT(sftpProc.state() == QProcess::Running, return);
+        QTC_ASSERT(sftpProc.isRunning(), return);
         activeCommand = pendingCommands.dequeue();
 
         // The second newline forces the prompt to appear after the command has finished.
diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp
index 1d878bc864..53f1e40431 100644
--- a/src/libs/ssh/sshremoteprocess.cpp
+++ b/src/libs/ssh/sshremoteprocess.cpp
@@ -116,11 +116,6 @@ void SshRemoteProcess::start()
     doStart();
 }
 
-bool SshRemoteProcess::isRunning() const
-{
-    return state() == QProcess::Running;
-}
-
 Utils::CommandLine SshRemoteProcess::fullLocalCommandLine() const
 {
     Utils::CommandLine cmd{SshSettings::sshFilePath()};
diff --git a/src/libs/ssh/sshremoteprocess.h b/src/libs/ssh/sshremoteprocess.h
index 6891289669..37de744135 100644
--- a/src/libs/ssh/sshremoteprocess.h
+++ b/src/libs/ssh/sshremoteprocess.h
@@ -47,7 +47,6 @@ public:
     void requestX11Forwarding(const QString &displayName);
     void start();
 
-    bool isRunning() const;
     Utils::CommandLine fullLocalCommandLine() const;
 
 signals:
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index aa7b21bc04..8d4ac7f5fe 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -1077,6 +1077,11 @@ QProcess::ProcessState QtcProcess::state() const
     return d->m_process->state();
 }
 
+bool QtcProcess::isRunning() const
+{
+    return state() == QProcess::Running;
+}
+
 QString QtcProcess::errorString() const
 {
     return d->m_process->errorString();
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index 5ff5a0033f..0a02b1cdcf 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -171,6 +171,7 @@ public:
 
     QProcess::ProcessError error() const;
     QProcess::ProcessState state() const;
+    bool isRunning() const; // Short for state() == QProcess::Running.
 
     QString errorString() const;
     void setErrorString(const QString &str);
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index b371664cd9..3944e30ed6 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -128,7 +128,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
                 .arg(avdManagerTool.toString(), arguments.join(' '));
         return result;
     }
-    QTC_CHECK(proc.state() == QProcess::Running);
+    QTC_CHECK(proc.isRunning());
     proc.write(QByteArray("yes\n")); // yes to "Do you wish to create a custom hardware profile"
 
     auto start = chrono::steady_clock::now();
@@ -151,7 +151,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
         // The exit code is always 0, so we need to check stderr
         // For now assume that any output at all indicates a error
         errorOutput = QString::fromLocal8Bit(proc.readAllStandardError());
-        if (proc.state() != QProcess::Running)
+        if (!proc.isRunning())
             break;
 
         // For a sane input and command, process should finish before timeout.
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index d0d769f654..d16e726983 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -719,7 +719,7 @@ void GdbEngine::runCommand(const DebuggerCommand &command)
         QTC_ASSERT(false, return);
     }
 
-    if (m_gdbProc.state() != QProcess::Running) {
+    if (!m_gdbProc.isRunning()) {
         showMessage(QString("NO GDB PROCESS RUNNING, CMD IGNORED: %1 %2")
             .arg(cmd.function).arg(state()));
         if (cmd.callback) {
@@ -767,7 +767,7 @@ void GdbEngine::runCommand(const DebuggerCommand &command)
         cmd.function = "python theDumper." + cmd.function + "(" + cmd.argsToPython() + ")";
     }
 
-    QTC_ASSERT(m_gdbProc.state() == QProcess::Running, return);
+    QTC_ASSERT(m_gdbProc.isRunning(), return);
 
     cmd.postTime = QTime::currentTime().msecsSinceStartOfDay();
     m_commandForToken[token] = cmd;
@@ -1663,7 +1663,7 @@ void GdbEngine::handleInferiorShutdown(const DebuggerResponse &response)
         // This happens when someone removed the binary behind our back.
         // It is not really an error from a user's point of view.
         showMessage("NOTE: " + msg);
-    } else if (m_gdbProc.state() == QProcess::Running) {
+    } else if (m_gdbProc.isRunning()) {
         AsynchronousMessageBox::critical(tr("Failed to Shut Down Application"),
                                          msgInferiorStopFailed(msg));
     }
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index e98c059815..287014ab7c 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -126,7 +126,7 @@ void LldbEngine::executeDebuggerCommand(const QString &command)
 
 void LldbEngine::runCommand(const DebuggerCommand &command)
 {
-    if (m_lldbProc.state() != QProcess::Running) {
+    if (!m_lldbProc.isRunning()) {
         // This can legally happen e.g. through a reloadModule()
         // triggered by changes in view visibility.
         showMessage(QString("NO LLDB PROCESS RUNNING, CMD IGNORED: %1 %2")
@@ -185,7 +185,7 @@ void LldbEngine::shutdownInferior()
 void LldbEngine::shutdownEngine()
 {
     QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
-    if (m_lldbProc.state() == QProcess::Running)
+    if (m_lldbProc.isRunning())
         m_lldbProc.terminate();
     else
         notifyEngineShutdownFinished();
@@ -193,7 +193,7 @@ void LldbEngine::shutdownEngine()
 
 void LldbEngine::abortDebuggerProcess()
 {
-    if (m_lldbProc.state() == QProcess::Running)
+    if (m_lldbProc.isRunning())
         m_lldbProc.kill();
     else
         notifyEngineShutdownFinished();
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 7bf8e951ee..5eae3b3482 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -76,13 +76,13 @@ void PdbEngine::executeDebuggerCommand(const QString &command)
         showMessage("PDB PROCESS NOT RUNNING, PLAIN CMD IGNORED: " + command);
         return;
     }
-    QTC_ASSERT(m_proc.state() == QProcess::Running, notifyEngineIll());
+    QTC_ASSERT(m_proc.isRunning(), notifyEngineIll());
     postDirectCommand(command);
 }
 
 void PdbEngine::postDirectCommand(const QString &command)
 {
-    QTC_ASSERT(m_proc.state() == QProcess::Running, notifyEngineIll());
+    QTC_ASSERT(m_proc.isRunning(), notifyEngineIll());
     showMessage(command, LogInput);
     m_proc.write(command.toUtf8() + '\n');
 }
@@ -93,7 +93,7 @@ void PdbEngine::runCommand(const DebuggerCommand &cmd)
         showMessage("IGNORED COMMAND: " + cmd.function);
         return;
     }
-    QTC_ASSERT(m_proc.state() == QProcess::Running, notifyEngineIll());
+    QTC_ASSERT(m_proc.isRunning(), notifyEngineIll());
     QString command = "qdebug('" + cmd.function + "'," + cmd.argsToPython() + ")";
     showMessage(command, LogInput);
     m_proc.write(command.toUtf8() + '\n');
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 10df7546ff..5377a037f7 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -887,7 +887,7 @@ void DockerDevicePrivate::startContainer()
     m_shell->start();
     m_shell->waitForStarted();
 
-    if (m_shell->state() != QProcess::Running) {
+    if (!m_shell->isRunning()) {
         DockerPlugin::setGlobalDaemonState(false);
         LOG("DOCKER SHELL FAILED");
         return;