QQmlEnginePrivate: remove functions that only forward to QQmlMetaType

As a drive-by, remove metatype-id to metatype conversion in
qqmlproperty.cpp

Task-number: QTBUG-82931
Change-Id: I88511bdc103bfb507b6c4401af103e0aec13894f
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

8 files changed, 10 insertions, 27 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 86d37bb5ec..41a57e36c9 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1997,7 +1997,7 @@ bool CallArgument::fromValue(QMetaType metaType, QV4::ExecutionEngine *engine, c
         } else {
             QQmlMetaObject mo = ep ? ep->rawMetaObjectForType(callType) : QQmlMetaObject();
             if (!mo.isNull()) {
-                QObject *obj = ep->toQObject(v);
+                QObject *obj = QQmlMetaType::toQObject(v);
 
                 if (obj != nullptr && !QQmlMetaObject::canConvert(obj, mo)) {
                     *qvariantPtr = QVariant(metaType, nullptr);
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index ba9de0ab61..26dc0730f9 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -2053,10 +2053,6 @@ bool QQmlEnginePrivate::isQObject(int t)
     return m_compositeTypes.contains(t) || QQmlMetaType::isQObject(t);
 }
 
-QObject *QQmlEnginePrivate::toQObject(const QVariant &v, bool *ok) const
-{
-    return QQmlMetaType::toQObject(v, ok);
-}
 
 QQmlMetaType::TypeCategory QQmlEnginePrivate::typeCategory(int t) const
 {
@@ -2066,16 +2062,6 @@ QQmlMetaType::TypeCategory QQmlEnginePrivate::typeCategory(int t) const
     return QQmlMetaType::typeCategory(t);
 }
 
-bool QQmlEnginePrivate::isList(int t) const
-{
-    return QQmlMetaType::isList(t);
-}
-
-int QQmlEnginePrivate::listType(int t) const
-{
-    return QQmlMetaType::listType(t);
-}
-
 
 static QQmlPropertyCache *propertyCacheForPotentialInlineComponentType(int t, const QHash<int, QV4::ExecutableCompilationUnit *>::const_iterator &iter) {
     if (t != (*iter)->typeIds.id.id()) {
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index df78149b0b..1ea5f3bedc 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -236,10 +236,7 @@ public:
 
     // These methods may be called from the loader thread
     bool isQObject(int);
-    QObject *toQObject(const QVariant &, bool *ok = nullptr) const;
     QQmlMetaType::TypeCategory typeCategory(int) const;
-    bool isList(int) const;
-    int listType(int) const;
     QQmlMetaObject rawMetaObjectForType(int) const;
     QQmlMetaObject metaObjectForType(int) const;
     QQmlPropertyCache *propertyCacheForType(int);
diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp
index fe0b820a1e..b266157d28 100644
--- a/src/qml/qml/qqmllist.cpp
+++ b/src/qml/qml/qqmllist.cpp
@@ -57,7 +57,7 @@ QQmlListReference QQmlListReferencePrivate::init(const QQmlListProperty<QObject>
 
     QQmlEnginePrivate *p = engine?QQmlEnginePrivate::get(engine):nullptr;
 
-    int listType = p?p->listType(propType):QQmlMetaType::listType(propType);
+    int listType = QQmlMetaType::listType(propType);
     if (listType == -1) return rv;
 
     rv.d = new QQmlListReferencePrivate;
@@ -139,7 +139,7 @@ QQmlListReference::QQmlListReference(const QVariant &variant, QQmlEngine *engine
         return;
 
     QQmlEnginePrivate *p = engine ? QQmlEnginePrivate::get(engine) : nullptr;
-    const int listType = p ? p->listType(t.id()) : QQmlMetaType::listType(t.id());
+    const int listType = QQmlMetaType::listType(t.id());
     if (listType == -1)
         return;
 
@@ -177,7 +177,7 @@ QQmlListReference::QQmlListReference(QObject *object, const char *property, QQml
 
     QQmlEnginePrivate *p = engine?QQmlEnginePrivate::get(engine):nullptr;
 
-    int listType = p?p->listType(data->propType().id()):QQmlMetaType::listType(data->propType().id());
+    int listType = QQmlMetaType::listType(data->propType().id());
     if (listType == -1) return;
 
     d = new QQmlListReferencePrivate;
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index ca1bf6cd9d..10b1304b67 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -1107,7 +1107,7 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *bindingProper
             void *itemToAdd = createdSubObject;
 
             const char *iid = nullptr;
-            int listItemType = QQmlEnginePrivate::get(engine)->listType(bindingProperty->propType().id());
+            int listItemType = QQmlMetaType::listType(bindingProperty->propType().id());
             if (listItemType != -1)
                 iid = QQmlMetaType::interfaceIId(listItemType);
             if (iid)
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index f2915c950d..af5d916c68 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -1261,7 +1261,7 @@ bool QQmlPropertyPrivate::write(
             double integral;
             double fractional = std::modf(value.toDouble(), &integral);
             if (qFuzzyIsNull(fractional))
-                v.convert(QMetaType(QMetaType::Int));
+                v.convert(QMetaType::fromType<qint32>());
         }
         return writeEnumProperty(prop, property.coreIndex(), object, v, flags);
     }
@@ -1352,7 +1352,7 @@ bool QQmlPropertyPrivate::write(
         QQmlMetaObject listType;
 
         if (enginePriv) {
-            listType = enginePriv->rawMetaObjectForType(enginePriv->listType(propertyType));
+            listType = enginePriv->rawMetaObjectForType(QQmlMetaType::listType(propertyType));
         } else {
             QQmlType type = QQmlMetaType::qmlType(QQmlMetaType::listType(propertyType));
             if (!type.isValid())
@@ -1389,7 +1389,7 @@ bool QQmlPropertyPrivate::write(
                 prop.append(&prop, o);
             }
         } else {
-            QObject *o = enginePriv?enginePriv->toQObject(value):QQmlMetaType::toQObject(value);
+            QObject *o = QQmlMetaType::toQObject(value);
             if (o && !QQmlMetaObject::canConvert(o, listType))
                 o = nullptr;
             prop.append(&prop, o);
diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp
index 615128bfac..7aeef30d9d 100644
--- a/src/qml/qml/qqmlpropertyvalidator.cpp
+++ b/src/qml/qml/qqmlpropertyvalidator.cpp
@@ -734,7 +734,7 @@ QQmlError QQmlPropertyValidator::validateObjectBinding(QQmlPropertyData *propert
         // We can convert everything to QVariant :)
         return noError;
     } else if (property->isQList()) {
-        const int listType = enginePrivate->listType(propType);
+        const int listType = QQmlMetaType::listType(propType);
         if (!QQmlMetaType::isInterface(listType)) {
             QQmlPropertyCache *source = propertyCaches.at(binding->value.objectIndex);
             if (!canCoerce(listType, source)) {
diff --git a/src/qmlmodels/qqmllistaccessor.cpp b/src/qmlmodels/qqmllistaccessor.cpp
index 5e3fb86510..1e67d03f74 100644
--- a/src/qmlmodels/qqmllistaccessor.cpp
+++ b/src/qmlmodels/qqmllistaccessor.cpp
@@ -105,7 +105,7 @@ void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine)
         }
     } else if ((!enginePrivate && QQmlMetaType::isQObject(d.userType())) ||
                (enginePrivate && enginePrivate->isQObject(d.userType()))) {
-        QObject *data = enginePrivate?enginePrivate->toQObject(d):QQmlMetaType::toQObject(d);
+        QObject *data = QQmlMetaType::toQObject(d);
         d = QVariant::fromValue(data);
         m_type = Instance;
     } else if (d.userType() == qMetaTypeId<QQmlListReference>()) {