Removed usage of QQmlValueType in QQmlValueTypeWrapper

QQmlValueType doesn't have anything really necessary :). Some code it has, but
that was only called from the wrapper, so it was moved there. This also reduces
one level of memory allocation for the wrapper.

In theory the allocation for the JavaScript wrapper could be changed to be the
size of the wrapper _plus_ the size needed for the gadget. However in
anticipation of wanting to be able to move objects, we can't do that as we
can't memmove() gadgets around - they might contain pointers to memory areas
within.

Change-Id: Icb5a6f5513e3b2c87f6639f6f7b1fb572af08137
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index 24031800cd..ad883266bd 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -53,7 +53,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlValueType;
 class QV8Engine;
 
 namespace QV4 {
@@ -62,8 +61,14 @@ namespace Heap {
 
 struct QQmlValueTypeWrapper : Object {
     QQmlValueTypeWrapper(ExecutionEngine *engine);
+    ~QQmlValueTypeWrapper();
     mutable QQmlRefPointer<QQmlPropertyCache> propertyCache;
-    mutable QScopedPointer<QQmlValueType> type;
+    mutable void *gadgetPtr;
+    mutable int metaType;
+
+    void setValue(const QVariant &value) const;
+    QVariant toVariant() const;
+    void *gadget() const { return gadgetPtr; }
 };
 
 }