Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerService

This avoids naming confusion with QDeclarativeTrace + makes it in line
with QV8ProfilerService.

Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 34e88ae..8e29e9f 100644 (file)
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -3,7 +3,7 @@ SOURCES += \
     $$PWD/qdeclarativedebugservice.cpp \
     $$PWD/qdeclarativedebugclient.cpp \
     $$PWD/qdeclarativeenginedebug.cpp \
-    $$PWD/qdeclarativedebugtrace.cpp \
+    $$PWD/qdeclarativeprofilerservice.cpp \
     $$PWD/qdeclarativedebughelper.cpp \
     $$PWD/qdeclarativedebugserver.cpp \
     $$PWD/qdeclarativeinspectorservice.cpp \
@@ -18,7 +18,7 @@ HEADERS += \
     $$PWD/qdeclarativedebugservice_p_p.h \
     $$PWD/qdeclarativedebugclient_p.h \
     $$PWD/qdeclarativeenginedebug_p.h \
-    $$PWD/qdeclarativedebugtrace_p.h \
+    $$PWD/qdeclarativeprofilerservice_p.h \
     $$PWD/qdeclarativedebughelper_p.h \
     $$PWD/qdeclarativedebugserver_p.h \
     $$PWD/qdeclarativedebugserverconnection_p.h \

diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativeprofilerservice.cpp
similarity index 56%
rename from src/declarative/debugger/qdeclarativedebugtrace.cpp
rename to src/declarative/debugger/qdeclarativeprofilerservice.cpp
index 3c71860..c5b6b65 100644 (file)
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativeprofilerservice.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativedebugtrace_p.h"
+#include "qdeclarativeprofilerservice_p.h"
 
 #include <QtCore/qdatastream.h>
 #include <QtCore/qurl.h>
@@ -52,44 +52,44 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance)
+Q_GLOBAL_STATIC(QDeclarativeProfilerService, profilerInstance)
 
 QDeclarativeBindingProfiler::QDeclarativeBindingProfiler(const QString &url, int line, int column)
 {
-    QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Binding);
-    QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Binding, url, line, column);
+    QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Binding);
+    QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Binding, url, line, column);
 }
 
 QDeclarativeBindingProfiler::~QDeclarativeBindingProfiler()
 {
-    QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Binding);
+    QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Binding);
 }
 
 void QDeclarativeBindingProfiler::addDetail(const QString &details)
 {
-    QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Binding, details);
+    QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Binding, details);
 }
 
 // convert to a QByteArray that can be sent to the debug client
 // use of QDataStream can skew results
 //     (see tst_qdeclarativedebugtrace::trace() benchmark)
-QByteArray QDeclarativeDebugData::toByteArray() const
+QByteArray QDeclarativeProfilerData::toByteArray() const
 {
     QByteArray data;
     //### using QDataStream is relatively expensive
     QDataStream ds(&data, QIODevice::WriteOnly);
     ds << time << messageType << detailType;
-    if (messageType == (int)QDeclarativeDebugTrace::RangeData)
+    if (messageType == (int)QDeclarativeProfilerService::RangeData)
         ds << detailData;
-    if (messageType == (int)QDeclarativeDebugTrace::RangeLocation)
+    if (messageType == (int)QDeclarativeProfilerService::RangeLocation)
         ds << detailData << line << column;
-    if (messageType == (int)QDeclarativeDebugTrace::Event &&
-            detailType == (int)QDeclarativeDebugTrace::AnimationFrame)
+    if (messageType == (int)QDeclarativeProfilerService::Event &&
+            detailType == (int)QDeclarativeProfilerService::AnimationFrame)
         ds << framerate << animationcount;
     return data;
 }
 
-QDeclarativeDebugTrace::QDeclarativeDebugTrace()
+QDeclarativeProfilerService::QDeclarativeProfilerService()
     : QDeclarativeDebugService(QLatin1String("CanvasFrameRate"), 1),
       m_enabled(false), m_messageReceived(false)
 {
@@ -104,72 +104,72 @@ QDeclarativeDebugTrace::QDeclarativeDebugTrace()
     }
 }
 
-QDeclarativeDebugTrace::~QDeclarativeDebugTrace()
+QDeclarativeProfilerService::~QDeclarativeProfilerService()
 {
 }
 
-void QDeclarativeDebugTrace::initialize()
+void QDeclarativeProfilerService::initialize()
 {
     // just make sure that the service is properly registered
-    traceInstance();
+    profilerInstance();
 }
 
