QQmlValueTypeWrapper: Move setData method inline

That's a rather common thing to do.

Change-Id: I259848b9be5e2a578b0fc1c5f4c6f0f61bd3b723
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 13 insertions, 10 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 08af9d7635..da3c2bfe2c 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -58,15 +58,6 @@ void Heap::QQmlValueTypeWrapper::destroy()
     ReferenceObject::destroy();
 }
 
-void Heap::QQmlValueTypeWrapper::setData(const void *data)
-{
-    if (auto *gadget = gadgetPtr())
-        metaType().destruct(gadget);
-    if (!gadgetPtr())
-        setGadgetPtr(::operator new(metaType().sizeOf()));
-    metaType().construct(gadgetPtr(), data);
-}
-
 QVariant Heap::QQmlValueTypeWrapper::toVariant() const
 {
     Q_ASSERT(gadgetPtr());
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index a100fc6519..df173e6325 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -67,7 +67,19 @@ DECLARE_HEAP_OBJECT(QQmlValueTypeWrapper, ReferenceObject) {
 
     const QMetaObject *metaObject() const { return m_metaObject; }
 
-    void setData(const void *data);
+    void setData(const void *data)
+    {
+        const QMetaType type = metaType();
+        void *gadget = gadgetPtr();
+        if (gadget) {
+            type.destruct(gadget);
+        } else {
+            gadget = ::operator new(type.sizeOf());
+            setGadgetPtr(gadget);
+        }
+        type.construct(gadget, data);
+    }
+
     QVariant toVariant() const;
 
     void *storagePointer();