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

Use short name as QTZP::abbreviation() by default

Browse Source 
Also use C locale for this, rather than QLocale().
This makes the ICU backend's override redundant.

Change-Id: I3d668dd3a784b48d0a5fff7d11cc25a6e1423c84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-02-02 15:32:36 +01:00
parent 56d8a751cb
commit bd07335554
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,8 +190,7 @@ QString QTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
QString QTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const QString QTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const
{ {
Q_UNUSED(atMSecsSinceEpoch); return displayName(atMSecsSinceEpoch, QTimeZone::ShortName, QLocale::c());
return QString();
} }
int QTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const int QTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const

9
src/corelib/time/qtimezoneprivate_icu.cpp
View File

@ -314,15 +314,6 @@ QString QIcuTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
return ucalTimeZoneDisplayName(m_ucal, timeType, nameType, locale.name()); return ucalTimeZoneDisplayName(m_ucal, timeType, nameType, locale.name());
} }
QString QIcuTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const
{
// TODO No ICU API, use short name instead
if (isDaylightTime(atMSecsSinceEpoch))
return displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, QLocale());
else
return displayName(QTimeZone::StandardTime, QTimeZone::ShortName, QLocale());
}
int QIcuTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const int QIcuTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const
{ {
int stdOffset = 0; int stdOffset = 0;

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

@ -216,7 +216,6 @@ public:
using QTimeZonePrivate::displayName; using QTimeZonePrivate::displayName;
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
const QLocale &locale) const override; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;