From baed8a12ff40e223c290b3ce9e573979f40995fa Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 31 Jul 2013 09:11:53 +0200 Subject: [PATCH] Analyzer: Remove unused AnalyzerStartParameter::toolId member Change-Id: I34e713ec1c9de99584ba206cfa1e38cd46e880fc Reviewed-by: Aurindam Jana --- src/plugins/analyzerbase/analyzerstartparameters.h | 2 -- src/plugins/analyzerbase/ianalyzertool.h | 1 + src/plugins/android/androidanalyzesupport.cpp | 1 - src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp | 1 - src/plugins/qmlprofiler/qmlprofilertool.cpp | 1 - src/plugins/valgrind/valgrindplugin.cpp | 1 - src/plugins/valgrind/valgrindruncontrolfactory.cpp | 2 -- 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h index c7c57c9237d..edc9d40a93f 100644 --- a/src/plugins/analyzerbase/analyzerstartparameters.h +++ b/src/plugins/analyzerbase/analyzerstartparameters.h @@ -35,7 +35,6 @@ #include -#include #include #include #include @@ -55,7 +54,6 @@ public: ProjectExplorer::RunMode runMode; QSsh::SshConnectionParameters connParams; - Core::Id toolId; QString debuggee; QString debuggeeArgs; QString analyzerCmdPrefix; diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h index 8d1b528309b..878039b4e66 100644 --- a/src/plugins/analyzerbase/ianalyzertool.h +++ b/src/plugins/analyzerbase/ianalyzertool.h @@ -34,6 +34,7 @@ #include "analyzerbase_global.h" #include "analyzerstartparameters.h" +#include #include #include diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp index 31f5ab990f2..470ca7a4350 100644 --- a/src/plugins/android/androidanalyzesupport.cpp +++ b/src/plugins/android/androidanalyzesupport.cpp @@ -61,7 +61,6 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati } AnalyzerStartParameters params; - params.toolId = tool->id(); params.runMode = runMode; Target *target = runConfig->target(); params.displayName = AndroidManager::packageName(target); diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp index 55de88fd32f..5a39a8ce928 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp @@ -112,7 +112,6 @@ static AnalyzerStartParameters createQmlProfilerStartParameters(RunConfiguration sp.analyzerPort = server.serverPort(); } sp.startMode = StartQml; - sp.toolId = "QmlProfiler"; return sp; } diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 758729090da..57679536318 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -465,7 +465,6 @@ static void startRemoteTool(IAnalyzerTool *tool, StartMode mode) } AnalyzerStartParameters sp; - sp.toolId = tool->id(); sp.startMode = mode; IDevice::ConstPtr device = DeviceKitInformation::device(kit); diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index a6432298929..bef11e453bd 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -67,7 +67,6 @@ static void startRemoteTool(IAnalyzerTool *tool) return; AnalyzerStartParameters sp; - sp.toolId = tool->id(); sp.startMode = StartRemote; sp.connParams = dlg.sshParams(); sp.debuggee = dlg.executable(); diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index e1b8efcab02..4204903c022 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -116,8 +116,6 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration QTC_ASSERT(canRun(runConfiguration, mode), return 0); AnalyzerStartParameters sp = createValgrindStartParameters(runConfiguration); - sp.toolId = tool->id(); - return tool->createRunControl(sp, runConfiguration); }