Replace bindingType() method by a virtual getter

This removes the need to save some bits in the abstract binding
object, and should make it easier to move QQmlAbstractBinding
over to be reference counted.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 39af82f0eb..997859d410 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -749,7 +749,7 @@ static QQmlAbstractBinding *removeOldBinding(QObject *object, int index, QQmlPro
     if (!oldBinding)
         return 0;
 
-    if (valueTypeIndex != -1 && oldBinding->bindingType() == QQmlAbstractBinding::ValueTypeProxy)
+    if (valueTypeIndex != -1 && oldBinding->isValueTypeProxy())
         oldBinding = static_cast<QQmlValueTypeProxyBinding *>(oldBinding)->binding(index);
 
     if (!oldBinding)
@@ -810,7 +810,7 @@ QQmlPropertyPrivate::binding(QObject *object, int index)
         binding = binding->nextBinding();
 
     if (binding && valueTypeIndex != -1) {
-        if (binding->bindingType() == QQmlAbstractBinding::ValueTypeProxy) {
+        if (binding->isValueTypeProxy()) {
             int index = QQmlPropertyData::encodeValueTypePropertyIndex(coreIndex, valueTypeIndex);
             binding = static_cast<QQmlValueTypeProxyBinding *>(binding)->binding(index);
         }