From 6dfb013b62e428a348131f887a08e83ff4bccaa6 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 28 Aug 2024 13:32:44 +0200 Subject: [PATCH] DRY QT_FOR_EACH_STATIC_CORE_TEMPLATE() Use the same technique used elsewhere in qmetatype.h to deal with missing features: define a new macro to either contain the types controlled by the feature or be empty, and then call that macro from the larger-scale one. DRYs the list of types to not repeat QByteArrayList and QStringList. Amends cdbc76360ae4c12b25923a7cb392355a6485fc70. Change-Id: I767452aa33c1a2404315a0c3cd02f7102b9d6653 Reviewed-by: Thiago Macieira (cherry picked from commit fbc80ee163f16baafcc236b533ea7ccc3376fa2f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qmetatype.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 54e63f98871..8c76d1de407 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -136,19 +136,20 @@ inline constexpr int qMetaTypeId(); F(QObjectStar, 39, QObject*) #ifndef QT_NO_VARIANT -# define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F)\ +# define QT_FOR_EACH_STATIC_CORE_QVARIANT_TEMPLATE(F) \ F(QVariantMap, 8, QVariantMap) \ F(QVariantList, 9, QVariantList) \ F(QVariantHash, 28, QVariantHash) \ F(QVariantPair, 58, QVariantPair) \ - F(QByteArrayList, 49, QByteArrayList) \ - F(QStringList, 11, QStringList) \ /**/ #else -# define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F)\ +# define QT_FOR_EACH_STATIC_CORE_QVARIANT_TEMPLATE(F) +#endif // QT_NO_VARIANT + +#define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F) \ + QT_FOR_EACH_STATIC_CORE_QVARIANT_TEMPLATE(F) \ F(QByteArrayList, 49, QByteArrayList) \ F(QStringList, 11, QStringList) -#endif #if QT_CONFIG(shortcut) #define QT_FOR_EACH_STATIC_KEYSEQUENCE_CLASS(F)\