QmlProfiler: Unify event type definitions

Generally save both the Message and RangeType attributes so that we
avoid clashes between those types. Also keep all the types in one
place and make their names follow qtdeclarative's conventions.

Change-Id: I811bfcc4b72aaa2a0142babc92d96968ed2d4007
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.h b/src/plugins/qmlprofiler/qmlprofilertracefile.h
index 0ecf73bfc32..b0f81ed5d22 100644
--- a/src/plugins/qmlprofiler/qmlprofilertracefile.h
+++ b/src/plugins/qmlprofiler/qmlprofilertracefile.h
@@ -52,8 +52,9 @@ struct QmlEvent {
     QString displayName;
     QString filename;
     QString details;
-    QmlDebug::QmlEventType type;
-    int bindingType;
+    QmlDebug::Message message;
+    QmlDebug::RangeType rangeType;
+    int detailType;
     int line;
     int column;
 };
@@ -85,8 +86,9 @@ signals:
     void traceStartTime(qint64 traceStartTime);
     void traceEndTime(qint64 traceStartTime);
 
-    void rangedEvent(int type, int bindingType, qint64 startTime, qint64 length,
-                     const QStringList &data, const QmlDebug::QmlEventLocation &location,
+    void rangedEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int detailType,
+                     qint64 startTime, qint64 length, const QStringList &data,
+                     const QmlDebug::QmlEventLocation &location,
                      qint64 param1, qint64 param2, qint64 param3, qint64 param4, qint64 param5);
     void error(const QString &error);
 
@@ -124,7 +126,8 @@ private:
     QV8ProfilerDataModel *m_v8Model;
     QHash<QString,QmlEvent> m_qmlEvents;
     QVector<QPair<Range, QString> > m_ranges;
-    QVector <int> m_acceptedTypes;
+    QVector<QmlDebug::RangeType> m_acceptedRangeTypes;
+    QVector<QmlDebug::Message> m_acceptedMessages;
 };