From 536b918ecaed0b8a04ca2b7c0884eea12ddb6931 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 16 May 2017 16:43:42 +0200 Subject: QTimeZone: make UTC offset range available for other code to reuse When QDateTimeParser learns to parse zones, it'll need to know the valid range of offsets. Change-Id: I44cd88a140ebaf6a2b98b0f9a1be0cbc7a35bae4 Reviewed-by: Thiago Macieira --- src/corelib/tools/qtimezone.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/corelib/tools/qtimezone.cpp') diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index ec2f7c4af6..0b331be503 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -338,12 +338,9 @@ QTimeZone::QTimeZone(const QByteArray &ianaId) */ QTimeZone::QTimeZone(int offsetSeconds) + : d((offsetSeconds >= MinUtcOffsetSecs && offsetSeconds <= MaxUtcOffsetSecs) + ? new QUtcTimeZonePrivate(offsetSeconds) : nullptr) { - // offsetSeconds must fall between -14:00 and +14:00 hours - if (offsetSeconds >= -50400 && offsetSeconds <= 50400) - d = new QUtcTimeZonePrivate(offsetSeconds); - else - d = 0; } /*! -- cgit v1.2.3