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

QTimeZone: short-cut the empty-name case for the system zone and its id

Browse Source 
The systemTimeZoneId() delegated to systemTimeZone() in a way that
worked - but wasn't easy to follow - in the case where the backend's
systemTimeZoneId() failed but its default constructor succeeds. This
went via the QTimeZone(id) constructor, relying on its handling of
empty id (which gets the system zone, unlike the default constructor
which gets an invalid zone). When it gets an empty id, it falls back
to newBackendTimeZone(), which uses the default constructor of the
backend; and we have (and are even accessing the backend methods via)
a default-constructed backend, so can simply share that with
global_tz. This, if nothing else, saves repeating the systemTimeZone()
look-up for the system ID when delegated to by systemTimeZoneId().

There's a risk that this might miss a change to the system
configuration since the global_tz was initialized, but it's only used
in a fallback and backends tend to cache this information anyway. When
we come to address QTBUG-56899, we can have the refresh function
update the global_tz object.

Change-Id: I8541e74f378e92af5a2a7187a49a9eb14a66c744
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2068645f07ab9108fc54fa2c499b1b2661a35bfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2024-10-07 17:48:04 +02:00 committed by Qt Cherry-pick Bot
parent 47ae9e4c2c
commit 9b6a585f71
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/time/qtimezone.cpp
View File

@ -67,6 +67,7 @@ public:
// the host resources are insufficient. A simple UTC backend is used if no
// alternative is available.
QExplicitlySharedDataPointer<QTimeZonePrivate> backend;
// TODO QTBUG-56899: refresh should update this backend.
};
Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
@ -1401,7 +1402,7 @@ QByteArray QTimeZone::systemTimeZoneId()
if (!sys.isEmpty())
return sys;
// The system zone, despite the empty ID, may know its real ID anyway:
return systemTimeZone().id();
return global_tz->backend->id();
}
/*!
@ -1424,9 +1425,9 @@ QByteArray QTimeZone::systemTimeZoneId()
*/
QTimeZone QTimeZone::systemTimeZone()
{
// Use ID even if empty, as default constructor is invalid but empty-ID
// constructor goes to backend's default constructor, which may succeed.
const auto sys = QTimeZone(global_tz->backend->systemTimeZoneId());
// Short-cut constructor's handling of empty ID:
const QByteArray sysId = global_tz->backend->systemTimeZoneId();
const auto sys = sysId.isEmpty() ? QTimeZone(global_tz->backend) : QTimeZone(sysId);
if (!sys.isValid()) {
static bool neverWarned = true;
if (neverWarned) {