Pass QMetaType by value rather than by ID in more places

This saves us some ping-pong between the IDs and the QMetaTypes, and
avoids possible ambiguities if multiple metatypes are registered for the
same C++ type.

Change-Id: I81cec94a9cd05d69927dc884f65574f0ab2ddc22
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 499f9dd492..1e11808ac7 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -235,11 +235,11 @@ public:
     using QJSEnginePrivate::cache;
 
     // These methods may be called from the loader thread
-    QQmlMetaObject rawMetaObjectForType(int) const;
-    QQmlMetaObject metaObjectForType(int) const;
-    QQmlPropertyCache *propertyCacheForType(int);
-    QQmlPropertyCache *rawPropertyCacheForType(int);
-    QQmlPropertyCache *rawPropertyCacheForType(int, QTypeRevision version);
+    QQmlMetaObject rawMetaObjectForType(QMetaType metaType) const;
+    QQmlMetaObject metaObjectForType(QMetaType metaType) const;
+    QQmlPropertyCache *propertyCacheForType(QMetaType metaType);
+    QQmlPropertyCache *rawPropertyCacheForType(QMetaType metaType);
+    QQmlPropertyCache *rawPropertyCacheForType(QMetaType metaType, QTypeRevision version);
     void registerInternalCompositeType(QV4::ExecutableCompilationUnit *compilationUnit);
     void unregisterInternalCompositeType(QV4::ExecutableCompilationUnit *compilationUnit);
     QV4::ExecutableCompilationUnit *obtainExecutableCompilationUnit(int typeId);