Smaller cleanups

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

1 files changed, 46 insertions, 45 deletions

diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp
index 877ded7af3..04fbb16764 100644
--- a/src/qml/qml/qqmlabstractbinding.cpp
+++ b/src/qml/qml/qqmlabstractbinding.cpp
@@ -110,59 +110,60 @@ Remove the binding from the object.
 */
 void QQmlAbstractBinding::removeFromObject()
 {
-    if (isAddedToObject()) {
-        QObject *obj = targetObject();
-        QQmlData *data = QQmlData::get(obj, false);
-        Q_ASSERT(data);
-
-        int coreIndex;
-        if (QQmlPropertyData::decodeValueTypePropertyIndex(targetPropertyIndex(), &coreIndex) != -1) {
-
-            // Find the value type binding
-            QQmlAbstractBinding *vtbinding = data->bindings;
-            while (vtbinding->targetPropertyIndex() != coreIndex) {
-                vtbinding = vtbinding->nextBinding();
-                Q_ASSERT(vtbinding);
-            }
-            Q_ASSERT(vtbinding->bindingType() == QQmlAbstractBinding::ValueTypeProxy);
-
-            QQmlValueTypeProxyBinding *vtproxybinding =
-                static_cast<QQmlValueTypeProxyBinding *>(vtbinding);
-
-            QQmlAbstractBinding *binding = vtproxybinding->m_bindings;
-            if (binding == this) {
-                vtproxybinding->m_bindings = nextBinding();
-            } else {
-               while (binding->nextBinding() != this) {
-                  binding = binding->nextBinding();
-                  Q_ASSERT(binding);
-               }
-               binding->setNextBinding(nextBinding());
-            }
+    if (!isAddedToObject())
+        return;
+
+    QObject *obj = targetObject();
+    QQmlData *data = QQmlData::get(obj, false);
+    Q_ASSERT(data);
+
+    int coreIndex;
+    if (QQmlPropertyData::decodeValueTypePropertyIndex(targetPropertyIndex(), &coreIndex) != -1) {
+
+        // Find the value type binding
+        QQmlAbstractBinding *vtbinding = data->bindings;
+        while (vtbinding->targetPropertyIndex() != coreIndex) {
+            vtbinding = vtbinding->nextBinding();
+            Q_ASSERT(vtbinding);
+        }
+        Q_ASSERT(vtbinding->bindingType() == QQmlAbstractBinding::ValueTypeProxy);
 
-            // Value type - we don't remove the proxy from the object.  It will sit their happily
-            // doing nothing until it is removed by a write, a binding change or it is reused
-            // to hold more sub-bindings.
+        QQmlValueTypeProxyBinding *vtproxybinding =
+            static_cast<QQmlValueTypeProxyBinding *>(vtbinding);
 
+        QQmlAbstractBinding *binding = vtproxybinding->m_bindings;
+        if (binding == this) {
+            vtproxybinding->m_bindings = nextBinding();
         } else {
+           while (binding->nextBinding() != this) {
+              binding = binding->nextBinding();
+              Q_ASSERT(binding);
+           }
+           binding->setNextBinding(nextBinding());
+        }
 
-            if (data->bindings == this) {
-                data->bindings = nextBinding();
-            } else {
-                QQmlAbstractBinding *binding = data->bindings;
-                while (binding->nextBinding() != this) {
-                    binding = binding->nextBinding();
-                    Q_ASSERT(binding);
-                }
-                binding->setNextBinding(nextBinding());
-            }
+        // Value type - we don't remove the proxy from the object.  It will sit their happily
+        // doing nothing until it is removed by a write, a binding change or it is reused
+        // to hold more sub-bindings.
+
+    } else {
 
-            data->clearBindingBit(coreIndex);
+        if (data->bindings == this) {
+            data->bindings = nextBinding();
+        } else {
+            QQmlAbstractBinding *binding = data->bindings;
+            while (binding->nextBinding() != this) {
+                binding = binding->nextBinding();
+                Q_ASSERT(binding);
+            }
+            binding->setNextBinding(nextBinding());
         }
 
-        setNextBinding(0);
-        setAddedToObject(false);
+        data->clearBindingBit(coreIndex);
     }
+
+    setNextBinding(0);
+    setAddedToObject(false);
 }
 
 void QQmlAbstractBinding::printBindingLoopError(QQmlProperty &prop)