Analyzers: Various cleanups

Fallout after the demise of IAnalizerTool.

Change-Id: I68f936ed5f2929dc4f09a408bdf6b0ea38e568ef
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

3 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index f8b9931eeb..c32dfcf5c3 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -906,7 +906,7 @@ void CallgrindToolPrivate::handleShowCostsOfFunction()
 
     m_toggleCollectFunction = qualifiedFunctionName + QLatin1String("()");
 
-    AnalyzerManager::selectTool(CallgrindToolId, StartLocal);
+    AnalyzerManager::selectTool(CallgrindLocalActionId);
     AnalyzerManager::startTool();
 }
 
diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h
index 809d0efe3c..76398925bb 100644
--- a/src/plugins/valgrind/callgrindtool.h
+++ b/src/plugins/valgrind/callgrindtool.h
@@ -37,6 +37,8 @@ namespace Valgrind {
 namespace Internal {
 
 const char CallgrindToolId[] = "Callgrind";
+const char CallgrindLocalActionId[] = "Callgrind.Local";
+const char CallgrindRemoteActionId[] = "Callgrind.Remote";
 
 class CallgrindToolPrivate;
 
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 7b0dfd0fac..162ea77e0b 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -178,7 +178,7 @@ bool ValgrindPlugin::initialize(const QStringList &, QString *)
         AnalyzerManager::addAction(action);
 
         action = new AnalyzerAction(this);
-        action->setActionId("Callgrind.Local");
+        action->setActionId(CallgrindLocalActionId);
         action->setToolId(CallgrindToolId);
         action->setWidgetCreator(cgWidgetCreator);
         action->setRunControlCreator(cgRunControlCreator);
@@ -206,7 +206,7 @@ bool ValgrindPlugin::initialize(const QStringList &, QString *)
     AnalyzerManager::addAction(action);
 
     action = new AnalyzerAction(this);
-    action->setActionId("Callgrind.Remote");
+    action->setActionId(CallgrindRemoteActionId);
     action->setToolId(CallgrindToolId);
     action->setWidgetCreator(cgWidgetCreator);
     action->setRunControlCreator(cgRunControlCreator);