From bccbf1be13ff07507394a8fce43502703f31bd67 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 11 Apr 2025 17:43:18 +0200 Subject: [PATCH] Fix spacing and indentation in QTimeZone code Petty tidy-up, just to disentangle it from other work. Pick-to: 6.8 Change-Id: Ifa7543585af35e494185be8faf637e3d48670c4b Reviewed-by: Thiago Macieira Reviewed-by: Ivan Solovev (cherry picked from commit bb8c1b85afec82240026bd85dcc52b0734ffc25f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/time/qtimezonelocale.cpp | 2 +- src/corelib/time/qtimezoneprivate_p.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/time/qtimezonelocale.cpp b/src/corelib/time/qtimezonelocale.cpp index 8995dc87a91..dd22e68c5e6 100644 --- a/src/corelib/time/qtimezonelocale.cpp +++ b/src/corelib/time/qtimezonelocale.cpp @@ -526,7 +526,7 @@ QString QTimeZonePrivate::localeName(qint64 atMSecsSinceEpoch, int offsetFromUtc // First try for an actual name: for (const qsizetype locInd : indices) { 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); const LocaleZoneData &nextData = localeZoneData[locInd + 1]; diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 24adf95d2d9..8889e648963 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -152,10 +152,10 @@ public: static QByteArray ianaIdToWindowsId(const QByteArray &ianaId); static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId); static QByteArray windowsIdToDefaultIanaId(const QByteArray &windowsId, - QLocale::Territory territory); + QLocale::Territory territory); static QList windowsIdToIanaIds(const QByteArray &windowsId); static QList windowsIdToIanaIds(const QByteArray &windowsId, - QLocale::Territory territory); + QLocale::Territory territory); // returns "UTC" QString and QByteArray [[nodiscard]] static inline QString utcQString()