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/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
index 0bf642b64e..277ba9abb2 100644
--- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
@@ -67,7 +67,7 @@ bool QmlProfilerPlugin::initialize(const QStringList &arguments, QString *errorS
         "applications using QML.");
 
     action = new AnalyzerAction(this);
-    action->setActionId("QmlProfiler.Local");
+    action->setActionId(QmlProfilerLocalActionId);
     action->setToolId(QmlProfilerToolId);
     action->setWidgetCreator(widgetCreator);
     action->setRunControlCreator(runControlCreator);
@@ -80,7 +80,7 @@ bool QmlProfilerPlugin::initialize(const QStringList &arguments, QString *errorS
     AnalyzerManager::addAction(action);
 
     action = new AnalyzerAction(this);
-    action->setActionId("QmlProfiler.Remote");
+    action->setActionId(QmlProfilerRemoteActionId);
     action->setToolId(QmlProfilerToolId);
     action->setWidgetCreator(widgetCreator);
     action->setRunControlCreator(runControlCreator);
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index c4e82c8695..0f2f495dfa 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -601,7 +601,7 @@ void QmlProfilerTool::showLoadDialog()
     if (ModeManager::currentMode()->id() != MODE_ANALYZE)
         AnalyzerManager::showMode();
 
-    AnalyzerManager::selectTool("QmlProfiler", StartRemote);
+    AnalyzerManager::selectTool(QmlProfilerRemoteActionId);
 
     QString filename = QFileDialog::getOpenFileName(ICore::mainWindow(), tr("Load QML Trace"), QString(),
                                                     tr("QML traces (*%1)").arg(QLatin1String(TraceFileExtension)));
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index 74c6b24174..8dfa2bdd8f 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -43,6 +43,8 @@ namespace QmlProfiler {
 namespace Internal {
 
 const char QmlProfilerToolId[] = "QmlProfiler";
+const char QmlProfilerLocalActionId[] = "QmlProfiler.Local";
+const char QmlProfilerRemoteActionId[] = "QmlProfiler.Remote";
 
 class QmlProfilerTool : public QObject
 {