From 1697fbdf05ff643d617a9ba1614454926e86a3d9 Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 --- src/corelib/kernel/qobject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/kernel/qobject.cpp') diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 4a3356d810..a84d501a32 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -104,7 +104,7 @@ static int *queuedConnectionTypes(const QList &typeNames) if (typeName.endsWith('*')) types[i] = QMetaType::VoidStar; else - types[i] = QMetaType::type(typeName); + types[i] = QMetaType::fromName(typeName).id(); if (!types[i]) { qWarning("QObject::connect: Cannot queue arguments of type '%s'\n" @@ -129,7 +129,7 @@ static int *queuedConnectionTypes(const QArgumentType *argumentTypes, int argc) else if (type.name().endsWith('*')) types[i] = QMetaType::VoidStar; else - types[i] = QMetaType::type(type.name()); + types[i] = QMetaType::fromName(type.name()).id(); if (!types[i]) { qWarning("QObject::connect: Cannot queue arguments of type '%s'\n" @@ -591,7 +591,7 @@ QMetaCallEvent::~QMetaCallEvent() int *typeIDs = types(); for (int i = 0; i < d.nargs_; ++i) { if (typeIDs[i] && d.args_[i]) - QMetaType::destroy(typeIDs[i], d.args_[i]); + QMetaType(typeIDs[i]).destroy(d.args_[i]); } if (reinterpret_cast(d.args_) != reinterpret_cast(prealloc_)) free(d.args_); @@ -3654,7 +3654,7 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect types[n] = argumentTypes[n-1]; for (int n = 1; n < nargs; ++n) - args[n] = QMetaType::create(types[n], argv[n]); + args[n] = QMetaType(types[n]).create(argv[n]); } locker.relock(); -- cgit v1.2.3