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, 9 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp
index 04fbb16764..4a081ae0e8 100644
--- a/src/qml/qml/qqmlabstractbinding.cpp
+++ b/src/qml/qml/qqmlabstractbinding.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlAbstractBinding::QQmlAbstractBinding(BindingType bt)
-    : m_nextBindingPtr(bt)
+QQmlAbstractBinding::QQmlAbstractBinding()
+    : m_nextBinding(0)
 {
 }
 
@@ -79,7 +79,7 @@ void QQmlAbstractBinding::addToObject()
             QQmlAbstractBinding *b = data->bindings;
             while (b && b->targetPropertyIndex() != coreIndex)
                 b = b->nextBinding();
-            Q_ASSERT(b && b->bindingType() == QQmlAbstractBinding::ValueTypeProxy);
+            Q_ASSERT(b && b->isValueTypeProxy());
             proxy = static_cast<QQmlValueTypeProxyBinding *>(b);
         }
 
@@ -126,7 +126,7 @@ void QQmlAbstractBinding::removeFromObject()
             vtbinding = vtbinding->nextBinding();
             Q_ASSERT(vtbinding);
         }
-        Q_ASSERT(vtbinding->bindingType() == QQmlAbstractBinding::ValueTypeProxy);
+        Q_ASSERT(vtbinding->isValueTypeProxy());
 
         QQmlValueTypeProxyBinding *vtproxybinding =
             static_cast<QQmlValueTypeProxyBinding *>(vtbinding);
@@ -197,4 +197,9 @@ QString QQmlAbstractBinding::expression() const
     return QLatin1String("<Unknown>");
 }
 
+bool QQmlAbstractBinding::isValueTypeProxy() const
+{
+    return false;
+}
+
 QT_END_NAMESPACE