summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qtimezoneprivate_mac.mm
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_mac.mm')
-rw-r--r--src/corelib/tools/qtimezoneprivate_mac.mm12
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;
}
}