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, 6 insertions, 9 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
index afe6186967..567b167bdf 100644
--- a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
@@ -25,6 +25,7 @@
 
 #include "qmlprofilertracefile.h"
 
+
 #include <utils/qtcassert.h>
 
 #include <QIODevice>
@@ -33,9 +34,8 @@
 #include <QXmlStreamWriter>
 #include <QDebug>
 
-// import QmlEventType, QmlBindingType enums, QmlEventLocation
-using namespace QmlDebug;
-
+namespace QmlProfiler {
+namespace Internal {
 
 const char PROFILER_FILE_VERSION[] = "1.02";
 
@@ -48,7 +48,7 @@ static const char *RANGE_TYPE_STRINGS[] = {
     "Javascript"
 };
 
-Q_STATIC_ASSERT(sizeof(RANGE_TYPE_STRINGS) == QmlDebug::MaximumRangeType * sizeof(const char *));
+Q_STATIC_ASSERT(sizeof(RANGE_TYPE_STRINGS) == MaximumRangeType * sizeof(const char *));
 
 static const char *MESSAGE_STRINGS[] = {
     // So far only pixmap and scenegraph are used. The others are padding.
@@ -64,7 +64,7 @@ static const char *MESSAGE_STRINGS[] = {
     "DebugMessage"
 };
 
-Q_STATIC_ASSERT(sizeof(MESSAGE_STRINGS) == QmlDebug::MaximumMessage * sizeof(const char *));
+Q_STATIC_ASSERT(sizeof(MESSAGE_STRINGS) == MaximumMessage * sizeof(const char *));
 
 #define _(X) QLatin1String(X)
 
@@ -72,9 +72,6 @@ Q_STATIC_ASSERT(sizeof(MESSAGE_STRINGS) == QmlDebug::MaximumMessage * sizeof(con
 // "be strict in your output but tolerant in your inputs"
 //
 
-namespace QmlProfiler {
-namespace Internal {
-
 static QPair<Message, RangeType> qmlTypeAsEnum(const QString &typeString)
 {
     QPair<Message, RangeType> ret(MaximumMessage, MaximumRangeType);
@@ -195,7 +192,7 @@ quint64 QmlProfilerFileReader::loadedFeatures() const
     return m_loadedFeatures;
 }
 
-QmlDebug::ProfileFeature featureFromEvent(const QmlProfilerDataModel::QmlEventTypeData &event) {
+ProfileFeature featureFromEvent(const QmlProfilerDataModel::QmlEventTypeData &event) {
     if (event.rangeType < MaximumRangeType)
         return featureFromRangeType(event.rangeType);