diff options
| author | John Layt <jlayt@kde.org> | 2014-01-07 17:10:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-11 17:23:25 +0100 |
| commit | 19be46414ae68c619b94f2fdebd21192898d65fd (patch) | |
| tree | 1fbb1980d76bcecc997ddd6721a6870828f8343b /src/corelib/tools/qtimezoneprivate_icu.cpp | |
| parent | 20a03d5612a5a7b763bfb0edbf9922ec4e50b25d (diff) | |
QTimeZone - Change from Olson ID to IANA ID
Complete changes from using Olsen/Olson in the code to IANA. Completes
a change started in 5.2 release branch on the public occurrences.
Change-Id: Ib077fcda2c77eef6f04ec28901d8d2d7210b8c72
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_icu.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_icu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_icu.cpp b/src/corelib/tools/qtimezoneprivate_icu.cpp index f43b9276a1..254900eb96 100644 --- a/src/corelib/tools/qtimezoneprivate_icu.cpp +++ b/src/corelib/tools/qtimezoneprivate_icu.cpp @@ -277,12 +277,12 @@ QIcuTimeZonePrivate::QIcuTimeZonePrivate() } // Create a named time zone -QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QByteArray &olsenId) +QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QByteArray &ianaId) : m_ucal(0) { // Need to check validity here as ICu will create a GMT tz if name is invalid - if (availableTimeZoneIds().contains(olsenId)) - init(olsenId); + if (availableTimeZoneIds().contains(ianaId)) + init(ianaId); } QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QIcuTimeZonePrivate &other) @@ -307,9 +307,9 @@ QTimeZonePrivate *QIcuTimeZonePrivate::clone() return new QIcuTimeZonePrivate(*this); } -void QIcuTimeZonePrivate::init(const QByteArray &olsenId) +void QIcuTimeZonePrivate::init(const QByteArray &ianaId) { - m_id = olsenId; + m_id = ianaId; const QString id = QString::fromUtf8(m_id); UErrorCode status = U_ZERO_ERROR; |