Utils: Encourage marking of raw command line parameters

Change-Id: Id66ac07732c66ab8c1232fe1f58042de8a61abb0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 14 insertions, 15 deletions

diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp
index 9ceba3b323..b291ef3177 100644
--- a/src/plugins/winrt/winrtdevice.cpp
+++ b/src/plugins/winrt/winrtdevice.cpp
@@ -159,11 +159,10 @@ void WinRtDeviceFactory::autoDetect()
                 this, &WinRtDeviceFactory::onProcessFinished);
     }
 
-    const QString args = QStringLiteral("--list-devices");
-    m_process->setCommand(CommandLine(FilePath::fromString(runnerFilePath), args));
-    qCDebug(winrtDeviceLog) << __FUNCTION__ << "Starting process" << runnerFilePath
-                            << "with arguments" << args;
-    MessageManager::write(runnerFilePath + QLatin1Char(' ') + args);
+    const CommandLine cmd(FilePath::fromString(runnerFilePath), {"--list-devices"});
+    m_process->setCommand(cmd);
+    qCDebug(winrtDeviceLog) << __FUNCTION__ << "Starting process" << cmd.toUserOutput();
+    MessageManager::write(cmd.toUserOutput());
     m_process->start();
     qCDebug(winrtDeviceLog) << __FUNCTION__ << "Process started";
 }
diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp
index 3ab8461f32..3e29aeb9df 100644
--- a/src/plugins/winrt/winrtrunnerhelper.cpp
+++ b/src/plugins/winrt/winrtrunnerhelper.cpp
@@ -94,11 +94,11 @@ WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunWorker *runWorker, QStr
     if (auto aspect = runControl->aspect<LoopbackExemptServerAspect>())
         loopbackExemptServer = aspect->value();
     if (loopbackExemptClient && loopbackExemptServer)
-        m_loopbackArguments = "--loopbackexempt clientserver";
+        m_loopbackArguments = QStringList{"--loopbackexempt", "clientserver"};
     else if (loopbackExemptClient)
-        m_loopbackArguments = "--loopbackexempt client";
+        m_loopbackArguments = QStringList{"--loopbackexempt", "client"};
     else if (loopbackExemptServer)
-        m_loopbackArguments = "--loopbackexempt server";
+        m_loopbackArguments = QStringList{"--loopbackexempt", "server"};
 
     if (BuildConfiguration *bc = runControl->target()->activeBuildConfiguration())
         m_environment = bc->environment();
@@ -190,29 +190,29 @@ void WinRtRunnerHelper::startWinRtRunner(const RunConf &conf)
         }
         Q_FALLTHROUGH();
     case Start:
-        cmdLine.addArgs("--start --stop --wait 0");
+        cmdLine.addArgs({"--start", "--stop", "--wait", "0"});
         connectProcess = true;
         QTC_ASSERT(!m_process, m_process->deleteLater());
         m_process = new QtcProcess(this);
         process = m_process;
         break;
     case Stop:
-        cmdLine.addArgs("--stop");
+        cmdLine.addArg("--stop");
         process = new QtcProcess(this);
         break;
     }
 
     if (m_device->type() == Constants::WINRT_DEVICE_TYPE_LOCAL)
-        cmdLine.addArgs("--profile appx");
+        cmdLine.addArgs({"--profile", "appx"});
     else if (m_device->type() == Constants::WINRT_DEVICE_TYPE_PHONE ||
              m_device->type() == Constants::WINRT_DEVICE_TYPE_EMULATOR)
-        cmdLine.addArgs("--profile appxphone");
+        cmdLine.addArgs({"--profile", "appxphone"});
 
     cmdLine.addArgs(m_loopbackArguments);
     cmdLine.addArg(m_executableFilePath);
-    cmdLine.addArgs(m_arguments);
+    cmdLine.addArgs(m_arguments, CommandLine::Raw);
 
-    appendMessage("winrtrunner " + cmdLine.arguments() + '\n', NormalMessageFormat);
+    appendMessage(cmdLine.toUserOutput(), NormalMessageFormat);
 
     if (connectProcess) {
         connect(process, &QProcess::started, this, &WinRtRunnerHelper::started);
diff --git a/src/plugins/winrt/winrtrunnerhelper.h b/src/plugins/winrt/winrtrunnerhelper.h
index f900dd1772..785946e985 100644
--- a/src/plugins/winrt/winrtrunnerhelper.h
+++ b/src/plugins/winrt/winrtrunnerhelper.h
@@ -77,7 +77,7 @@ private:
     QString m_debuggerExecutable;
     QString m_debuggerArguments;
     QString m_arguments;
-    QString m_loopbackArguments;
+    QStringList m_loopbackArguments;
     bool m_uninstallAfterStop = false;
     Utils::QtcProcess *m_process = nullptr;
 };