-bool QDeclarativeDebugTrace::startProfiling()
+bool QDeclarativeProfilerService::startProfiling()
 {
-    return traceInstance()->startProfilingImpl();
+    return profilerInstance()->startProfilingImpl();
 }
 
-bool QDeclarativeDebugTrace::stopProfiling()
+bool QDeclarativeProfilerService::stopProfiling()
 {
-    return traceInstance()->stopProfilingImpl();
+    return profilerInstance()->stopProfilingImpl();
 }
 
-void QDeclarativeDebugTrace::addEvent(EventType t)
+void QDeclarativeProfilerService::addEvent(EventType t)
 {
-    traceInstance()->addEventImpl(t);
+    profilerInstance()->addEventImpl(t);
 }
 
-void QDeclarativeDebugTrace::startRange(RangeType t)
+void QDeclarativeProfilerService::startRange(RangeType t)
 {
-    traceInstance()->startRangeImpl(t);
+    profilerInstance()->startRangeImpl(t);
 }
 
-void QDeclarativeDebugTrace::rangeData(RangeType t, const QString &data)
+void QDeclarativeProfilerService::rangeData(RangeType t, const QString &data)
 {
-    traceInstance()->rangeDataImpl(t, data);
+    profilerInstance()->rangeDataImpl(t, data);
 }
 
-void QDeclarativeDebugTrace::rangeData(RangeType t, const QUrl &data)
+void QDeclarativeProfilerService::rangeData(RangeType t, const QUrl &data)
 {
-    traceInstance()->rangeDataImpl(t, data);
+    profilerInstance()->rangeDataImpl(t, data);
 }
 
-void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QString &fileName, int line, int column)
+void QDeclarativeProfilerService::rangeLocation(RangeType t, const QString &fileName, int line, int column)
 {
-    traceInstance()->rangeLocationImpl(t, fileName, line, column);
+    profilerInstance()->rangeLocationImpl(t, fileName, line, column);
 }
 
-void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QUrl &fileName, int line, int column)
+void QDeclarativeProfilerService::rangeLocation(RangeType t, const QUrl &fileName, int line, int column)
 {
-    traceInstance()->rangeLocationImpl(t, fileName, line, column);
+    profilerInstance()->rangeLocationImpl(t, fileName, line, column);
 }
 
-void QDeclarativeDebugTrace::endRange(RangeType t)
+void QDeclarativeProfilerService::endRange(RangeType t)
 {
-    traceInstance()->endRangeImpl(t);
+    profilerInstance()->endRangeImpl(t);
 }
 
-void QDeclarativeDebugTrace::animationFrame(qint64 delta)
+void QDeclarativeProfilerService::animationFrame(qint64 delta)
 {
-    traceInstance()->animationFrameImpl(delta);
+    profilerInstance()->animationFrameImpl(delta);
 }
 
-void QDeclarativeDebugTrace::sendProfilingData()
+void QDeclarativeProfilerService::sendProfilingData()
 {
-    traceInstance()->sendMessages();
+    profilerInstance()->sendMessages();
 }
 
-bool QDeclarativeDebugTrace::startProfilingImpl()
+bool QDeclarativeProfilerService::startProfilingImpl()
 {
     bool success = false;
     if (!profilingEnabled()) {
@@ -180,7 +180,7 @@ bool QDeclarativeDebugTrace::startProfilingImpl()
     return success;
 }
 
-bool QDeclarativeDebugTrace::stopProfilingImpl()
+bool QDeclarativeProfilerService::stopProfilingImpl()
 {
     bool success = false;
     if (profilingEnabled()) {
@@ -191,70 +191,70 @@ bool QDeclarativeDebugTrace::stopProfilingImpl()
     return success;
 }
 
-void QDeclarativeDebugTrace::addEventImpl(EventType event)
+void QDeclarativeProfilerService::addEventImpl(EventType event)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0};
+    QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0};
     processMessage(ed);
 }
 
-void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
+void QDeclarativeProfilerService::startRangeImpl(RangeType range)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QString &rData)
+void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QString &rData)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
+void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QUrl &rData)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column)
+void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column)
+void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
+void QDeclarativeProfilerService::endRangeImpl(RangeType range)
 {
     if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0};
+    QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0};
     processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::animationFrameImpl(qint64 delta)
+void QDeclarativeProfilerService::animationFrameImpl(qint64 delta)
 {
     Q_ASSERT(QDeclarativeDebugService::isDebuggingEnabled());
     if (!m_enabled)
@@ -265,7 +265,7 @@ void QDeclarativeDebugTrace::animationFrameImpl(qint64 delta)
     if (animCount > 0 && delta > 0) {
         // trim fps to integer
         int fps = 1000 / delta;
-        QDeclarativeDebugData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount};
+        QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount};
         processMessage(ed);
     }
 }
