QQmlProfilerService: Drop support for non-location-tracking clients

All known QML profiler clients track locations by now.

Change-Id: I1613da87dab22cfadfc25a35678d3e816ecda189
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 13 insertions, 15 deletions

diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h
index 5d1b339324..42515388e3 100644
--- a/src/qml/debugger/qqmlabstractprofileradapter_p.h
+++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h
@@ -73,13 +73,13 @@ public:
     virtual ~QQmlAbstractProfilerAdapter() {}
     void setService(QQmlProfilerService *new_service) { service = new_service; }
 
-    virtual qint64 sendMessages(qint64 until, QList<QByteArray> &messages, bool trackLocations) = 0;
+    virtual qint64 sendMessages(qint64 until, QList<QByteArray> &messages) = 0;
 
     void startProfiling(quint64 features);
 
     void stopProfiling();
 
-    void reportData(bool trackLocations) { emit dataRequested(trackLocations); }
+    void reportData() { emit dataRequested(); }
 
     void stopWaiting() { waiting = false; }
     void startWaiting() { waiting = true; }
@@ -96,7 +96,7 @@ signals:
     void profilingDisabled();
     void profilingDisabledWhileWaiting();
 
-    void dataRequested(bool trackLocations);
+    void dataRequested();
     void referenceTimeKnown(const QElapsedTimer &timer);
 
 protected:
diff --git a/src/qml/debugger/qqmlprofiler.cpp b/src/qml/debugger/qqmlprofiler.cpp
index 8c0bd73822..da0b14dd85 100644
--- a/src/qml/debugger/qqmlprofiler.cpp
+++ b/src/qml/debugger/qqmlprofiler.cpp
@@ -59,19 +59,18 @@ void QQmlProfiler::startProfiling(quint64 features)
 void QQmlProfiler::stopProfiling()
 {
     featuresEnabled = false;
-    reportData(true);
+    reportData();
     m_locations.clear();
 }
 
-void QQmlProfiler::reportData(bool trackLocations)
+void QQmlProfiler::reportData()
 {
     LocationHash resolved;
     resolved.reserve(m_locations.size());
     for (auto it = m_locations.begin(), end = m_locations.end(); it != end; ++it) {
-        if (!trackLocations || !it->sent) {
+        if (!it->sent) {
             resolved.insert(it.key(), it.value());
-            if (trackLocations)
-                it->sent = true;
+            it->sent = true;
         }
     }
 
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index 2e87f10302..a326bfc4ad 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -383,7 +383,7 @@ public:
 
     void startProfiling(quint64 features);
     void stopProfiling();
-    void reportData(bool trackLocations);
+    void reportData();
     void setTimer(const QElapsedTimer &timer) { m_timer = timer; }
 
 signals:
diff --git a/src/qml/jsruntime/qv4profiling.cpp b/src/qml/jsruntime/qv4profiling.cpp
index 5fd200efc1..b337243204 100644
--- a/src/qml/jsruntime/qv4profiling.cpp
+++ b/src/qml/jsruntime/qv4profiling.cpp
@@ -78,7 +78,7 @@ Profiler::Profiler(QV4::ExecutionEngine *engine) : featuresEnabled(0), m_engine(
 void Profiler::stopProfiling()
 {
     featuresEnabled = 0;
-    reportData(true);
+    reportData();
     m_sentLocations.clear();
 }
 
@@ -89,7 +89,7 @@ bool operator<(const FunctionCall &call1, const FunctionCall &call2)
             (call1.m_end == call2.m_end && call1.m_function < call2.m_function)));
 }
 
-void Profiler::reportData(bool trackLocations)
+void Profiler::reportData()
 {
     std::sort(m_data.begin(), m_data.end());
     QVector<FunctionCallProperties> properties;
@@ -100,12 +100,11 @@ void Profiler::reportData(bool trackLocations)
         properties.append(call.properties());
         Function *function = call.function();
         SentMarker &marker = m_sentLocations[reinterpret_cast<quintptr>(function)];
-        if (!trackLocations || !marker.isValid()) {
+        if (!marker.isValid()) {
             FunctionLocation &location = locations[properties.constLast().id];
             if (!location.isValid())
                 location = call.resolveLocation();
-            if (trackLocations)
-                marker.setFunction(function);
+            marker.setFunction(function);
         }
     }
 
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index c69d1e4cf6..66227fe733 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -251,7 +251,7 @@ public:
 
     void stopProfiling();
     void startProfiling(quint64 features);
-    void reportData(bool trackLocations);
+    void reportData();
     void setTimer(const QElapsedTimer &timer) { m_timer = timer; }
 
 signals: