diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-20 09:38:07 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-05 10:07:50 +0000 |
commit | a775e43ae8872e344924581736c0ab933e12510d (patch) | |
tree | f02d240abb2f2c7ac410f3ae84049923a6f0969e /src/qml/qml/qqmlproperty.cpp | |
parent | 6e1a4bf12846e6a68931a924890f54b433a42d1c (diff) |
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>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 4 |
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); } |