@@ -274,18 +274,18 @@ void QDeclarativeDebugTrace::animationFrameImpl(qint64 delta)
     Either send the message directly, or queue up
     a list of messages to send later (via sendMessages)
 */
-void QDeclarativeDebugTrace::processMessage(const QDeclarativeDebugData &message)
+void QDeclarativeProfilerService::processMessage(const QDeclarativeProfilerData &message)
 {
     QMutexLocker locker(&m_mutex);
     m_data.append(message);
 }
 
-bool QDeclarativeDebugTrace::profilingEnabled()
+bool QDeclarativeProfilerService::profilingEnabled()
 {
     return m_enabled;
 }
 
-void QDeclarativeDebugTrace::setProfilingEnabled(bool enable)
+void QDeclarativeProfilerService::setProfilingEnabled(bool enable)
 {
     m_enabled = enable;
 }
@@ -293,7 +293,7 @@ void QDeclarativeDebugTrace::setProfilingEnabled(bool enable)
 /*
     Send the messages queued up by processMessage
 */
-void QDeclarativeDebugTrace::sendMessages()
+void QDeclarativeProfilerService::sendMessages()
 {
     QMutexLocker locker(&m_mutex);
     QList<QByteArray> messages;
@@ -310,7 +310,7 @@ void QDeclarativeDebugTrace::sendMessages()
     QDeclarativeDebugService::sendMessages(messages);
 }
 
-void QDeclarativeDebugTrace::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
+void QDeclarativeProfilerService::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
 {
     if (state() == newState)
         return;
@@ -322,7 +322,7 @@ void QDeclarativeDebugTrace::stateAboutToBeChanged(QDeclarativeDebugService::Sta
     }
 }
 
-void QDeclarativeDebugTrace::messageReceived(const QByteArray &message)
+void QDeclarativeProfilerService::messageReceived(const QByteArray &message)
 {
     QByteArray rwData = message;
     QDataStream stream(&rwData, QIODevice::ReadOnly);

diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativeprofilerservice_p.h
similarity index 90%
rename from src/declarative/debugger/qdeclarativedebugtrace_p.h
rename to src/declarative/debugger/qdeclarativeprofilerservice_p.h
index 7e2db4d..f5ca8ec 100644 (file)
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativeprofilerservice_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEDEBUGTRACE_P_H
-#define QDECLARATIVEDEBUGTRACE_P_H
+#ifndef QDECLARATIVEPROFILERSERVICE_P_H
+#define QDECLARATIVEPROFILERSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -62,7 +62,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-struct Q_AUTOTEST_EXPORT QDeclarativeDebugData
+struct Q_AUTOTEST_EXPORT QDeclarativeProfilerData
 {
     qint64 time;
     int messageType;
@@ -78,7 +78,7 @@ struct Q_AUTOTEST_EXPORT QDeclarativeDebugData
     QByteArray toByteArray() const;
 };
 
-Q_DECLARE_TYPEINFO(QDeclarativeDebugData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QDeclarativeProfilerData, Q_MOVABLE_TYPE);
 
 class QUrl;
 class QDeclarativeEngine;
@@ -91,7 +91,7 @@ public:
     void addDetail(const QString &details);
 };
 
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
+class Q_DECLARATIVE_EXPORT QDeclarativeProfilerService : public QDeclarativeDebugService
 {
 public:
     enum Message {
@@ -141,8 +141,8 @@ public:
 
     static void sendProfilingData();
 
-    QDeclarativeDebugTrace();
-    ~QDeclarativeDebugTrace();
+    QDeclarativeProfilerService();
+    ~QDeclarativeProfilerService();
 
 protected:
     virtual void stateAboutToBeChanged(State state);
@@ -163,13 +163,13 @@ private:
     bool profilingEnabled();
     void setProfilingEnabled(bool enable);
     void sendMessages();
-    void processMessage(const QDeclarativeDebugData &);
+    void processMessage(const QDeclarativeProfilerData &);
 
 private:
     QElapsedTimer m_timer;
     bool m_enabled;
     bool m_messageReceived;
-    QVector<QDeclarativeDebugData> m_data;
+    QVector<QDeclarativeProfilerData> m_data;
     QMutex m_mutex;
 };
 
@@ -177,5 +177,5 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEDEBUGTRACE_P_H
+#endif // QDECLARATIVEPROFILERSERVICE_P_H
 

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index e625c7a..93d6fea 100644 (file)
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -47,7 +47,7 @@
 #include "qdeclarativeinfo.h"
 #include "qdeclarativecompiler_p.h"
 #include "qdeclarativedata_p.h"
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qdeclarativetrace_p.h>
 
 #include <QVariant>

diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index 340e78d..5d1c28b 100644 (file)
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -49,7 +49,7 @@
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeglobal_p.h"
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qv8debugservice_p.h>
 
 #include <QtCore/qstringbuilder.h>
@@ -171,9 +171,9 @@ int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
         if (!m_expression)
             return -1;
         if (QDeclarativeDebugService::isDebuggingEnabled()) {
-            QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::HandlingSignal);
-            QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::HandlingSignal, QLatin1String(m_signal.signature()) % QLatin1String(": ") % m_expression->expression());
-            QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::HandlingSignal, m_expression->sourceFile(), m_expression->lineNumber(), m_expression->columnNumber());
+            QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::HandlingSignal);
+            QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::HandlingSignal, QLatin1String(m_signal.signature()) % QLatin1String(": ") % m_expression->expression());
+            QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::HandlingSignal, m_expression->sourceFile(), m_expression->lineNumber(), m_expression->columnNumber());
             QV8DebugService::instance()->signalEmitted(QString::fromAscii(m_signal.signature()));
         }
         m_isEvaluating = true;
