ProjectExplorer: Use Utils::CommandLine in ProjectExplorer::Runnable

Change-Id: Id965f1f9047dcbc3ea5c9ddaa550d12668cf8ae6
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>

7 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index ffcca330cfc..d76a43c5b7c 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -125,8 +125,8 @@ void CallgrindController::run(Option option)
             this, &CallgrindController::controllerProcessClosed);
 
     Runnable controller = m_valgrindRunnable;
-    controller.executable =  FilePath::fromString(CALLGRIND_CONTROL_BINARY);
-    controller.commandLineArguments = QString("%1 %2").arg(toOptionString(option)).arg(m_pid);
+    controller.command.setExecutable(FilePath::fromString(CALLGRIND_CONTROL_BINARY));
+    controller.command.setArguments(QString("%1 %2").arg(toOptionString(option)).arg(m_pid));
 
     if (!m_valgrindRunnable.device
             || m_valgrindRunnable.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index c19b80414a0..148f0307728 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -286,7 +286,7 @@ CallgrindToolPrivate::CallgrindToolPrivate()
         runControl->createMainWorker();
         const auto runnable = dlg.runnable();
         runControl->setRunnable(runnable);
-        runControl->setDisplayName(runnable.executable.toUserOutput());
+        runControl->setDisplayName(runnable.command.executable().toUserOutput());
         ProjectExplorerPlugin::startRunControl(runControl);
     });
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 6898afda66b..9fcb7919a32 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -692,7 +692,7 @@ MemcheckToolPrivate::MemcheckToolPrivate()
         rc->createMainWorker();
         const auto runnable = dlg.runnable();
         rc->setRunnable(runnable);
-        rc->setDisplayName(runnable.executable.toUserOutput());
+        rc->setDisplayName(runnable.command.executable().toUserOutput());
         ProjectExplorerPlugin::startRunControl(rc);
     });
 
@@ -751,9 +751,9 @@ void MemcheckToolPrivate::heobAction()
         return;
     }
 
-    QString executable = sr.executable.toString();
+    QString executable = sr.command.executable().toString();
     const QString workingDirectory = Utils::FileUtils::normalizePathName(sr.workingDirectory.toString());
-    const QString commandLineArguments = sr.commandLineArguments;
+    const QString commandLineArguments = sr.command.arguments();
     const QStringList envStrings = sr.environment.toStringList();
 
     // target executable
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 0e7fc99d909..6c24c8c0374 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -117,7 +117,7 @@ void ValgrindToolRunner::stop()
 
 FilePath ValgrindToolRunner::executable() const
 {
-    return runnable().executable;
+    return runnable().command.executable();
 }
 
 QStringList ValgrindToolRunner::genericToolArguments() const
diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
index f99082f25d7..2c35acc16a9 100644
--- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
+++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
@@ -500,7 +500,7 @@ void ValgrindMemcheckParserTest::testRealValgrind()
     qDebug() << "running exe:" << executable << " HINT: set VALGRIND_TEST_BIN to change this";
 
     ProjectExplorer::Runnable debuggee;
-    debuggee.executable = FilePath::fromString(executable);
+    debuggee.command.setExecutable(FilePath::fromString(executable));
     debuggee.environment = sysEnv;
     ValgrindRunner runner;
     runner.setValgrindCommand({"valgrind", {}});
@@ -537,9 +537,9 @@ void ValgrindMemcheckParserTest::testValgrindStartError()
     QFETCH(QString, debuggeeArgs);
 
     ProjectExplorer::Runnable debuggeeExecutable;
-    debuggeeExecutable.executable = FilePath::fromString(debuggee);
+    debuggeeExecutable.command.setExecutable(FilePath::fromString(debuggee));
+    debuggeeExecutable.command.setArguments(debuggeeArgs);
     debuggeeExecutable.environment = Utils::Environment::systemEnvironment();
-    debuggeeExecutable.commandLineArguments = debuggeeArgs;
 
     ValgrindRunner runner;
     runner.setValgrindCommand({valgrindExe, valgrindArgs});
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index 2bf5fefde46..cfd3fd81ea8 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -138,13 +138,13 @@ bool ValgrindRunner::Private::run()
     if (HostOsInfo::isMacHost())
         // May be slower to start but without it we get no filenames for symbols.
         cmd.addArg("--dsymutil=yes");
-    cmd.addArg(m_debuggee.executable.toString());
-    cmd.addArgs(m_debuggee.commandLineArguments, CommandLine::Raw);
+    cmd.addArg(m_debuggee.command.executable().toString());
+    cmd.addArgs(m_debuggee.command.arguments(), CommandLine::Raw);
 
     emit q->valgrindExecuted(cmd.toUserOutput());
 
     Runnable valgrind;
-    valgrind.setCommandLine(cmd);
+    valgrind.command = cmd;
     valgrind.workingDirectory = m_debuggee.workingDirectory;
     valgrind.environment = m_debuggee.environment;
     valgrind.device = m_device;
@@ -190,17 +190,17 @@ void ValgrindRunner::Private::remoteProcessStarted()
     const QString proc = m_valgrindCommand.executable().toString().split(' ').last();
 
     Runnable findPid;
-    findPid.executable = FilePath::fromString("/bin/sh");
     // sleep required since otherwise we might only match "bash -c..."
     //  and not the actual valgrind run
-    findPid.commandLineArguments = QString("-c \""
+    findPid.command.setExecutable(FilePath::fromString("/bin/sh"));
+    findPid.command.setArguments(QString("-c \""
                                            "sleep 1; ps ax" // list all processes with aliased name
                                            " | grep '\\b%1.*%2'" // find valgrind process
                                            " | tail -n 1" // limit to single process
                                            // we pick the last one, first would be "bash -c ..."
                                            " | awk '{print $1;}'" // get pid
                                            "\""
-                                           ).arg(proc, m_debuggee.executable.fileName());
+                                           ).arg(proc, m_debuggee.command.executable().fileName()));
 
 //    m_remote.m_findPID = m_remote.m_connection->createRemoteProcess(cmd.toUtf8());
     connect(&m_findPID, &ApplicationLauncher::remoteStderr,
diff --git a/src/plugins/valgrind/valgrindtestrunnertest.cpp b/src/plugins/valgrind/valgrindtestrunnertest.cpp
index 211d40e5fc0..4dde3013628 100644
--- a/src/plugins/valgrind/valgrindtestrunnertest.cpp
+++ b/src/plugins/valgrind/valgrindtestrunnertest.cpp
@@ -82,7 +82,7 @@ QString ValgrindTestRunnerTest::runTestBinary(const QString &binary, const QStri
 
     Runnable debuggee;
     const QString &binPath = binPathFileInfo.canonicalFilePath();
-    debuggee.executable = Utils::FilePath::fromString(binPath);
+    debuggee.command.setExecutable(Utils::FilePath::fromString(binPath));
     debuggee.environment = Utils::Environment::systemEnvironment();
 
     CommandLine valgrind{"valgrind", {"--num-callers=50", "--track-origins=yes"}};