Utils: Rename ProjectExplorer::Runnable into Utils::ProcessRunData

Move it into Utils lib.

Change-Id: I3b6c16d18439cabddf59afc03116f13c1970102c
Reviewed-by: hjk <hjk@qt.io>

6 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h
index d5d26e113a5..755c75d38c0 100644
--- a/src/plugins/valgrind/callgrindengine.h
+++ b/src/plugins/valgrind/callgrindengine.h
@@ -9,6 +9,7 @@
 #include "callgrind/callgrindparser.h"
 
 #include <utils/process.h>
+#include <utils/processinterface.h>
 
 namespace Valgrind {
 namespace Internal {
@@ -74,7 +75,7 @@ private:
     bool m_markAsPaused = false;
 
     std::unique_ptr<Utils::Process> m_controllerProcess;
-    ProjectExplorer::Runnable m_valgrindRunnable;
+    Utils::ProcessRunData m_valgrindRunnable;
     qint64 m_pid = 0;
 
     Option m_lastOption = Unknown;
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index cc5aff5e987..599dec740b7 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -712,7 +712,7 @@ MemcheckToolPrivate::~MemcheckToolPrivate()
 
 void MemcheckToolPrivate::heobAction()
 {
-    Runnable sr;
+    ProcessRunData sr;
     Abi abi;
     bool hasLocalRc = false;
     Kit *kit = nullptr;
diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
index 4b16f42efdf..a9c0669cd14 100644
--- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
+++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
@@ -11,7 +11,7 @@
 #include "xmlprotocol/status.h"
 #include "xmlprotocol/suppression.h"
 
-#include <projectexplorer/runcontrol.h>
+#include <utils/processinterface.h>
 
 #include <QFileInfo>
 #include <QTcpServer>
@@ -507,7 +507,7 @@ void ValgrindMemcheckParserTest::testRealValgrind()
                                                                         fakeValgrindExecutable());
     qDebug() << "running exe:" << executable << " HINT: set VALGRIND_TEST_BIN to change this";
 
-    ProjectExplorer::Runnable debuggee;
+    ProcessRunData debuggee;
     debuggee.command.setExecutable(FilePath::fromString(executable));
     debuggee.environment = sysEnv;
     ValgrindRunner runner;
@@ -541,7 +541,7 @@ void ValgrindMemcheckParserTest::testValgrindStartError()
     QFETCH(QString, debuggee);
     QFETCH(QString, debuggeeArgs);
 
-    ProjectExplorer::Runnable debuggeeExecutable;
+    ProcessRunData debuggeeExecutable;
     debuggeeExecutable.command.setExecutable(FilePath::fromString(debuggee));
     debuggeeExecutable.command.setArguments(debuggeeArgs);
     debuggeeExecutable.environment = Environment::systemEnvironment();
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index e6502bb3e89..e39bdcf402e 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -6,11 +6,10 @@
 #include "valgrindtr.h"
 #include "xmlprotocol/parser.h"
 
-#include <projectexplorer/runcontrol.h>
-
 #include <solutions/tasking/barrier.h>
 
 #include <utils/process.h>
+#include <utils/processinterface.h>
 #include <utils/qtcassert.h>
 
 #include <QEventLoop>
@@ -18,7 +17,6 @@
 #include <QTcpSocket>
 #include <QTimer>
 
-using namespace ProjectExplorer;
 using namespace Tasking;
 using namespace Utils;
 using namespace Valgrind::XmlProtocol;
@@ -112,7 +110,7 @@ public:
     ValgrindRunner *q = nullptr;
 
     CommandLine m_valgrindCommand;
-    Runnable m_debuggee;
+    ProcessRunData m_debuggee;
     QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels;
     QHostAddress m_localServerAddress;
     bool m_useTerminal = false;
@@ -237,7 +235,7 @@ void ValgrindRunner::setValgrindCommand(const CommandLine &command)
     d->m_valgrindCommand = command;
 }
 
-void ValgrindRunner::setDebuggee(const Runnable &debuggee)
+void ValgrindRunner::setDebuggee(const ProcessRunData &debuggee)
 {
     d->m_debuggee = debuggee;
 }
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index 508b896e3aa..1edbdf81515 100644
--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -11,8 +11,10 @@ QT_BEGIN_NAMESPACE
 class QHostAddress;
 QT_END_NAMESPACE
 
-namespace Utils { class CommandLine; }
-namespace ProjectExplorer { class Runnable; }
+namespace Utils {
+class CommandLine;
+class ProcessRunData;
+}
 
 namespace Valgrind {
 
@@ -32,7 +34,7 @@ public:
     ~ValgrindRunner() override;
 
     void setValgrindCommand(const Utils::CommandLine &command);
-    void setDebuggee(const ProjectExplorer::Runnable &debuggee);
+    void setDebuggee(const Utils::ProcessRunData &debuggee);
     void setProcessChannelMode(QProcess::ProcessChannelMode mode);
     void setLocalServerAddress(const QHostAddress &localServerAddress);
     void setUseTerminal(bool on);
diff --git a/src/plugins/valgrind/valgrindtestrunnertest.cpp b/src/plugins/valgrind/valgrindtestrunnertest.cpp
index 09f316eea7b..e8678329ed8 100644
--- a/src/plugins/valgrind/valgrindtestrunnertest.cpp
+++ b/src/plugins/valgrind/valgrindtestrunnertest.cpp
@@ -9,10 +9,9 @@
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/runconfiguration.h>
-#include <projectexplorer/runcontrol.h>
 
 #include <utils/algorithm.h>
+#include <utils/processinterface.h>
 
 #include <QDebug>
 #include <QTest>
@@ -55,7 +54,7 @@ QString ValgrindTestRunnerTest::runTestBinary(const QString &binary, const QStri
     if (!binPathFileInfo.isExecutable())
         return QString();
 
-    Runnable debuggee;
+    ProcessRunData debuggee;
     const QString &binPath = binPathFileInfo.canonicalFilePath();
     debuggee.command.setExecutable(Utils::FilePath::fromString(binPath));
     debuggee.environment = Utils::Environment::systemEnvironment();