@@ -191,7 +191,7 @@ int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
         }
         if (m_params) m_params->clearValues();
         m_isEvaluating = false;
-        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::HandlingSignal);
+        QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::HandlingSignal);
         return -1;
     } else {
         return QObject::qt_metacall(c, id, a);

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index a932eb7..5bfa821 100644 (file)
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -53,7 +53,7 @@
 #include "qdeclarativebinding_p_p.h"
 #include "qdeclarativeglobal_p.h"
 #include "qdeclarativescript_p.h"
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qdeclarativeenginedebugservice_p.h>
 #include "qdeclarativeincubator.h"
 #include "qdeclarativeincubator_p.h"
@@ -745,7 +745,7 @@ QDeclarativeComponentPrivate::beginCreate(QDeclarativeContextData *context)
     state.completePending = true;
 
     if (isRoot) 
-        QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Creating);
+        QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Creating);
 
     enginePriv->referenceScarceResources();
     state.vme.init(context, cc, start, creationContext);
@@ -763,11 +763,11 @@ QDeclarativeComponentPrivate::beginCreate(QDeclarativeContextData *context)
             context->asQDeclarativeContextPrivate()->instances.append(rv);
         QDeclarativeEngineDebugService::instance()->objectCreated(engine, rv);
         if (isRoot) {
-            QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Creating, 
+            QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Creating,
                                               buildTypeNameForDebug(rv->metaObject()));
             QDeclarativeData *data = QDeclarativeData::get(rv);
             Q_ASSERT(data);
-            QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Creating, 
+            QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Creating,
                                                   cc->url, data->lineNumber, data->columnNumber);
         }
     }
@@ -824,7 +824,7 @@ void QDeclarativeComponentPrivate::completeCreate()
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
         complete(ep, &state);
 
-        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Creating);
+        QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Creating);
     }
 }
 

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 73385fe..2031bc4 100644 (file)
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -66,7 +66,7 @@
 #include "qdeclarativelist_p.h"
 #include "qdeclarativetypenamecache_p.h"
 #include "qdeclarativenotifier_p.h"
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qdeclarativeapplication_p.h>
 #include <private/qv8debugservice_p.h>
 #include <private/qdebugmessageservice_p.h>
@@ -453,7 +453,7 @@ void QDeclarativeEnginePrivate::init()
         QDeclarativeEngineDebugService::instance()->addEngine(q);
         QV8DebugService::initialize(v8engine());
         QV8ProfilerService::initialize();
-        QDeclarativeDebugTrace::initialize();
+        QDeclarativeProfilerService::initialize();
         QDebugMessageService::instance();
     }
 
@@ -966,12 +966,12 @@ Q_AUTOTEST_EXPORT void qmlExecuteDeferred(QObject *object)
 
     if (data && data->deferredComponent) {
         if (QDeclarativeDebugService::isDebuggingEnabled()) {
-            QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Creating);
+            QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Creating);
             QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
             QString typeName = type ? type->qmlTypeName() : QString::fromUtf8(object->metaObject()->className());
-            QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Creating, typeName);
+            QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Creating, typeName);
             if (data->outerContext)
