From 30ead66c6238b4eea4867a540975e4ad8f343dbc Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 8 Jul 2015 16:03:51 +0200 Subject: qmlprofiler: Use QQmlProfilerDefinitions for accessing definitions Change-Id: I6def7dd8a0ce0db22ad4829029d8510f5869c813 Reviewed-by: Simon Hausmann --- tools/qmlprofiler/qmlprofilerdata.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tools/qmlprofiler/qmlprofilerdata.h') diff --git a/tools/qmlprofiler/qmlprofilerdata.h b/tools/qmlprofiler/qmlprofilerdata.h index ef8ef10929..91c16c3222 100644 --- a/tools/qmlprofiler/qmlprofilerdata.h +++ b/tools/qmlprofiler/qmlprofilerdata.h @@ -34,9 +34,9 @@ #ifndef QMLPROFILERDATA_H #define QMLPROFILERDATA_H -#include #include "qmlprofilereventlocation.h" +#include #include class QmlProfilerDataPrivate; @@ -56,8 +56,8 @@ public: static QString getHashStringForQmlEvent(const QmlEventLocation &location, int eventType); static QString getHashStringForV8Event(const QString &displayName, const QString &function); - static QString qmlRangeTypeAsString(QQmlProfilerService::RangeType type); - static QString qmlMessageAsString(QQmlProfilerService::Message type); + static QString qmlRangeTypeAsString(QQmlProfilerDefinitions::RangeType type); + static QString qmlMessageAsString(QQmlProfilerDefinitions::Message type); static QString rootEventName(); static QString rootEventDescription(); @@ -75,20 +75,20 @@ public slots: void clear(); void setTraceEndTime(qint64 time); void setTraceStartTime(qint64 time); - void addQmlEvent(QQmlProfilerService::RangeType type, - QQmlProfilerService::BindingType bindingType, + void addQmlEvent(QQmlProfilerDefinitions::RangeType type, + QQmlProfilerDefinitions::BindingType bindingType, qint64 startTime, qint64 duration, const QStringList &data, const QmlEventLocation &location); void addV8Event(int depth, const QString &function, const QString &filename, int lineNumber, double totalTime, double selfTime); void addFrameEvent(qint64 time, int framerate, int animationcount, int threadId); - void addSceneGraphFrameEvent(QQmlProfilerService::SceneGraphFrameType type, qint64 time, + void addSceneGraphFrameEvent(QQmlProfilerDefinitions::SceneGraphFrameType type, qint64 time, qint64 numericData1, qint64 numericData2, qint64 numericData3, qint64 numericData4, qint64 numericData5); - void addPixmapCacheEvent(QQmlProfilerService::PixmapEventType type, qint64 time, + void addPixmapCacheEvent(QQmlProfilerDefinitions::PixmapEventType type, qint64 time, const QmlEventLocation &location, int width, int height, int refcount); - void addMemoryEvent(QQmlProfilerService::MemoryType type, qint64 time, qint64 size); - void addInputEvent(QQmlProfilerService::EventType type, qint64 time); + void addMemoryEvent(QQmlProfilerDefinitions::MemoryType type, qint64 time, qint64 size); + void addInputEvent(QQmlProfilerDefinitions::EventType type, qint64 time); void complete(); bool save(const QString &filename); -- cgit v1.2.3