From 8e12120a2b3f033f07f609d5aa1f6089502a43a6 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 12 May 2016 15:45:02 -0700 Subject: Simplify the QDateTimePrivate::setTimeSpec() function Change-Id: I06bae9392f534e45b3f1ffff144df36cc98b5f3f Reviewed-by: Lars Knoll Reviewed-by: Edward Welbourne --- src/corelib/tools/qdatetime.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'src/corelib/tools/qdatetime.cpp') diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 708526c8f3..1e91dccc81 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2513,31 +2513,26 @@ void QDateTimePrivate::setTimeSpec(Qt::TimeSpec spec, int offsetSeconds) clearValidDateTime(); clearSetToDaylightStatus(); -#ifndef QT_BOOTSTRAPPED - m_timeZone = QTimeZone(); -#endif // QT_BOOTSTRAPPED - switch (spec) { case Qt::OffsetFromUTC: - if (offsetSeconds == 0) { - setSpec(Qt::UTC); - m_offsetFromUtc = 0; - } else { - setSpec(Qt::OffsetFromUTC); - m_offsetFromUtc = offsetSeconds; - } + if (offsetSeconds == 0) + spec = Qt::UTC; break; case Qt::TimeZone: // Use system time zone instead - setSpec(Qt::LocalTime); - m_offsetFromUtc = 0; - break; + spec = Qt::LocalTime; + // fallthrough case Qt::UTC: case Qt::LocalTime: - setSpec(spec); - m_offsetFromUtc = 0; + offsetSeconds = 0; break; } + + setSpec(spec); + m_offsetFromUtc = offsetSeconds; +#ifndef QT_BOOTSTRAPPED + m_timeZone = QTimeZone(); +#endif // QT_BOOTSTRAPPED } void QDateTimePrivate::setDateTime(const QDate &date, const QTime &time) -- cgit v1.2.3