From 0b89eb6c6f9617147af87f75d0a374fddb0a27b3 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 28 Aug 2024 11:29:30 +0200 Subject: [PATCH] Remove spurious and unused QUtcTZP::init() with too few arguments QUtcTimeZonePrivate accommodates the custom time-zone API and, as such, needs to know all of its details when constructed. The constructor as a plain UTC-offset constructs the details to match a custom zone, so that it also has those details initialized. As a result, this backend never initialized a zone from only its IANA ID, as all the others do, so does not need an init() with that signature (which did not adequately initialize the instance anyway). Change-Id: I462f537c9d48e09f05f91aae0ff6c7a317b421c1 Reviewed-by: Mate Barany Reviewed-by: Magdalena Stojek (cherry picked from commit 70b680502997678b7c9964acef6569b18b6a65bf) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/time/qtimezoneprivate.cpp | 5 ----- src/corelib/time/qtimezoneprivate_p.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/corelib/time/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index 24330c3eebe..5e50ce6dbab 100644 --- a/src/corelib/time/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp @@ -1012,11 +1012,6 @@ bool QUtcTimeZonePrivate::isDataLocale(const QLocale &locale) const return locale.language() == QLocale::C || locale.language() == QLocale::English; } -void QUtcTimeZonePrivate::init(const QByteArray &zoneId) -{ - m_id = zoneId; -} - void QUtcTimeZonePrivate::init(const QByteArray &zoneId, int offsetSeconds, const QString &name, const QString &abbreviation, QLocale::Territory territory, const QString &comment) diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 7034a7285c7..592a517e6d9 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -218,7 +218,6 @@ public: void serialize(QDataStream &ds) const override; private: - void init(const QByteArray &zoneId); void init(const QByteArray &zoneId, int offsetSeconds, const QString &name, const QString &abbreviation, QLocale::Territory territory, const QString &comment);