-                QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Creating, data->outerContext->url, data->lineNumber, data->columnNumber);
+                QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Creating, data->outerContext->url, data->lineNumber, data->columnNumber);
         }
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(data->context->engine);
 
@@ -982,7 +982,7 @@ Q_AUTOTEST_EXPORT void qmlExecuteDeferred(QObject *object)
         data->deferredComponent = 0;
 
         QDeclarativeComponentPrivate::complete(ep, &state);
-        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Creating);
+        QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Creating);
     }
 }
 

diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 40f8e5c..7251296 100644 (file)
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -46,7 +46,7 @@
 #include <private/qdeclarativethread_p.h>
 #include <private/qdeclarativecompiler_p.h>
 #include <private/qdeclarativecomponent_p.h>
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
@@ -1566,13 +1566,13 @@ void QDeclarativeTypeData::downloadProgressChanged(qreal p)
 void QDeclarativeTypeData::compile()
 {
     Q_ASSERT(m_compiledData == 0);
-    QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Compiling);
+    QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Compiling);
 
     m_compiledData = new QDeclarativeCompiledData(typeLoader()->engine());
     m_compiledData->url = m_imports.baseUrl();
     m_compiledData->name = m_compiledData->url.toString();
-    QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Compiling, QUrl(m_compiledData->name),1,1);
-    QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Compiling, m_compiledData->name);
+    QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Compiling, QUrl(m_compiledData->name),1,1);
+    QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Compiling, m_compiledData->name);
 
     QDeclarativeCompiler compiler(&scriptParser._pool);
     if (!compiler.compile(typeLoader()->engine(), this, m_compiledData)) {
@@ -1580,7 +1580,7 @@ void QDeclarativeTypeData::compile()
         m_compiledData->release();
         m_compiledData = 0;
     }
-    QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Compiling);
+    QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Compiling);
 }
 
 void QDeclarativeTypeData::resolveTypes()

diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp
index eed4efc..f321628 100644 (file)
--- a/src/declarative/qml/v4/qv4bindings.cpp
+++ b/src/declarative/qml/v4/qv4bindings.cpp
@@ -47,7 +47,7 @@
 #include "qv4compiler_p_p.h"
 
 #include <private/qdeclarativeaccessors_p.h>
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativetrace_p.h>
 

diff --git a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
index ef12743..3453472 100644 (file)
--- a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
+++ b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
@@ -49,7 +49,7 @@
 #include <private/qv8engine_p.h>
 
 #include <private/qv8profilerservice_p.h>
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 
 #include <QtCore/qstring.h>
 #include <QtCore/qdatetime.h>
@@ -183,7 +183,7 @@ v8::Handle<v8::Value> consoleProfile(const v8::Arguments &args)
     Q_UNUSED(args);
     QString title;
 
