1 files changed, 8 insertions, 133 deletions

diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp
index 0c031db914..b69c7e73e1 100644
--- a/tools/qmlprofiler/qmlprofilerclient.cpp
+++ b/tools/qmlprofiler/qmlprofilerclient.cpp
@@ -43,36 +43,26 @@ public:
     QmlProfilerClientPrivate(QQmlDebugConnection *connection, QmlProfilerData *data);
 
     QmlProfilerData *data;
-
-    qint64 inProgressRanges;
-    QStack<qint64> rangeStartTimes[QQmlProfilerDefinitions::MaximumRangeType];
-    QStack<QStringList> rangeDatas[QQmlProfilerDefinitions::MaximumRangeType];
-    QStack<QQmlEventLocation> rangeLocations[QQmlProfilerDefinitions::MaximumRangeType];
-    int rangeCount[QQmlProfilerDefinitions::MaximumRangeType];
-
     bool enabled;
 };
 
 QmlProfilerClientPrivate::QmlProfilerClientPrivate(QQmlDebugConnection *connection,
                                                    QmlProfilerData *data) :
-    QQmlProfilerClientPrivate(connection), data(data), inProgressRanges(0), enabled(false)
+    QQmlProfilerClientPrivate(connection, data), data(data), enabled(false)
 {
-    ::memset(rangeCount, 0, QQmlProfilerDefinitions::MaximumRangeType * sizeof(int));
 }
 
 QmlProfilerClient::QmlProfilerClient(QQmlDebugConnection *connection, QmlProfilerData *data) :
     QQmlProfilerClient(*(new QmlProfilerClientPrivate(connection, data)))
 {
-}
-
-void QmlProfilerClient::clearPendingData()
-{
     Q_D(QmlProfilerClient);
-    for (int i = 0; i < QQmlProfilerDefinitions::MaximumRangeType; ++i) {
-        d->rangeCount[i] = 0;
-        d->rangeDatas[i].clear();
-        d->rangeLocations[i].clear();
-    }
+    setRequestedFeatures(std::numeric_limits<quint64>::max());
+    connect(this, &QQmlProfilerClient::traceStarted,
+            d->data, &QmlProfilerData::setTraceStartTime);
+    connect(this, &QQmlProfilerClient::traceFinished,
+            d->data, &QmlProfilerData::setTraceEndTime);
+    connect(this, &QQmlProfilerClient::complete,
+            d->data, &QmlProfilerData::complete);
 }
 
 void QmlProfilerClient::stateChanged(State state)
@@ -84,119 +74,4 @@ void QmlProfilerClient::stateChanged(State state)
     }
 }
 
-void QmlProfilerClient::traceStarted(qint64 time, int engineId)
-{
-    Q_UNUSED(engineId);
-    Q_D(QmlProfilerClient);
-    d->data->setTraceStartTime(time);
-    emit recordingStarted();
-}
-
-void QmlProfilerClient::traceFinished(qint64 time, int engineId)
-{
-    Q_UNUSED(engineId);
-    Q_D(QmlProfilerClient);
-    d->data->setTraceEndTime(time);
-}
-
-void QmlProfilerClient::rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime)
-{
-    Q_D(QmlProfilerClient);
-    d->rangeStartTimes[type].push(startTime);
-    d->inProgressRanges |= (static_cast<qint64>(1) << type);
-    ++d->rangeCount[type];
-}
-
-void QmlProfilerClient::rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time,
-                                  const QString &data)
-{
-    Q_UNUSED(time);
-    Q_D(QmlProfilerClient);
-    int count = d->rangeCount[type];
-    if (count > 0) {
-        while (d->rangeDatas[type].count() < count)
-            d->rangeDatas[type].push(QStringList());
-        d->rangeDatas[type][count - 1] << data;
-    }
-}
-
-void QmlProfilerClient::rangeLocation(QQmlProfilerDefinitions::RangeType type, qint64 time,
-                                      const QQmlEventLocation &location)
-{
-    Q_UNUSED(time);
-    Q_D(QmlProfilerClient);
-    if (d->rangeCount[type] > 0)
-        d->rangeLocations[type].push(location);
-}
-
-void QmlProfilerClient::rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime)
-{
-    Q_D(QmlProfilerClient);
-
-    if (d->rangeCount[type] == 0) {
-        emit error(tr("Spurious range end detected."));
-        return;
-    }
-
-    --d->rangeCount[type];
-    if (d->inProgressRanges & (static_cast<qint64>(1) << type))
-        d->inProgressRanges &= ~(static_cast<qint64>(1) << type);
-    QStringList data = d->rangeDatas[type].count() ? d->rangeDatas[type].pop() : QStringList();
-    QQmlEventLocation location = d->rangeLocations[type].count() ? d->rangeLocations[type].pop() :
-                                                                   QQmlEventLocation();
-    qint64 startTime = d->rangeStartTimes[type].pop();
-
-    if (d->rangeCount[type] == 0 && d->rangeDatas[type].count() + d->rangeStartTimes[type].count()
-            + d->rangeLocations[type].count() != 0) {
-        emit error(tr("Incorrectly nested range data"));
-        return;
-    }
-
-    d->data->addQmlEvent(type, QQmlProfilerDefinitions::QmlBinding, startTime, endTime - startTime,
-                         data, location);
-}
-
-void QmlProfilerClient::animationFrame(qint64 time, int frameRate, int animationCount, int threadId)
-{
-    Q_D(QmlProfilerClient);
-    d->data->addFrameEvent(time, frameRate, animationCount, threadId);
-}
-
-void QmlProfilerClient::sceneGraphEvent(QQmlProfilerDefinitions::SceneGraphFrameType type,
-                                        qint64 time, qint64 numericData1, qint64 numericData2,
-                                        qint64 numericData3, qint64 numericData4,
-                                        qint64 numericData5)
-{
-    Q_D(QmlProfilerClient);
-    d->data->addSceneGraphFrameEvent(type, time, numericData1, numericData2, numericData3,
-                                     numericData4, numericData5);
-}
-
-void QmlProfilerClient::pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEventType type, qint64 time,
-                                         const QString &url, int numericData1, int numericData2)
-{
-    Q_D(QmlProfilerClient);
-    d->data->addPixmapCacheEvent(type, time, url, numericData1, numericData2);
-}
-
-void QmlProfilerClient::memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time,
-                                         qint64 amount)
-{
-    Q_D(QmlProfilerClient);
-    d->data->addMemoryEvent(type, time, amount);
-}
-
-void QmlProfilerClient::inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time,
-                                   int a, int b)
-{
-    Q_D(QmlProfilerClient);
-    d->data->addInputEvent(type, time, a, b);
-}
-
-void QmlProfilerClient::complete()
-{
-    Q_D(QmlProfilerClient);
-    d->data->complete();
-}
-
 #include "moc_qmlprofilerclient.cpp"