From a775e43ae8872e344924581736c0ab933e12510d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 20 Apr 2015 09:38:07 +0200 Subject: 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 --- src/qml/qml/qqmlabstractbinding.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/qml/qml/qqmlabstractbinding.cpp') 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(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(vtbinding); @@ -197,4 +197,9 @@ QString QQmlAbstractBinding::expression() const return QLatin1String(""); } +bool QQmlAbstractBinding::isValueTypeProxy() const +{ + return false; +} + QT_END_NAMESPACE -- cgit v1.2.3