-    if (QDeclarativeDebugTrace::startProfiling()) {
+    if (QDeclarativeProfilerService::startProfiling()) {
         QV8ProfilerService::instance()->startProfiling(title);
         qDebug("Profiling started.");
     } else {
@@ -201,10 +201,10 @@ v8::Handle<v8::Value> consoleProfileEnd(const v8::Arguments &args)
     Q_UNUSED(args);
     QString title;
 
-    if (QDeclarativeDebugTrace::stopProfiling()) {
+    if (QDeclarativeProfilerService::stopProfiling()) {
         QV8ProfilerService *profiler = QV8ProfilerService::instance();
         profiler->stopProfiling(title);
-        QDeclarativeDebugTrace::sendProfilingData();
+        QDeclarativeProfilerService::sendProfilingData();
         profiler->sendProfilingData();
         qDebug("Profiling ended.");
     } else {

diff --git a/src/declarative/qml/v8/qv8bindings.cpp b/src/declarative/qml/v8/qv8bindings.cpp
index b21ddf5..daadce4 100644 (file)
--- a/src/declarative/qml/v8/qv8bindings.cpp
+++ b/src/declarative/qml/v8/qv8bindings.cpp
@@ -49,7 +49,7 @@
 #include <private/qdeclarativeexpression_p.h>
 #include <private/qobject_p.h>
 #include <private/qdeclarativetrace_p.h>
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 6c5b223..4a166c1 100644 (file)
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -66,7 +66,7 @@
 #include <QtCore/qabstractanimation.h>
 #include <QtDeclarative/qdeclarativeincubator.h>
 
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 7e3969c..76d82a4 100644 (file)
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -46,7 +46,7 @@
 #include "qquickitem_p.h"
 #include "qquickitemchangelistener_p.h"
 
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 #include <private/qdeclarativeinspectorservice_p.h>
 
 #include <QtDeclarative/qdeclarativeengine.h>
@@ -499,35 +499,35 @@ void QQuickView::resizeEvent(QResizeEvent *e)
 
 void QQuickView::keyPressEvent(QKeyEvent *e)
 {
-    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
+    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key);
 
     QQuickCanvas::keyPressEvent(e);
 }
 
 void QQuickView::keyReleaseEvent(QKeyEvent *e)
 {
-    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
+    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key);
 
     QQuickCanvas::keyReleaseEvent(e);
 }
 
 void QQuickView::mouseMoveEvent(QMouseEvent *e)
 {
-    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
 
     QQuickCanvas::mouseMoveEvent(e);
 }
 
 void QQuickView::mousePressEvent(QMouseEvent *e)
 {
-    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
 
     QQuickCanvas::mousePressEvent(e);
 }
 
 void QQuickView::mouseReleaseEvent(QMouseEvent *e)
 {
-    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
 
     QQuickCanvas::mouseReleaseEvent(e);
 }

diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 6ef26d1..7ccedc4 100644 (file)
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -45,7 +45,7 @@
 #include <qopenglfunctions.h>
 #include <QtQuick/private/qsgcontext_p.h>
 #include <qthread.h>
-#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeprofilerservice_p.h>
 
 #if !defined(QT_NO_DEBUG) && (defined(Q_OS_LINUX) || defined(Q_OS_MAC))
 #include <execinfo.h>

diff --git a/tests/auto/declarative/debugger/debugger.pro b/tests/auto/declarative/debugger/debugger.pro
index 6d7548c..314f0d1 100644 (file)
--- a/tests/auto/declarative/debugger/debugger.pro
+++ b/tests/auto/declarative/debugger/debugger.pro
@@ -6,7 +6,7 @@ PRIVATETESTS += \
     qdeclarativedebugservice \
     qdeclarativedebugjs \
     qdeclarativeinspector \
-    qdeclarativedebugtrace \
+    qdeclarativeprofilerservice \
     qpacketprotocol \
     qv8profilerservice \
     qdebugmessageservice

diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/data/exit.qml b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/data/exit.qml
similarity index 100%
rename from tests/auto/declarative/debugger/qdeclarativedebugtrace/data/exit.qml
rename to tests/auto/declarative/debugger/qdeclarativeprofilerservice/data/exit.qml

diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/data/test.qml b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/data/test.qml
similarity index 100%
rename from tests/auto/declarative/debugger/qdeclarativedebugtrace/data/test.qml
rename to tests/auto/declarative/debugger/qdeclarativeprofilerservice/data/test.qml

diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/qdeclarativeprofilerservice.pro
similarity index 74%
rename from tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
rename to tests/auto/declarative/debugger/qdeclarativeprofilerservice/qdeclarativeprofilerservice.pro
index 487c63a..564945f 100644 (file)
--- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
+++ b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/qdeclarativeprofilerservice.pro
@@ -1,10 +1,10 @@
 CONFIG += testcase
-TARGET = tst_qdeclarativedebugtrace
+TARGET = tst_qdeclarativeprofilerservice
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
 
-SOURCES += tst_qdeclarativedebugtrace.cpp \
+SOURCES += tst_qdeclarativeprofilerservice.cpp \
            ../shared/debugutil.cpp
 OTHER_FILES += data/test.qml
 

diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/tst_qdeclarativeprofilerservice.cpp
similarity index 77%
rename from tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp
rename to tests/auto/declarative/debugger/qdeclarativeprofilerservice/tst_qdeclarativeprofilerservice.cpp
index f0a660c..5de7b86 100644 (file)
--- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp
+++ b/tests/auto/declarative/debugger/qdeclarativeprofilerservice/tst_qdeclarativeprofilerservice.cpp
@@ -42,24 +42,24 @@
 #include <qtest.h>
 #include <QLibraryInfo>
 
-#include "QtDeclarative/private/qdeclarativedebugtrace_p.h"
+#include "QtDeclarative/private/qdeclarativeprofilerservice_p.h"
 #include "../shared/debugutil_p.h"
 #include "../../../shared/util.h"
 
 #define PORT 13773
 #define STR_PORT "13773"
 
-class QDeclarativeDebugTraceClient : public QDeclarativeDebugClient
+class QDeclarativeProfilerClient : public QDeclarativeDebugClient
 {
     Q_OBJECT
 
 public:
-    QDeclarativeDebugTraceClient(QDeclarativeDebugConnection *connection)
+    QDeclarativeProfilerClient(QDeclarativeDebugConnection *connection)
         : QDeclarativeDebugClient(QLatin1String("CanvasFrameRate"), connection)
     {
     }
 
-    QList<QDeclarativeDebugData> traceMessages;
+    QList<QDeclarativeProfilerData> traceMessages;
 
     void setTraceState(bool enabled) {
         QByteArray message;
@@ -75,12 +75,12 @@ protected:
     void messageReceived(const QByteArray &message);
 };
 
-class tst_QDeclarativeDebugTrace : public QDeclarativeDataTest
+class tst_QDeclarativeProfilerService : public QDeclarativeDataTest
 {
     Q_OBJECT
 
 public:
-    tst_QDeclarativeDebugTrace()
+    tst_QDeclarativeProfilerService()
         : m_process(0)
         , m_connection(0)
         , m_client(0)
@@ -90,7 +90,7 @@ public:
 private:
     QDeclarativeDebugProcess *m_process;
     QDeclarativeDebugConnection *m_connection;
-    QDeclarativeDebugTraceClient *m_client;
+    QDeclarativeProfilerClient *m_client;
 
     void connect(bool block, const QString &testFile);
 
@@ -103,13 +103,13 @@ private slots:
     void profileOnExit();
 };
 
-void QDeclarativeDebugTraceClient::messageReceived(const QByteArray &message)
+void QDeclarativeProfilerClient::messageReceived(const QByteArray &message)
 {
     QByteArray msg = message;
     QDataStream stream(&msg, QIODevice::ReadOnly);
 
 
-    QDeclarativeDebugData data;
+    QDeclarativeProfilerData data;
     data.time = -2;
     data.messageType = -1;
     data.detailType = -1;
@@ -122,21 +122,21 @@ void QDeclarativeDebugTraceClient::messageReceived(const QByteArray &message)
     QVERIFY(data.time >= -1);
 
     switch (data.messageType) {
-    case (QDeclarativeDebugTrace::Event): {
+    case (QDeclarativeProfilerService::Event): {
         stream >> data.detailType;
 
         switch (data.detailType) {
-        case QDeclarativeDebugTrace::AnimationFrame: {
+        case QDeclarativeProfilerService::AnimationFrame: {
             stream >> data.framerate >> data.animationcount;
             QVERIFY(data.framerate != -1);
             QVERIFY(data.animationcount != -1);
             break;
         }
-        case QDeclarativeDebugTrace::FramePaint:
-        case QDeclarativeDebugTrace::Mouse:
-        case QDeclarativeDebugTrace::Key:
-        case QDeclarativeDebugTrace::StartTrace:
-        case QDeclarativeDebugTrace::EndTrace:
+        case QDeclarativeProfilerService::FramePaint:
+        case QDeclarativeProfilerService::Mouse:
+        case QDeclarativeProfilerService::Key:
+        case QDeclarativeProfilerService::StartTrace:
+        case QDeclarativeProfilerService::EndTrace:
             break;
         default: {
             QString failMsg = QString("Unknown event type:") + data.detailType;
@@ -146,28 +146,28 @@ void QDeclarativeDebugTraceClient::messageReceived(const QByteArray &message)
         }
         break;
     }
-    case QDeclarativeDebugTrace::Complete: {
+    case QDeclarativeProfilerService::Complete: {
         emit complete();
         return;
     }
-    case QDeclarativeDebugTrace::RangeStart: {
+    case QDeclarativeProfilerService::RangeStart: {
         stream >> data.detailType;
-        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeDebugTrace::MaximumRangeType);
+        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeProfilerService::MaximumRangeType);
         break;
     }
-    case QDeclarativeDebugTrace::RangeEnd: {
+    case QDeclarativeProfilerService::RangeEnd: {
         stream >> data.detailType;
-        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeDebugTrace::MaximumRangeType);
+        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeProfilerService::MaximumRangeType);
         break;
     }
-    case QDeclarativeDebugTrace::RangeData: {
+    case QDeclarativeProfilerService::RangeData: {
         stream >> data.detailType >> data.detailData;
-        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeDebugTrace::MaximumRangeType);
+        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeProfilerService::MaximumRangeType);
         break;
     }
-    case QDeclarativeDebugTrace::RangeLocation: {
+    case QDeclarativeProfilerService::RangeLocation: {
         stream >> data.detailType >> data.detailData >> data.line >> data.column;
-        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeDebugTrace::MaximumRangeType);
+        QVERIFY(data.detailType >= 0 && data.detailType < QDeclarativeProfilerService::MaximumRangeType);
         QVERIFY(data.line >= -2);
         break;
     }
@@ -180,7 +180,7 @@ void QDeclarativeDebugTraceClient::messageReceived(const QByteArray &message)
     traceMessages.append(data);
 }
 
-void tst_QDeclarativeDebugTrace::connect(bool block, const QString &testFile)
+void tst_QDeclarativeProfilerService::connect(bool block, const QString &testFile)
 {
     const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
     QStringList arguments;
@@ -201,19 +201,19 @@ void tst_QDeclarativeDebugTrace::connect(bool block, const QString &testFile)
     }
 
     QDeclarativeDebugConnection *m_connection = new QDeclarativeDebugConnection();
-    m_client = new QDeclarativeDebugTraceClient(m_connection);
+    m_client = new QDeclarativeProfilerClient(m_connection);
 
     m_connection->connectToHost(QLatin1String("127.0.0.1"), PORT);
 }
 
-void tst_QDeclarativeDebugTrace::cleanup()
+void tst_QDeclarativeProfilerService::cleanup()
 {
     delete m_process;
     delete m_connection;
     delete m_client;
 }
 
-void tst_QDeclarativeDebugTrace::blockingConnectWithTraceEnabled()
+void tst_QDeclarativeProfilerService::blockingConnectWithTraceEnabled()
 {
     connect(true, "test.qml");
     QTRY_COMPARE(m_client->state(), QDeclarativeDebugClient::Enabled);
@@ -228,15 +228,15 @@ void tst_QDeclarativeDebugTrace::blockingConnectWithTraceEnabled()
 
     QVERIFY(m_client->traceMessages.count());
     // must start with "StartTrace"
-    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeDebugTrace::StartTrace);
+    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeProfilerService::StartTrace);
 
     // must end with "EndTrace"
-    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeDebugTrace::EndTrace);
+    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeProfilerService::EndTrace);
 }
 
