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

Fix spacing and indentation in QTimeZone code

Browse Source 
Petty tidy-up, just to disentangle it from other work.

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

2
src/corelib/time/qtimezonelocale.cpp
View File

@ -526,7 +526,7 @@ QString QTimeZonePrivate::localeName(qint64 atMSecsSinceEpoch, int offsetFromUtc
// First try for an actual name: // First try for an actual name:
for (const qsizetype locInd : indices) { for (const qsizetype locInd : indices) {
const LocaleZoneData &locData = localeZoneData[locInd]; const LocaleZoneData &locData = localeZoneData[locInd];
// After the row for the last actual locale, there's a terminal row: // After the row for the last actual locale, there's a terminal row:
Q_ASSERT(std::size_t(locInd) < std::size(localeZoneData) - 1); Q_ASSERT(std::size_t(locInd) < std::size(localeZoneData) - 1);
const LocaleZoneData &nextData = localeZoneData[locInd + 1]; const LocaleZoneData &nextData = localeZoneData[locInd + 1];

4
src/corelib/time/qtimezoneprivate_p.h
View File

@ -152,10 +152,10 @@ public:
static QByteArray ianaIdToWindowsId(const QByteArray &ianaId); static QByteArray ianaIdToWindowsId(const QByteArray &ianaId);
static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId); static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId);
static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId, static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId,
QLocale::Territory territory); QLocale::Territory territory);
static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId); static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId);
static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId, static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId,
QLocale::Territory territory); QLocale::Territory territory);
// returns "UTC" QString and QByteArray // returns "UTC" QString and QByteArray
[[nodiscard]] static inline QString utcQString() [[nodiscard]] static inline QString utcQString()