From 396190686c4d1162953badf90f9aab9992bd1e76 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 21 Apr 2022 15:03:48 +0200 Subject: Exploit the new macro varargs form of Q_GLOBAL_STATIC Convert various uses of Q_GLOBAL_STATIC_WITH_ARGS() to the less verbose form the recent reworking makes possible. Change-Id: I57820660b5d00d39bf54b5a08cb921ebaec57c7c Reviewed-by: Thiago Macieira --- src/corelib/text/qlocale.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/text/qlocale.cpp') diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 1f2a0b62e2..bdd896b4c8 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -860,8 +860,8 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l) static const int locale_data_size = sizeof(locale_data)/sizeof(QLocaleData) - 1; Q_CONSTINIT QBasicAtomicInt QLocalePrivate::s_generation = Q_BASIC_ATOMIC_INITIALIZER(0); -Q_GLOBAL_STATIC_WITH_ARGS(QSharedDataPointer, defaultLocalePrivate, - (new QLocalePrivate(defaultData(), defaultIndex()))) +Q_GLOBAL_STATIC(QSharedDataPointer, defaultLocalePrivate, + new QLocalePrivate(defaultData(), defaultIndex())) static QLocalePrivate *localePrivateByName(QStringView name) { -- cgit v1.2.3