Analyzer: Slim down AnalyzerStartParameters

* SysRoot can always be determined from kit.
* Pass around RunMode as extra parameter
  not as part of AnalyzerStartParameters.
  That's closer to the pattern used elsewhere.
* Environment was always initialized from the runconfig's
  EnvironmentAspect. The tools can do that directly.
* Provide setter for display name for cases where
  it is not equal to RunConfiguration::displayName

Change-Id: I811a0d7cdeb55cc37a16a593b3942abb567a2150
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>

1 files changed, 16 insertions, 5 deletions

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 0de0d0b728..1480f62269 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -55,12 +55,13 @@ namespace Valgrind {
 namespace Internal {
 
 ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
-        RunConfiguration *runConfiguration)
-    : AnalyzerRunControl(sp, runConfiguration),
+        RunConfiguration *runConfiguration, Core::Id runMode)
+    : AnalyzerRunControl(sp, runConfiguration, runMode),
       m_settings(0),
       m_isStopping(false)
 {
     m_isCustomStart = false;
+    m_localRunMode = ApplicationLauncher::Gui;
 
     if (runConfiguration)
         if (IRunConfigurationAspect *aspect = runConfiguration->extraAspect(ANALYZER_VALGRIND_SETTINGS))
@@ -94,15 +95,15 @@ bool ValgrindRunControl::startEngine()
 #endif
 
     ValgrindRunner *run = runner();
-    run->setWorkingDirectory(sp.workingDirectory);
+    run->setWorkingDirectory(workingDirectory());
     run->setValgrindExecutable(m_settings->valgrindExecutable());
     run->setValgrindArguments(genericToolArguments() + toolArguments());
     run->setDebuggeeExecutable(sp.debuggee);
     run->setDebuggeeArguments(sp.debuggeeArgs);
-    run->setEnvironment(sp.environment);
+    run->setEnvironment(m_environment);
     run->setConnectionParameters(sp.connParams);
     run->setUseStartupProject(!m_isCustomStart);
-    run->setLocalRunMode(sp.localRunMode);
+    run->setLocalRunMode(m_localRunMode);
 
     connect(run, &ValgrindRunner::processOutputReceived,
             this, &ValgrindRunControl::receiveProcessOutput);
@@ -129,6 +130,16 @@ QString ValgrindRunControl::executable() const
     return startParameters().debuggee;
 }
 
+void ValgrindRunControl::setEnvironment(const Utils::Environment &environment)
+{
+    m_environment = environment;
+}
+
+void ValgrindRunControl::setLocalRunMode(ApplicationLauncher::Mode localRunMode)
+{
+    m_localRunMode = localRunMode;
+}
+
 QStringList ValgrindRunControl::genericToolArguments() const
 {
     QTC_ASSERT(m_settings, return QStringList());