AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTimeZone: make UTC offset range available for other code to reuse

Browse Source 
When QDateTimeParser learns to parse zones, it'll need to know the
valid range of offsets.

Change-Id: I44cd88a140ebaf6a2b98b0f9a1be0cbc7a35bae4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2017-05-16 16:43:42 +02:00
parent 748d87f28f
commit 536b918eca
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/tools/qtimezone.cpp
View File

@ -338,12 +338,9 @@ QTimeZone::QTimeZone(const QByteArray &ianaId)
*/ */
QTimeZone::QTimeZone(int offsetSeconds) 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;
} }
/*! /*!

8
src/corelib/tools/qtimezone.h
View File

@ -59,6 +59,14 @@ class QTimeZonePrivate;
class Q_CORE_EXPORT QTimeZone class Q_CORE_EXPORT QTimeZone
{ {
public: public:
// Sane UTC offsets range from -14 to +14 hours:
enum {
// No known zone > 12 hrs West of Greenwich (Baker Island, USA)
MinUtcOffsetSecs = -14 * 3600,
// No known zone > 14 hrs East of Greenwich (Kiritimati, Christmas Island, Kiribati)
MaxUtcOffsetSecs = +14 * 3600
};
enum TimeType { enum TimeType {
StandardTime = 0, StandardTime = 0,
DaylightTime = 1, DaylightTime = 1,

2
src/corelib/tools/qtimezoneprivate.cpp
View File

@ -258,6 +258,8 @@ QTimeZonePrivate::Data QTimeZonePrivate::dataForLocalTime(qint64 forLocalMSecs,
brackets the correct time and at most one DST transition. brackets the correct time and at most one DST transition.
*/ */
const qint64 sixteenHoursInMSecs(16 * 3600 * 1000); const qint64 sixteenHoursInMSecs(16 * 3600 * 1000);
Q_STATIC_ASSERT(-sixteenHoursInMSecs / 1000 < QTimeZone::MinUtcOffsetSecs
&& sixteenHoursInMSecs / 1000 > QTimeZone::MaxUtcOffsetSecs);
/* /*
Offsets are Local - UTC, positive to the east of Greenwich, negative to Offsets are Local - UTC, positive to the east of Greenwich, negative to
the west; DST offset always exceeds standard offset, when DST applies. the west; DST offset always exceeds standard offset, when DST applies.