From 1697fbdf05ff643d617a9ba1614454926e86a3d9 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 4 Aug 2020 10:35:46 +0200
Subject: Deprecate the static int based API in QMetaType

And remove one of the type id to name mapping that still
existed in QMetaType. QMetaTypeInterface can provide that,
so there's no need to have a second copy of the data.

qMetaTypeTypeInternal() can still map all the names of all
builtin types to ids. That functionality is for now still
required by moc and can't be removed yet.

Change-Id: Ib4f8e9c71e1e7d99d52da9e44477c9a1f1805e57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/kernel/qmetaobjectbuilder.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp')

diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index 514cfeac554..e451e5cf41f 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 namespace QtPrivate {
 Q_CORE_EXPORT bool isBuiltinType(const QByteArray &type)
 {
-    int id = QMetaType::type(type);
+    int id = QMetaType::fromName(type).id();
     if (!id && !type.isEmpty() && type != "void")
         return false;
     return (id < QMetaType::User);
@@ -1316,7 +1316,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
                 const QByteArray &typeName = (i < 0) ? method.returnType : paramTypeNames.at(i);
                 int typeInfo;
                 if (QtPrivate::isBuiltinType(typeName))
-                    typeInfo = QMetaType::type(typeName);
+                    typeInfo = QMetaType::fromName(typeName).id();
                 else
                     typeInfo = IsUnresolvedType | strings.enter(typeName);
                 if (buf)
@@ -1343,7 +1343,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
 
         int typeInfo;
         if (QtPrivate::isBuiltinType(prop.type))
-            typeInfo = QMetaType::type(prop.type);
+            typeInfo = QMetaType::fromName(prop.type).id();
         else
             typeInfo = IsUnresolvedType | strings.enter(prop.type);
 
@@ -1438,23 +1438,23 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
         if (buf) {
             meta->d.metaTypes = types;
             for (const auto &prop : d->properties) {
-                QMetaType mt(QMetaType::type(prop.type));
+                QMetaType mt = QMetaType::fromName(prop.type);
                 *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
                 types++;
             }
             for (const auto &method: d->methods) {
-                QMetaType mt(QMetaType::type(method.returnType));
+                QMetaType mt(QMetaType::fromName(method.returnType).id());
                 *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
                 types++;
                 for (const auto &parameterType: method.parameterTypes()) {
-                    QMetaType mt(QMetaType::type(parameterType));
+                    QMetaType mt = QMetaType::fromName(parameterType);
                     *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
                     types++;
                 }
             }
             for (const auto &constructor: d->constructors) {
                 for (const auto &parameterType: constructor.parameterTypes()) {
-                    QMetaType mt(QMetaType::type(parameterType));
+                    QMetaType mt = QMetaType::fromName(parameterType);
                     *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
                     types++;
                 }
-- 
cgit v1.2.3