diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 67932827c0d..76dce306020 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -33,7 +33,6 @@ #include "analyzerplugin.h" #include "ianalyzertool.h" #include "analyzersettings.h" -#include "analyzerruncontrol.h" #include #include @@ -659,9 +658,6 @@ AnalyzerManager::~AnalyzerManager() void AnalyzerManager::extensionsInitialized() { - if (m_instance->d->m_tools.isEmpty()) - return; - foreach (IAnalyzerTool *tool, m_instance->d->m_tools) tool->extensionsInitialized(); } @@ -760,19 +756,12 @@ void AnalyzerManager::handleToolFinished() AnalyzerRunControl *AnalyzerManager::createRunControl( const AnalyzerStartParameters &sp, ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode runMode, - QString *errorMessage) + ProjectExplorer::RunMode runMode) { - foreach (IAnalyzerTool *tool, m_instance->d->m_tools) { - if (tool->runMode() == runMode) { - AnalyzerRunControl *rc = tool->createRunControl(sp, runConfiguration); - showStatusMessage(tr("Tool \"%1\" started...").arg(rc->displayName())); - return rc; - } - } - - if (errorMessage) - *errorMessage = tr("No analyzer tool selected."); + foreach (IAnalyzerTool *tool, m_instance->d->m_tools) + if (tool->runMode() == 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 efa59153a27..ec88567b74b 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -93,8 +93,7 @@ public: static QAction *stopAction(); static AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode runMode, - QString *errorMessage); + ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode runMode); private: friend class AnalyzerManagerPrivate; diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp index 5d0299f7f7d..14dac95326a 100644 --- a/src/plugins/android/androidanalyzesupport.cpp +++ b/src/plugins/android/androidanalyzesupport.cpp @@ -69,7 +69,7 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati } AnalyzerRunControl *analyzerRunControl = - AnalyzerManager::createRunControl(params, runConfig, runMode, errorMessage); + AnalyzerManager::createRunControl(params, runConfig, runMode); (void) new AndroidAnalyzeSupport(runConfig, analyzerRunControl); return analyzerRunControl; } diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp index 16af540102d..ba9848f3258 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp @@ -75,9 +75,6 @@ static AnalyzerStartParameters createQmlProfilerStartParameters(RunConfiguration { AnalyzerStartParameters sp; EnvironmentAspect *environment = runConfiguration->extraAspect(); - Debugger::DebuggerRunConfigurationAspect *debugger - = runConfiguration->extraAspect(); - QTC_ASSERT(debugger, return sp); // FIXME: This is only used to communicate the connParams settings. if (QmlProjectManager::QmlProjectRunConfiguration *rc1 = @@ -126,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, errorMessage); + AnalyzerRunControl *rc = AnalyzerManager::createRunControl(sp, runConfiguration, mode); QmlProfilerRunControl *engine = qobject_cast(rc); if (!engine) { delete rc; diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp index 76d51563fe0..29ecbeb031d 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.cpp +++ b/src/plugins/qnx/qnxruncontrolfactory.cpp @@ -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, errorMessage); + AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig, mode); 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 79b79e07086..6f0cee31a44 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, errorMessage); + AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(params, runConfig, mode); 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 cb92165fdd6..eb98039e1ee 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -65,9 +65,11 @@ bool ValgrindRunControlFactory::canRun(RunConfiguration *runConfiguration, RunMo return mode == CallgrindRunMode || mode == MemcheckRunMode; } -static AnalyzerStartParameters createValgrindStartParameters(RunConfiguration *runConfiguration) +RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage) { - Analyzer::AnalyzerStartParameters sp; + Q_UNUSED(errorMessage); + + AnalyzerStartParameters sp; sp.displayName = runConfiguration->displayName(); if (LocalApplicationRunConfiguration *rc1 = qobject_cast(runConfiguration)) { @@ -79,35 +81,28 @@ static AnalyzerStartParameters createValgrindStartParameters(RunConfiguration *r sp.debuggeeArgs = rc1->commandLineArguments(); const IDevice::ConstPtr device = DeviceKitInformation::device(runConfiguration->target()->kit()); - QTC_ASSERT(device, return sp); - QTC_ASSERT(device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE, return sp); + QTC_ASSERT(device, return 0); + QTC_ASSERT(device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE, return 0); QTcpServer server; if (!server.listen(QHostAddress::LocalHost) && !server.listen(QHostAddress::LocalHostIPv6)) { qWarning() << "Cannot open port on host for profiling."; - return sp; + return 0; } sp.connParams.host = server.serverAddress().toString(); sp.connParams.port = server.serverPort(); - sp.startMode = Analyzer::StartLocal; + sp.startMode = StartLocal; } else if (RemoteLinux::RemoteLinuxRunConfiguration *rc2 = qobject_cast(runConfiguration)) { - sp.startMode = Analyzer::StartRemote; + sp.startMode = StartRemote; sp.debuggee = rc2->remoteExecutableFilePath(); sp.connParams = DeviceKitInformation::device(rc2->target()->kit())->sshParameters(); sp.analyzerCmdPrefix = rc2->commandPrefix(); sp.debuggeeArgs = rc2->arguments(); } else { - // Might be S60DeviceRunfiguration, or something else ... - //sp.startMode = StartRemote; - sp.startMode = Analyzer::StartRemote; + QTC_ASSERT(false, return 0); } - return sp; -} -RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage) -{ - AnalyzerStartParameters sp = createValgrindStartParameters(runConfiguration); - return AnalyzerManager::createRunControl(sp, runConfiguration, mode, errorMessage); + return AnalyzerManager::createRunControl(sp, runConfiguration, mode); } IRunConfigurationAspect *ValgrindRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)