From e925f1067958a8cc9fa8bcbd839d43425f92f945 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 15 Aug 2024 13:51:35 +0200 Subject: [PATCH] Remove some redundant class-name prefixes The the body of QTimeZone's own class declaration, QTimeZone:: prefixes are redundant. Likewise in the argument list of QTimeZone::Data's copy-assignment. Similarly, in classes derived from QTimeZonePrivate, its name is not needed as a prefix. Change-Id: Iff94bae237e9869296b9a415d40ff423456eedd6 Reviewed-by: Thiago Macieira --- src/corelib/time/qtimezone.cpp | 2 +- src/corelib/time/qtimezone.h | 6 ++---- src/corelib/time/qtimezoneprivate.cpp | 6 +++--- src/corelib/time/qtimezoneprivate_icu.cpp | 2 +- src/corelib/time/qtimezoneprivate_mac.mm | 2 +- src/corelib/time/qtimezoneprivate_tz.cpp | 22 +++++++++++----------- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp index 8ce967cf9fc..ece49d0c7b7 100644 --- a/src/corelib/time/qtimezone.cpp +++ b/src/corelib/time/qtimezone.cpp @@ -395,7 +395,7 @@ QTimeZone::Data::~Data() #endif } -QTimeZone::Data &QTimeZone::Data::operator=(const QTimeZone::Data &other) noexcept +QTimeZone::Data &QTimeZone::Data::operator=(const Data &other) noexcept { #if QT_CONFIG(timezone) if (!other.isShort()) diff --git a/src/corelib/time/qtimezone.h b/src/corelib/time/qtimezone.h index 6c490c4e252..4a56828ab72 100644 --- a/src/corelib/time/qtimezone.h +++ b/src/corelib/time/qtimezone.h @@ -175,11 +175,9 @@ public: # endif QString comment() const; - QString displayName(const QDateTime &atDateTime, - QTimeZone::NameType nameType = QTimeZone::DefaultName, + QString displayName(const QDateTime &atDateTime, NameType nameType = DefaultName, const QLocale &locale = QLocale()) const; - QString displayName(QTimeZone::TimeType timeType, - QTimeZone::NameType nameType = QTimeZone::DefaultName, + QString displayName(TimeType timeType, NameType nameType = DefaultName, const QLocale &locale = QLocale()) const; QString abbreviation(const QDateTime &atDateTime) const; diff --git a/src/corelib/time/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index 17b32ec2e8e..795e016ac08 100644 --- a/src/corelib/time/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp @@ -253,14 +253,14 @@ bool QTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const QTimeZonePrivate::Data QTimeZonePrivate::data(QTimeZone::TimeType timeType) const { // True if tran is valid and has the DST-ness to match timeType: - const auto validMatch = [timeType](const QTimeZonePrivate::Data &tran) { + const auto validMatch = [timeType](const Data &tran) { return tran.atMSecsSinceEpoch != invalidMSecs() && ((timeType == QTimeZone::DaylightTime) != (tran.daylightTimeOffset == 0)); }; // Get current tran, use if suitable: const qint64 currentMSecs = QDateTime::currentMSecsSinceEpoch(); - QTimeZonePrivate::Data tran = data(currentMSecs); + Data tran = data(currentMSecs); if (validMatch(tran)) return tran; @@ -310,7 +310,7 @@ QTimeZonePrivate::Data QTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const QDateTimePrivate::ZoneState QTimeZonePrivate::stateAtZoneTime( qint64 forLocalMSecs, QDateTimePrivate::TransitionOptions resolve) const { - auto dataToState = [](const QTimeZonePrivate::Data &d) { + auto dataToState = [](const Data &d) { return QDateTimePrivate::ZoneState(d.atMSecsSinceEpoch + d.offsetFromUtc * 1000, d.offsetFromUtc, d.daylightTimeOffset ? QDateTimePrivate::DaylightTime diff --git a/src/corelib/time/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp index a9fe68b83c4..0005ebeced8 100644 --- a/src/corelib/time/qtimezoneprivate_icu.cpp +++ b/src/corelib/time/qtimezoneprivate_icu.cpp @@ -325,7 +325,7 @@ bool QIcuTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const QTimeZonePrivate::Data QIcuTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const { // Available in ICU C++ api, and draft C api in v50 - QTimeZonePrivate::Data data; + Data data; #if U_ICU_VERSION_MAJOR_NUM >= 50 data = ucalTimeZoneTransition(m_ucal, UCAL_TZ_TRANSITION_PREVIOUS_INCLUSIVE, forMSecsSinceEpoch); diff --git a/src/corelib/time/qtimezoneprivate_mac.mm b/src/corelib/time/qtimezoneprivate_mac.mm index da7e24d6144..abd9deb164e 100644 --- a/src/corelib/time/qtimezoneprivate_mac.mm +++ b/src/corelib/time/qtimezoneprivate_mac.mm @@ -183,7 +183,7 @@ bool QMacTimeZonePrivate::hasTransitions() const QTimeZonePrivate::Data QMacTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const { - QTimeZonePrivate::Data tran; + Data tran; const NSTimeInterval seconds = afterMSecsSinceEpoch / 1000.0; NSDate *nextDate = [NSDate dateWithTimeIntervalSince1970:seconds]; nextDate = [m_nstz nextDaylightSavingTimeTransitionAfterDate:nextDate]; diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 4975e2a8e6e..23916be1792 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -1024,7 +1024,7 @@ QString QTzTimeZonePrivate::displayName(QTimeZone::TimeType timeType, { // TZ only provides C-locale abbreviations and offset: if (nameType != QTimeZone::LongName && isDataLocale(locale)) { - QTimeZonePrivate::Data tran = data(timeType); + Data tran = data(timeType); if (tran.atMSecsSinceEpoch != invalidMSecs()) { if (nameType == QTimeZone::ShortName) return tran.abbreviation; @@ -1044,7 +1044,7 @@ QString QTzTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const int QTzTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const { - const QTimeZonePrivate::Data tran = data(atMSecsSinceEpoch); + const Data tran = data(atMSecsSinceEpoch); return tran.offsetFromUtc; // == tran.standardTimeOffset + tran.daylightTimeOffset } @@ -1094,14 +1094,14 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const // and we have a POSIX rule, then use it: if (!cached_data.m_posixRule.isEmpty() && (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < forMSecsSinceEpoch)) { - QList posixTrans = getPosixTransitions(forMSecsSinceEpoch); + QList posixTrans = getPosixTransitions(forMSecsSinceEpoch); auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(), - [forMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) { + [forMSecsSinceEpoch] (const Data &at) { return at.atMSecsSinceEpoch <= forMSecsSinceEpoch; }); // Use most recent, if any in the past; or the first if we have no other rules: if (it > posixTrans.cbegin() || (tranCache().isEmpty() && it < posixTrans.cend())) { - QTimeZonePrivate::Data data = *(it > posixTrans.cbegin() ? it - 1 : it); + Data data = *(it > posixTrans.cbegin() ? it - 1 : it); data.atMSecsSinceEpoch = forMSecsSinceEpoch; return data; } @@ -1129,14 +1129,14 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const QTimeZonePrivate::Data QTzTimeZonePrivate::data(QTimeZone::TimeType timeType) const { // True if tran is valid and has the DST-ness to match timeType: - const auto validMatch = [timeType](const QTimeZonePrivate::Data &tran) { + const auto validMatch = [timeType](const Data &tran) { return tran.atMSecsSinceEpoch != invalidMSecs() && ((timeType == QTimeZone::DaylightTime) != (tran.daylightTimeOffset == 0)); }; // Get current tran, use if suitable: const qint64 currentMSecs = QDateTime::currentMSecsSinceEpoch(); - QTimeZonePrivate::Data tran = data(currentMSecs); + Data tran = data(currentMSecs); if (validMatch(tran)) return tran; @@ -1190,9 +1190,9 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::nextTransition(qint64 afterMSecsSince // and we have a POSIX rule, then use it: if (!cached_data.m_posixRule.isEmpty() && (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < afterMSecsSinceEpoch)) { - QList posixTrans = getPosixTransitions(afterMSecsSinceEpoch); + QList posixTrans = getPosixTransitions(afterMSecsSinceEpoch); auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(), - [afterMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) { + [afterMSecsSinceEpoch] (const Data &at) { return at.atMSecsSinceEpoch <= afterMSecsSinceEpoch; }); @@ -1213,9 +1213,9 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs // and we have a POSIX rule, then use it: if (!cached_data.m_posixRule.isEmpty() && (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < beforeMSecsSinceEpoch)) { - QList posixTrans = getPosixTransitions(beforeMSecsSinceEpoch); + QList posixTrans = getPosixTransitions(beforeMSecsSinceEpoch); auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(), - [beforeMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) { + [beforeMSecsSinceEpoch] (const Data &at) { return at.atMSecsSinceEpoch < beforeMSecsSinceEpoch; }); if (it > posixTrans.cbegin())