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_mac.mm | |
| 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_mac.mm')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_mac.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/tools/qtimezoneprivate_mac.mm index 69d2c42d27..3d95377850 100644 --- a/src/corelib/tools/qtimezoneprivate_mac.mm +++ b/src/corelib/tools/qtimezoneprivate_mac.mm @@ -64,10 +64,10 @@ QMacTimeZonePrivate::QMacTimeZonePrivate() } // Create a named time zone -QMacTimeZonePrivate::QMacTimeZonePrivate(const QByteArray &olsenId) +QMacTimeZonePrivate::QMacTimeZonePrivate(const QByteArray &ianaId) : m_nstz(0) { - init(olsenId); + init(ianaId); } QMacTimeZonePrivate::QMacTimeZonePrivate(const QMacTimeZonePrivate &other) @@ -86,12 +86,12 @@ QTimeZonePrivate *QMacTimeZonePrivate::clone() return new QMacTimeZonePrivate(*this); } -void QMacTimeZonePrivate::init(const QByteArray &olsenId) +void QMacTimeZonePrivate::init(const QByteArray &ianaId) { - if (availableTimeZoneIds().contains(olsenId)) { - m_nstz = [NSTimeZone timeZoneWithName:QCFString::toNSString(QString::fromUtf8(olsenId))]; + if (availableTimeZoneIds().contains(ianaId)) { + m_nstz = [NSTimeZone timeZoneWithName:QCFString::toNSString(QString::fromUtf8(ianaId))]; if (m_nstz) - m_id = olsenId; + m_id = ianaId; } } |