-void tst_QDeclarativeDebugTrace::blockingConnectWithTraceDisabled()
+void tst_QDeclarativeProfilerService::blockingConnectWithTraceDisabled()
 {
     connect(true, "test.qml");
     QTRY_COMPARE(m_client->state(), QDeclarativeDebugClient::Enabled);
@@ -253,15 +253,15 @@ void tst_QDeclarativeDebugTrace::blockingConnectWithTraceDisabled()
     QVERIFY(m_client->traceMessages.count());
 
     // must start with "StartTrace"
-    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeDebugTrace::StartTrace);
+    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeProfilerService::StartTrace);
 
     // must end with "EndTrace"
-    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeDebugTrace::EndTrace);
+    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeProfilerService::EndTrace);
 }
 
-void tst_QDeclarativeDebugTrace::nonBlockingConnect()
+void tst_QDeclarativeProfilerService::nonBlockingConnect()
 {
     connect(false, "test.qml");
     QTRY_COMPARE(m_client->state(), QDeclarativeDebugClient::Enabled);
@@ -275,15 +275,15 @@ void tst_QDeclarativeDebugTrace::nonBlockingConnect()
     }
 
     // must start with "StartTrace"
-    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeDebugTrace::StartTrace);
+    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeProfilerService::StartTrace);
 
     // must end with "EndTrace"
