diff options
| author | hjk <hjk@theqtcompany.com> | 2016-01-30 01:38:58 +0100 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-02-02 14:14:02 +0000 |
| commit | dcfb622126ea8141eb961003e44afe4c89888bd5 (patch) | |
| tree | 35c326de7b83fb1b364bb90cba25789a18e2725b /src/plugins/valgrind/valgrindengine.cpp | |
| parent | d14257736e7f8f122086fe3554aa8f746fbc3214 (diff) | |
Valgrind: Simplify device setup and handling
Make isLocal() less intrusively used and correct. Use the stored device
more often, also handle errors more quickly.
Change-Id: I146d1f5788ea79d0a9d7b058c81908d451cf00d0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins/valgrind/valgrindengine.cpp')
| -rw-r--r-- | src/plugins/valgrind/valgrindengine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 6ea8545448..78da2c58df 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -52,11 +52,10 @@ namespace Valgrind { namespace Internal { ValgrindRunControl::ValgrindRunControl(RunConfiguration *runConfiguration, Core::Id runMode) - : AnalyzerRunControl(runConfiguration, runMode), - m_settings(0), - m_isStopping(false) + : AnalyzerRunControl(runConfiguration, runMode) { - m_isCustomStart = false; + QTC_ASSERT(runConfiguration, return); + setRunnable(runConfiguration->runnable()); if (runConfiguration) if (IRunConfigurationAspect *aspect = runConfiguration->extraAspect(ANALYZER_VALGRIND_SETTINGS)) @@ -87,8 +86,8 @@ bool ValgrindRunControl::startEngine() ValgrindRunner *run = runner(); run->setValgrindExecutable(m_settings->valgrindExecutable()); run->setValgrindArguments(genericToolArguments() + toolArguments()); - run->setConnectionParameters(connection().as<AnalyzerConnection>().connParams); - run->setUseStartupProject(!m_isCustomStart); + QTC_ASSERT(!device().isNull(), return false); + run->setDevice(device()); run->setDebuggee(runnable().as<StandardRunnable>()); connect(run, &ValgrindRunner::processOutputReceived, |