From 2da86477d0973605bd598db7ff3ff219e2736b42 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 18 Nov 2024 23:09:20 -0800 Subject: [PATCH] QMetaType: remove qt_metaTypeArray and qt_incomplete_metaTypeArray moc no longer generates code using them. These were not in the QtPrivate namespace, but were undocumented. The incomplete one was also quite clunky and hard to use, due to the Unique type. Change-Id: I27c8f752800756af91eafffd5282bc67becf2d2d Reviewed-by: Fabian Kosmale Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetatype.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index d3355d52eb9..f379803e4a4 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2695,28 +2695,11 @@ constexpr const QMetaObject *QMetaType::metaObject() const return d_ptr && d_ptr->metaObjectFn ? d_ptr->metaObjectFn(d_ptr) : nullptr; } -template -constexpr const QtPrivate::QMetaTypeInterface *const qt_metaTypeArray[] = { - /* - Unique in qTryMetaTypeInterfaceForType does not have to be unique here - as we require _all_ types here to be actually complete. - We just want to have the additional type processing that exist in - QtPrivate::qTryMetaTypeInterfaceForType as opposed to the normal - QtPrivate::qMetaTypeInterfaceForType used in QMetaType::fromType - */ - QtPrivate::qTryMetaTypeInterfaceForType>()... -}; - constexpr const char *QMetaType::name() const { return d_ptr ? d_ptr->name : nullptr; } -template -constexpr const QtPrivate::QMetaTypeInterface *const qt_incomplete_metaTypeArray[] = { - QtPrivate::qTryMetaTypeInterfaceForType()... -}; - inline size_t qHash(QMetaType type, size_t seed = 0) { // We cannot use d_ptr here since the same type in different DLLs