-    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeDebugTrace::EndTrace);
+    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeProfilerService::EndTrace);
 }
 
-void tst_QDeclarativeDebugTrace::profileOnExit()
+void tst_QDeclarativeProfilerService::profileOnExit()
 {
     connect(true, "exit.qml");
     QTRY_COMPARE(m_client->state(), QDeclarativeDebugClient::Enabled);
@@ -297,14 +297,14 @@ void tst_QDeclarativeDebugTrace::profileOnExit()
     }
 
     // must start with "StartTrace"
-    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeDebugTrace::StartTrace);
+    QCOMPARE(m_client->traceMessages.first().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.first().detailType, (int)QDeclarativeProfilerService::StartTrace);
 
     // must end with "EndTrace"
-    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeDebugTrace::Event);
-    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeDebugTrace::EndTrace);
+    QCOMPARE(m_client->traceMessages.last().messageType, (int)QDeclarativeProfilerService::Event);
+    QCOMPARE(m_client->traceMessages.last().detailType, (int)QDeclarativeProfilerService::EndTrace);
 }
 
-QTEST_MAIN(tst_QDeclarativeDebugTrace)
+QTEST_MAIN(tst_QDeclarativeProfilerService)
 
-#include "tst_qdeclarativedebugtrace.moc"
+#include "tst_qdeclarativeprofilerservice.moc"