QmlProfiler: Remove binding types

There is only one type of binding left and as all clients check atEnd()
before trying to get the bindingType from the stream we can just remove
all of this.

Change-Id: I4d50ef4a691630b521292cb622ef539b3494a970
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

3 files changed, 3 insertions, 20 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 8879cc4037..49c719f036 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -78,8 +78,7 @@ static void qQmlProfilerDataToByteArrays(const QQmlProfilerData *d, QList<QByteA
 
             switch (decodedMessageType) {
             case QQmlProfilerDefinitions::RangeStart:
-                if (decodedDetailType == (int)QQmlProfilerDefinitions::Binding)
-                    ds << QQmlProfilerDefinitions::QmlBinding;
+            case QQmlProfilerDefinitions::RangeEnd:
                 break;
             case QQmlProfilerDefinitions::RangeData:
                 ds << (d->detailString.isEmpty() ? d->detailUrl.toString() : d->detailString);
@@ -88,7 +87,6 @@ static void qQmlProfilerDataToByteArrays(const QQmlProfilerData *d, QList<QByteA
                 ds << (d->detailUrl.isEmpty() ? d->detailString : d->detailUrl.toString()) << d->x
                    << d->y;
                 break;
-            case QQmlProfilerDefinitions::RangeEnd: break;
             default:
                 Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message type.");
                 break;
diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h
index 952eafed29..bdc21cbf25 100644
--- a/src/qml/debugger/qqmlprofilerdefinitions_p.h
+++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h
@@ -89,9 +89,6 @@ struct QQmlProfilerDefinitions {
 
     enum BindingType {
         QmlBinding,
-        V8Binding,
-        V4Binding,
-
         MaximumBindingType
     };
 
diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp
index bd7b98379f..28cb64066d 100644
--- a/tools/qmlprofiler/qmlprofilerclient.cpp
+++ b/tools/qmlprofiler/qmlprofilerclient.cpp
@@ -52,7 +52,6 @@ public:
     QStack<qint64> rangeStartTimes[QQmlProfilerDefinitions::MaximumRangeType];
     QStack<QStringList> rangeDatas[QQmlProfilerDefinitions::MaximumRangeType];
     QStack<QmlEventLocation> rangeLocations[QQmlProfilerDefinitions::MaximumRangeType];
-    QStack<QQmlProfilerDefinitions::BindingType> bindingTypes;
     int rangeCount[QQmlProfilerDefinitions::MaximumRangeType];
 
     quint64 features;
@@ -82,7 +81,6 @@ void QmlProfilerClient::clearData()
         d->rangeDatas[i].clear();
         d->rangeLocations[i].clear();
     }
-    d->bindingTypes.clear();
 }
 
 void QmlProfilerClient::sendRecordingStatus(bool record)
@@ -216,13 +214,6 @@ void QmlProfilerClient::messageReceived(const QByteArray &data)
             d->inProgressRanges |= (static_cast<qint64>(1) << range);
             ++d->rangeCount[range];
 
-            // read binding type
-            if (range == (int)QQmlProfilerDefinitions::Binding) {
-                int bindingType = (int)QQmlProfilerDefinitions::QmlBinding;
-                if (!stream.atEnd())
-                    stream >> bindingType;
-                d->bindingTypes.push((QQmlProfilerDefinitions::BindingType)bindingType);
-            }
         } else if (messageType == QQmlProfilerDefinitions::RangeData) {
             QString data;
             stream >> data;
@@ -259,12 +250,9 @@ void QmlProfilerClient::messageReceived(const QByteArray &data)
                             d->rangeLocations[range].pop() : QmlEventLocation();
 
                 qint64 startTime = d->rangeStartTimes[range].pop();
-                QQmlProfilerDefinitions::BindingType bindingType =
-                        QQmlProfilerDefinitions::QmlBinding;
-                if (range == (int)QQmlProfilerDefinitions::Binding)
-                    bindingType = d->bindingTypes.pop();
                 emit this->range((QQmlProfilerDefinitions::RangeType)range,
-                                 bindingType, startTime, time - startTime, data, location);
+                                 QQmlProfilerDefinitions::QmlBinding, startTime, time - startTime,
+                                 data, location);
                 if (d->rangeCount[range] == 0) {
                     int count = d->rangeDatas[range].count() +
                                 d->rangeStartTimes[range].count() +