Reduce size of QQmlValueType

QMetaType exposes the type id it holds, so QQmlValueType do not have to
keep a duplicate.

Change-Id: I4491744b9f7c1e447cd21466f9d71b4007fdfa06
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 9 insertions, 11 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index e38f379eb0..024ec29a56 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -316,7 +316,7 @@ protected:
                 break;
             default:
                 if (const QV4::QQmlValueTypeWrapper *vtw = result.as<const QV4::QQmlValueTypeWrapper>()) {
-                    if (vtw->d()->valueType->typeId == pd->propType()) {
+                    if (vtw->d()->valueType->metaType.id() == pd->propType()) {
                         return vtw->write(m_target.data(), pd->coreIndex());
                     }
                 }
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 2b21591017..e92488f9f6 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -191,7 +191,6 @@ void QQmlValueTypeFactory::registerValueTypes(const char *uri, int versionMajor,
 
 QQmlValueType::QQmlValueType(int typeId, const QMetaObject *gadgetMetaObject)
     : gadgetPtr(QMetaType::create(typeId))
-    , typeId(typeId)
     , metaType(typeId)
 {
     QObjectPrivate *op = QObjectPrivate::get(this);
@@ -230,12 +229,12 @@ void QQmlValueType::write(QObject *obj, int idx, QQmlPropertyData::WriteFlags fl
 QVariant QQmlValueType::value()
 {
     Q_ASSERT(gadgetPtr);
-    return QVariant(typeId, gadgetPtr);
+    return QVariant(metaType.id(), gadgetPtr);
 }
 
 void QQmlValueType::setValue(const QVariant &value)
 {
-    Q_ASSERT(typeId == value.userType());
+    Q_ASSERT(metaType.id() == value.userType());
     metaType.destruct(gadgetPtr);
     metaType.construct(gadgetPtr, value.constData());
 }
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 4ea71e8955..89f1b71d61 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -84,7 +84,6 @@ private:
     void *gadgetPtr;
 
 public:
-    int typeId;
     QMetaType metaType;
 };
 
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index b503d75a47..9ce1c82f09 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -105,7 +105,7 @@ void Heap::QQmlValueTypeWrapper::destroy()
 
 void Heap::QQmlValueTypeWrapper::setValue(const QVariant &value) const
 {
-    Q_ASSERT(valueType->typeId == value.userType());
+    Q_ASSERT(valueType->metaType.id() == value.userType());
     if (gadgetPtr)
         valueType->metaType.destruct(gadgetPtr);
     if (!gadgetPtr)
@@ -116,7 +116,7 @@ void Heap::QQmlValueTypeWrapper::setValue(const QVariant &value) const
 QVariant Heap::QQmlValueTypeWrapper::toVariant() const
 {
     Q_ASSERT(gadgetPtr);
-    return QVariant(valueType->typeId, gadgetPtr);
+    return QVariant(valueType->metaType.id(), gadgetPtr);
 }
 
 
@@ -221,7 +221,7 @@ bool QQmlValueTypeWrapper::toGadget(void *data) const
     if (const QQmlValueTypeReference *ref = as<const QQmlValueTypeReference>())
         if (!ref->readReferenceValue())
             return false;
-    const int typeId = d()->valueType->typeId;
+    const int typeId = d()->valueType->metaType.id();
     QMetaType::destruct(typeId, data);
     QMetaType::construct(typeId, data, d()->gadgetPtr);
     return true;
@@ -305,7 +305,7 @@ bool QQmlValueTypeWrapper::isEqual(const QVariant& value) const
 
 int QQmlValueTypeWrapper::typeId() const
 {
-    return d()->valueType->typeId;
+    return d()->valueType->metaType.id();
 }
 
 bool QQmlValueTypeWrapper::write(QObject *target, int propertyIndex) const
@@ -352,10 +352,10 @@ ReturnedValue QQmlValueTypeWrapper::method_toString(const FunctionObject *b, con
     // Prepare a buffer to pass to QMetaType::convert()
     QString convertResult;
     convertResult.~QString();
-    if (QMetaType::convert(w->d()->gadgetPtr, w->d()->valueType->typeId, &convertResult, QMetaType::QString)) {
+    if (QMetaType::convert(w->d()->gadgetPtr, w->d()->valueType->metaType.id(), &convertResult, QMetaType::QString)) {
         result = convertResult;
     } else {
-        result += QString::fromUtf8(QMetaType::typeName(w->d()->valueType->typeId))
+        result += QString::fromUtf8(QMetaType::typeName(w->d()->valueType->metaType.id()))
                 + QLatin1Char('(');
         const QMetaObject *mo = w->d()->propertyCache()->metaObject();
         const int propCount = mo->propertyCount();