ProjectExplorer: Use Utils::FileName in ProcessParameters

For the command and the working directory.

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

3 files changed, 12 insertions, 16 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 77f9193b41..950982ee15 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -77,9 +77,8 @@ bool AutogenStep::init()
     ProcessParameters *pp = processParameters();
     pp->setMacroExpander(bc->macroExpander());
     pp->setEnvironment(bc->environment());
-    const QString projectDir(bc->target()->project()->projectDirectory().toString());
-    pp->setWorkingDirectory(projectDir);
-    pp->setCommand("./autogen.sh");
+    pp->setWorkingDirectory(bc->target()->project()->projectDirectory());
+    pp->setCommand(Utils::FileName::fromString("./autogen.sh"));
     pp->setArguments(m_additionalArgumentsAspect->value());
     pp->resolveAll();
 
@@ -122,9 +121,8 @@ BuildStepConfigWidget *AutogenStep::createConfigWidget()
         ProcessParameters param;
         param.setMacroExpander(bc->macroExpander());
         param.setEnvironment(bc->environment());
-        const QString projectDir(bc->target()->project()->projectDirectory().toString());
-        param.setWorkingDirectory(projectDir);
-        param.setCommand("./autogen.sh");
+        param.setWorkingDirectory(bc->target()->project()->projectDirectory());
+        param.setCommand(Utils::FileName::fromString("./autogen.sh"));
         param.setArguments(m_additionalArgumentsAspect->value());
 
         widget->setSummaryText(param.summary(displayName()));
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index ab9ae1147f..dd44dd4015 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -75,9 +75,8 @@ bool AutoreconfStep::init()
     ProcessParameters *pp = processParameters();
     pp->setMacroExpander(bc->macroExpander());
     pp->setEnvironment(bc->environment());
-    const QString projectDir(bc->target()->project()->projectDirectory().toString());
-    pp->setWorkingDirectory(projectDir);
-    pp->setCommand("autoreconf");
+    pp->setWorkingDirectory(bc->target()->project()->projectDirectory());
+    pp->setCommand(Utils::FileName::fromString("autoreconf"));
     pp->setArguments(m_additionalArgumentsAspect->value());
     pp->resolveAll();
 
@@ -114,9 +113,8 @@ BuildStepConfigWidget *AutoreconfStep::createConfigWidget()
         ProcessParameters param;
         param.setMacroExpander(bc->macroExpander());
         param.setEnvironment(bc->environment());
-        const QString projectDir(bc->target()->project()->projectDirectory().toString());
-        param.setWorkingDirectory(projectDir);
-        param.setCommand("autoreconf");
+        param.setWorkingDirectory(bc->target()->project()->projectDirectory());
+        param.setCommand(Utils::FileName::fromString("autoreconf"));
         param.setArguments(m_additionalArgumentsAspect->value());
 
         widget->setSummaryText(param.summary(displayName()));
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 66fcbc03e3..8cda28566d 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -97,8 +97,8 @@ bool ConfigureStep::init()
     ProcessParameters *pp = processParameters();
     pp->setMacroExpander(bc->macroExpander());
     pp->setEnvironment(bc->environment());
-    pp->setWorkingDirectory(bc->buildDirectory().toString());
-    pp->setCommand(projectDirRelativeToBuildDir(bc) + "configure");
+    pp->setWorkingDirectory(bc->buildDirectory());
+    pp->setCommand(Utils::FileName::fromString(projectDirRelativeToBuildDir(bc) + "configure"));
     pp->setArguments(m_additionalArgumentsAspect->value());
     pp->resolveAll();
 
@@ -158,8 +158,8 @@ void ConfigureStep::updateDetails()
     ProcessParameters param;
     param.setMacroExpander(bc->macroExpander());
     param.setEnvironment(bc->environment());
-    param.setWorkingDirectory(bc->buildDirectory().toString());
-    param.setCommand(projectDirRelativeToBuildDir(bc) + "configure");
+    param.setWorkingDirectory(bc->buildDirectory());
+    param.setCommand(Utils::FileName::fromString(projectDirRelativeToBuildDir(bc) + "configure"));
     param.setArguments(m_additionalArgumentsAspect->value());
 
     m_widget->setSummaryText(param.summaryInWorkdir(displayName()));