From 3d59c99143e221f2fd246f708e2664dd6bc246c0 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 27 May 2016 17:25:39 +0200
Subject: [PATCH] QmlProfiler: Pass AnalyzerRunControl to
 LocalQmlProfilerRunner

It doesn't make much sense to require a non-exported class to be passed
to the ctor of an exported one.

Change-Id: I15463f3ec0153a71cb55ad83724ec071a504a483
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/qmlprofiler/localqmlprofilerrunner.cpp | 8 ++++----
 src/plugins/qmlprofiler/localqmlprofilerrunner.h   | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
index 9a7bcfa9385..114e92ca0f0 100644
--- a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
+++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
@@ -25,7 +25,6 @@
 
 #include "localqmlprofilerrunner.h"
 #include "qmlprofilerplugin.h"
-#include "qmlprofilerruncontrol.h"
 
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/environmentaspect.h>
@@ -33,6 +32,7 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <qmldebug/qmldebugcommandlinearguments.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 
 #include <QTcpServer>
 #include <QTemporaryFile>
@@ -65,16 +65,16 @@ Utils::Port LocalQmlProfilerRunner::findFreePort(QString &host)
 }
 
 LocalQmlProfilerRunner::LocalQmlProfilerRunner(const Configuration &configuration,
-                                               QmlProfilerRunControl *engine) :
+                                               Debugger::AnalyzerRunControl *engine) :
     QObject(engine),
     m_configuration(configuration)
 {
     connect(&m_launcher, &ApplicationLauncher::appendMessage,
             this, &LocalQmlProfilerRunner::appendMessage);
     connect(this, &LocalQmlProfilerRunner::stopped,
-            engine, &QmlProfilerRunControl::notifyRemoteFinished);
+            engine, &Debugger::AnalyzerRunControl::notifyRemoteFinished);
     connect(this, &LocalQmlProfilerRunner::appendMessage,
-            engine, &QmlProfilerRunControl::appendMessage);
+            engine, &Debugger::AnalyzerRunControl::appendMessage);
     connect(engine, &Debugger::AnalyzerRunControl::starting,
             this, &LocalQmlProfilerRunner::start);
     connect(engine, &RunControl::finished,
diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.h b/src/plugins/qmlprofiler/localqmlprofilerrunner.h
index 757f09f8aee..4ad92b3e609 100644
--- a/src/plugins/qmlprofiler/localqmlprofilerrunner.h
+++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.h
@@ -31,9 +31,12 @@
 #include <projectexplorer/applicationlauncher.h>
 #include <projectexplorer/runnables.h>
 
+namespace Debugger {
+class AnalyzerRunControl;
+}
+
 namespace QmlProfiler {
 
-class QmlProfilerRunControl;
 class QMLPROFILER_EXPORT LocalQmlProfilerRunner : public QObject
 {
     Q_OBJECT
@@ -45,7 +48,8 @@ public:
         QString socket;
     };
 
-    LocalQmlProfilerRunner(const Configuration &configuration, QmlProfilerRunControl *engine);
+    LocalQmlProfilerRunner(const Configuration &configuration,
+                           Debugger::AnalyzerRunControl *engine);
     ~LocalQmlProfilerRunner();
 
     static Utils::Port findFreePort(QString &host);