Move QmlProfiler specific files from qmldebug to qmlprofiler

These file were not used anywhere else and had no business to be in
qmldebug to begin with. Moving them allows us to drop a number of
namespace qualifications and forces us to rename a few local symbols
in other classes in order to avoid name clashes.

Change-Id: I658ed455eec027cbaddacf2980d2ea6827ae6205
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
index d0cfd34b24a..335f68e5648 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
@@ -26,9 +26,9 @@
 #pragma once
 
 #include "qmlprofiler_global.h"
+#include "qmlprofilereventtypes.h"
+#include "qmlprofilereventlocation.h"
 
-#include <qmldebug/qmlprofilereventlocation.h>
-#include <qmldebug/qmlprofilereventtypes.h>
 #include <utils/fileinprojectfinder.h>
 
 #include <QObject>
@@ -107,7 +107,7 @@ public:
     void acquiringDone();
     void processingDone();
 
-    static const char *featureName(QmlDebug::ProfileFeature feature);
+    static const char *featureName(ProfileFeature feature);
 
 signals:
     void error(const QString &error);
@@ -116,7 +116,7 @@ signals:
     void loadFinished();
     void saveFinished();
 
-    void requestDetailsForLocation(int eventType, const QmlDebug::QmlEventLocation &location);
+    void requestDetailsForLocation(int eventType, const QmlEventLocation &location);
     void availableFeaturesChanged(quint64 features);
     void visibleFeaturesChanged(quint64 features);
     void recordedFeaturesChanged(quint64 features);
@@ -125,12 +125,11 @@ public slots:
     void clear();
 
     void prepareForWriting();
-    void addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int bindingType,
-                     qint64 startTime, qint64 length, const QString &data,
-                     const QmlDebug::QmlEventLocation &location,
+    void addQmlEvent(Message message, RangeType rangeType, int bindingType, qint64 startTime,
+                     qint64 length, const QString &data, const QmlEventLocation &location,
                      qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5);
     void addDebugMessage(QtMsgType type, qint64 timestamp, const QString &text,
-                         const QmlDebug::QmlEventLocation &location);
+                         const QmlEventLocation &location);
 
     void save(const QString &filename);
     void load(const QString &filename);