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

Tidy up some QTimeZone code and comments

Browse Source 
Correct a member comment in LocaleMetaZoneLongNames.
Remove a superfluous else in QUtcTimeZonePrivate::displayName().
Add a TODO comment to QUtcTimeZonePrivate::isTimeZoneIdAvailable().

Pick-to: 6.8
Change-Id: Iddc144a267ca8fb33a6577e8d671ef3da53ca525
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 7983b9bd9a56cdb6c8ec6c0ae907329eabde39fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2025-04-11 17:45:59 +02:00 committed by Qt Cherry-pick Bot
parent bccbf1be13
commit b069dda4da
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/time/qtimezonelocale_p.h
View File

@ -154,7 +154,7 @@ struct LocaleZoneNames
struct LocaleMetaZoneLongNames
{
quint16 localeIndex; // Index in locale data tables
quint16 metaIdIndex; // metaZoneTable[metaZoneKey - 1].metaIdIndex
quint16 metaIdIndex; // As for MetaZoneData metaZoneTable[].
timeTypeRange(long)
#define forEachField(X) forEachNameType(X, long)
// Long localized names (length zero for unspecified) for the

3
src/corelib/time/qtimezoneprivate.cpp
View File

@ -1084,7 +1084,7 @@ QString QUtcTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
Q_UNUSED(locale);
if (nameType == QTimeZone::ShortName)
return m_abbreviation;
else if (nameType == QTimeZone::OffsetName)
if (nameType == QTimeZone::OffsetName)
return isoOffsetFormat(m_offsetFromUtc);
return m_name;
}
@ -1112,6 +1112,7 @@ QByteArray QUtcTimeZonePrivate::systemTimeZoneId() const
return utcQByteArray();
}
// TODO: port to QByteArrayView
bool QUtcTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
{
// Only the zone IDs supplied by CLDR and recognized by constructor.