From 835ef9507b842cea670a5ceb15f6340865c594ad Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 2 Aug 2013 15:39:33 +0200 Subject: [PATCH] Analyzer: Use the run mode stored in the parameters instead of a copy Change-Id: I045622efa22bfcb26f9161556ccbbfb3df08599d Reviewed-by: Aurindam Jana --- src/plugins/analyzerbase/analyzermanager.cpp | 6 ++---- src/plugins/analyzerbase/analyzermanager.h | 2 +- src/plugins/android/androidanalyzesupport.cpp | 5 ++--- src/plugins/android/androidanalyzesupport.h | 2 +- src/plugins/android/androidrunfactories.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp | 2 +- src/plugins/qnx/qnxruncontrolfactory.cpp | 8 ++++---- src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp | 2 +- src/plugins/valgrind/valgrindruncontrolfactory.cpp | 3 ++- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 76dce306020..0c7f7479125 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -754,12 +754,10 @@ void AnalyzerManager::handleToolFinished() } AnalyzerRunControl *AnalyzerManager::createRunControl( - const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode runMode) + const AnalyzerStartParameters &sp, RunConfiguration *runConfiguration) { foreach (IAnalyzerTool *tool, m_instance->d->m_tools) - if (tool->runMode() == runMode) + if (tool->runMode() == sp.runMode) return tool->createRunControl(sp, runConfiguration); QTC_CHECK(false); return 0; diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h index ec88567b74b..940997d3ebb 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -93,7 +93,7 @@ public: static QAction *stopAction(); static AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode runMode); + ProjectExplorer::RunConfiguration *runConfiguration); private: friend class AnalyzerManagerPrivate; diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp index 14dac95326a..dc71f02adbd 100644 --- a/src/plugins/android/androidanalyzesupport.cpp +++ b/src/plugins/android/androidanalyzesupport.cpp @@ -51,7 +51,7 @@ namespace Android { namespace Internal { RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfiguration *runConfig, - RunMode runMode, QString *errorMessage) + RunMode runMode) { Target *target = runConfig->target(); AnalyzerStartParameters params; @@ -68,8 +68,7 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati params.startMode = StartQmlRemote; } - AnalyzerRunControl *analyzerRunControl = - AnalyzerManager::createRunControl(params, runConfig, runMode); + AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig); (void) new AndroidAnalyzeSupport(runConfig, analyzerRunControl); return analyzerRunControl; } diff --git a/src/plugins/android/androidanalyzesupport.h b/src/plugins/android/androidanalyzesupport.h index 2e96f3b5a1b..0f0f86f4bbb 100644 --- a/src/plugins/android/androidanalyzesupport.h +++ b/src/plugins/android/androidanalyzesupport.h @@ -48,7 +48,7 @@ class AndroidAnalyzeSupport : public AndroidRunSupport public: static ProjectExplorer::RunControl *createAnalyzeRunControl(AndroidRunConfiguration *runConfig, - ProjectExplorer::RunMode runMode, QString *errorMessage); + ProjectExplorer::RunMode runMode); AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig, Analyzer::AnalyzerRunControl *runControl); diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp index 65c62377395..a76656c33a3 100644 --- a/src/plugins/android/androidrunfactories.cpp +++ b/src/plugins/android/androidrunfactories.cpp @@ -168,7 +168,7 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig, case DebugRunMode: return AndroidDebugSupport::createDebugRunControl(rc, errorMessage); case QmlProfilerRunMode: - return AndroidAnalyzeSupport::createAnalyzeRunControl(rc, mode, errorMessage); + return AndroidAnalyzeSupport::createAnalyzeRunControl(rc, mode); case NoRunMode: case DebugRunModeWithBreakOnMain: case CallgrindRunMode: diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp index 7c5246c1aeb..86f0583e81a 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp @@ -123,7 +123,7 @@ RunControl *QmlProfilerRunControlFactory::create(RunConfiguration *runConfigurat const IDevice::ConstPtr device = DeviceKitInformation::device(runConfiguration->target()->kit()); QTC_ASSERT(device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE, return 0); - AnalyzerRunControl *rc = AnalyzerManager::createRunControl(sp, runConfiguration, mode); + AnalyzerRunControl *rc = AnalyzerManager::createRunControl(sp, runConfiguration); QmlProfilerRunControl *engine = qobject_cast(rc); if (!engine) { delete rc; diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp index 29ecbeb031d..069577550ed 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.cpp +++ b/src/plugins/qnx/qnxruncontrolfactory.cpp @@ -63,7 +63,7 @@ using namespace ProjectExplorer; using namespace Qnx; using namespace Qnx::Internal; -DebuggerStartParameters createStartParameters(const QnxRunConfiguration *runConfig) +static DebuggerStartParameters createDebuggerStartParameters(const QnxRunConfiguration *runConfig) { DebuggerStartParameters params; Target *target = runConfig->target(); @@ -114,7 +114,7 @@ DebuggerStartParameters createStartParameters(const QnxRunConfiguration *runConf return params; } -AnalyzerStartParameters createAnalyzerStartParameters(const QnxRunConfiguration *runConfig, RunMode mode) +static AnalyzerStartParameters createAnalyzerStartParameters(const QnxRunConfiguration *runConfig, RunMode mode) { AnalyzerStartParameters params; Target *target = runConfig->target(); @@ -178,7 +178,7 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, RunMode mo case NormalRunMode: return new QnxRunControl(rc); case DebugRunMode: { - const DebuggerStartParameters params = createStartParameters(rc); + const DebuggerStartParameters params = createDebuggerStartParameters(rc); DebuggerRunControl * const runControl = DebuggerPlugin::createDebugger(params, rc, errorMessage); if (!runControl) return 0; @@ -190,7 +190,7 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, RunMode mo } case QmlProfilerRunMode: { const AnalyzerStartParameters params = createAnalyzerStartParameters(rc, mode); - AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig, mode); + AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig); QnxAnalyzeSupport * const analyzeSupport = new QnxAnalyzeSupport(rc, runControl); connect(runControl, SIGNAL(finished()), analyzeSupport, SLOT(handleProfilingFinished())); return runControl; diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp index 6f0cee31a44..6372b8cae09 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp @@ -108,7 +108,7 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru } case QmlProfilerRunMode: { AnalyzerStartParameters params = RemoteLinuxAnalyzeSupport::startParameters(rc, mode); - AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig, mode); + AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig); RemoteLinuxAnalyzeSupport * const analyzeSupport = new RemoteLinuxAnalyzeSupport(rc, runControl, mode); connect(runControl, SIGNAL(finished()), analyzeSupport, SLOT(handleProfilingFinished())); diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index eb98039e1ee..b9e3cacca88 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -71,6 +71,7 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration AnalyzerStartParameters sp; sp.displayName = runConfiguration->displayName(); + sp.runMode = mode; if (LocalApplicationRunConfiguration *rc1 = qobject_cast(runConfiguration)) { EnvironmentAspect *aspect = runConfiguration->extraAspect(); @@ -102,7 +103,7 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration QTC_ASSERT(false, return 0); } - return AnalyzerManager::createRunControl(sp, runConfiguration, mode); + return AnalyzerManager::createRunControl(sp, runConfiguration); } IRunConfigurationAspect *ValgrindRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)