1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exploit the new macro varargs form of Q_GLOBAL_STATIC

Browse Source 
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 <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2022-04-21 15:03:48 +02:00
parent 48561178e2
commit 396190686c
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qabstractfileengine.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -107,7 +107,7 @@ Q_CONSTINIT static QBasicAtomicInt qt_file_engine_handlers_in_use = Q_BASIC_ATOM
All application-wide handlers are stored in this list. The mutex must be All application-wide handlers are stored in this list. The mutex must be
acquired to ensure thread safety. acquired to ensure thread safety.
*/ */
Q_GLOBAL_STATIC_WITH_ARGS(QReadWriteLock, fileEngineHandlerMutex, (QReadWriteLock::Recursive)) Q_GLOBAL_STATIC(QReadWriteLock, fileEngineHandlerMutex, QReadWriteLock::Recursive)
Q_CONSTINIT static bool qt_abstractfileenginehandlerlist_shutDown = false; Q_CONSTINIT static bool qt_abstractfileenginehandlerlist_shutDown = false;
class QAbstractFileEngineHandlerList : public QList<QAbstractFileEngineHandler *> class QAbstractFileEngineHandlerList : public QList<QAbstractFileEngineHandler *>
{ {

6
src/corelib/io/qloggingcategory.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -43,9 +43,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
const char qtDefaultCategoryName[] = "default"; const char qtDefaultCategoryName[] = "default";
Q_GLOBAL_STATIC(QLoggingCategory, qtDefaultCategory, qtDefaultCategoryName)
Q_GLOBAL_STATIC_WITH_ARGS(QLoggingCategory, qtDefaultCategory,
(qtDefaultCategoryName))
#ifndef Q_ATOMIC_INT8_IS_SUPPORTED #ifndef Q_ATOMIC_INT8_IS_SUPPORTED
static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift) static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift)

5
src/corelib/io/qstorageinfo.cpp
View File

@ -1,6 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com> ** Copyright (C) 2022 The Qt Company Ltd.
** Copyright (C) 2015 Ivan Komissarov <ABBAPOH@gmail.com>
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -399,7 +400,7 @@ QList<QStorageInfo> QStorageInfo::mountedVolumes()
return QStorageInfoPrivate::mountedVolumes(); return QStorageInfoPrivate::mountedVolumes();
} }
Q_GLOBAL_STATIC_WITH_ARGS(QStorageInfo, getRoot, (QStorageInfoPrivate::root())) Q_GLOBAL_STATIC(QStorageInfo, getRoot, QStorageInfoPrivate::root())
/*! /*!
Returns a QStorageInfo object that represents the system root volume. Returns a QStorageInfo object that represents the system root volume.

6
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> ** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
@ -769,7 +769,7 @@ void QAbstractItemModelPrivate::invalidatePersistentIndex(const QModelIndex &ind
} }
using DefaultRoleNames = QHash<int, QByteArray>; using DefaultRoleNames = QHash<int, QByteArray>;
Q_GLOBAL_STATIC_WITH_ARGS(DefaultRoleNames, qDefaultRoleNames, ( Q_GLOBAL_STATIC(DefaultRoleNames, qDefaultRoleNames,
{ {
{ Qt::DisplayRole, "display" }, { Qt::DisplayRole, "display" },
{ Qt::DecorationRole, "decoration" }, { Qt::DecorationRole, "decoration" },
@ -777,7 +777,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(DefaultRoleNames, qDefaultRoleNames, (
{ Qt::ToolTipRole, "toolTip" }, { Qt::ToolTipRole, "toolTip" },
{ Qt::StatusTipRole, "statusTip" }, { Qt::StatusTipRole, "statusTip" },
{ Qt::WhatsThisRole, "whatsThis" }, { Qt::WhatsThisRole, "whatsThis" },
})) })
const QHash<int,QByteArray> &QAbstractItemModelPrivate::defaultRoleNames() const QHash<int,QByteArray> &QAbstractItemModelPrivate::defaultRoleNames()
{ {

4
src/corelib/kernel/qjnihelpers.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -69,7 +69,7 @@ static jobject g_jActivity = nullptr;
static jobject g_jService = nullptr; static jobject g_jService = nullptr;
static jobject g_jClassLoader = nullptr; static jobject g_jClassLoader = nullptr;
Q_GLOBAL_STATIC_WITH_ARGS(QtAndroidPrivate::OnBindListener*, g_onBindListener, (nullptr)); Q_GLOBAL_STATIC(QtAndroidPrivate::OnBindListener *, g_onBindListener, nullptr);
Q_GLOBAL_STATIC(QMutex, g_onBindListenerMutex); Q_GLOBAL_STATIC(QMutex, g_onBindListenerMutex);
Q_GLOBAL_STATIC(QSemaphore, g_waitForServiceSetupSemaphore); Q_GLOBAL_STATIC(QSemaphore, g_waitForServiceSetupSemaphore);
Q_GLOBAL_STATIC(QAtomicInt, g_serviceSetupLockers); Q_GLOBAL_STATIC(QAtomicInt, g_serviceSetupLockers);

4
src/corelib/text/qlocale.cpp
View File

@ -860,8 +860,8 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
static const int locale_data_size = sizeof(locale_data)/sizeof(QLocaleData) - 1; static const int locale_data_size = sizeof(locale_data)/sizeof(QLocaleData) - 1;
Q_CONSTINIT QBasicAtomicInt QLocalePrivate::s_generation = Q_BASIC_ATOMIC_INITIALIZER(0); Q_CONSTINIT QBasicAtomicInt QLocalePrivate::s_generation = Q_BASIC_ATOMIC_INITIALIZER(0);
Q_GLOBAL_STATIC_WITH_ARGS(QSharedDataPointer<QLocalePrivate>, defaultLocalePrivate, Q_GLOBAL_STATIC(QSharedDataPointer<QLocalePrivate>, defaultLocalePrivate,
(new QLocalePrivate(defaultData(), defaultIndex()))) new QLocalePrivate(defaultData(), defaultIndex()))
static QLocalePrivate *localePrivateByName(QStringView name) static QLocalePrivate *localePrivateByName(QStringView name)
{ {

4
src/corelib/time/qtimezoneprivate_tz.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Copyright (C) 2019 Crimson AS <info@crimson.no> ** Copyright (C) 2019 Crimson AS <info@crimson.no>
** Copyright (C) 2013 John Layt <jlayt@kde.org> ** Copyright (C) 2013 John Layt <jlayt@kde.org>
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
@ -125,7 +125,7 @@ static QTzTimeZoneHash loadTzTimeZones()
} }
// Hash of available system tz files as loaded by loadTzTimeZones() // Hash of available system tz files as loaded by loadTzTimeZones()
Q_GLOBAL_STATIC_WITH_ARGS(const QTzTimeZoneHash, tzZones, (loadTzTimeZones())); Q_GLOBAL_STATIC(const QTzTimeZoneHash, tzZones, loadTzTimeZones());
/* /*
The following is copied and modified from tzfile.h which is in the public domain. The following is copied and modified from tzfile.h which is in the public domain.