From 52bbb19fa4dc7647a0cad35a69dcf09437386080 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Thu, 6 Aug 2020 12:22:10 +0200
Subject: [PATCH] Reduce some code duplication

The r-value setBinding() overloads can be removed,
as they took a copy internally anyway.

Change-Id: I691265299e5cb336791f614b30788c81467df534
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/corelib/kernel/qproperty.h | 43 ++--------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index c6be89e169..acaf74f9af 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
@@ -276,20 +276,11 @@ public:
         return oldBinding;
     }
 
-    QPropertyBinding<T> setBinding(QPropertyBinding<T> &&newBinding)
-    {
-        QPropertyBinding<T> b(std::move(newBinding));
-        QPropertyBinding<T> oldBinding(d.priv.setBinding(b, &d));
-        notify();
-        return oldBinding;
-    }
-
     bool setBinding(const QUntypedPropertyBinding &newBinding)
     {
         if (newBinding.valueMetaType().id() != qMetaTypeId<T>())
             return false;
-        d.priv.setBinding(newBinding, &d);
-        notify();
+        setBinding(static_cast<const QPropertyBinding<T> &>(newBinding));
         return true;
     }
 
@@ -461,41 +452,11 @@ public:
         }
     }
 
-    QPropertyBinding<T> setBinding(Class *owner, QPropertyBinding<T> &&newBinding)
-    {
-        QPropertyBinding<T> b(std::move(newBinding));
-        if constexpr (CallbackAcceptsOldValue) {
-            T oldValue = value();
-            QPropertyBinding<T> oldBinding(d.priv.setBinding(b, &d, owner, [](void *o, void *oldVal) {
-                (reinterpret_cast<Class *>(o)->*Callback)(*reinterpret_cast<T *>(oldVal));
-            }, GuardTE));
-            notify(owner, &oldValue);
-            return oldBinding;
-        } else {
-            QPropertyBinding<T> oldBinding(d.priv.setBinding(b, &d, owner, [](void *o, void *) {
-                (reinterpret_cast<Class *>(o)->*Callback)();
-            }, GuardTE));
-            notify(owner);
-            return oldBinding;
-        }
-    }
-
     bool setBinding(Class *owner, const QUntypedPropertyBinding &newBinding)
     {
         if (newBinding.valueMetaType().id() != qMetaTypeId<T>())
             return false;
-        if constexpr (CallbackAcceptsOldValue) {
-            T oldValue = value();
-            d.priv.setBinding(newBinding, &d, owner, [](void *o, void *oldVal) {
-                (reinterpret_cast<Class *>(o)->*Callback)(*reinterpret_cast<T *>(oldVal));
-            }, GuardTE);
-            notify(owner, &oldValue);
-        } else {
-            d.priv.setBinding(newBinding, &d, owner, [](void *o, void *) {
-                (reinterpret_cast<Class *>(o)->*Callback)();
-            }, GuardTE);
-            notify(owner);
-        }
+        setBinding(owner, static_cast<const QPropertyBinding<T> &>(newBinding));
         return true;
     }