diff options
Diffstat (limited to 'src/corelib/time/qdatetime.cpp')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 2688 |
1 files changed, 1763 insertions, 925 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 6cb3b0492a..687f174c07 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2,14 +2,13 @@ // Copyright (C) 2021 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "qplatformdefs.h" #include "qdatetime.h" #include "qcalendar.h" #include "qdatastream.h" #include "qdebug.h" -#include "qset.h" #include "qlocale.h" +#include "qset.h" #include "private/qcalendarmath_p.h" #include "private/qdatetime_p.h" @@ -20,8 +19,10 @@ #include "private/qcore_mac_p.h" #endif #include "private/qgregoriancalendar_p.h" +#include "private/qlocale_tools_p.h" #include "private/qlocaltime_p.h" #include "private/qnumeric_p.h" +#include "private/qstringconverter_p.h" #include "private/qstringiterator_p.h" #if QT_CONFIG(timezone) #include "private/qtimezoneprivate_p.h" @@ -32,10 +33,13 @@ # include <qt_windows.h> #endif +#include <private/qtools_p.h> + QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; using namespace QtPrivate::DateTimeConstants; +using namespace QtMiscUtils; /***************************************************************************** Date/Time Constants @@ -44,8 +48,9 @@ using namespace QtPrivate::DateTimeConstants; /***************************************************************************** QDate static helper functions *****************************************************************************/ +static_assert(std::is_trivially_copyable_v<QCalendar::YearMonthDay>); -static inline QDate fixedDate(QCalendar::YearMonthDay &&parts, QCalendar cal) +static inline QDate fixedDate(QCalendar::YearMonthDay parts, QCalendar cal) { if ((parts.year < 0 && !cal.isProleptic()) || (parts.year == 0 && !cal.hasYearZero())) return QDate(); @@ -54,13 +59,13 @@ static inline QDate fixedDate(QCalendar::YearMonthDay &&parts, QCalendar cal) return cal.dateFromParts(parts); } -static inline QDate fixedDate(QCalendar::YearMonthDay &&parts) +static inline QDate fixedDate(QCalendar::YearMonthDay parts) { if (parts.year) { parts.day = qMin(parts.day, QGregorianCalendar::monthLength(parts.month, parts.year)); - qint64 jd; - if (QGregorianCalendar::julianFromParts(parts.year, parts.month, parts.day, &jd)) - return QDate::fromJulianDay(jd); + const auto jd = QGregorianCalendar::julianFromParts(parts.year, parts.month, parts.day); + if (jd) + return QDate::fromJulianDay(*jd); } return QDate(); } @@ -86,10 +91,46 @@ static int fromShortMonthName(QStringView monthName) #endif // textdate #if QT_CONFIG(datestring) // depends on, so implies, textdate +namespace { +using ParsedInt = QSimpleParsedNumber<qulonglong>; + +/* + Reads a whole number that must be the whole text. +*/ +ParsedInt readInt(QLatin1StringView text) +{ + // Various date formats' fields (e.g. all in ISO) should not accept spaces + // or signs, so check that the string starts with a digit and that qstrntoull() + // converted the whole string. + + if (text.isEmpty() || !isAsciiDigit(text.front().toLatin1())) + return {}; + + QSimpleParsedNumber res = qstrntoull(text.data(), text.size(), 10); + return res.used == text.size() ? res : ParsedInt{}; +} + +ParsedInt readInt(QStringView text) +{ + if (text.isEmpty()) + return {}; + + // Converting to Latin-1 because QStringView::toULongLong() works with + // US-ASCII only by design anyway. + // Also QStringView::toULongLong() can't be used here as it will happily ignore + // spaces and accept signs; but various date formats' fields (e.g. all in ISO) + // should not. + QVarLengthArray<char> latin1(text.size()); + QLatin1::convertFromUnicode(latin1.data(), text); + return readInt(QLatin1StringView{latin1.data(), latin1.size()}); +} + +} // namespace + struct ParsedRfcDateTime { QDate date; QTime time; - int utcOffset; + int utcOffset = 0; }; static int shortDayFromName(QStringView name) @@ -122,7 +163,7 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s) QDate date; const auto isShortName = [](QStringView name) { - return (name.length() == 3 && name[0].isUpper() + return (name.size() == 3 && name[0].isUpper() && name[1].isLower() && name[2].isLower()); }; @@ -239,7 +280,7 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s) } #endif // datestring -// Return offset in [+-]HH:mm format +// Return offset in ±HH:mm format static QString toOffsetString(Qt::DateFormat format, int offset) { return QString::asprintf("%c%02d%s%02d", @@ -251,12 +292,12 @@ static QString toOffsetString(Qt::DateFormat format, int offset) } #if QT_CONFIG(datestring) -// Parse offset in [+-]HH[[:]mm] format +// Parse offset in ±HH[[:]mm] format static int fromOffsetString(QStringView offsetString, bool *valid) noexcept { *valid = false; - const int size = offsetString.size(); + const qsizetype size = offsetString.size(); if (size < 2 || size > 6) return 0; @@ -277,7 +318,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept qsizetype hhLen = time.indexOf(u':'); qsizetype mmIndex; if (hhLen == -1) - mmIndex = hhLen = 2; // [+-]HHmm or [+-]HH format + mmIndex = hhLen = 2; // ±HHmm or ±HH format else mmIndex = hhLen + 1; @@ -307,6 +348,12 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept \reentrant \brief The QDate class provides date functions. + \compares strong + \compareswith strong std::chrono::year_month_day std::chrono::year_month_day_last \ + std::chrono::year_month_weekday std::chrono::year_month_weekday_last + These comparison operators are only available when using C++20. + \endcompareswith + A QDate object represents a particular day, regardless of calendar, locale or other settings used when creating it or supplied by the system. It can report the year, month and day of the month that represent the day with @@ -394,8 +441,9 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept QDate::QDate(int y, int m, int d) { - if (!QGregorianCalendar::julianFromParts(y, m, d, &jd)) - jd = nullJd(); + static_assert(maxJd() == JulianDayMax); + static_assert(minJd() == JulianDayMin); + jd = QGregorianCalendar::julianFromParts(y, m, d).value_or(nullJd()); } QDate::QDate(int y, int m, int d, QCalendar cal) @@ -404,14 +452,14 @@ QDate::QDate(int y, int m, int d, QCalendar cal) } /*! - \fn QDate::QDate(std::chrono::year_month_day ymd) - \fn QDate::QDate(std::chrono::year_month_day_last ymd) - \fn QDate::QDate(std::chrono::year_month_weekday ymd) - \fn QDate::QDate(std::chrono::year_month_weekday_last ymd) + \fn QDate::QDate(std::chrono::year_month_day date) + \fn QDate::QDate(std::chrono::year_month_day_last date) + \fn QDate::QDate(std::chrono::year_month_weekday date) + \fn QDate::QDate(std::chrono::year_month_weekday_last date) \since 6.4 - Constructs a QDate representing the same date as \a ymd. This allows for + Constructs a QDate representing the same date as \a date. This allows for easy interoperability between the Standard Library calendaring classes and Qt datetime classes. @@ -420,9 +468,9 @@ QDate::QDate(int y, int m, int d, QCalendar cal) \snippet code/src_corelib_time_qdatetime.cpp 22 \note Unlike QDate, std::chrono::year and the related classes feature the - year zero. This means that if \a ymd is in the year zero or before, the + year zero. This means that if \a date is in the year zero or before, the resulting QDate object will have an year one less than the one specified by - \a ymd. + \a date. \note This function requires C++20. */ @@ -654,9 +702,8 @@ int QDate::dayOfYear(QCalendar cal) const int QDate::dayOfYear() const { if (isValid()) { - qint64 first; - if (QGregorianCalendar::julianFromParts(year(), 1, 1, &first)) - return jd - first + 1; + if (const auto first = QGregorianCalendar::julianFromParts(year(), 1, 1)) + return jd - *first + 1; } return 0; } @@ -755,7 +802,41 @@ int QDate::weekNumber(int *yearNumber) const return (thursday.dayOfYear() + 6) / 7; } -static bool inDateTimeRange(qint64 jd, bool start) +#if QT_DEPRECATED_SINCE(6, 9) +// Only called by deprecated methods (so bootstrap builds warn unused without this #if). +static QTimeZone asTimeZone(Qt::TimeSpec spec, int offset, const char *warner) +{ + if (warner) { + switch (spec) { + case Qt::TimeZone: + qWarning("%s: Pass a QTimeZone instead of Qt::TimeZone.", warner); + break; + case Qt::LocalTime: + if (offset) { + qWarning("%s: Ignoring offset (%d seconds) passed with Qt::LocalTime", + warner, offset); + } + break; + case Qt::UTC: + if (offset) { + qWarning("%s: Ignoring offset (%d seconds) passed with Qt::UTC", + warner, offset); + offset = 0; + } + break; + case Qt::OffsetFromUTC: + break; + } + } + return QTimeZone::isUtcOrFixedOffset(spec) + ? QTimeZone::fromSecondsAheadOfUtc(offset) + : QTimeZone(QTimeZone::LocalTime); +} +#endif // Helper for 6.9 deprecation + +enum class DaySide { Start, End }; + +static bool inDateTimeRange(qint64 jd, DaySide side) { using Bounds = std::numeric_limits<qint64>; if (jd < Bounds::min() + JULIAN_DAY_FOR_EPOCH) @@ -763,30 +844,24 @@ static bool inDateTimeRange(qint64 jd, bool start) jd -= JULIAN_DAY_FOR_EPOCH; const qint64 maxDay = Bounds::max() / MSECS_PER_DAY; const qint64 minDay = Bounds::min() / MSECS_PER_DAY - 1; - // (Divisions rounded towards zero, as MSECS_PER_DAY has factors other than two.) + // (Divisions rounded towards zero, as MSECS_PER_DAY is even - so doesn't + // divide max() - and has factors other than two, so doesn't divide min().) // Range includes start of last day and end of first: - if (start) + switch (side) { + case DaySide::Start: return jd > minDay && jd <= maxDay; - return jd >= minDay && jd < maxDay; + case DaySide::End: + return jd >= minDay && jd < maxDay; + } + Q_UNREACHABLE_RETURN(false); } -static QDateTime toEarliest(QDate day, const QDateTime &form) +static QDateTime toEarliest(QDate day, const QTimeZone &zone) { - const Qt::TimeSpec spec = form.timeSpec(); - const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0; -#if QT_CONFIG(timezone) - QTimeZone zone; - if (spec == Qt::TimeZone) - zone = form.timeZone(); -#endif - auto moment = [=](QTime time) { - switch (spec) { - case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset); -#if QT_CONFIG(timezone) - case Qt::TimeZone: return QDateTime(day, time, zone); -#endif - default: return QDateTime(day, time, spec); - } + Q_ASSERT(!zone.isUtcOrFixedOffset()); + // And the day starts in a gap. First find a moment not in that gap. + const auto moment = [=](QTime time) { + return QDateTime(day, time, zone, QDateTime::TransitionResolution::Reject); }; // Longest routine time-zone transition is 2 hours: QDateTime when = moment(QTime(2, 0)); @@ -804,8 +879,9 @@ static QDateTime toEarliest(QDate day, const QDateTime &form) int low = 0; // Binary chop to the right minute while (high > low + 1) { - int mid = (high + low) / 2; - QDateTime probe = moment(QTime(mid / 60, mid % 60)); + const int mid = (high + low) / 2; + const QDateTime probe = QDateTime(day, QTime(mid / 60, mid % 60), zone, + QDateTime::TransitionResolution::PreferBefore); if (probe.isValid() && probe.date() == day) { high = mid; when = probe; @@ -813,107 +889,134 @@ static QDateTime toEarliest(QDate day, const QDateTime &form) low = mid; } } - return when; + // Transitions out of local solar mean time, and the few international + // date-line crossings before that (Alaska, Philippines), may have happened + // between minute boundaries. Don't try to fix milliseconds. + if (QDateTime p = moment(when.time().addSecs(-1)); Q_UNLIKELY(p.isValid() && p.date() == day)) { + high *= 60; + low *= 60; + while (high > low + 1) { + const int mid = (high + low) / 2; + const int min = mid / 60; + const QDateTime probe = moment(QTime(min / 60, min % 60, mid % 60)); + if (probe.isValid() && probe.date() == day) { + high = mid; + when = probe; + } else { + low = mid; + } + } + } + return when.isValid() ? when : QDateTime(); } /*! \since 5.14 - \fn QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const - \fn QDateTime QDate::startOfDay(const QTimeZone &zone) const - Returns the start-moment of the day. Usually, this shall be midnight at the - start of the day: however, if a time-zone transition causes the given date - to skip over that midnight (e.g. a DST spring-forward skipping from the end - of the previous day to 01:00 of the new day), the actual earliest time in - the day is returned. This can only arise when the start-moment is specified - in terms of a time-zone (by passing its QTimeZone as \a zone) or in terms of - local time (by passing Qt::LocalTime as \a spec; this is its default). + Returns the start-moment of the day. + + When a day starts depends on a how time is described: each day starts and + ends earlier for those in time-zones further west and later for those in + time-zones further east. The time representation to use can be specified by + an optional time \a zone. The default time representation is the system's + local time. - The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it - gives the implied zone's offset from UTC. As UTC and such zones have no - transitions, the start of the day is QTime(0, 0) in these cases. + Usually, the start of the day is midnight, 00:00: however, if a time-zone + transition causes the given date to skip over that midnight (e.g. a DST + spring-forward skipping over the first hour of the day day), the actual + earliest time in the day is returned. This can only arise when the time + representation is a time-zone or local time. + + When \a zone has a timeSpec() of is Qt::OffsetFromUTC or Qt::UTC, the time + representation has no transitions so the start of the day is QTime(0, 0). In the rare case of a date that was entirely skipped (this happens when a zone east of the international date-line switches to being west of it), the - return shall be invalid. Passing Qt::TimeZone as \a spec (instead of - passing a QTimeZone) or passing an invalid time-zone as \a zone will also + return shall be invalid. Passing an invalid time-zone as \a zone will also produce an invalid result, as shall dates that start outside the range representable by QDateTime. \sa endOfDay() */ -QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const +QDateTime QDate::startOfDay(const QTimeZone &zone) const { - if (!inDateTimeRange(jd, true)) + if (!inDateTimeRange(jd, DaySide::Start) || !zone.isValid()) return QDateTime(); - switch (spec) { - case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone - qWarning() << "Called QDate::startOfDay(Qt::TimeZone) on" << *this; - return QDateTime(); - case Qt::OffsetFromUTC: - case Qt::UTC: - return QDateTime(*this, QTime(0, 0), spec, offsetSeconds); + QDateTime when(*this, QTime(0, 0), zone, + QDateTime::TransitionResolution::RelativeToBefore); + if (Q_UNLIKELY(!when.isValid() || when.date() != *this)) { +#if QT_CONFIG(timezone) + // The start of the day must have fallen in a spring-forward's gap; find the spring-forward: + if (zone.timeSpec() == Qt::TimeZone && zone.hasTransitions()) { + QTimeZone::OffsetData tran + // There's unlikely to be another transition before noon tomorrow. + // However, the whole of today may have been skipped ! + = zone.previousTransition(QDateTime(addDays(1), QTime(12, 0), zone)); + const QDateTime &at = tran.atUtc.toTimeZone(zone); + if (at.isValid() && at.date() == *this) + return at; + } +#endif - case Qt::LocalTime: - if (offsetSeconds) - qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds); - break; + when = toEarliest(*this, zone); } - QDateTime when(*this, QTime(0, 0), spec); - if (!when.isValid()) - when = toEarliest(*this, when); - return when.isValid() ? when : QDateTime(); + return when; } -#if QT_CONFIG(timezone) /*! - \overload - \since 5.14 + \overload + \since 6.5 */ -QDateTime QDate::startOfDay(const QTimeZone &zone) const +QDateTime QDate::startOfDay() const { - if (!inDateTimeRange(jd, true) || !zone.isValid()) - return QDateTime(); + return startOfDay(QTimeZone::LocalTime); +} - QDateTime when(*this, QTime(0, 0), zone); - if (when.isValid()) - return when; - - // The start of the day must have fallen in a spring-forward's gap; find the spring-forward: - if (zone.hasTransitions()) { - QTimeZone::OffsetData tran - // There's unlikely to be another transition before noon tomorrow. - // However, the whole of today may have been skipped ! - = zone.previousTransition(QDateTime(addDays(1), QTime(12, 0), zone)); - const QDateTime &at = tran.atUtc.toTimeZone(zone); - if (at.isValid() && at.date() == *this) - return at; - } +#if QT_DEPRECATED_SINCE(6, 9) +/*! + \overload + \since 5.14 + \deprecated [6.9] Use \c{startOfDay(const QTimeZone &)} instead. - when = toEarliest(*this, when); - return when.isValid() ? when : QDateTime(); + Returns the start-moment of the day. + + When a day starts depends on a how time is described: each day starts and + ends earlier for those with higher offsets from UTC and later for those with + lower offsets from UTC. The time representation to use can be specified + either by a \a spec and \a offsetSeconds (ignored unless \a spec is + Qt::OffsetSeconds) or by a time zone. + + Usually, the start of the day is midnight, 00:00: however, if a local time + transition causes the given date to skip over that midnight (e.g. a DST + spring-forward skipping over the first hour of the day day), the actual + earliest time in the day is returned. + + When \a spec is Qt::OffsetFromUTC, \a offsetSeconds gives an implied zone's + offset from UTC. As UTC and such zones have no transitions, the start of the + day is QTime(0, 0) in these cases. + + In the rare case of a date that was entirely skipped (this happens when a + zone east of the international date-line switches to being west of it), the + return shall be invalid. Passing Qt::TimeZone as \a spec (instead of passing + a QTimeZone) will also produce an invalid result, as shall dates that start + outside the range representable by QDateTime. +*/ +QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const +{ + QTimeZone zone = asTimeZone(spec, offsetSeconds, "QDate::startOfDay"); + // If spec was Qt::TimeZone, zone's is Qt::LocalTime. + return zone.timeSpec() == spec ? startOfDay(zone) : QDateTime(); } -#endif // timezone +#endif // 6.9 deprecation -static QDateTime toLatest(QDate day, const QDateTime &form) +static QDateTime toLatest(QDate day, const QTimeZone &zone) { - const Qt::TimeSpec spec = form.timeSpec(); - const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0; -#if QT_CONFIG(timezone) - QTimeZone zone; - if (spec == Qt::TimeZone) - zone = form.timeZone(); -#endif - auto moment = [=](QTime time) { - switch (spec) { - case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset); -#if QT_CONFIG(timezone) - case Qt::TimeZone: return QDateTime(day, time, zone); -#endif - default: return QDateTime(day, time, spec); - } + Q_ASSERT(!zone.isUtcOrFixedOffset()); + // And the day ends in a gap. First find a moment not in that gap: + const auto moment = [=](QTime time) { + return QDateTime(day, time, zone, QDateTime::TransitionResolution::Reject); }; // Longest routine time-zone transition is 2 hours: QDateTime when = moment(QTime(21, 59, 59, 999)); @@ -931,8 +1034,9 @@ static QDateTime toLatest(QDate day, const QDateTime &form) int low = when.time().msecsSinceStartOfDay() / 60000; // Binary chop to the right minute while (high > low + 1) { - int mid = (high + low) / 2; - QDateTime probe = moment(QTime(mid / 60, mid % 60, 59, 999)); + const int mid = (high + low) / 2; + const QDateTime probe = QDateTime(day, QTime(mid / 60, mid % 60, 59, 999), zone, + QDateTime::TransitionResolution::PreferAfter); if (probe.isValid() && probe.date() == day) { low = mid; when = probe; @@ -940,88 +1044,127 @@ static QDateTime toLatest(QDate day, const QDateTime &form) high = mid; } } - return when; + // Transitions out of local solar mean time, and the few international + // date-line crossings before that (Alaska, Philippines), may have happened + // between minute boundaries. Don't try to fix milliseconds. + if (QDateTime p = moment(when.time().addSecs(1)); Q_UNLIKELY(p.isValid() && p.date() == day)) { + high *= 60; + low *= 60; + while (high > low + 1) { + const int mid = (high + low) / 2; + const int min = mid / 60; + const QDateTime probe = moment(QTime(min / 60, min % 60, mid % 60, 999)); + if (probe.isValid() && probe.date() == day) { + low = mid; + when = probe; + } else { + high = mid; + } + } + } + return when.isValid() ? when : QDateTime(); } /*! \since 5.14 - \fn QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const - \fn QDateTime QDate::endOfDay(const QTimeZone &zone) const - - Returns the end-moment of the day. Usually, this is one millisecond before - the midnight at the end of the day: however, if a time-zone transition - causes the given date to skip over that midnight (e.g. a DST spring-forward - skipping from just before 23:00 to the start of the next day), the actual - latest time in the day is returned. This can only arise when the - start-moment is specified in terms of a time-zone (by passing its QTimeZone - as \a zone) or in terms of local time (by passing Qt::LocalTime as \a spec; - this is its default). - - The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it - gives the implied zone's offset from UTC. As UTC and such zones have no - transitions, the end of the day is QTime(23, 59, 59, 999) in these cases. + + Returns the end-moment of the day. + + When a day ends depends on a how time is described: each day starts and ends + earlier for those in time-zones further west and later for those in + time-zones further east. The time representation to use can be specified by + an optional time \a zone. The default time representation is the system's + local time. + + Usually, the end of the day is one millisecond before the midnight, 24:00: + however, if a time-zone transition causes the given date to skip over that + moment (e.g. a DST spring-forward skipping over 23:00 and the following + hour), the actual latest time in the day is returned. This can only arise + when the time representation is a time-zone or local time. + + When \a zone has a timeSpec() of Qt::OffsetFromUTC or Qt::UTC, the time + representation has no transitions so the end of the day is QTime(23, 59, 59, + 999). In the rare case of a date that was entirely skipped (this happens when a zone east of the international date-line switches to being west of it), the - return shall be invalid. Passing Qt::TimeZone as \a spec (instead of - passing a QTimeZone) will also produce an invalid result, as shall dates - that end outside the range representable by QDateTime. + return shall be invalid. Passing an invalid time-zone as \a zone will also + produce an invalid result, as shall dates that end outside the range + representable by QDateTime. \sa startOfDay() */ -QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const +QDateTime QDate::endOfDay(const QTimeZone &zone) const { - if (!inDateTimeRange(jd, false)) + if (!inDateTimeRange(jd, DaySide::End) || !zone.isValid()) return QDateTime(); - switch (spec) { - case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone - qWarning() << "Called QDate::endOfDay(Qt::TimeZone) on" << *this; - return QDateTime(); - case Qt::UTC: - case Qt::OffsetFromUTC: - return QDateTime(*this, QTime(23, 59, 59, 999), spec, offsetSeconds); + QDateTime when(*this, QTime(23, 59, 59, 999), zone, + QDateTime::TransitionResolution::RelativeToAfter); + if (Q_UNLIKELY(!when.isValid() || when.date() != *this)) { +#if QT_CONFIG(timezone) + // The end of the day must have fallen in a spring-forward's gap; find the spring-forward: + if (zone.timeSpec() == Qt::TimeZone && zone.hasTransitions()) { + QTimeZone::OffsetData tran + // It's unlikely there's been another transition since yesterday noon. + // However, the whole of today may have been skipped ! + = zone.nextTransition(QDateTime(addDays(-1), QTime(12, 0), zone)); + const QDateTime &at = tran.atUtc.toTimeZone(zone); + if (at.isValid() && at.date() == *this) + return at; + } +#endif - case Qt::LocalTime: - if (offsetSeconds) - qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds); - break; + when = toLatest(*this, zone); } - QDateTime when(*this, QTime(23, 59, 59, 999), spec); - if (!when.isValid()) - when = toLatest(*this, when); - return when.isValid() ? when : QDateTime(); + return when; } -#if QT_CONFIG(timezone) /*! - \overload - \since 5.14 + \overload + \since 6.5 */ -QDateTime QDate::endOfDay(const QTimeZone &zone) const +QDateTime QDate::endOfDay() const { - if (!inDateTimeRange(jd, false) || !zone.isValid()) - return QDateTime(); + return endOfDay(QTimeZone::LocalTime); +} - QDateTime when(*this, QTime(23, 59, 59, 999), zone); - if (when.isValid()) - return when; - - // The end of the day must have fallen in a spring-forward's gap; find the spring-forward: - if (zone.hasTransitions()) { - QTimeZone::OffsetData tran - // It's unlikely there's been another transition since yesterday noon. - // However, the whole of today may have been skipped ! - = zone.nextTransition(QDateTime(addDays(-1), QTime(12, 0), zone)); - const QDateTime &at = tran.atUtc.toTimeZone(zone); - if (at.isValid() && at.date() == *this) - return at; - } +#if QT_DEPRECATED_SINCE(6, 9) +/*! + \overload + \since 5.14 + \deprecated [6.9] Use \c{endOfDay(const QTimeZone &) instead. - when = toLatest(*this, when); - return when.isValid() ? when : QDateTime(); + Returns the end-moment of the day. + + When a day ends depends on a how time is described: each day starts and ends + earlier for those with higher offsets from UTC and later for those with + lower offsets from UTC. The time representation to use can be specified + either by a \a spec and \a offsetSeconds (ignored unless \a spec is + Qt::OffsetSeconds) or by a time zone. + + Usually, the end of the day is one millisecond before the midnight, 24:00: + however, if a local time transition causes the given date to skip over that + moment (e.g. a DST spring-forward skipping over 23:00 and the following + hour), the actual latest time in the day is returned. + + When \a spec is Qt::OffsetFromUTC, \a offsetSeconds gives the implied zone's + offset from UTC. As UTC and such zones have no transitions, the end of the + day is QTime(23, 59, 59, 999) in these cases. + + In the rare case of a date that was entirely skipped (this happens when a + zone east of the international date-line switches to being west of it), the + return shall be invalid. Passing Qt::TimeZone as \a spec (instead of passing + a QTimeZone) will also produce an invalid result, as shall dates that end + outside the range representable by QDateTime. +*/ +QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const +{ + QTimeZone zone = asTimeZone(spec, offsetSeconds, "QDate::endOfDay"); + // If spec was Qt::TimeZone, zone's is Qt::LocalTime. + return endOfDay(zone); } -#endif // timezone +#endif // 6.9 deprecation #if QT_CONFIG(datestring) // depends on, so implies, textdate @@ -1098,12 +1241,14 @@ QString QDate::toString(Qt::DateFormat format) const /*! \fn QString QDate::toString(const QString &format, QCalendar cal) const \fn QString QDate::toString(QStringView format, QCalendar cal) const + \since 5.14 Returns the date as a string. The \a format parameter determines the format of the result string. If \a cal is supplied, it determines the calendar used - to represent the date; it defaults to Gregorian. + to represent the date; it defaults to Gregorian. Prior to Qt 5.14, there was + no \a cal parameter and the Gregorian calendar was always used. - These expressions may be used: + These expressions may be used in the \a format parameter: \table \header \li Expression \li Output @@ -1146,13 +1291,38 @@ QString QDate::toString(Qt::DateFormat format) const \note Day and month names are given in English (C locale). To get localized month and day names, use QLocale::system().toString(). - \sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString() + \note If a format character is repeated more times than the longest + expression in the table above using it, this part of the format will be read + as several expressions with no separator between them; the longest above, + possibly repeated as many times as there are copies of it, ending with a + residue that may be a shorter expression. Thus \c{'MMMMMMMMMM'} for a date + in May will contribute \c{"MayMay05"} to the output. + \sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString() */ QString QDate::toString(QStringView format, QCalendar cal) const { return QLocale::c().toString(*this, format, cal); } + +// Out-of-line no-calendar overloads, since QCalendar is a non-trivial type +/*! + \overload + \since 5.10 +*/ +QString QDate::toString(QStringView format) const +{ + return QLocale::c().toString(*this, format, QCalendar()); +} + +/*! + \overload + \since 4.6 +*/ +QString QDate::toString(const QString &format) const +{ + return QLocale::c().toString(*this, qToStringViewIgnoringNull(format), QCalendar()); +} #endif // datestring /*! @@ -1167,11 +1337,9 @@ QString QDate::toString(QStringView format, QCalendar cal) const */ bool QDate::setDate(int year, int month, int day) { - if (QGregorianCalendar::julianFromParts(year, month, day, &jd)) - return true; - - jd = nullJd(); - return false; + const auto maybe = QGregorianCalendar::julianFromParts(year, month, day); + jd = maybe.value_or(nullJd()); + return bool(maybe); } /*! @@ -1299,7 +1467,7 @@ QDate QDate::addMonths(int nmonths, QCalendar cal) const count = (++parts.year || cal.hasYearZero()) ? cal.monthsInYear(parts.year) : 0; } - return fixedDate(std::move(parts), cal); + return fixedDate(parts, cal); } /*! @@ -1331,7 +1499,7 @@ QDate QDate::addMonths(int nmonths) const ++parts.year; } - return fixedDate(std::move(parts)); + return fixedDate(parts); } /*! @@ -1360,11 +1528,11 @@ QDate QDate::addYears(int nyears, QCalendar cal) const int old_y = parts.year; parts.year += nyears; - // If we just crossed (or hit) a missing year zero, adjust year by +/- 1: + // If we just crossed (or hit) a missing year zero, adjust year by ±1: if (!cal.hasYearZero() && ((old_y > 0) != (parts.year > 0) || !parts.year)) parts.year += nyears > 0 ? +1 : -1; - return fixedDate(std::move(parts), cal); + return fixedDate(parts, cal); } /*! @@ -1383,11 +1551,11 @@ QDate QDate::addYears(int nyears) const int old_y = parts.year; parts.year += nyears; - // If we just crossed (or hit) a missing year zero, adjust year by +/- 1: + // If we just crossed (or hit) a missing year zero, adjust year by ±1: if ((old_y > 0) != (parts.year > 0) || !parts.year) parts.year += nyears > 0 ? +1 : -1; - return fixedDate(std::move(parts)); + return fixedDate(parts); } /*! @@ -1413,14 +1581,14 @@ qint64 QDate::daysTo(QDate d) const /*! - \fn bool QDate::operator==(QDate lhs, QDate rhs) + \fn bool QDate::operator==(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs and \a rhs represent the same day, otherwise \c false. */ /*! - \fn bool QDate::operator!=(QDate lhs, QDate rhs) + \fn bool QDate::operator!=(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs and \a rhs represent distinct days; otherwise returns \c false. @@ -1429,26 +1597,26 @@ qint64 QDate::daysTo(QDate d) const */ /*! - \fn bool QDate::operator<(QDate lhs, QDate rhs) + \fn bool QDate::operator<(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs is earlier than \a rhs; otherwise returns \c false. */ /*! - \fn bool QDate::operator<=(QDate lhs, QDate rhs) + \fn bool QDate::operator<=(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs is earlier than or equal to \a rhs; otherwise returns \c false. */ /*! - \fn bool QDate::operator>(QDate lhs, QDate rhs) + \fn bool QDate::operator>(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs is later than \a rhs; otherwise returns \c false. */ /*! - \fn bool QDate::operator>=(QDate lhs, QDate rhs) + \fn bool QDate::operator>=(const QDate &lhs, const QDate &rhs) Returns \c true if \a lhs is later than or equal to \a rhs; otherwise returns \c false. @@ -1456,35 +1624,12 @@ qint64 QDate::daysTo(QDate d) const /*! \fn QDate::currentDate() - Returns the current date, as reported by the system clock. + Returns the system clock's current date. \sa QTime::currentTime(), QDateTime::currentDateTime() */ #if QT_CONFIG(datestring) // depends on, so implies, textdate -namespace { - -struct ParsedInt { qulonglong value = 0; bool ok = false; }; - -/* - /internal - - Read a whole number that must be the whole text. QStringView::toULongLong() - will happily ignore spaces and accept signs; but various date formats' - fields (e.g. all in ISO) should not. -*/ -ParsedInt readInt(QStringView text) -{ - ParsedInt result; - for (QStringIterator it(text); it.hasNext();) { - if (!QChar::isDigit(it.next())) - return result; - } - result.value = text.toULongLong(&result.ok); - return result; -} - -} /*! \fn QDate QDate::fromString(const QString &string, Qt::DateFormat format) @@ -1537,13 +1682,13 @@ QDate QDate::fromString(QStringView string, Qt::DateFormat format) } case Qt::ISODate: // Semi-strict parsing, must be long enough and have punctuators as separators - if (string.size() >= 10 && string.at(4).isPunct() && string.at(7).isPunct() - && (string.size() == 10 || !string.at(10).isDigit())) { + if (string.size() >= 10 && string[4].isPunct() && string[7].isPunct() + && (string.size() == 10 || !string[10].isDigit())) { const ParsedInt year = readInt(string.first(4)); const ParsedInt month = readInt(string.sliced(5, 2)); const ParsedInt day = readInt(string.sliced(8, 2)); - if (year.ok && year.value > 0 && year.value <= 9999 && month.ok && day.ok) - return QDate(year.value, month.value, day.value); + if (year.ok() && year.result > 0 && year.result <= 9999 && month.ok() && day.ok()) + return QDate(year.result, month.result, day.result); } break; } @@ -1551,7 +1696,7 @@ QDate QDate::fromString(QStringView string, Qt::DateFormat format) } /*! - \fn QDate QDate::fromString(const QString &string, const QString &format, QCalendar cal) + \fn QDate QDate::fromString(const QString &string, const QString &format, int baseYear, QCalendar cal) Returns the QDate represented by the \a string, using the \a format given, or an invalid date if the string cannot be parsed. @@ -1601,15 +1746,82 @@ QDate QDate::fromString(QStringView string, Qt::DateFormat format) \table \header \li Field \li Default value - \row \li Year \li 1900 + \row \li Year \li \a baseYear (or 1900) \row \li Month \li 1 (January) \row \li Day \li 1 \endtable + When \a format only specifies the last two digits of a year, the 100 years + starting at \a baseYear are the candidates first considered. Prior to 6.7 + there was no \a baseYear parameter and 1900 was always used. This is the + default for \a baseYear, selecting a year from then to 1999. Passing 1976 as + \a baseYear will select a year from 1976 through 2075, for example. When the + format also includes month, day (of month) and day-of-week, these suffice to + imply the century. In such a case, a matching date is selected in the + nearest century to the one indicated by \a baseYear, prefering later over + earlier. See \l QCalendar::matchCenturyToWeekday() and \l {Date ambiguities} + for further details, + The following examples demonstrate the default values: \snippet code/src_corelib_time_qdatetime.cpp 3 + \note If a format character is repeated more times than the longest + expression in the table above using it, this part of the format will be read + as several expressions with no separator between them; the longest above, + possibly repeated as many times as there are copies of it, ending with a + residue that may be a shorter expression. Thus \c{'MMMMMMMMMM'} would match + \c{"MayMay05"} and set the month to May. Likewise, \c{'MMMMMM'} would match + \c{"May08"} and find it inconsistent, leading to an invalid date. + + \section2 Date ambiguities + + Different cultures use different formats for dates and, as a result, users + may mix up the order in which date fields should be given. For example, + \c{"Wed 28-Nov-01"} might mean either 2028 November 1st or the 28th of + November, 2001 (each of which happens to be a Wednesday). Using format + \c{"ddd yy-MMM-dd"} it shall be interpreted the first way, using \c{"ddd + dd-MMM-yy"} the second. However, which the user meant may depend on the way + the user normally writes dates, rather than the format the code was + expecting. + + The example considered above mixed up day of the month and a two-digit year. + Similar confusion can arise over interchanging the month and day of the + month, when both are given as numbers. In these cases, including a day of + the week field in the date format can provide some redundancy, that may help + to catch errors of this kind. However, as in the example above, this is not + always effective: the interchange of two fields (or their meanings) may + produce dates with the same day of the week. + + Including a day of the week in the format can also resolve the century of a + date specified using only the last two digits of its year. Unfortunately, + when combined with a date in which the user (or other source of data) has + mixed up two of the fields, this resolution can lead to finding a date which + does match the format's reading but isn't the one intended by its author. + Likewise, if the user simply gets the day of the week wrong, in an otherwise + correct date, this can lead a date in a different century. In each case, + finding a date in a different century can turn a wrongly-input date into a + wildly different one. + + The best way to avoid date ambiguities is to use four-digit years and months + specified by name (whether full or abbreviated), ideally collected via user + interface idioms that make abundantly clear to the user which part of the + date they are selecting. Including a day of the week can also help by + providing the means to check consistency of the data. Where data comes from + the user, using a format supplied by a locale selected by the user, it is + best to use a long format as short formats are more likely to use two-digit + years. Of course, it is not always possible to control the format - data may + come from a source you do not control, for example. + + As a result of these possible sources of confusion, particularly when you + cannot be sure an unambiguous format is in use, it is important to check + that the result of reading a string as a date is not just valid but + reasonable for the purpose for which it was supplied. If the result is + outside some range of reasonable values, it may be worth getting the user to + confirm their date selection, showing the date read from the string in a + long format that does include month name and four-digit year, to make it + easier for them to recognize any errors. + \sa toString(), QDateTime::fromString(), QTime::fromString(), QLocale::toDate() */ @@ -1624,21 +1836,67 @@ QDate QDate::fromString(QStringView string, Qt::DateFormat format) \overload \since 6.0 */ -QDate QDate::fromString(const QString &string, QStringView format, QCalendar cal) +QDate QDate::fromString(const QString &string, QStringView format, int baseYear, QCalendar cal) { QDate date; #if QT_CONFIG(datetimeparser) QDateTimeParser dt(QMetaType::QDate, QDateTimeParser::FromString, cal); dt.setDefaultLocale(QLocale::c()); if (dt.parseFormat(format)) - dt.fromString(string, &date, nullptr); + dt.fromString(string, &date, nullptr, baseYear); #else Q_UNUSED(string); Q_UNUSED(format); + Q_UNUSED(baseYear); Q_UNUSED(cal); #endif return date; } + +/*! + \fn QDate QDate::fromString(const QString &string, const QString &format, QCalendar cal) + \overload + \since 5.14 +*/ + +/*! + \fn QDate QDate::fromString(const QString &string, QStringView format, QCalendar cal) + \overload + \since 6.0 +*/ + +/*! + \fn QDate QDate::fromString(QStringView string, QStringView format, int baseYear, QCalendar cal) + \overload + \since 6.7 +*/ + +/*! + \fn QDate QDate::fromString(QStringView string, QStringView format, int baseYear) + \overload + \since 6.7 + + Uses a default-constructed QCalendar. +*/ + +/*! + \overload + \since 6.7 + + Uses a default-constructed QCalendar. +*/ +QDate QDate::fromString(const QString &string, QStringView format, int baseYear) +{ + return fromString(string, format, baseYear, QCalendar()); +} + +/*! + \fn QDate QDate::fromString(const QString &string, const QString &format, int baseYear) + \overload + \since 6.7 + + Uses a default-constructed QCalendar. +*/ #endif // datestring /*! @@ -1697,6 +1955,8 @@ bool QDate::isLeapYear(int y) \brief The QTime class provides clock time functions. + \compares strong + A QTime object contains a clock time, which it can express as the numbers of hours, minutes, seconds, and milliseconds since midnight. It provides functions for comparing times and for manipulating a time by adding a number @@ -1911,12 +2171,17 @@ QString QTime::toString(Qt::DateFormat format) const \row \li mm \li The minute with a leading zero (00 to 59) \row \li s \li The whole second, without any leading zero (0 to 59) \row \li ss \li The whole second, with a leading zero where applicable (00 to 59) - \row \li z \li The fractional part of the second, to go after a decimal - point, without trailing zeroes (0 to 999). Thus "\c{s.z}" - reports the seconds to full available (millisecond) precision - without trailing zeroes. - \row \li zzz \li The fractional part of the second, to millisecond - precision, including trailing zeroes where applicable (000 to 999). + \row \li z or zz + \li The fractional part of the second, to go after a decimal point, + without trailing zeroes. Thus \c{"s.z"} reports the seconds to full + available (millisecond) precision without trailing zeroes (0 to + 999). For example, \c{"s.z"} would produce \c{"0.25"} for a time a + quarter second into a minute. + \row \li zzz + \li The fractional part of the second, to millisecond precision, + including trailing zeroes where applicable (000 to 999). For + example, \c{"ss.zzz"} would produce \c{"00.250"} for a time a + quarter second into a minute. \row \li AP or A \li Use AM/PM display. \c A/AP will be replaced by 'AM' or 'PM'. In localized forms (only relevant to \l{QLocale::toString()}), the @@ -1931,7 +2196,24 @@ QString QTime::toString(Qt::DateFormat format) const \l{QLocale::toString()}), the locale-appropriate text (returned by \l{QLocale::amText()} or \l{QLocale::pmText()}) is used without change of case. - \row \li t \li The timezone (for example "CEST") + \row \li t + \li The timezone abbreviation (for example "CEST"). Note that time zone + abbreviations are not unique. In particular, \l toString() cannot + parse this. + \row \li tt + \li The timezone's offset from UTC with no colon between the hours and + minutes (for example "+0200"). + \row \li ttt + \li The timezone's offset from UTC with a colon between the hours and + minutes (for example "+02:00"). + \row \li tttt + \li The timezone name (for example "Europe/Berlin"). Note that this + gives no indication of whether the datetime was in daylight-saving + time or standard time, which may lead to ambiguity if the datetime + falls in an hour repeated by a transition between the two. The name + used is the one provided by \l QTimeZone::displayName() with the \l + QTimeZone::LongName type. This may depend on the operating system + in use. \endtable Any non-empty sequence of characters enclosed in single quotes will be @@ -1959,8 +2241,16 @@ QString QTime::toString(Qt::DateFormat format) const \note To get localized forms of AM or PM (the AP, ap, A, a, aP or Ap formats), use QLocale::system().toString(). + \note If a format character is repeated more times than the longest + expression in the table above using it, this part of the format will be read + as several expressions with no separator between them; the longest above, + possibly repeated as many times as there are copies of it, ending with a + residue that may be a shorter expression. Thus \c{'HHHHH'} for the time + 08:00 will contribute \c{"08088"} to the output. + \sa fromString(), QDate::toString(), QDateTime::toString(), QLocale::toString() */ +// ### Qt 7 The 't' format specifiers should be specific to QDateTime (compare fromString). QString QTime::toString(QStringView format) const { return QLocale::c().toString(*this, format); @@ -1984,7 +2274,7 @@ bool QTime::setHMS(int h, int m, int s, int ms) mds = NullTime; // make this invalid return false; } - mds = (h * SECS_PER_HOUR + m * SECS_PER_MIN + s) * MSECS_PER_SEC + ms; + mds = ((h * MINS_PER_HOUR + m) * SECS_PER_MIN + s) * MSECS_PER_SEC + ms; Q_ASSERT(mds >= 0 && mds < MSECS_PER_DAY); return true; } @@ -2052,7 +2342,7 @@ QTime QTime::addMSecs(int ms) const { QTime t; if (isValid()) - t.mds = QRoundingDown::qMod(ds() + ms, MSECS_PER_DAY); + t.mds = QRoundingDown::qMod<MSECS_PER_DAY>(ds() + ms); return t; } @@ -2079,38 +2369,38 @@ int QTime::msecsTo(QTime t) const /*! - \fn bool QTime::operator==(QTime lhs, QTime rhs) + \fn bool QTime::operator==(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is equal to \a rhs; otherwise returns \c false. */ /*! - \fn bool QTime::operator!=(QTime lhs, QTime rhs) + \fn bool QTime::operator!=(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is different from \a rhs; otherwise returns \c false. */ /*! - \fn bool QTime::operator<(QTime lhs, QTime rhs) + \fn bool QTime::operator<(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is earlier than \a rhs; otherwise returns \c false. */ /*! - \fn bool QTime::operator<=(QTime lhs, QTime rhs) + \fn bool QTime::operator<=(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is earlier than or equal to \a rhs; otherwise returns \c false. */ /*! - \fn bool QTime::operator>(QTime lhs, QTime rhs) + \fn bool QTime::operator>(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is later than \a rhs; otherwise returns \c false. */ /*! - \fn bool QTime::operator>=(QTime lhs, QTime rhs) + \fn bool QTime::operator>=(const QTime &lhs, const QTime &rhs) Returns \c true if \a lhs is later than or equal to \a rhs; otherwise returns \c false. @@ -2162,7 +2452,7 @@ static QTime fromIsoTimeString(QStringView string, Qt::DateFormat format, bool * // TextDate restricts fractional parts to the seconds field. QStringView tail; - const int dot = string.indexOf(u'.'), comma = string.indexOf(u','); + const qsizetype dot = string.indexOf(u'.'), comma = string.indexOf(u','); if (dot != -1) { tail = string.sliced(dot + 1); if (tail.indexOf(u'.') != -1) // Forbid second dot: @@ -2177,63 +2467,63 @@ static QTime fromIsoTimeString(QStringView string, Qt::DateFormat format, bool * const ParsedInt frac = readInt(tail); // There must be *some* digits in a fractional part; and it must be all digits: - if (tail.isEmpty() ? dot != -1 || comma != -1 : !frac.ok) + if (tail.isEmpty() ? dot != -1 || comma != -1 : !frac.ok()) return QTime(); - Q_ASSERT(frac.ok ^ tail.isEmpty()); - double fraction = frac.ok ? frac.value * std::pow(0.1, tail.size()) : 0.0; + Q_ASSERT(frac.ok() ^ tail.isEmpty()); + double fraction = frac.ok() ? frac.result * std::pow(0.1, tail.size()) : 0.0; - const int size = string.size(); + const qsizetype size = string.size(); if (size < 2 || size > 8) return QTime(); ParsedInt hour = readInt(string.first(2)); - if (!hour.ok || hour.value > (format == Qt::TextDate ? 23 : 24)) + if (!hour.ok() || hour.result > (format == Qt::TextDate ? 23 : 24)) return QTime(); - ParsedInt minute; + ParsedInt minute{}; if (string.size() > 2) { if (string[2] == u':' && string.size() > 4) minute = readInt(string.sliced(3, 2)); - if (!minute.ok || minute.value >= 60) + if (!minute.ok() || minute.result >= MINS_PER_HOUR) return QTime(); } else if (format == Qt::TextDate) { // Requires minutes return QTime(); - } else if (frac.ok) { + } else if (frac.ok()) { Q_ASSERT(!(fraction < 0.0) && fraction < 1.0); - fraction *= 60; - minute.value = qulonglong(fraction); - fraction -= minute.value; + fraction *= MINS_PER_HOUR; + minute.result = qulonglong(fraction); + fraction -= minute.result; } - ParsedInt second; + ParsedInt second{}; if (string.size() > 5) { if (string[5] == u':' && string.size() == 8) second = readInt(string.sliced(6, 2)); - if (!second.ok || second.value >= 60) + if (!second.ok() || second.result >= SECS_PER_MIN) return QTime(); - } else if (frac.ok) { + } else if (frac.ok()) { if (format == Qt::TextDate) // Doesn't allow fraction of minutes return QTime(); Q_ASSERT(!(fraction < 0.0) && fraction < 1.0); - fraction *= 60; - second.value = qulonglong(fraction); - fraction -= second.value; + fraction *= SECS_PER_MIN; + second.result = qulonglong(fraction); + fraction -= second.result; } Q_ASSERT(!(fraction < 0.0) && fraction < 1.0); // Round millis to nearest (unlike minutes and seconds, rounded down): - int msec = frac.ok ? qRound(MSECS_PER_SEC * fraction) : 0; + int msec = frac.ok() ? qRound(MSECS_PER_SEC * fraction) : 0; // But handle overflow gracefully: if (msec == MSECS_PER_SEC) { // If we can (when data were otherwise valid) validly propagate overflow // into other fields, do so: - if (isMidnight24 || hour.value < 23 || minute.value < 59 || second.value < 59) { + if (isMidnight24 || hour.result < 23 || minute.result < 59 || second.result < 59) { msec = 0; - if (++second.value == 60) { - second.value = 0; - if (++minute.value == 60) { - minute.value = 0; - ++hour.value; + if (++second.result == SECS_PER_MIN) { + second.result = 0; + if (++minute.result == MINS_PER_HOUR) { + minute.result = 0; + ++hour.result; // May need to propagate further via isMidnight24, see below } } @@ -2245,14 +2535,14 @@ static QTime fromIsoTimeString(QStringView string, Qt::DateFormat format, bool * } // For ISO date format, 24:0:0 means 0:0:0 on the next day: - if (hour.value == 24 && minute.value == 0 && second.value == 0 && msec == 0) { + if (hour.result == 24 && minute.result == 0 && second.result == 0 && msec == 0) { Q_ASSERT(format != Qt::TextDate); // It clipped hour at 23, above. if (isMidnight24) *isMidnight24 = true; - hour.value = 0; + hour.result = 0; } - return QTime(hour.value, minute.value, second.value, msec); + return QTime(hour.result, minute.result, second.result, msec); } /*! @@ -2306,12 +2596,20 @@ QTime QTime::fromString(QStringView string, Qt::DateFormat format) \row \li mm \li The minute with a leading zero (00 to 59) \row \li s \li The whole second, without any leading zero (0 to 59) \row \li ss \li The whole second, with a leading zero where applicable (00 to 59) - \row \li z \li The fractional part of the second, to go after a decimal - point, without trailing zeroes (0 to 999). Thus "\c{s.z}" - reports the seconds to full available (millisecond) precision - without trailing zeroes. - \row \li zzz \li The fractional part of the second, to millisecond - precision, including trailing zeroes where applicable (000 to 999). + \row \li z or zz + \li The fractional part of the second, as would usually follow a + decimal point, without requiring trailing zeroes (0 to 999). Thus + \c{"s.z"} matches the seconds with up to three digits of fractional + part supplying millisecond precision, without needing trailing + zeroes. For example, \c{"s.z"} would recognize either \c{"00.250"} + or \c{"0.25"} as representing a time a quarter second into its + minute. + \row \li zzz + \li Three digit fractional part of the second, to millisecond + precision, including trailing zeroes where applicable (000 to 999). + For example, \c{"ss.zzz"} would reject \c{"0.25"} but recognize + \c{"00.250"} as representing a time a quarter second into its + minute. \row \li AP, A, ap, a, aP or Ap \li Either 'AM' indicating a time before 12:00 or 'PM' for later times, matched case-insensitively. @@ -2341,6 +2639,15 @@ QTime QTime::fromString(QStringView string, Qt::DateFormat format) \note If localized forms of am or pm (the AP, ap, Ap, aP, A or a formats) are to be recognized, use QLocale::system().toTime(). + \note If a format character is repeated more times than the longest + expression in the table above using it, this part of the format will be read + as several expressions with no separator between them; the longest above, + possibly repeated as many times as there are copies of it, ending with a + residue that may be a shorter expression. Thus \c{'HHHHH'} would match + \c{"08088"} or \c{"080808"} and set the hour to 8; if the time string + contained "070809" it would "match" but produce an inconsistent result, + leading to an invalid time. + \sa toString(), QDateTime::fromString(), QDate::fromString(), QLocale::toTime(), QLocale::toDateTime() */ @@ -2388,7 +2695,8 @@ QTime QTime::fromString(const QString &string, QStringView format) bool QTime::isValid(int h, int m, int s, int ms) { - return uint(h) < 24 && uint(m) < 60 && uint(s) < SECS_PER_MIN && uint(ms) < MSECS_PER_SEC; + return (uint(h) < 24 && uint(m) < MINS_PER_HOUR && uint(s) < SECS_PER_MIN + && uint(ms) < MSECS_PER_SEC); } /***************************************************************************** @@ -2402,7 +2710,7 @@ typedef QDateTimePrivate::QDateTimeData QDateTimeData; // Converts milliseconds since the start of 1970 into a date and/or time: static qint64 msecsToJulianDay(qint64 msecs) { - return JULIAN_DAY_FOR_EPOCH + QRoundingDown::qDiv(msecs, MSECS_PER_DAY); + return JULIAN_DAY_FOR_EPOCH + QRoundingDown::qDiv<MSECS_PER_DAY>(msecs); } static QDate msecsToDate(qint64 msecs) @@ -2412,7 +2720,15 @@ static QDate msecsToDate(qint64 msecs) static QTime msecsToTime(qint64 msecs) { - return QTime::fromMSecsSinceStartOfDay(QRoundingDown::qMod(msecs, MSECS_PER_DAY)); + return QTime::fromMSecsSinceStartOfDay(QRoundingDown::qMod<MSECS_PER_DAY>(msecs)); +} + +// True if combining days with millis overflows; otherwise, stores result in *sumMillis +// The inputs should not have opposite signs. +static inline bool daysAndMillisOverflow(qint64 days, qint64 millisInDay, qint64 *sumMillis) +{ + return qMulOverflow(days, std::integral_constant<qint64, MSECS_PER_DAY>(), sumMillis) + || qAddOverflow(*sumMillis, millisInDay, sumMillis); } // Converts a date/time value into msecs @@ -2424,8 +2740,7 @@ static qint64 timeToMSecs(QDate date, QTime time) ++days; dayms -= MSECS_PER_DAY; } - if (mul_overflow(days, std::integral_constant<qint64, MSECS_PER_DAY>(), &msecs) - || add_overflow(msecs, dayms, &msecs)) { + if (daysAndMillisOverflow(days, dayms, &msecs)) { using Bound = std::numeric_limits<qint64>; return days < 0 ? Bound::min() : Bound::max(); } @@ -2509,7 +2824,7 @@ QDateTimePrivate::ZoneState QDateTimePrivate::expressUtcAsLocal(qint64 utcMSecs) #if QT_CONFIG(timezone) // Use the system time-zone. if (const auto sys = QTimeZone::systemTimeZone(); sys.isValid()) { result.offset = sys.d->offsetFromUtc(utcMSecs); - if (add_overflow(utcMSecs, result.offset * MSECS_PER_SEC, &result.when)) + if (qAddOverflow(utcMSecs, result.offset * MSECS_PER_SEC, &result.when)) return result; result.dst = sys.d->isDaylightTime(utcMSecs) ? DaylightTime : StandardTime; result.valid = true; @@ -2522,18 +2837,19 @@ QDateTimePrivate::ZoneState QDateTimePrivate::expressUtcAsLocal(qint64 utcMSecs) // dates might be right, and adjust by the number of days that was off: const qint64 jd = msecsToJulianDay(utcMSecs); const auto ymd = QGregorianCalendar::partsFromJulian(jd); - qint64 fakeJd, diffMillis, fakeUtc; - if (Q_UNLIKELY(!QGregorianCalendar::julianFromParts(systemTimeYearMatching(ymd.year), - ymd.month, ymd.day, &fakeJd) - || mul_overflow(jd - fakeJd, std::integral_constant<qint64, MSECS_PER_DAY>(), + qint64 diffMillis, fakeUtc; + const auto fakeJd = QGregorianCalendar::julianFromParts(systemTimeYearMatching(ymd.year), + ymd.month, ymd.day); + if (Q_UNLIKELY(!fakeJd + || qMulOverflow(jd - *fakeJd, std::integral_constant<qint64, MSECS_PER_DAY>(), &diffMillis) - || sub_overflow(utcMSecs, diffMillis, &fakeUtc))) { + || qSubOverflow(utcMSecs, diffMillis, &fakeUtc))) { return result; } result = QLocalTime::utcToLocal(fakeUtc); // Now correct result.when for the use of the fake date: - if (!result.valid || add_overflow(result.when, diffMillis, &result.when)) { + if (!result.valid || qAddOverflow(result.when, diffMillis, &result.when)) { // If utcToLocal() failed, its return has the fake when; restore utcMSecs. // Fail on overflow, but preserve offset and DST-ness. result.when = utcMSecs; @@ -2548,21 +2864,107 @@ static auto millisToWithinRange(qint64 millis) qint64 shifted = 0; bool good = false; } result; - qint64 jd = msecsToJulianDay(millis), fakeJd, diffMillis; + qint64 jd = msecsToJulianDay(millis); auto ymd = QGregorianCalendar::partsFromJulian(jd); - result.good = QGregorianCalendar::julianFromParts(systemTimeYearMatching(ymd.year), - ymd.month, ymd.day, &fakeJd) - && !mul_overflow(fakeJd - jd, std::integral_constant<qint64, MSECS_PER_DAY>(), - &diffMillis) - && !add_overflow(diffMillis, millis, &result.shifted); + const auto fakeJd = QGregorianCalendar::julianFromParts(systemTimeYearMatching(ymd.year), + ymd.month, ymd.day); + result.good = fakeJd && !daysAndMillisOverflow(*fakeJd - jd, millis, &result.shifted); return result; } +/*! + \internal + \enum QDateTimePrivate::TransitionOption + + This enumeration is used to resolve datetime combinations which fall in \l + {Timezone transitions}. The transition is described as a "gap" if there are + time representations skipped over by the zone, as is common in the "spring + forward" transitions in many zones on entering daylight-saving time. The + transition is described as a "fold" if there are time representations + repeated in the zone, as in a "fall back" transition out of daylight-saving + time. + + When the options specified do not determine a resolution for a datetime, it + is marked invalid. + + The prepared option sets above are in fact composed from low-level atomic + options. For each of gap and fold you can chose between two candidate times, + one before or after the transition, based on the time requested; or you can + pick the moment of transition, or the start or end of the transition + interval. For a gap, the start and end of the interval are the moment of the + transition, but for a repeated interval the start of the first pass is the + start of the transition interval, the end of the second pass is the end of + the transition interval and the moment of the transition itself is both the + end of the first pass and the start of the second. + + \value GapUseBefore For a time in a gap, use a time before the transition, + as if stepping back from a later time. + \value GapUseAfter For a time in a gap, use a time after the transition, as + if stepping forward from an earlier time. + \value FoldUseBefore For a repeated time, use the first candidate, which is + before the transition. + \value FoldUseAfter For a repeated time, use the second candidate, which is + after the transition. + \value FlipForReverseDst For "reversed" DST, this reverses the preceding + four options (see below). + + The last has no effect unless the "daylight-saving" time side of the + transition is known to have a lower offset from UTC than the standard time + side. (This is the "reversed" DST case of \l {Timezone transitions}.) In + that case, if other options would select a time after the transition, a time + before is used instead, and vice versa. This effectively turns a preference + for the side with lower offset into a preference for the side that is + officially standard time, even if it has higher offset; and conversely a + preference for higher offset into a preference for daylight-saving time, + even if it has a lower offset. This option has no effect on a resolution + that selects the moment of transition or the start or end of the transition + interval. + + The result of combining more than one of the \c GapUse* options is + undefined; likewise for the \c FoldUse*. Each of QDateTime's + TransitionResolution values, aside from Reject, maps to a combination that + incorporates one from each of these sets. +*/ + +constexpr static QDateTimePrivate::TransitionOptions +toTransitionOptions(QDateTime::TransitionResolution res) +{ + switch (res) { + case QDateTime::TransitionResolution::RelativeToBefore: + return QDateTimePrivate::GapUseAfter | QDateTimePrivate::FoldUseBefore; + case QDateTime::TransitionResolution::RelativeToAfter: + return QDateTimePrivate::GapUseBefore | QDateTimePrivate::FoldUseAfter; + case QDateTime::TransitionResolution::PreferBefore: + return QDateTimePrivate::GapUseBefore | QDateTimePrivate::FoldUseBefore; + case QDateTime::TransitionResolution::PreferAfter: + return QDateTimePrivate::GapUseAfter | QDateTimePrivate::FoldUseAfter; + case QDateTime::TransitionResolution::PreferStandard: + return QDateTimePrivate::GapUseBefore + | QDateTimePrivate::FoldUseAfter + | QDateTimePrivate::FlipForReverseDst; + case QDateTime::TransitionResolution::PreferDaylightSaving: + return QDateTimePrivate::GapUseAfter + | QDateTimePrivate::FoldUseBefore + | QDateTimePrivate::FlipForReverseDst; + case QDateTime::TransitionResolution::Reject: break; + } + return {}; +} + +constexpr static QDateTimePrivate::TransitionOptions +toTransitionOptions(QDateTimePrivate::DaylightStatus dst) +{ + return toTransitionOptions(dst == QDateTimePrivate::DaylightTime + ? QDateTime::TransitionResolution::PreferDaylightSaving + : QDateTime::TransitionResolution::PreferStandard); +} + QString QDateTimePrivate::localNameAtMillis(qint64 millis, DaylightStatus dst) { + const QDateTimePrivate::TransitionOptions resolve = toTransitionOptions(dst); QString abbreviation; if (millisInSystemRange(millis, MSECS_PER_DAY)) { - abbreviation = QLocalTime::localTimeAbbbreviationAt(millis, dst); + abbreviation = QLocalTime::localTimeAbbbreviationAt(millis, resolve); if (!abbreviation.isEmpty()) return abbreviation; } @@ -2572,7 +2974,7 @@ QString QDateTimePrivate::localNameAtMillis(qint64 millis, DaylightStatus dst) // Use the system zone: const auto sys = QTimeZone::systemTimeZone(); if (sys.isValid()) { - ZoneState state = zoneStateAtMillis(sys, millis, dst); + ZoneState state = zoneStateAtMillis(sys, millis, resolve); if (state.valid) return sys.d->abbreviation(state.when - state.offset * MSECS_PER_SEC); } @@ -2582,19 +2984,20 @@ QString QDateTimePrivate::localNameAtMillis(qint64 millis, DaylightStatus dst) // Use a time in the system range with the same day-of-week pattern to its year: auto fake = millisToWithinRange(millis); if (Q_LIKELY(fake.good)) - return QLocalTime::localTimeAbbbreviationAt(fake.shifted, dst); + return QLocalTime::localTimeAbbbreviationAt(fake.shifted, resolve); // Overflow, apparently. return {}; } // Determine the offset from UTC at the given local time as millis. -QDateTimePrivate::ZoneState QDateTimePrivate::localStateAtMillis(qint64 millis, DaylightStatus dst) +QDateTimePrivate::ZoneState QDateTimePrivate::localStateAtMillis( + qint64 millis, QDateTimePrivate::TransitionOptions resolve) { // First, if millis is within a day of the viable range, try mktime() in // case it does fall in the range and gets useful information: if (millisInSystemRange(millis, MSECS_PER_DAY)) { - auto result = QLocalTime::mapLocalTime(millis, dst); + auto result = QLocalTime::mapLocalTime(millis, resolve); if (result.valid) return result; } @@ -2604,17 +3007,17 @@ QDateTimePrivate::ZoneState QDateTimePrivate::localStateAtMillis(qint64 millis, // Use the system zone: const auto sys = QTimeZone::systemTimeZone(); if (sys.isValid()) - return zoneStateAtMillis(sys, millis, dst); + return zoneStateAtMillis(sys, millis, resolve); #endif // timezone // Kludge // Use a time in the system range with the same day-of-week pattern to its year: auto fake = millisToWithinRange(millis); if (Q_LIKELY(fake.good)) { - auto result = QLocalTime::mapLocalTime(fake.shifted, dst); + auto result = QLocalTime::mapLocalTime(fake.shifted, resolve); if (result.valid) { qint64 adjusted; - if (Q_UNLIKELY(add_overflow(result.when, millis - fake.shifted, &adjusted))) { + if (Q_UNLIKELY(qAddOverflow(result.when, millis - fake.shifted, &adjusted))) { using Bound = std::numeric_limits<qint64>; adjusted = millis < fake.shifted ? Bound::min() : Bound::max(); } @@ -2629,41 +3032,26 @@ QDateTimePrivate::ZoneState QDateTimePrivate::localStateAtMillis(qint64 millis, } #if QT_CONFIG(timezone) -// For a TimeZone and a time expressed in zone msecs encoding, possibly with a -// hint to DST-ness, compute the actual DST-ness and offset, adjusting the time -// if needed to escape a spring-forward. -QDateTimePrivate::ZoneState QDateTimePrivate::zoneStateAtMillis(const QTimeZone &zone, - qint64 millis, DaylightStatus dst) +// For a TimeZone and a time expressed in zone msecs encoding, compute the +// actual DST-ness and offset, adjusting the time if needed to escape a +// spring-forward. +QDateTimePrivate::ZoneState QDateTimePrivate::zoneStateAtMillis( + const QTimeZone &zone, qint64 millis, QDateTimePrivate::TransitionOptions resolve) { Q_ASSERT(zone.isValid()); - // Get the effective data from QTimeZone - QTimeZonePrivate::Data data = zone.d->dataForLocalTime(millis, int(dst)); - if (data.offsetFromUtc == QTimeZonePrivate::invalidSeconds()) - return {millis}; - Q_ASSERT(zone.d->offsetFromUtc(data.atMSecsSinceEpoch) == data.offsetFromUtc); - ZoneState state(data.atMSecsSinceEpoch + data.offsetFromUtc * MSECS_PER_SEC, - data.offsetFromUtc, - data.daylightTimeOffset ? DaylightTime : StandardTime); - // Revise offset, when stepping out of a spring-forward, to what makes a - // fromMSecsSinceEpoch(toMSecsSinceEpoch()) of the resulting QDT work: - if (millis != state.when) - state.offset += (millis - state.when) / MSECS_PER_SEC; - return state; + Q_ASSERT(zone.timeSpec() == Qt::TimeZone); + return zone.d->stateAtZoneTime(millis, resolve); } #endif // timezone -static inline QDateTimePrivate::ZoneState stateAtMillis(Qt::TimeSpec spec, - QDateTimeData &d, - qint64 millis, - QDateTimePrivate::DaylightStatus dst) +static inline QDateTimePrivate::ZoneState stateAtMillis(const QTimeZone &zone, qint64 millis, + QDateTimePrivate::TransitionOptions resolve) { - if (spec == Qt::LocalTime) - return QDateTimePrivate::localStateAtMillis(millis, dst); + if (zone.timeSpec() == Qt::LocalTime) + return QDateTimePrivate::localStateAtMillis(millis, resolve); #if QT_CONFIG(timezone) - if (spec == Qt::TimeZone && d.d->m_timeZone.isValid()) - return QDateTimePrivate::zoneStateAtMillis(d.d->m_timeZone, millis, dst); -#else - Q_UNUSED(d); + if (zone.timeSpec() == Qt::TimeZone && zone.isValid()) + return QDateTimePrivate::zoneStateAtMillis(zone, millis, resolve); #endif return {millis}; } @@ -2675,7 +3063,7 @@ static inline bool specCanBeSmall(Qt::TimeSpec spec) static inline bool msecsCanBeSmall(qint64 msecs) { - if (!QDateTimeData::CanBeSmall) + if constexpr (!QDateTimeData::CanBeSmall) return false; ShortData sd; @@ -2713,9 +3101,9 @@ mergeDaylightStatus(QDateTimePrivate::StatusFlags sf, QDateTimePrivate::Daylight static constexpr inline QDateTimePrivate::DaylightStatus extractDaylightStatus(QDateTimePrivate::StatusFlags status) { - if (status & QDateTimePrivate::SetToDaylightTime) + if (status.testFlag(QDateTimePrivate::SetToDaylightTime)) return QDateTimePrivate::DaylightTime; - if (status & QDateTimePrivate::SetToStandardTime) + if (status.testFlag(QDateTimePrivate::SetToStandardTime)) return QDateTimePrivate::StandardTime; return QDateTimePrivate::UnknownDaylightTime; } @@ -2772,40 +3160,62 @@ static inline bool usesSameOffset(const QDateTimeData &a, const QDateTimeData &b Q_ASSERT(!a.isShort() && !b.isShort()); return a->m_offsetFromUtc == b->m_offsetFromUtc; } - Q_UNREACHABLE(); - return false; + Q_UNREACHABLE_RETURN(false); } // Refresh the LocalTime or TimeZone validity and offset -static void refreshZonedDateTime(QDateTimeData &d, Qt::TimeSpec spec) +static void refreshZonedDateTime(QDateTimeData &d, const QTimeZone &zone, + QDateTimePrivate::TransitionOptions resolve) { - Q_ASSERT(spec == Qt::TimeZone || spec == Qt::LocalTime); + Q_ASSERT(zone.timeSpec() == Qt::TimeZone || zone.timeSpec() == Qt::LocalTime); auto status = getStatus(d); - Q_ASSERT(extractSpec(status) == spec); + Q_ASSERT(extractSpec(status) == zone.timeSpec()); int offsetFromUtc = 0; + /* Callers are: + * QDTP::create(), where d is too new to be shared yet + * reviseTimeZone(), which detach()es if not short before calling this + * checkValidDateTime(), always follows a setDateTime() that detach()ed if not short + + So we can assume d is not shared. We only need to detach() if we convert + from short to pimpled to accommodate an oversize msecs, which can only be + needed in the unlikely event we revise it. + */ // If not valid date and time then is invalid - if (!(status & QDateTimePrivate::ValidDate) || !(status & QDateTimePrivate::ValidTime)) { - status &= ~QDateTimePrivate::ValidDateTime; + if (!status.testFlags(QDateTimePrivate::ValidDate | QDateTimePrivate::ValidTime)) { + status.setFlag(QDateTimePrivate::ValidDateTime, false); } else { - // We have a valid date and time and a Qt::LocalTime or Qt::TimeZone that needs calculating - // LocalTime and TimeZone might fall into a "missing" DST transition hour - // Calling toEpochMSecs will adjust the returned date/time if it does + // We have a valid date and time and a Qt::LocalTime or Qt::TimeZone + // that might fall into a "missing" DST transition hour. qint64 msecs = getMSecs(d); - QDateTimePrivate::ZoneState state = stateAtMillis(spec, d, msecs, - extractDaylightStatus(status)); - // Save the offset to use in offsetFromUtc() &c., even if the next check - // marks invalid; this lets fromMSecsSinceEpoch() give a useful fallback - // for times in spring-forward gaps. - offsetFromUtc = state.offset; + QDateTimePrivate::ZoneState state = stateAtMillis(zone, msecs, resolve); Q_ASSERT(!state.valid || (state.offset >= -SECS_PER_DAY && state.offset <= SECS_PER_DAY)); - if (state.valid && msecs == state.when) - status = mergeDaylightStatus(status | QDateTimePrivate::ValidDateTime, state.dst); - else // msecs changed or failed to convert (e.g. overflow) - status &= ~QDateTimePrivate::ValidDateTime; + if (state.dst == QDateTimePrivate::UnknownDaylightTime) { // Overflow + status.setFlag(QDateTimePrivate::ValidDateTime, false); + } else if (state.valid) { + status = mergeDaylightStatus(status, state.dst); + offsetFromUtc = state.offset; + status.setFlag(QDateTimePrivate::ValidDateTime, true); + if (Q_UNLIKELY(msecs != state.when)) { + // Update msecs to the resolution: + if (status.testFlag(QDateTimePrivate::ShortData)) { + if (msecsCanBeSmall(state.when)) { + d.data.msecs = qintptr(state.when); + } else { + // Convert to long-form so we can hold the revised msecs: + status.setFlag(QDateTimePrivate::ShortData, false); + d.detach(); + } + } + if (!status.testFlag(QDateTimePrivate::ShortData)) + d->m_msecs = state.when; + } + } else { + status.setFlag(QDateTimePrivate::ValidDateTime, false); + } } - if (status & QDateTimePrivate::ShortData) { + if (status.testFlag(QDateTimePrivate::ShortData)) { d.data.status = status.toInt(); } else { d->m_status = status; @@ -2817,23 +3227,20 @@ static void refreshZonedDateTime(QDateTimeData &d, Qt::TimeSpec spec) static void refreshSimpleDateTime(QDateTimeData &d) { auto status = getStatus(d); - Q_ASSERT(extractSpec(status) == Qt::UTC || extractSpec(status) == Qt::OffsetFromUTC); - if ((status & QDateTimePrivate::ValidDate) && (status & QDateTimePrivate::ValidTime)) - status |= QDateTimePrivate::ValidDateTime; - else - status &= ~QDateTimePrivate::ValidDateTime; + Q_ASSERT(QTimeZone::isUtcOrFixedOffset(extractSpec(status))); + status.setFlag(QDateTimePrivate::ValidDateTime, + status.testFlags(QDateTimePrivate::ValidDate | QDateTimePrivate::ValidTime)); - if (status & QDateTimePrivate::ShortData) + if (status.testFlag(QDateTimePrivate::ShortData)) d.data.status = status.toInt(); else d->m_status = status; } // Clean up and set status after assorted set-up or reworking: -static void checkValidDateTime(QDateTimeData &d) +static void checkValidDateTime(QDateTimeData &d, QDateTime::TransitionResolution resolve) { - auto status = getStatus(d); - auto spec = extractSpec(status); + auto spec = extractSpec(getStatus(d)); switch (spec) { case Qt::OffsetFromUTC: case Qt::UTC: @@ -2842,46 +3249,54 @@ static void checkValidDateTime(QDateTimeData &d) break; case Qt::TimeZone: case Qt::LocalTime: - // for these, we need to check whether the timezone is valid and whether - // the time is valid in that timezone. Expensive, but no other option. - refreshZonedDateTime(d, spec); + // For these, we need to check whether (the zone is valid and) the time + // is valid for the zone. Expensive, but we have no other option. + refreshZonedDateTime(d, d.timeZone(), toTransitionOptions(resolve)); break; } } -// Caller needs to refresh after calling this -static void setTimeSpec(QDateTimeData &d, Qt::TimeSpec spec, int offsetSeconds) +static void reviseTimeZone(QDateTimeData &d, const QTimeZone &zone, + QDateTime::TransitionResolution resolve) { - auto status = getStatus(d); - status &= ~(QDateTimePrivate::ValidDateTime | QDateTimePrivate::DaylightMask | - QDateTimePrivate::TimeSpecMask); + Qt::TimeSpec spec = zone.timeSpec(); + auto status = mergeSpec(getStatus(d), spec); + bool reuse = d.isShort(); + int offset = 0; switch (spec) { + case Qt::UTC: + Q_ASSERT(zone.fixedSecondsAheadOfUtc() == 0); + break; case Qt::OffsetFromUTC: - if (offsetSeconds == 0) - spec = Qt::UTC; + reuse = false; + offset = zone.fixedSecondsAheadOfUtc(); + Q_ASSERT(offset); break; case Qt::TimeZone: - qWarning("Using TimeZone in setTimeSpec() is unsupported"); // Use system time zone instead - spec = Qt::LocalTime; - Q_FALLTHROUGH(); - case Qt::UTC: + reuse = false; + break; case Qt::LocalTime: - offsetSeconds = 0; break; } - status = mergeSpec(status, spec); - if (d.isShort() && offsetSeconds == 0) { + status &= ~(QDateTimePrivate::ValidDateTime | QDateTimePrivate::DaylightMask); + if (reuse) { d.data.status = status.toInt(); } else { d.detach(); d->m_status = status & ~QDateTimePrivate::ShortData; - d->m_offsetFromUtc = offsetSeconds; + d->m_offsetFromUtc = offset; #if QT_CONFIG(timezone) - d->m_timeZone = QTimeZone(); + if (spec == Qt::TimeZone) + d->m_timeZone = zone; #endif // timezone } + + if (QTimeZone::isUtcOrFixedOffset(spec)) + refreshSimpleDateTime(d); + else + refreshZonedDateTime(d, zone, toTransitionOptions(resolve)); } static void setDateTime(QDateTimeData &d, QDate date, QTime time) @@ -2915,8 +3330,7 @@ static void setDateTime(QDateTimeData &d, QDate date, QTime time) // Check in representable range: qint64 msecs = 0; - if (mul_overflow(days, std::integral_constant<qint64, MSECS_PER_DAY>(), &msecs) - || add_overflow(msecs, qint64(ds), &msecs)) { + if (daysAndMillisOverflow(days, qint64(ds), &msecs)) { newStatus = QDateTimePrivate::StatusFlags{}; msecs = 0; } @@ -2940,16 +3354,16 @@ static void setDateTime(QDateTimeData &d, QDate date, QTime time) } } -static QPair<QDate, QTime> getDateTime(const QDateTimeData &d) +static std::pair<QDate, QTime> getDateTime(const QDateTimeData &d) { auto status = getStatus(d); const qint64 msecs = getMSecs(d); - const qint64 days = QRoundingDown::qDiv(msecs, MSECS_PER_DAY); + const auto dayMilli = QRoundingDown::qDivMod<MSECS_PER_DAY>(msecs); return { status.testFlag(QDateTimePrivate::ValidDate) - ? QDate::fromJulianDay(JULIAN_DAY_FOR_EPOCH + days) + ? QDate::fromJulianDay(JULIAN_DAY_FOR_EPOCH + dayMilli.quotient) : QDate(), status.testFlag(QDateTimePrivate::ValidTime) - ? QTime::fromMSecsSinceStartOfDay(msecs - days * MSECS_PER_DAY) + ? QTime::fromMSecsSinceStartOfDay(dayMilli.remainder) : QTime() }; } @@ -2966,20 +3380,28 @@ inline QDateTime::Data::Data() noexcept d = reinterpret_cast<QDateTimePrivate *>(value); } -inline QDateTime::Data::Data(Qt::TimeSpec spec) +inline QDateTime::Data::Data(const QTimeZone &zone) { + Qt::TimeSpec spec = zone.timeSpec(); if (CanBeSmall && Q_LIKELY(specCanBeSmall(spec))) { - d = reinterpret_cast<QDateTimePrivate *>(quintptr(mergeSpec(QDateTimePrivate::ShortData, spec).toInt())); + quintptr value = mergeSpec(QDateTimePrivate::ShortData, spec).toInt(); + d = reinterpret_cast<QDateTimePrivate *>(value); + Q_ASSERT(isShort()); } else { // the structure is too small, we need to detach d = new QDateTimePrivate; d->ref.ref(); d->m_status = mergeSpec({}, spec); + if (spec == Qt::OffsetFromUTC) + d->m_offsetFromUtc = zone.fixedSecondsAheadOfUtc(); + else if (spec == Qt::TimeZone) + d->m_timeZone = zone; + Q_ASSERT(!isShort()); } } -inline QDateTime::Data::Data(const Data &other) - : d(other.d) +inline QDateTime::Data::Data(const Data &other) noexcept + : data(other.data) { if (!isShort()) { // check if we could shrink @@ -2995,18 +3417,18 @@ inline QDateTime::Data::Data(const Data &other) } } -inline QDateTime::Data::Data(Data &&other) - : d(other.d) +inline QDateTime::Data::Data(Data &&other) noexcept + : data(other.data) { // reset the other to a short state Data dummy; Q_ASSERT(dummy.isShort()); - other.d = dummy.d; + other.data = dummy.data; } -inline QDateTime::Data &QDateTime::Data::operator=(const Data &other) +inline QDateTime::Data &QDateTime::Data::operator=(const Data &other) noexcept { - if (d == other.d) + if (isShort() ? data == other.data : d == other.d) return *this; auto x = d; @@ -3040,11 +3462,11 @@ inline bool QDateTime::Data::isShort() const bool b = quintptr(d) & QDateTimePrivate::ShortData; // sanity check: - Q_ASSERT(b || (d->m_status & QDateTimePrivate::ShortData) == 0); + Q_ASSERT(b || !d->m_status.testFlag(QDateTimePrivate::ShortData)); // even if CanBeSmall = false, we have short data for a default-constructed // QDateTime object. But it's unlikely. - if (CanBeSmall) + if constexpr (CanBeSmall) return Q_LIKELY(b); return Q_UNLIKELY(b); } @@ -3071,6 +3493,35 @@ inline void QDateTime::Data::detach() d = x; } +void QDateTime::Data::invalidate() +{ + if (isShort()) { + data.status &= ~int(QDateTimePrivate::ValidityMask); + } else { + detach(); + d->m_status &= ~QDateTimePrivate::ValidityMask; + } +} + +QTimeZone QDateTime::Data::timeZone() const +{ + switch (getSpec(*this)) { + case Qt::UTC: + return QTimeZone::UTC; + case Qt::OffsetFromUTC: + return QTimeZone::fromSecondsAheadOfUtc(d->m_offsetFromUtc); + case Qt::TimeZone: +#if QT_CONFIG(timezone) + if (d->m_timeZone.isValid()) + return d->m_timeZone; +#endif + break; + case Qt::LocalTime: + return QTimeZone::LocalTime; + } + return QTimeZone(); +} + inline const QDateTimePrivate *QDateTime::Data::operator->() const { Q_ASSERT(!isShort()); @@ -3090,34 +3541,18 @@ inline QDateTimePrivate *QDateTime::Data::operator->() *****************************************************************************/ Q_NEVER_INLINE -QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, Qt::TimeSpec toSpec, - int offsetSeconds) +QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, const QTimeZone &zone, + QDateTime::TransitionResolution resolve) { - QDateTime::Data result(toSpec); - setTimeSpec(result, toSpec, offsetSeconds); + QDateTime::Data result(zone); setDateTime(result, toDate, toTime); - if (toSpec == Qt::OffsetFromUTC || toSpec == Qt::UTC) + if (zone.isUtcOrFixedOffset()) refreshSimpleDateTime(result); else - refreshZonedDateTime(result, Qt::LocalTime); + refreshZonedDateTime(result, zone, toTransitionOptions(resolve)); return result; } -#if QT_CONFIG(timezone) -inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, - const QTimeZone &toTimeZone) -{ - QDateTime::Data result(Qt::TimeZone); - Q_ASSERT(!result.isShort()); - - result.d->m_status = mergeSpec(result.d->m_status, Qt::TimeZone); - result.d->m_timeZone = toTimeZone; - setDateTime(result, toDate, toTime); - refreshZonedDateTime(result, Qt::TimeZone); - return result; -} -#endif // timezone - /***************************************************************************** QDateTime member functions *****************************************************************************/ @@ -3129,37 +3564,42 @@ inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, \reentrant \brief The QDateTime class provides date and time functions. + \compares weak - A QDateTime object encodes a calendar date and a clock time (a - "datetime"). It combines features of the QDate and QTime classes. - It can read the current datetime from the system clock. It - provides functions for comparing datetimes and for manipulating a + A QDateTime object encodes a calendar date and a clock time (a "datetime") + in accordance with a time representation. It combines features of the QDate + and QTime classes. It can read the current datetime from the system + clock. It provides functions for comparing datetimes and for manipulating a datetime by adding a number of seconds, days, months, or years. QDateTime can describe datetimes with respect to \l{Qt::LocalTime}{local time}, to \l{Qt::UTC}{UTC}, to a specified \l{Qt::OffsetFromUTC}{offset from - UTC} or to a specified \l{Qt::TimeZone}{time zone}, in conjunction with the - QTimeZone class. For example, a time zone of "Europe/Berlin" will apply the - daylight-saving rules as used in Germany. In contrast, an offset from UTC of - +3600 seconds is one hour ahead of UTC (usually written in ISO standard - notation as "UTC+01:00"), with no daylight-saving offset or changes. When - using either local time or a specified time zone, time-zone transitions such - as the starts and ends of daylight-saving time (DST; but see below) are - taken into account. The choice of system used to represent a datetime is - described as its "timespec". + UTC} or to a specified \l{Qt::TimeZone}{time zone}. Each of these time + representations can be encapsulated in a suitable instance of the QTimeZone + class. For example, a time zone of "Europe/Berlin" will apply the + daylight-saving rules as used in Germany. In contrast, a fixed offset from + UTC of +3600 seconds is one hour ahead of UTC (usually written in ISO + standard notation as "UTC+01:00"), with no daylight-saving + complications. When using either local time or a specified time zone, + time-zone transitions (see \l {Timezone transitions}{below}) are taken into + account. A QDateTime's timeSpec() will tell you which of the four types of + time representation is in use; its timeRepresentation() provides a full + description of that time representation, as a QTimeZone. A QDateTime object is typically created either by giving a date and time explicitly in the constructor, or by using a static function such as currentDateTime() or fromMSecsSinceEpoch(). The date and time can be changed with setDate() and setTime(). A datetime can also be set using the setMSecsSinceEpoch() function that takes the time, in milliseconds, since - 00:00:00 on January 1, 1970. The fromString() function returns a QDateTime, - given a string and a date format used to interpret the date within the - string. + the start, in UTC, of the year 1970. The fromString() function returns a + QDateTime, given a string and a date format used to interpret the date + within the string. QDateTime::currentDateTime() returns a QDateTime that expresses the current - time with respect to local time. QDateTime::currentDateTimeUtc() returns a - QDateTime that expresses the current time with respect to UTC. + date and time with respect to a specific time representation, such as local + time (its default). QDateTime::currentDateTimeUtc() returns a QDateTime that + expresses the current date and time with respect to UTC; it is equivalent to + \c {QDateTime::currentDateTime(QTimeZone::UTC)}. The date() and time() functions provide access to the date and time parts of the datetime. The same information is provided in @@ -3178,17 +3618,17 @@ inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, daylight-saving time (DST) and other time-zone transitions, where applicable. - Use toTimeSpec() to express a datetime in local time or UTC, - toOffsetFromUtc() to express in terms of an offset from UTC, or toTimeZone() - to express it with respect to a general time zone. You can use timeSpec() to - find out what time-spec a QDateTime object stores its time relative to. When - that is Qt::TimeZone, you can use timeZone() to find out which zone it is - using. - - \note QDateTime does not account for leap seconds. + Use toTimeZone() to re-express a datetime in terms of a different time + representation. By passing a lightweight QTimeZone that represents local + time, UTC or a fixed offset from UTC, you can convert the datetime to use + the corresponding time representation; or you can pass a full time zone + (whose \l {QTimeZone::timeSpec()}{timeSpec()} is \c {Qt::TimeZone}) to use + that instead. \section1 Remarks + \note QDateTime does not account for leap seconds. + \note All conversion to and from string formats is done using the C locale. For localized conversions, see QLocale. @@ -3196,15 +3636,21 @@ inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, considered invalid. The year -1 is the year "1 before Christ" or "1 before common era." The day before 1 January 1 CE is 31 December 1 BCE. + \note Using local time (the default) or a specified time zone implies a need + to resolve any issues around \l {Timezone transitions}{transitions}. As a + result, operations on such QDateTime instances (notably including + constructing them) may be more expensive than the equivalent when using UTC + or a fixed offset from it. + \section2 Range of Valid Dates The range of values that QDateTime can represent is dependent on the internal storage implementation. QDateTime is currently stored in a qint64 as a serial msecs value encoding the date and time. This restricts the date - range to about +/- 292 million years, compared to the QDate range of +/- 2 - billion years. Care must be taken when creating a QDateTime with extreme - values that you do not overflow the storage. The exact range of supported - values varies depending on the Qt::TimeSpec and time zone. + range to about ±292 million years, compared to the QDate range of ±2 billion + years. Care must be taken when creating a QDateTime with extreme values that + you do not overflow the storage. The exact range of supported values varies + depending on the time representation used. \section2 Use of Timezones @@ -3221,34 +3667,106 @@ inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, information about historical transitions (including DST, see below) whenever possible. On Windows, where the system doesn't support historical timezone data, historical accuracy is not maintained with respect to timezone - transitions, notably including DST. - - \section2 Daylight-Saving Time (DST) - - QDateTime takes into account transitions between Standard Time and - Daylight-Saving Time. For example, if the transition is at 2am and the clock - goes forward to 3am, then there is a "missing" hour from 02:00:00 to - 02:59:59.999 which QDateTime considers to be invalid. Any date arithmetic - performed will take this missing hour into account and return a valid - result. For example, adding one minute to 01:59:59 will get 03:00:00. - - For date-times that the system \c time_t can represent (from 1901-12-14 to + transitions, notably including DST. However, building Qt with the ICU + library will equip QTimeZone with the same timezone database as is used on + Unix. + + \section2 Timezone transitions + + QDateTime takes into account timezone transitions, both the transitions + between Standard Time and Daylight-Saving Time (DST) and the transitions + that arise when a zone changes its standard offset. For example, if the + transition is at 2am and the clock goes forward to 3am, then there is a + "missing" hour from 02:00:00 to 02:59:59.999. Such a transition is known as + a "spring forward" and the times skipped over have no meaning. When a + transition goes the other way, known as a "fall back", a time interval is + repeated, first in the old zone (usually DST), then in the new zone (usually + Standard Time), so times in this interval are ambiguous. + + Some zones use "reversed" DST, using standard time in summer and + daylight-saving time (with a lowered offset) in winter. For such zones, the + spring forward still happens in spring and skips an hour, but is a + transition \e{out of} daylight-saving time, while the fall back still + repeats an autumn hour but is a transition \e to daylight-saving time. + + When converting from a UTC time (or a time at fixed offset from UTC), there + is always an unambiguous valid result in any timezone. However, when + combining a date and time to make a datetime, expressed with respect to + local time or a specific time-zone, the nominal result may fall in a + transition, making it either invalid or ambiguous. Methods where this + situation may arise take a \c resolve parameter: this is always ignored if + the requested datetime is valid and unambiguous. See \l TransitionResolution + for the options it lets you control. Prior to Qt 6.7, the equivalent of its + \l LegacyBehavior was selected. + + For a spring forward's skipped interval, interpreting the requested time + with either offset yields an actual time at which the other offset was in + use; so passing \c TransitionResolution::RelativeToBefore for \c resolve + will actually result in a time after the transition, that would have had the + requested representation had the transition not happened. Likewise, \c + TransitionResolution::RelativeToAfter for \c resolve results in a time + before the transition, that would have had the requested representation, had + the transition happened earlier. + + When QDateTime performs arithmetic, as with addDay() or addSecs(), it takes + care to produce a valid result. For example, on a day when there is a spring + forward from 02:00 to 03:00, adding one second to 01:59:59 will get + 03:00:00. Adding one day to 02:30 on the preceding day will get 03:30 on the + day of the transition, while subtracting one day, by calling \c{addDay(-1)}, + to 02:30 on the following day will get 01:30 on the day of the transition. + While addSecs() will deliver a time offset by the given number of seconds, + addDays() adjusts the date and only adjusts time if it would otherwise get + an invalid result. Applying \c{addDays(1)} to 03:00 on the day before the + spring-forward will simply get 03:00 on the day of the transition, even + though the latter is only 23 hours after the former; but \c{addSecs(24 * 60 + * 60)} will get 04:00 on the day of the transition, since that's 24 hours + later. Typical transitions make some days 23 or 25 hours long. + + For datetimes that the system \c time_t can represent (from 1901-12-14 to 2038-01-18 on systems with 32-bit \c time_t; for the full range QDateTime can represent if the type is 64-bit), the standard system APIs are used to - determine local time's offset from UTC. For date-times not handled by these - system APIs, QTimeZone::systemTimeZone() is used. In either case, the offset - information used depends on the system and may be incomplete or, for past - times, historically inaccurate. In any case, for future dates, the local - time zone's offsets and DST rules may change before that date comes around. + determine local time's offset from UTC. For datetimes not handled by these + system APIs (potentially including some within the \c time_t range), + QTimeZone::systemTimeZone() is used, if available, or a best effort is made + to estimate. In any case, the offset information used depends on the system + and may be incomplete or, for past times, historically + inaccurate. Furthermore, for future dates, the local time zone's offsets and + DST rules may change before that date comes around. + + \section3 Whole day transitions + + A small number of zones have skipped or repeated entire days as part of + moving The International Date Line across themselves. For these, daysTo() + will be unaware of the duplication or gap, simply using the difference in + calendar date; in contrast, msecsTo() and secsTo() know the true time + interval. Likewise, addMSecs() and addSecs() correspond directly to elapsed + time, where addDays(), addMonths() and addYears() follow the nominal + calendar, aside from where landing in a gap or duplication requires + resolving an ambiguity or invalidity due to a duplication or omission. + + \note Days "lost" during a change of calendar, such as from Julian to + Gregorian, do not affect QDateTime. Although the two calendars describe + dates differently, the successive days across the change are described by + consecutive QDate instances, each one day later than the previous, as + described by either calendar or by their toJulianDay() values. In contrast, + a zone skipping or duplicating a day is changing its description of \e time, + not date, for all that it does so by a whole 24 hours. \section2 Offsets From UTC + Offsets from UTC are measured in seconds east of Greenwich. The moment + described by a particular date and time, such as noon on a particular day, + depends on the time representation used. Those with a higher offset from UTC + describe an earlier moment, and those with a lower offset a later moment, by + any given combination of date and time. + There is no explicit size restriction on an offset from UTC, but there is an implicit limit imposed when using the toString() and fromString() methods - which use a [+|-]hh:mm format, effectively limiting the range to +/- 99 - hours and 59 minutes and whole minutes only. Note that currently no time - zone has an offset outside the range of ±14 hours and all known offsets are - multiples of five minutes. + which use a ±hh:mm format, effectively limiting the range to ± 99 hours and + 59 minutes and whole minutes only. Note that currently no time zone has an + offset outside the range of ±14 hours and all known offsets are multiples of + five minutes. Historical time zones have a wider range and may have offsets + including seconds; these last cannot be faithfully represented in strings. \sa QDate, QTime, QDateTimeEdit, QTimeZone */ @@ -3274,11 +3792,153 @@ inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, */ /*! - Constructs a null datetime. + \since 6.7 + \enum QDateTime::TransitionResolution + + This enumeration is used to resolve datetime combinations which fall in \l + {Timezone transitions}. + + When constructing a datetime, specified in terms of local time or a + time-zone that has daylight-saving time, or revising one with setDate(), + setTime() or setTimeZone(), the given parameters may imply a time + representation that either has no meaning or has two meanings in the + zone. Such time representations are described as being in the transition. In + either case, we can simply return an invalid datetime, to indicate that the + operation is ill-defined. In the ambiguous case, we can alternatively select + one of the two times that could be meant. When there is no meaning, we can + select a time either side of it that might plausibly have been meant. For + example, when advancing from an earlier time, we can select the time after + the transition that is actually the specified amount of time after the + earlier time in question. The options specified here configure how such + selection is performed. + + \value Reject + Treat any time in a transition as invalid. Either it really is, or it + is ambiguous. + \value RelativeToBefore + Selects a time as if stepping forward from a time before the + transition. This interprets the requested time using the offset in + effect before the transition and, if necessary, converts the result + to the offset in effect at the resulting time. + \value RelativeToAfter + Select a time as if stepping backward from a time after the + transition. This interprets the requested time using the offset in + effect after the transition and, if necessary, converts the result to + the offset in effect at the resulting time. + \value PreferBefore + Selects a time before the transition, + \value PreferAfter + Selects a time after the transition. + \value PreferStandard + Selects a time on the standard time side of the transition. + \value PreferDaylightSaving + Selects a time on the daylight-saving-time side of the transition. + \value LegacyBehavior + An alias for RelativeToBefore, which is used as default for + TransitionResolution parameters, as this most closely matches the + behavior prior to Qt 6.7. + + For \l addDays(), \l addMonths() or \l addYears(), the behavior is and + (mostly) was to use \c RelativeToBefore if adding a positive adjustment and \c + RelativeToAfter if adding a negative adjustment. + + \note In time zones where daylight-saving increases the offset from UTC in + summer (known as "positive DST"), PreferStandard is an alias for + RelativeToAfter and PreferDaylightSaving for RelativeToBefore. In time zones + where the daylight-saving mechanism is a decrease in offset from UTC in + winter (known as "negative DST"), the reverse applies, provided the + operating system reports - as it does on most platforms - whether a datetime + is in DST or standard time. For some platforms, where transition times are + unavailable even for Qt::TimeZone datetimes, QTimeZone is obliged to presume + that the side with lower offset from UTC is standard time, effectively + assuming positive DST. + + The following tables illustrate how a QDateTime constructor resolves a + request for 02:30 on a day when local time has a transition between 02:00 + and 03:00, with a nominal standard time LST and daylight-saving time LDT on + the two sides, in the various possible cases. The transition type may be to + skip an hour or repeat it. The type of transition and value of a parameter + \c resolve determine which actual time on the given date is selected. First, + the common case of positive daylight-saving, where: + + \table + \header \li Before \li 02:00--03:00 \li After \li \c resolve \li selected + \row \li LST \li skip \li LDT \li RelativeToBefore \li 03:30 LDT + \row \li LST \li skip \li LDT \li RelativeToAfter \li 01:30 LST + \row \li LST \li skip \li LDT \li PreferBefore \li 01:30 LST + \row \li LST \li skip \li LDT \li PreferAfter \li 03:30 LDT + \row \li LST \li skip \li LDT \li PreferStandard \li 01:30 LST + \row \li LST \li skip \li LDT \li PreferDaylightSaving \li 03:30 LDT + \row \li LDT \li repeat \li LST \li RelativeToBefore \li 02:30 LDT + \row \li LDT \li repeat \li LST \li RelativeToAfter \li 02:30 LST + \row \li LDT \li repeat \li LST \li PreferBefore \li 02:30 LDT + \row \li LDT \li repeat \li LST \li PreferAfter \li 02:30 LST + \row \li LDT \li repeat \li LST \li PreferStandard \li 02:30 LST + \row \li LDT \li repeat \li LST \li PreferDaylightSaving \li 02:30 LDT + \endtable + + Second, the case for negative daylight-saving, using LDT in winter and + skipping an hour to transition to LST in summer, then repeating an hour at + the transition back to winter: + + \table + \row \li LDT \li skip \li LST \li RelativeToBefore \li 03:30 LST + \row \li LDT \li skip \li LST \li RelativeToAfter \li 01:30 LDT + \row \li LDT \li skip \li LST \li PreferBefore \li 01:30 LDT + \row \li LDT \li skip \li LST \li PreferAfter \li 03:30 LST + \row \li LDT \li skip \li LST \li PreferStandard \li 03:30 LST + \row \li LDT \li skip \li LST \li PreferDaylightSaving \li 01:30 LDT + \row \li LST \li repeat \li LDT \li RelativeToBefore \li 02:30 LST + \row \li LST \li repeat \li LDT \li RelativeToAfter \li 02:30 LDT + \row \li LST \li repeat \li LDT \li PreferBefore \li 02:30 LST + \row \li LST \li repeat \li LDT \li PreferAfter \li 02:30 LDT + \row \li LST \li repeat \li LDT \li PreferStandard \li 02:30 LST + \row \li LST \li repeat \li LDT \li PreferDaylightSaving \li 02:30 LDT + \endtable + + Reject can be used to prompt relevant QDateTime APIs to return an invalid + datetime object so that your code can deal with transitions for itself, for + example by alerting a user to the fact that the datetime they have selected + is in a transition interval, to offer them the opportunity to resolve a + conflict or ambiguity. Code using this may well find the other options above + useful to determine relevant information to use in its own (or the user's) + resolution. If the start or end of the transition, or the moment of the + transition itself, is the right resolution, QTimeZone's transition APIs can + be used to obtain that information. You can determine whether the transition + is a repeated or skipped interval by using \l secsTo() to measure the actual + time between noon on the previous and following days. The result will be + less than 48 hours for a skipped interval (such as a spring-forward) and + more than 48 hours for a repeated interval (such as a fall-back). + + \note When a resolution other than Reject is specified, a valid QDateTime + object is returned, if possible. If the requested date-time falls in a gap, + the returned date-time will not have the time() requested - or, in some + cases, the date(), if a whole day was skipped. You can thus detect when a + gap is hit by comparing date() and time() to what was requested. + + \section2 Relation to other datetime software + + The Python programming language's datetime APIs have a \c fold parameter + that corresponds to \c RelativeToBefore (\c{fold = True}) and \c + RelativeToAfter (\c{fold = False}). + + The \c Temporal proposal to replace JavaScript's \c Date offers four options + for how to resolve a transition, as value for a \c disambiguation + parameter. Its \c{'reject'} raises an exception, which roughly corresponds + to \c Reject producing an invalid result. Its \c{'earlier'} and \c{'later'} + options correspond to \c PreferBefore and \c PreferAfter. Its + \c{'compatible'} option corresponds to \c RelativeToBefore (and Python's + \c{fold = True}). + + \sa {Timezone transitions}, QDateTime::TransitionResolution +*/ + +/*! + Constructs a null datetime, nominally using local time. A null datetime is invalid, since its date and time are invalid. - \sa isValid() + \sa isValid(), setMSecsSinceEpoch(), setDate(), setTime(), setTimeZone() */ QDateTime::QDateTime() noexcept { @@ -3289,44 +3949,73 @@ QDateTime::QDateTime() noexcept static_assert(sizeof(ShortData) >= sizeof(void*), "oops, Data::swap() is broken!"); } +#if QT_DEPRECATED_SINCE(6, 9) /*! - Constructs a datetime with the given \a date and \a time, using - the time specification defined by \a spec and \a offsetSeconds seconds. + \deprecated [6.9] Use \c{QDateTime(date, time)} or \c{QDateTime(date, time, QTimeZone::fromSecondsAheadOfUtc(offsetSeconds))}. - If \a date is valid and \a time is not, the time will be set to midnight. + Constructs a datetime with the given \a date and \a time, using the time + representation implied by \a spec and \a offsetSeconds seconds. - If the \a spec is not Qt::OffsetFromUTC then \a offsetSeconds will be ignored. + If \a date is valid and \a time is not, the time will be set to midnight. - If the \a spec is Qt::OffsetFromUTC and \a offsetSeconds is 0 then the + If \a spec is not Qt::OffsetFromUTC then \a offsetSeconds will be + ignored. If \a spec is Qt::OffsetFromUTC and \a offsetSeconds is 0 then the timeSpec() will be set to Qt::UTC, i.e. an offset of 0 seconds. If \a spec is Qt::TimeZone then the spec will be set to Qt::LocalTime, i.e. the current system time zone. To create a Qt::TimeZone datetime use the correct constructor. -*/ + If \a date lies outside the range of dates representable by QDateTime, the + result is invalid. If \a spec is Qt::LocalTime and the system's time-zone + skipped over the given date and time, the result is invalid. +*/ QDateTime::QDateTime(QDate date, QTime time, Qt::TimeSpec spec, int offsetSeconds) - : d(QDateTimePrivate::create(date, time, spec, offsetSeconds)) + : d(QDateTimePrivate::create(date, time, asTimeZone(spec, offsetSeconds, "QDateTime"), + TransitionResolution::LegacyBehavior)) { } +#endif // 6.9 deprecation -#if QT_CONFIG(timezone) /*! \since 5.2 - Constructs a datetime with the given \a date and \a time, using - the Time Zone specified by \a timeZone. + Constructs a datetime with the given \a date and \a time, using the time + representation described by \a timeZone. + + If \a date is valid and \a time is not, the time will be set to midnight. + If \a timeZone is invalid then the datetime will be invalid. If \a date and + \a time describe a moment close to a transition for \a timeZone, \a resolve + controls how that situation is resolved. + +//! [pre-resolve-note] + \note Prior to Qt 6.7, the version of this function lacked the \a resolve + parameter so had no way to resolve the ambiguities related to transitions. +//! [pre-resolve-note] +*/ + +QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone, TransitionResolution resolve) + : d(QDateTimePrivate::create(date, time, timeZone, resolve)) +{ +} + +/*! + \since 6.5 + \overload - If \a date is valid and \a time is not, the time will be set to 00:00:00. + Constructs a datetime with the given \a date and \a time, using local time. - If \a timeZone is invalid then the datetime will be invalid. + If \a date is valid and \a time is not, midnight will be used as the + time. If \a date and \a time describe a moment close to a transition for + local time, \a resolve controls how that situation is resolved. + + \include qdatetime.cpp pre-resolve-note */ -QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone) - : d(QDateTimePrivate::create(date, time, timeZone)) +QDateTime::QDateTime(QDate date, QTime time, TransitionResolution resolve) + : d(QDateTimePrivate::create(date, time, QTimeZone::LocalTime, resolve)) { } -#endif // timezone /*! Constructs a copy of the \a other datetime. @@ -3354,8 +4043,7 @@ QDateTime::~QDateTime() } /*! - Makes a copy of the \a other datetime and returns a reference to the - copy. + Copies the \a other datetime into this and returns this copy. */ QDateTime &QDateTime::operator=(const QDateTime &other) noexcept @@ -3380,62 +4068,60 @@ QDateTime &QDateTime::operator=(const QDateTime &other) noexcept bool QDateTime::isNull() const { - auto status = getStatus(d); - return !status.testFlag(QDateTimePrivate::ValidDate) && - !status.testFlag(QDateTimePrivate::ValidTime); + // If date or time is invalid, we don't set datetime valid. + return !getStatus(d).testAnyFlag(QDateTimePrivate::ValidityMask); } /*! - Returns \c true if both the date and the time are valid and they are valid in - the current Qt::TimeSpec, otherwise returns \c false. + Returns \c true if this datetime represents a definite moment, otherwise \c false. - If the timeSpec() is Qt::LocalTime or Qt::TimeZone and this object - represents a time that was skipped by a forward transition, then it is - invalid. For example, if DST ends at 2am with the clock advancing to 3am, - then date-times from 02:00:00 to 02:59:59.999 on that day are considered - invalid. + A datetime is valid if both its date and its time are valid and the time + representation used gives a valid meaning to their combination. When the + time representation is a specific time-zone or local time, there may be + times on some dates that the zone skips in its representation, as when a + daylight-saving transition skips an hour (typically during a night in + spring). For example, if DST ends at 2am with the clock advancing to 3am, + then datetimes from 02:00:00 to 02:59:59.999 on that day are invalid. \sa QDateTime::YearRange, QDate::isValid(), QTime::isValid() */ bool QDateTime::isValid() const { - auto status = getStatus(d); - return status.testFlag(QDateTimePrivate::ValidDateTime); + return getStatus(d).testFlag(QDateTimePrivate::ValidDateTime); } /*! Returns the date part of the datetime. - \sa setDate(), time(), timeSpec() + \sa setDate(), time(), timeRepresentation() */ QDate QDateTime::date() const { - auto status = getStatus(d); - if (!status.testFlag(QDateTimePrivate::ValidDate)) - return QDate(); - return msecsToDate(getMSecs(d)); + return getStatus(d).testFlag(QDateTimePrivate::ValidDate) ? msecsToDate(getMSecs(d)) : QDate(); } /*! Returns the time part of the datetime. - \sa setTime(), date(), timeSpec() + \sa setTime(), date(), timeRepresentation() */ QTime QDateTime::time() const { - auto status = getStatus(d); - if (!status.testFlag(QDateTimePrivate::ValidTime)) - return QTime(); - return msecsToTime(getMSecs(d)); + return getStatus(d).testFlag(QDateTimePrivate::ValidTime) ? msecsToTime(getMSecs(d)) : QTime(); } /*! Returns the time specification of the datetime. - \sa setTimeSpec(), date(), time(), Qt::TimeSpec + This classifies its time representation as local time, UTC, a fixed offset + from UTC (without indicating the offset) or a time zone (without giving the + details of that time zone). Equivalent to + \c{timeRepresentation().timeSpec()}. + + \sa setTimeSpec(), timeRepresentation(), date(), time() */ Qt::TimeSpec QDateTime::timeSpec() const @@ -3443,41 +4129,51 @@ Qt::TimeSpec QDateTime::timeSpec() const return getSpec(d); } +/*! + \since 6.5 + Returns a QTimeZone identifying how this datetime represents time. + + The timeSpec() of the returned QTimeZone will coincide with that of this + datetime; if it is not Qt::TimeZone then the returned QTimeZone is a time + representation. When their timeSpec() is Qt::OffsetFromUTC, the returned + QTimeZone's fixedSecondsAheadOfUtc() supplies the offset. When timeSpec() + is Qt::TimeZone, the QTimeZone object itself is the full representation of + that time zone. + + \sa timeZone(), setTimeZone(), QTimeZone::asBackendZone() +*/ + +QTimeZone QDateTime::timeRepresentation() const +{ + return d.timeZone(); +} + #if QT_CONFIG(timezone) /*! \since 5.2 Returns the time zone of the datetime. - If the timeSpec() is Qt::LocalTime then an instance of the current system - time zone will be returned. Note however that if you copy this time zone - the instance will not remain in sync if the system time zone changes. + The result is the same as \c{timeRepresentation().asBackendZone()}. In all + cases, the result's \l {QTimeZone::timeSpec()}{timeSpec()} is Qt::TimeZone. + + When timeSpec() is Qt::LocalTime, the result will describe local time at the + time this method was called. It will not reflect subsequent changes to the + system time zone, even when the QDateTime from which it was obtained does. - \sa setTimeZone(), Qt::TimeSpec + \sa timeRepresentation(), setTimeZone(), Qt::TimeSpec, QTimeZone::asBackendZone() */ QTimeZone QDateTime::timeZone() const { - switch (getSpec(d)) { - case Qt::UTC: - return QTimeZone::utc(); - case Qt::OffsetFromUTC: - return QTimeZone(d->m_offsetFromUtc); - case Qt::TimeZone: - if (d->m_timeZone.isValid()) - return d->m_timeZone; - break; - case Qt::LocalTime: - return QTimeZone::systemTimeZone(); - } - return QTimeZone(); + return d.timeZone().asBackendZone(); } #endif // timezone /*! \since 5.2 - Returns this date-time's Offset From UTC in seconds. + Returns this datetime's Offset From UTC in seconds. The result depends on timeSpec(): \list @@ -3498,16 +4194,18 @@ QTimeZone QDateTime::timeZone() const int QDateTime::offsetFromUtc() const { + const auto status = getStatus(d); + if (!status.testFlags(QDateTimePrivate::ValidDate | QDateTimePrivate::ValidTime)) + return 0; + // But allow invalid date-time (e.g. gap's resolution) to report its offset. if (!d.isShort()) return d->m_offsetFromUtc; - if (!isValid()) - return 0; - auto spec = getSpec(d); + auto spec = extractSpec(status); if (spec == Qt::LocalTime) { - // we didn't cache the value, so we need to calculate it now... - qint64 msecs = getMSecs(d); - return (msecs - toMSecsSinceEpoch()) / MSECS_PER_SEC; + // We didn't cache the value, so we need to calculate it: + const auto resolve = toTransitionOptions(extractDaylightStatus(status)); + return QDateTimePrivate::localStateAtMillis(getMSecs(d), resolve).offset; } Q_ASSERT(spec == Qt::UTC); @@ -3523,7 +4221,7 @@ int QDateTime::offsetFromUtc() const \list \li For Qt::UTC it is "UTC". - \li For Qt::OffsetFromUTC it will be in the format "UTC[+-]00:00". + \li For Qt::OffsetFromUTC it will be in the format "UTC±00:00". \li For Qt::LocalTime, the host system is queried. \li For Qt::TimeZone, the associated QTimeZone object is queried. \endlist @@ -3584,29 +4282,43 @@ bool QDateTime::isDaylightTime() const break; #else Q_ASSERT(d->m_timeZone.isValid()); + if (auto dst = extractDaylightStatus(getStatus(d)); + dst != QDateTimePrivate::UnknownDaylightTime) { + return dst == QDateTimePrivate::DaylightTime; + } return d->m_timeZone.d->isDaylightTime(toMSecsSinceEpoch()); #endif // timezone case Qt::LocalTime: { - auto status = extractDaylightStatus(getStatus(d)); - if (status == QDateTimePrivate::UnknownDaylightTime) - status = QDateTimePrivate::localStateAtMillis(getMSecs(d), status).dst; - return status == QDateTimePrivate::DaylightTime; + auto dst = extractDaylightStatus(getStatus(d)); + if (dst == QDateTimePrivate::UnknownDaylightTime) { + dst = QDateTimePrivate::localStateAtMillis( + getMSecs(d), toTransitionOptions(TransitionResolution::LegacyBehavior)).dst; + } + return dst == QDateTimePrivate::DaylightTime; } } return false; } /*! - Sets the date part of this datetime to \a date. If no time is set yet, it - is set to midnight. If \a date is invalid, this QDateTime becomes invalid. + Sets the date part of this datetime to \a date. + + If no time is set yet, it is set to midnight. If \a date is invalid, this + QDateTime becomes invalid. - \sa date(), setTime(), setTimeSpec() + If \a date and time() describe a moment close to a transition for this + datetime's time representation, \a resolve controls how that situation is + resolved. + + \include qdatetime.cpp pre-resolve-note + + \sa date(), setTime(), setTimeZone() */ -void QDateTime::setDate(QDate date) +void QDateTime::setDate(QDate date, TransitionResolution resolve) { setDateTime(d, date, time()); - checkValidDateTime(d); + checkValidDateTime(d, resolve); } /*! @@ -3619,18 +4331,27 @@ void QDateTime::setDate(QDate date) dt.setTime(QTime()); \endcode - \sa time(), setDate(), setTimeSpec() + If date() and \a time describe a moment close to a transition for this + datetime's time representation, \a resolve controls how that situation is + resolved. + + \include qdatetime.cpp pre-resolve-note + + \sa time(), setDate(), setTimeZone() */ -void QDateTime::setTime(QTime time) +void QDateTime::setTime(QTime time, TransitionResolution resolve) { setDateTime(d, date(), time); - checkValidDateTime(d); + checkValidDateTime(d, resolve); } +#if QT_DEPRECATED_SINCE(6, 9) /*! + \deprecated [6.9] Use setTimeZone() instead + Sets the time specification used in this datetime to \a spec. - The datetime will refer to a different point in time. + The datetime may refer to a different point in time. If \a spec is Qt::OffsetFromUTC then the timeSpec() will be set to Qt::UTC, i.e. an effective offset of 0. @@ -3641,23 +4362,21 @@ void QDateTime::setTime(QTime time) Example: \snippet code/src_corelib_time_qdatetime.cpp 19 - \sa timeSpec(), setDate(), setTime(), setTimeZone(), Qt::TimeSpec + \sa setTimeZone(), timeSpec(), toTimeSpec(), setDate(), setTime() */ void QDateTime::setTimeSpec(Qt::TimeSpec spec) { - QT_PREPEND_NAMESPACE(setTimeSpec(d, spec, 0)); - if (spec == Qt::OffsetFromUTC || spec == Qt::UTC) - refreshSimpleDateTime(d); - else - refreshZonedDateTime(d, Qt::LocalTime); + reviseTimeZone(d, asTimeZone(spec, 0, "QDateTime::setTimeSpec"), + TransitionResolution::LegacyBehavior); } /*! \since 5.2 + \deprecated [6.9] Use setTimeZone(QTimeZone::fromSecondsAheadOfUtc(offsetSeconds)) instead Sets the timeSpec() to Qt::OffsetFromUTC and the offset to \a offsetSeconds. - The datetime will refer to a different point in time. + The datetime may refer to a different point in time. The maximum and minimum offset is 14 positive or negative hours. If \a offsetSeconds is larger or smaller than that, then the result is @@ -3665,42 +4384,46 @@ void QDateTime::setTimeSpec(Qt::TimeSpec spec) If \a offsetSeconds is 0 then the timeSpec() will be set to Qt::UTC. - \sa isValid(), offsetFromUtc() + \sa setTimeZone(), isValid(), offsetFromUtc(), toOffsetFromUtc() */ void QDateTime::setOffsetFromUtc(int offsetSeconds) { - QT_PREPEND_NAMESPACE(setTimeSpec(d, Qt::OffsetFromUTC, offsetSeconds)); - refreshSimpleDateTime(d); + reviseTimeZone(d, QTimeZone::fromSecondsAheadOfUtc(offsetSeconds), + TransitionResolution::Reject); } +#endif // 6.9 deprecations -#if QT_CONFIG(timezone) /*! \since 5.2 Sets the time zone used in this datetime to \a toZone. - The datetime will refer to a different point in time. - If \a toZone is invalid then the datetime will be invalid. + The datetime may refer to a different point in time. It uses the time + representation of \a toZone, which may change the meaning of its unchanged + date() and time(). - \sa timeZone(), Qt::TimeSpec + If \a toZone is invalid then the datetime will be invalid. Otherwise, this + datetime's timeSpec() after the call will match \c{toZone.timeSpec()}. + + If date() and time() describe a moment close to a transition for \a toZone, + \a resolve controls how that situation is resolved. + + \include qdatetime.cpp pre-resolve-note + + \sa timeRepresentation(), timeZone(), Qt::TimeSpec */ -void QDateTime::setTimeZone(const QTimeZone &toZone) +void QDateTime::setTimeZone(const QTimeZone &toZone, TransitionResolution resolve) { - d.detach(); // always detach - d->m_status = mergeSpec(d->m_status, Qt::TimeZone); - d->m_offsetFromUtc = 0; - d->m_timeZone = toZone; - refreshZonedDateTime(d, Qt::TimeZone); + reviseTimeZone(d, toZone, resolve); } -#endif // timezone /*! \since 4.7 - Returns the datetime as the number of milliseconds that have passed - since 1970-01-01T00:00:00.000, Coordinated Universal Time (Qt::UTC). + Returns the datetime as a number of milliseconds after the start, in UTC, of + the year 1970. On systems that do not support time zones, this function will behave as if local time were Qt::UTC. @@ -3709,15 +4432,20 @@ void QDateTime::setTimeZone(const QTimeZone &toZone) this object is not valid. However, for all valid dates, this function returns a unique value. - \sa toSecsSinceEpoch(), setMSecsSinceEpoch() + \sa toSecsSinceEpoch(), setMSecsSinceEpoch(), fromMSecsSinceEpoch() */ qint64 QDateTime::toMSecsSinceEpoch() const { // Note: QDateTimeParser relies on this producing a useful result, even when // !isValid(), at least when the invalidity is a time in a fall-back (that // we'll have adjusted to lie outside it, but marked invalid because it's - // not what was asked for). Other things may be doing similar. - switch (getSpec(d)) { + // not what was asked for). Other things may be doing similar. But that's + // only relevant when we got enough data for resolution to find it invalid. + const auto status = getStatus(d); + if (!status.testFlags(QDateTimePrivate::ValidDate | QDateTimePrivate::ValidTime)) + return 0; + + switch (extractSpec(status)) { case Qt::UTC: return getMSecs(d); @@ -3726,10 +4454,10 @@ qint64 QDateTime::toMSecsSinceEpoch() const return d->m_msecs - d->m_offsetFromUtc * MSECS_PER_SEC; case Qt::LocalTime: - if (d.isShort()) { + if (status.testFlag(QDateTimePrivate::ShortData)) { // Short form has nowhere to cache the offset, so recompute. - auto dst = extractDaylightStatus(getStatus(d)); - auto state = QDateTimePrivate::localStateAtMillis(getMSecs(d), dst); + const auto resolve = toTransitionOptions(extractDaylightStatus(getStatus(d))); + const auto state = QDateTimePrivate::localStateAtMillis(getMSecs(d), resolve); return state.when - state.offset * MSECS_PER_SEC; } // Use the offset saved by refreshZonedDateTime() on creation. @@ -3744,15 +4472,14 @@ qint64 QDateTime::toMSecsSinceEpoch() const #endif return 0; } - Q_UNREACHABLE(); - return 0; + Q_UNREACHABLE_RETURN(0); } /*! \since 5.8 - Returns the datetime as the number of seconds that have passed since - 1970-01-01T00:00:00.000, Coordinated Universal Time (Qt::UTC). + Returns the datetime as a number of seconds after the start, in UTC, of the + year 1970. On systems that do not support time zones, this function will behave as if local time were Qt::UTC. @@ -3761,7 +4488,7 @@ qint64 QDateTime::toMSecsSinceEpoch() const this object is not valid. However, for all valid dates, this function returns a unique value. - \sa toMSecsSinceEpoch(), setSecsSinceEpoch() + \sa toMSecsSinceEpoch(), fromSecsSinceEpoch(), setSecsSinceEpoch() */ qint64 QDateTime::toSecsSinceEpoch() const { @@ -3771,34 +4498,35 @@ qint64 QDateTime::toSecsSinceEpoch() const /*! \since 4.7 - Sets the date and time given the number of milliseconds \a msecs that have - passed since 1970-01-01T00:00:00.000, Coordinated Universal Time - (Qt::UTC). On systems that do not support time zones this function - will behave as if local time were Qt::UTC. + Sets the datetime to represent a moment a given number, \a msecs, of + milliseconds after the start, in UTC, of the year 1970. + + On systems that do not support time zones, this function will + behave as if local time were Qt::UTC. Note that passing the minimum of \c qint64 (\c{std::numeric_limits<qint64>::min()}) to \a msecs will result in undefined behavior. - \sa toMSecsSinceEpoch(), setSecsSinceEpoch() + \sa setSecsSinceEpoch(), toMSecsSinceEpoch(), fromMSecsSinceEpoch() */ void QDateTime::setMSecsSinceEpoch(qint64 msecs) { auto status = getStatus(d); const auto spec = extractSpec(status); - Q_ASSERT(spec == Qt::UTC || spec == Qt::LocalTime || !d.isShort()); + Q_ASSERT(specCanBeSmall(spec) || !d.isShort()); QDateTimePrivate::ZoneState state(msecs); status &= ~QDateTimePrivate::ValidityMask; - if (spec == Qt::UTC || spec == Qt::OffsetFromUTC) { + if (QTimeZone::isUtcOrFixedOffset(spec)) { if (spec == Qt::OffsetFromUTC) state.offset = d->m_offsetFromUtc; - if (!state.offset || !add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when)) - status |= QDateTimePrivate::ValidWhenMask; + if (!state.offset || !qAddOverflow(msecs, state.offset * MSECS_PER_SEC, &state.when)) + status |= QDateTimePrivate::ValidityMask; } else if (spec == Qt::LocalTime) { state = QDateTimePrivate::expressUtcAsLocal(msecs); if (state.valid) - status = mergeDaylightStatus(status | QDateTimePrivate::ValidWhenMask, state.dst); + status = mergeDaylightStatus(status | QDateTimePrivate::ValidityMask, state.dst); #if QT_CONFIG(timezone) } else if (spec == Qt::TimeZone && (d.detach(), d->m_timeZone.isValid())) { const auto data = d->m_timeZone.d->data(msecs); @@ -3806,8 +4534,8 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs) state.offset = data.offsetFromUtc; Q_ASSERT(state.offset >= -SECS_PER_DAY && state.offset <= SECS_PER_DAY); if (!state.offset - || !Q_UNLIKELY(add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when))) { - d->m_status = mergeDaylightStatus(status | QDateTimePrivate::ValidWhenMask, + || !Q_UNLIKELY(qAddOverflow(msecs, state.offset * MSECS_PER_SEC, &state.when))) { + d->m_status = mergeDaylightStatus(status | QDateTimePrivate::ValidityMask, data.daylightTimeOffset ? QDateTimePrivate::DaylightTime : QDateTimePrivate::StandardTime); @@ -3818,7 +4546,7 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs) } // else: zone unable to represent given UTC time (should only happen on overflow). #endif // timezone } - Q_ASSERT(!(status & QDateTimePrivate::ValidDateTime) + Q_ASSERT(!status.testFlag(QDateTimePrivate::ValidDateTime) || (state.offset >= -SECS_PER_DAY && state.offset <= SECS_PER_DAY)); if (msecsCanBeSmall(state.when) && d.isShort()) { @@ -3836,24 +4564,21 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs) /*! \since 5.8 - Sets the date and time given the number of seconds \a secs that have - passed since 1970-01-01T00:00:00.000, Coordinated Universal Time - (Qt::UTC). On systems that do not support time zones this function - will behave as if local time were Qt::UTC. + Sets the datetime to represent a moment a given number, \a secs, of seconds + after the start, in UTC, of the year 1970. - \sa toSecsSinceEpoch(), setMSecsSinceEpoch() + On systems that do not support time zones, this function will + behave as if local time were Qt::UTC. + + \sa setMSecsSinceEpoch(), toSecsSinceEpoch(), fromSecsSinceEpoch() */ void QDateTime::setSecsSinceEpoch(qint64 secs) { qint64 msecs; - if (!mul_overflow(secs, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) { + if (!qMulOverflow(secs, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) setMSecsSinceEpoch(msecs); - } else if (d.isShort()) { - d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); - } else { - d.detach(); - d->m_status &= ~QDateTimePrivate::ValidWhenMask; - } + else + d.invalidate(); } #if QT_CONFIG(datestring) // depends on, so implies, textdate @@ -3867,15 +4592,14 @@ void QDateTime::setSecsSinceEpoch(qint64 secs) formatting is "Wed May 20 03:40:13 1998". For localized formatting, see \l{QLocale::toString()}. - If the \a format is Qt::ISODate, the string format corresponds - to the ISO 8601 extended specification for representations of - dates and times, taking the form yyyy-MM-ddTHH:mm:ss[Z|[+|-]HH:mm], - depending on the timeSpec() of the QDateTime. If the timeSpec() - is Qt::UTC, Z will be appended to the string; if the timeSpec() is - Qt::OffsetFromUTC, the offset in hours and minutes from UTC will - be appended to the string. To include milliseconds in the ISO 8601 + If the \a format is Qt::ISODate, the string format corresponds to the ISO + 8601 extended specification for representations of dates and times, taking + the form yyyy-MM-ddTHH:mm:ss[Z|±HH:mm], depending on the timeSpec() of the + QDateTime. If the timeSpec() is Qt::UTC, Z will be appended to the string; + if the timeSpec() is Qt::OffsetFromUTC, the offset in hours and minutes from + UTC will be appended to the string. To include milliseconds in the ISO 8601 date, use the \a format Qt::ISODateWithMs, which corresponds to - yyyy-MM-ddTHH:mm:ss.zzz[Z|[+|-]HH:mm]. + yyyy-MM-ddTHH:mm:ss.zzz[Z|±HH:mm]. If the \a format is Qt::RFC2822Date, the string is formatted following \l{RFC 2822}. @@ -3901,7 +4625,7 @@ QString QDateTime::toString(Qt::DateFormat format) const return buf; default: case Qt::TextDate: { - const QPair<QDate, QTime> p = getDateTime(d); + const std::pair<QDate, QTime> p = getDateTime(d); buf = toStringTextDate(p.first); // Insert time between date's day and year: buf.insert(buf.lastIndexOf(u' '), @@ -3929,7 +4653,7 @@ QString QDateTime::toString(Qt::DateFormat format) const } case Qt::ISODate: case Qt::ISODateWithMs: { - const QPair<QDate, QTime> p = getDateTime(d); + const std::pair<QDate, QTime> p = getDateTime(d); buf = toStringIsoDate(p.first); if (buf.isEmpty()) return QString(); // failed to convert @@ -3939,9 +4663,7 @@ QString QDateTime::toString(Qt::DateFormat format) const buf += u'Z'; break; case Qt::OffsetFromUTC: -#if QT_CONFIG(timezone) case Qt::TimeZone: -#endif buf += toOffsetString(Qt::ISODate, offsetFromUtc()); break; default: @@ -3955,12 +4677,14 @@ QString QDateTime::toString(Qt::DateFormat format) const /*! \fn QString QDateTime::toString(const QString &format, QCalendar cal) const \fn QString QDateTime::toString(QStringView format, QCalendar cal) const + \since 5.14 Returns the datetime as a string. The \a format parameter determines the - format of the result string. If \a cal is supplied, it determines the calendar - used to represent the date; it defaults to Gregorian. See QTime::toString() - and QDate::toString() for the supported specifiers for time and date, - respectively. + format of the result string. If \a cal is supplied, it determines the + calendar used to represent the date; it defaults to Gregorian. Prior to Qt + 5.14, there was no \a cal parameter and the Gregorian calendar was always + used. See QTime::toString() and QDate::toString() for the supported + specifiers for time and date, respectively, in the \a format parameter. Any sequence of characters enclosed in single quotes will be included verbatim in the output string (stripped of the quotes), even if it contains @@ -3997,37 +4721,48 @@ QString QDateTime::toString(QStringView format, QCalendar cal) const { return QLocale::c().toString(*this, format, cal); } + +// Out-of-line no-calendar overloads, since QCalendar is a non-trivial type +/*! + \overload + \since 5.10 +*/ +QString QDateTime::toString(QStringView format) const +{ + return QLocale::c().toString(*this, format, QCalendar()); +} + +/*! + \overload + \since 4.6 +*/ +QString QDateTime::toString(const QString &format) const +{ + return QLocale::c().toString(*this, qToStringViewIgnoringNull(format), QCalendar()); +} #endif // datestring -static inline void massageAdjustedDateTime(QDateTimeData &d, QDate date, QTime time) -{ - /* - If we have just adjusted to a day with a DST transition, our given time - may lie in the transition hour (either missing or duplicated). For any - other time, telling mktime() or QTimeZone what we know about DST-ness, of - the time we adjusted from, will make no difference; it'll just tell us the - actual DST-ness of the given time. When landing in a transition that - repeats an hour, passing the prior DST-ness - when known - will get us the - indicated side of the duplicate (either local or zone). When landing in a - gap, the zone gives us the other side of the gap and mktime() is wrapped - to coax it into doing the same (which it does by default on Unix). - */ +static inline void massageAdjustedDateTime(QDateTimeData &d, QDate date, QTime time, bool forward) +{ + const QDateTimePrivate::TransitionOptions resolve = toTransitionOptions( + forward ? QDateTime::TransitionResolution::RelativeToBefore + : QDateTime::TransitionResolution::RelativeToAfter); auto status = getStatus(d); - Q_ASSERT((status & QDateTimePrivate::ValidDate) && (status & QDateTimePrivate::ValidTime) - && (status & QDateTimePrivate::ValidDateTime)); + Q_ASSERT(status.testFlags(QDateTimePrivate::ValidDate | QDateTimePrivate::ValidTime + | QDateTimePrivate::ValidDateTime)); auto spec = extractSpec(status); - if (spec == Qt::OffsetFromUTC || spec == Qt::UTC) { + if (QTimeZone::isUtcOrFixedOffset(spec)) { setDateTime(d, date, time); refreshSimpleDateTime(d); return; } - auto dst = extractDaylightStatus(status); qint64 local = timeToMSecs(date, time); - const QDateTimePrivate::ZoneState state = stateAtMillis(spec, d, local, dst); - if (state.valid) - status = mergeDaylightStatus(status | QDateTimePrivate::ValidDateTime, state.dst); + const QDateTimePrivate::ZoneState state = stateAtMillis(d.timeZone(), local, resolve); + Q_ASSERT(state.valid || state.dst == QDateTimePrivate::UnknownDaylightTime); + if (state.dst == QDateTimePrivate::UnknownDaylightTime) + status.setFlag(QDateTimePrivate::ValidDateTime, false); else - status &= ~QDateTimePrivate::ValidDateTime; + status = mergeDaylightStatus(status | QDateTimePrivate::ValidDateTime, state.dst); if (status & QDateTimePrivate::ShortData) { d.data.msecs = state.when; @@ -4047,13 +4782,14 @@ static inline void massageAdjustedDateTime(QDateTimeData &d, QDate date, QTime t later than the datetime of this object (or earlier if \a ndays is negative). - If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting - date and time fall in the Standard Time to Daylight-Saving Time transition - hour then the result will be adjusted accordingly, i.e. if the transition - is at 2am and the clock goes forward to 3am and the result falls between - 2am and 3am then the result will be adjusted to fall after 3am. + If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting date + and time fall in the Standard Time to Daylight-Saving Time transition hour + then the result will be just beyond this gap, in the direction of change. + If the transition is at 2am and the clock goes forward to 3am, the result of + aiming between 2am and 3am will be adjusted to fall before 2am (if \c{ndays + < 0}) or after 3am (otherwise). - \sa daysTo(), addMonths(), addYears(), addSecs() + \sa daysTo(), addMonths(), addYears(), addSecs(), {Timezone transitions} */ QDateTime QDateTime::addDays(qint64 ndays) const @@ -4062,8 +4798,8 @@ QDateTime QDateTime::addDays(qint64 ndays) const return QDateTime(); QDateTime dt(*this); - QPair<QDate, QTime> p = getDateTime(d); - massageAdjustedDateTime(dt.d, p.first.addDays(ndays), p.second); + std::pair<QDate, QTime> p = getDateTime(d); + massageAdjustedDateTime(dt.d, p.first.addDays(ndays), p.second, ndays >= 0); return dt; } @@ -4072,13 +4808,14 @@ QDateTime QDateTime::addDays(qint64 ndays) const later than the datetime of this object (or earlier if \a nmonths is negative). - If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting - date and time fall in the Standard Time to Daylight-Saving Time transition - hour then the result will be adjusted accordingly, i.e. if the transition - is at 2am and the clock goes forward to 3am and the result falls between - 2am and 3am then the result will be adjusted to fall after 3am. + If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting date + and time fall in the Standard Time to Daylight-Saving Time transition hour + then the result will be just beyond this gap, in the direction of change. + If the transition is at 2am and the clock goes forward to 3am, the result of + aiming between 2am and 3am will be adjusted to fall before 2am (if + \c{nmonths < 0}) or after 3am (otherwise). - \sa daysTo(), addDays(), addYears(), addSecs() + \sa daysTo(), addDays(), addYears(), addSecs(), {Timezone transitions} */ QDateTime QDateTime::addMonths(int nmonths) const @@ -4087,8 +4824,8 @@ QDateTime QDateTime::addMonths(int nmonths) const return QDateTime(); QDateTime dt(*this); - QPair<QDate, QTime> p = getDateTime(d); - massageAdjustedDateTime(dt.d, p.first.addMonths(nmonths), p.second); + std::pair<QDate, QTime> p = getDateTime(d); + massageAdjustedDateTime(dt.d, p.first.addMonths(nmonths), p.second, nmonths >= 0); return dt; } @@ -4097,13 +4834,14 @@ QDateTime QDateTime::addMonths(int nmonths) const later than the datetime of this object (or earlier if \a nyears is negative). - If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting - date and time fall in the Standard Time to Daylight-Saving Time transition - hour then the result will be adjusted accordingly, i.e. if the transition - is at 2am and the clock goes forward to 3am and the result falls between - 2am and 3am then the result will be adjusted to fall after 3am. + If the timeSpec() is Qt::LocalTime or Qt::TimeZone and the resulting date + and time fall in the Standard Time to Daylight-Saving Time transition hour + then the result will be just beyond this gap, in the direction of change. + If the transition is at 2am and the clock goes forward to 3am, the result of + aiming between 2am and 3am will be adjusted to fall before 2am (if \c{nyears + < 0}) or after 3am (otherwise). - \sa daysTo(), addDays(), addMonths(), addSecs() + \sa daysTo(), addDays(), addMonths(), addSecs(), {Timezone transitions} */ QDateTime QDateTime::addYears(int nyears) const @@ -4112,8 +4850,8 @@ QDateTime QDateTime::addYears(int nyears) const return QDateTime(); QDateTime dt(*this); - QPair<QDate, QTime> p = getDateTime(d); - massageAdjustedDateTime(dt.d, p.first.addYears(nyears), p.second); + std::pair<QDate, QTime> p = getDateTime(d); + massageAdjustedDateTime(dt.d, p.first.addYears(nyears), p.second, nyears >= 0); return dt; } @@ -4130,7 +4868,7 @@ QDateTime QDateTime::addYears(int nyears) const QDateTime QDateTime::addSecs(qint64 s) const { qint64 msecs; - if (mul_overflow(s, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) + if (qMulOverflow(s, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) return QDateTime(); return addMSecs(msecs); } @@ -4154,33 +4892,18 @@ QDateTime QDateTime::addMSecs(qint64 msecs) const case Qt::LocalTime: case Qt::TimeZone: // Convert to real UTC first in case this crosses a DST transition: - if (!add_overflow(toMSecsSinceEpoch(), msecs, &msecs)) { + if (!qAddOverflow(toMSecsSinceEpoch(), msecs, &msecs)) dt.setMSecsSinceEpoch(msecs); - } else if (dt.d.isShort()) { - dt.d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); - } else { - dt.d.detach(); - dt.d->m_status &= ~QDateTimePrivate::ValidWhenMask; - } + else + dt.d.invalidate(); break; case Qt::UTC: case Qt::OffsetFromUTC: // No need to convert, just add on - if (add_overflow(getMSecs(d), msecs, &msecs)) { - if (dt.d.isShort()) { - dt.d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); - } else { - dt.d.detach(); - dt.d->m_status &= ~QDateTimePrivate::ValidWhenMask; - } - } else if (d.isShort()) { - // need to check if we need to enlarge first - if (msecsCanBeSmall(msecs)) { - dt.d.data.msecs = qintptr(msecs); - } else { - dt.d.detach(); - dt.d->m_msecs = msecs; - } + if (qAddOverflow(getMSecs(d), msecs, &msecs)) { + dt.d.invalidate(); + } else if (d.isShort() && msecsCanBeSmall(msecs)) { + dt.d.data.msecs = qintptr(msecs); } else { dt.d.detach(); dt.d->m_msecs = msecs; @@ -4344,76 +5067,104 @@ qint64 QDateTime::msecsTo(const QDateTime &other) const \sa addMSecs */ +#if QT_DEPRECATED_SINCE(6, 9) /*! - Returns a copy of this datetime converted to the given time - \a spec. + \deprecated [6.9] Use \l toTimeZone() instead. + + Returns a copy of this datetime converted to the given time \a spec. + + The result represents the same moment in time as, and is equal to, this datetime. - If \a spec is Qt::OffsetFromUTC then it is set to Qt::UTC. To set to a - spec of Qt::OffsetFromUTC use toOffsetFromUtc(). + If \a spec is Qt::OffsetFromUTC then it is set to Qt::UTC. To set to a fixed + offset from UTC, use toTimeZone() or toOffsetFromUtc(). - If \a spec is Qt::TimeZone then it is set to Qt::LocalTime, - i.e. the local Time Zone. + If \a spec is Qt::TimeZone then it is set to Qt::LocalTime, i.e. the local + Time Zone. To set a specified time-zone, use toTimeZone(). Example: \snippet code/src_corelib_time_qdatetime.cpp 16 - \sa timeSpec(), toTimeZone(), toOffsetFromUtc() + \sa setTimeSpec(), timeSpec(), toTimeZone() */ QDateTime QDateTime::toTimeSpec(Qt::TimeSpec spec) const { - if (getSpec(d) == spec && (spec == Qt::UTC || spec == Qt::LocalTime)) - return *this; - - if (!isValid()) { - QDateTime ret = *this; - ret.setTimeSpec(spec); - return ret; - } - - return fromMSecsSinceEpoch(toMSecsSinceEpoch(), spec, 0); + return toTimeZone(asTimeZone(spec, 0, "toTimeSpec")); } +#endif // 6.9 deprecation /*! \since 5.2 - \fn QDateTime QDateTime::toOffsetFromUtc(int offsetSeconds) const - Returns a copy of this datetime converted to a spec of Qt::OffsetFromUTC - with the given \a offsetSeconds. + with the given \a offsetSeconds. Equivalent to + \c{toTimeZone(QTimeZone::fromSecondsAheadOfUtc(offsetSeconds))}. + + If the \a offsetSeconds equals 0 then a UTC datetime will be returned. - If the \a offsetSeconds equals 0 then a UTC datetime will be returned + The result represents the same moment in time as, and is equal to, this datetime. - \sa setOffsetFromUtc(), offsetFromUtc(), toTimeSpec() + \sa setOffsetFromUtc(), offsetFromUtc(), toTimeZone() */ QDateTime QDateTime::toOffsetFromUtc(int offsetSeconds) const { - if (getSpec(d) == Qt::OffsetFromUTC - && d->m_offsetFromUtc == offsetSeconds) - return *this; + return toTimeZone(QTimeZone::fromSecondsAheadOfUtc(offsetSeconds)); +} - if (!isValid()) { - QDateTime ret = *this; - ret.setOffsetFromUtc(offsetSeconds); - return ret; - } +/*! + Returns a copy of this datetime converted to local time. + + The result represents the same moment in time as, and is equal to, this datetime. + + Example: + + \snippet code/src_corelib_time_qdatetime.cpp 17 - return fromMSecsSinceEpoch(toMSecsSinceEpoch(), Qt::OffsetFromUTC, offsetSeconds); + \sa toTimeZone(), toUTC(), toOffsetFromUtc() +*/ +QDateTime QDateTime::toLocalTime() const +{ + return toTimeZone(QTimeZone::LocalTime); +} + +/*! + Returns a copy of this datetime converted to UTC. + + The result represents the same moment in time as, and is equal to, this datetime. + + Example: + + \snippet code/src_corelib_time_qdatetime.cpp 18 + + \sa toTimeZone(), toLocalTime(), toOffsetFromUtc() +*/ +QDateTime QDateTime::toUTC() const +{ + return toTimeZone(QTimeZone::UTC); } -#if QT_CONFIG(timezone) /*! \since 5.2 - Returns a copy of this datetime converted to the given \a timeZone + Returns a copy of this datetime converted to the given \a timeZone. + + The result represents the same moment in time as, and is equal to, this datetime. + + The result describes the moment in time in terms of \a timeZone's time + representation. For example: + + \snippet code/src_corelib_time_qdatetime.cpp 23 + + If \a timeZone is invalid then the datetime will be invalid. Otherwise the + returned datetime's timeSpec() will match \c{timeZone.timeSpec()}. - \sa timeZone(), toTimeSpec() + \sa timeRepresentation(), toLocalTime(), toUTC(), toOffsetFromUtc() */ QDateTime QDateTime::toTimeZone(const QTimeZone &timeZone) const { - if (getSpec(d) == Qt::TimeZone && d->m_timeZone == timeZone) + if (timeRepresentation() == timeZone) return *this; if (!isValid()) { @@ -4424,7 +5175,6 @@ QDateTime QDateTime::toTimeZone(const QTimeZone &timeZone) const return fromMSecsSinceEpoch(toMSecsSinceEpoch(), timeZone); } -#endif // timezone /*! \internal @@ -4451,11 +5201,20 @@ bool QDateTime::equals(const QDateTime &other) const /*! \fn bool QDateTime::operator==(const QDateTime &lhs, const QDateTime &rhs) - Returns \c true if \a lhs is the same as \a rhs; otherwise returns \c false. + Returns \c true if \a lhs represents the same moment in time as \a rhs; + otherwise returns \c false. + +//! [datetime-order-details] + Two datetimes using different time representations can have different + offsets from UTC. In this case, they may compare equivalent even if their \l + date() and \l time() differ, if that difference matches the difference in + UTC offset. If their \c date() and \c time() coincide, the one with higher + offset from UTC is less (earlier) than the one with lower offset. As a + result, datetimes are only weakly ordered. - Two datetimes are different if either the date, the time, or the time zone - components are different. Since 5.14, all invalid datetime are equal (and - less than all valid datetimes). + Since 5.14, all invalid datetimes are equivalent and less than all valid + datetimes. +//! [datetime-order-details] \sa operator!=(), operator<(), operator<=(), operator>(), operator>=() */ @@ -4466,33 +5225,24 @@ bool QDateTime::equals(const QDateTime &other) const Returns \c true if \a lhs is different from \a rhs; otherwise returns \c false. - Two datetimes are different if either the date, the time, or the time zone - components are different. Since 5.14, all invalid datetime are equal (and - less than all valid datetimes). + \include qdatetime.cpp datetime-order-details \sa operator==() */ -/*! - \internal - Returns \c true if \a lhs is earlier than the \a rhs - datetime; otherwise returns \c false. - - \sa equals(), operator<() -*/ - -bool QDateTime::precedes(const QDateTime &other) const +Qt::weak_ordering compareThreeWay(const QDateTime &lhs, const QDateTime &rhs) { - if (!isValid()) - return other.isValid(); - if (!other.isValid()) - return false; + if (!lhs.isValid()) + return rhs.isValid() ? Qt::weak_ordering::less : Qt::weak_ordering::equivalent; - if (usesSameOffset(d, other.d)) - return getMSecs(d) < getMSecs(other.d); + if (!rhs.isValid()) + return Qt::weak_ordering::greater; // we know that lhs is valid here + + if (usesSameOffset(lhs.d, rhs.d)) + return Qt::compareThreeWay(getMSecs(lhs.d), getMSecs(rhs.d)); // Convert to UTC and compare - return toMSecsSinceEpoch() < other.toMSecsSinceEpoch(); + return Qt::compareThreeWay(lhs.toMSecsSinceEpoch(), rhs.toMSecsSinceEpoch()); } /*! @@ -4501,6 +5251,8 @@ bool QDateTime::precedes(const QDateTime &other) const Returns \c true if \a lhs is earlier than \a rhs; otherwise returns \c false. + \include qdatetime.cpp datetime-order-details + \sa operator==() */ @@ -4510,6 +5262,8 @@ bool QDateTime::precedes(const QDateTime &other) const Returns \c true if \a lhs is earlier than or equal to \a rhs; otherwise returns \c false. + \include qdatetime.cpp datetime-order-details + \sa operator==() */ @@ -4518,6 +5272,8 @@ bool QDateTime::precedes(const QDateTime &other) const Returns \c true if \a lhs is later than \a rhs; otherwise returns \c false. + \include qdatetime.cpp datetime-order-details + \sa operator==() */ @@ -4527,33 +5283,53 @@ bool QDateTime::precedes(const QDateTime &other) const Returns \c true if \a lhs is later than or equal to \a rhs; otherwise returns \c false. + \include qdatetime.cpp datetime-order-details + \sa operator==() */ /*! - \fn QDateTime QDateTime::currentDateTime() - Returns the current datetime, as reported by the system clock, in - the local time zone. + \since 6.5 + \fn QDateTime QDateTime::currentDateTime(const QTimeZone &zone) + + Returns the system clock's current datetime, using the time representation + described by \a zone. If \a zone is omitted, local time is used. \sa currentDateTimeUtc(), QDate::currentDate(), QTime::currentTime(), toTimeSpec() */ /*! + \overload + \since 0.90 +*/ +QDateTime QDateTime::currentDateTime() +{ + return currentDateTime(QTimeZone::LocalTime); +} + +/*! \fn QDateTime QDateTime::currentDateTimeUtc() \since 4.7 - Returns the current datetime, as reported by the system clock, in - UTC. + Returns the system clock's current datetime, expressed in terms of UTC. + + Equivalent to \c{currentDateTime(QTimeZone::UTC)}. \sa currentDateTime(), QDate::currentDate(), QTime::currentTime(), toTimeSpec() */ +QDateTime QDateTime::currentDateTimeUtc() +{ + return currentDateTime(QTimeZone::UTC); +} + /*! \fn qint64 QDateTime::currentMSecsSinceEpoch() \since 4.7 - Returns the number of milliseconds since 1970-01-01T00:00:00 Universal - Coordinated Time. This number is like the POSIX time_t variable, but - expressed in milliseconds instead. + Returns the current number of milliseconds since the start, in UTC, of the year 1970. + + This number is like the POSIX time_t variable, but expressed in milliseconds + instead of seconds. \sa currentDateTime(), currentDateTimeUtc(), toTimeSpec() */ @@ -4562,8 +5338,9 @@ bool QDateTime::precedes(const QDateTime &other) const \fn qint64 QDateTime::currentSecsSinceEpoch() \since 5.8 - Returns the number of seconds since 1970-01-01T00:00:00 Universal - Coordinated Time. + Returns the number of seconds since the start, in UTC, of the year 1970. + + This number is like the POSIX time_t variable. \sa currentMSecsSinceEpoch() */ @@ -4669,24 +5446,21 @@ QTime QTime::currentTime() return ct; } -QDateTime QDateTime::currentDateTime() +QDateTime QDateTime::currentDateTime(const QTimeZone &zone) { - QTime t; + // We can get local time or "system" time (which is UTC); otherwise, we must + // convert, which is most efficiently done from UTC. + const Qt::TimeSpec spec = zone.timeSpec(); SYSTEMTIME st = {}; - GetLocalTime(&st); + // GetSystemTime()'s page links to its partner page for GetLocalTime(). + // https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtime + (spec == Qt::LocalTime ? GetLocalTime : GetSystemTime)(&st); QDate d(st.wYear, st.wMonth, st.wDay); - t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); - return QDateTime(d, t); -} - -QDateTime QDateTime::currentDateTimeUtc() -{ - QTime t; - SYSTEMTIME st = {}; - GetSystemTime(&st); - QDate d(st.wYear, st.wMonth, st.wDay); - t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); - return QDateTime(d, t, Qt::UTC); + QTime t(msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds)); + if (spec == Qt::LocalTime) + return QDateTime(d, t); + QDateTime utc(d, t, QTimeZone::UTC); + return spec == Qt::UTC ? utc : utc.toTimeZone(zone); } qint64 QDateTime::currentMSecsSinceEpoch() noexcept @@ -4709,7 +5483,7 @@ qint64 QDateTime::currentSecsSinceEpoch() noexcept daysAfterEpoch * SECS_PER_DAY; } -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) // Assume POSIX-compliant QDate QDate::currentDate() { return QDateTime::currentDateTime().date(); @@ -4720,127 +5494,151 @@ QTime QTime::currentTime() return QDateTime::currentDateTime().time(); } -QDateTime QDateTime::currentDateTime() +QDateTime QDateTime::currentDateTime(const QTimeZone &zone) { - return fromMSecsSinceEpoch(currentMSecsSinceEpoch(), Qt::LocalTime); -} - -QDateTime QDateTime::currentDateTimeUtc() -{ - return fromMSecsSinceEpoch(currentMSecsSinceEpoch(), Qt::UTC); + return fromMSecsSinceEpoch(currentMSecsSinceEpoch(), zone); } qint64 QDateTime::currentMSecsSinceEpoch() noexcept { - // posix compliant system - // we have milliseconds - struct timeval tv; - gettimeofday(&tv, nullptr); - return tv.tv_sec * MSECS_PER_SEC + tv.tv_usec / 1000; + struct timespec when; + if (clock_gettime(CLOCK_REALTIME, &when) == 0) // should always succeed + return when.tv_sec * MSECS_PER_SEC + (when.tv_nsec + 500'000) / 1'000'000; + Q_UNREACHABLE_RETURN(0); } qint64 QDateTime::currentSecsSinceEpoch() noexcept { - struct timeval tv; - gettimeofday(&tv, nullptr); - return tv.tv_sec; + struct timespec when; + if (clock_gettime(CLOCK_REALTIME, &when) == 0) // should always succeed + return when.tv_sec; + Q_UNREACHABLE_RETURN(0); } #else #error "What system is this?" #endif +#if QT_DEPRECATED_SINCE(6, 9) /*! - Returns a datetime whose date and time are the number of milliseconds \a msecs - that have passed since 1970-01-01T00:00:00.000, Coordinated Universal - Time (Qt::UTC) and converted to the given \a spec. + \since 5.2 + \overload + \deprecated [6.9] Pass a \l QTimeZone instead, or omit \a spec and \a offsetSeconds. - Note that there are possible values for \a msecs that lie outside the valid - range of QDateTime, both negative and positive. The behavior of this - function is undefined for those values. + Returns a datetime representing a moment the given number \a msecs of + milliseconds after the start, in UTC, of the year 1970, described as + specified by \a spec and \a offsetSeconds. - If the \a spec is not Qt::OffsetFromUTC then the \a offsetSeconds will be - ignored. If the \a spec is Qt::OffsetFromUTC and the \a offsetSeconds is 0 - then the spec will be set to Qt::UTC, i.e. an offset of 0 seconds. + Note that there are possible values for \a msecs that lie outside the valid + range of QDateTime, both negative and positive. The behavior of this + function is undefined for those values. - If \a spec is Qt::TimeZone then the spec will be set to Qt::LocalTime, - i.e. the current system time zone. + If the \a spec is not Qt::OffsetFromUTC then the \a offsetSeconds will be + ignored. If the \a spec is Qt::OffsetFromUTC and the \a offsetSeconds is 0 + then Qt::UTC will be used as the \a spec, since UTC has zero offset. - \sa toMSecsSinceEpoch(), setMSecsSinceEpoch() + If \a spec is Qt::TimeZone then Qt::LocalTime will be used in its place, + equivalent to using the current system time zone (but differently + represented). + + \sa fromSecsSinceEpoch(), toMSecsSinceEpoch(), setMSecsSinceEpoch() */ QDateTime QDateTime::fromMSecsSinceEpoch(qint64 msecs, Qt::TimeSpec spec, int offsetSeconds) { - QDateTime dt; - QT_PREPEND_NAMESPACE(setTimeSpec(dt.d, spec, offsetSeconds)); - dt.setMSecsSinceEpoch(msecs); - return dt; + return fromMSecsSinceEpoch(msecs, + asTimeZone(spec, offsetSeconds, "QDateTime::fromMSecsSinceEpoch")); } /*! - \since 5.8 + \since 5.8 + \overload + \deprecated [6.9] Pass a \l QTimeZone instead, or omit \a spec and \a offsetSeconds. - Returns a datetime whose date and time are the number of seconds \a secs - that have passed since 1970-01-01T00:00:00.000, Coordinated Universal - Time (Qt::UTC) and converted to the given \a spec. + Returns a datetime representing a moment the given number \a secs of seconds + after the start, in UTC, of the year 1970, described as specified by \a spec + and \a offsetSeconds. - Note that there are possible values for \a secs that lie outside the valid - range of QDateTime, both negative and positive. The behavior of this - function is undefined for those values. + Note that there are possible values for \a secs that lie outside the valid + range of QDateTime, both negative and positive. The behavior of this + function is undefined for those values. - If the \a spec is not Qt::OffsetFromUTC then the \a offsetSeconds will be - ignored. If the \a spec is Qt::OffsetFromUTC and the \a offsetSeconds is 0 - then the spec will be set to Qt::UTC, i.e. an offset of 0 seconds. + If the \a spec is not Qt::OffsetFromUTC then the \a offsetSeconds will be + ignored. If the \a spec is Qt::OffsetFromUTC and the \a offsetSeconds is 0 + then Qt::UTC will be used as the \a spec, since UTC has zero offset. - If \a spec is Qt::TimeZone then the spec will be set to Qt::LocalTime, - i.e. the current system time zone. + If \a spec is Qt::TimeZone then Qt::LocalTime will be used in its place, + equivalent to using the current system time zone (but differently + represented). - \sa toSecsSinceEpoch(), setSecsSinceEpoch() + \sa fromMSecsSinceEpoch(), toSecsSinceEpoch(), setSecsSinceEpoch() */ QDateTime QDateTime::fromSecsSinceEpoch(qint64 secs, Qt::TimeSpec spec, int offsetSeconds) { - constexpr qint64 maxSeconds = std::numeric_limits<qint64>::max() / MSECS_PER_SEC; - constexpr qint64 minSeconds = std::numeric_limits<qint64>::min() / MSECS_PER_SEC; - if (secs > maxSeconds || secs < minSeconds) - return QDateTime(); // Would {und,ov}erflow - return fromMSecsSinceEpoch(secs * MSECS_PER_SEC, spec, offsetSeconds); + return fromSecsSinceEpoch(secs, + asTimeZone(spec, offsetSeconds, "QDateTime::fromSecsSinceEpoch")); } +#endif // 6.9 deprecations -#if QT_CONFIG(timezone) /*! \since 5.2 - Returns a datetime whose date and time are the number of milliseconds \a msecs - that have passed since 1970-01-01T00:00:00.000, Coordinated Universal - Time (Qt::UTC) and with the given \a timeZone. + Returns a datetime representing a moment the given number \a msecs of + milliseconds after the start, in UTC, of the year 1970, described as + specified by \a timeZone. The default time representation is local time. + + Note that there are possible values for \a msecs that lie outside the valid + range of QDateTime, both negative and positive. The behavior of this + function is undefined for those values. - \sa fromSecsSinceEpoch() + \sa fromSecsSinceEpoch(), toMSecsSinceEpoch(), setMSecsSinceEpoch() */ QDateTime QDateTime::fromMSecsSinceEpoch(qint64 msecs, const QTimeZone &timeZone) { QDateTime dt; - dt.setTimeZone(timeZone); + reviseTimeZone(dt.d, timeZone, TransitionResolution::Reject); if (timeZone.isValid()) dt.setMSecsSinceEpoch(msecs); return dt; } /*! + \since 6.5 + \overload +*/ +QDateTime QDateTime::fromMSecsSinceEpoch(qint64 msecs) +{ + return fromMSecsSinceEpoch(msecs, QTimeZone::LocalTime); +} + +/*! \since 5.8 - Returns a datetime whose date and time are the number of seconds \a secs - that have passed since 1970-01-01T00:00:00.000, Coordinated Universal - Time (Qt::UTC) and with the given \a timeZone. + Returns a datetime representing a moment the given number \a secs of seconds + after the start, in UTC, of the year 1970, described as specified by \a + timeZone. The default time representation is local time. + + Note that there are possible values for \a secs that lie outside the valid + range of QDateTime, both negative and positive. The behavior of this + function is undefined for those values. - \sa fromMSecsSinceEpoch() + \sa fromMSecsSinceEpoch(), toSecsSinceEpoch(), setSecsSinceEpoch() */ QDateTime QDateTime::fromSecsSinceEpoch(qint64 secs, const QTimeZone &timeZone) { - constexpr qint64 maxSeconds = std::numeric_limits<qint64>::max() / MSECS_PER_SEC; - constexpr qint64 minSeconds = std::numeric_limits<qint64>::min() / MSECS_PER_SEC; - if (secs > maxSeconds || secs < minSeconds) - return QDateTime(); // Would {und,ov}erflow - return fromMSecsSinceEpoch(secs * MSECS_PER_SEC, timeZone); + QDateTime dt; + reviseTimeZone(dt.d, timeZone, TransitionResolution::Reject); + if (timeZone.isValid()) + dt.setSecsSinceEpoch(secs); + return dt; +} + +/*! + \since 6.5 + \overload +*/ +QDateTime QDateTime::fromSecsSinceEpoch(qint64 secs) +{ + return fromSecsSinceEpoch(secs, QTimeZone::LocalTime); } -#endif #if QT_CONFIG(datestring) // depends on, so implies, textdate @@ -4872,8 +5670,8 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) if (!rfc.date.isValid() || !rfc.time.isValid()) return QDateTime(); - QDateTime dateTime(rfc.date, rfc.time, Qt::UTC); - dateTime.setOffsetFromUtc(rfc.utcOffset); + QDateTime dateTime(rfc.date, rfc.time, QTimeZone::UTC); + dateTime.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(rfc.utcOffset)); return dateTime; } case Qt::ISODate: @@ -4888,7 +5686,7 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) if (size == 10) return date.startOfDay(); - Qt::TimeSpec spec = Qt::LocalTime; + QTimeZone zone = QTimeZone::LocalTime; QStringView isoString = string.sliced(10); // trim "yyyy-MM-dd" // Must be left with T (or space) and at least one digit for the hour: @@ -4902,10 +5700,9 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) } isoString = isoString.sliced(1); // trim 'T' (or space) - int offset = 0; - // Check end of string for Time Zone definition, either Z for UTC or [+-]HH:mm for Offset + // Check end of string for Time Zone definition, either Z for UTC or ±HH:mm for Offset if (isoString.endsWith(u'Z', Qt::CaseInsensitive)) { - spec = Qt::UTC; + zone = QTimeZone::UTC; isoString.chop(1); // trim 'Z' } else { // the loop below is faster but functionally equal to: @@ -4920,11 +5717,11 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) if (found) { bool ok; - offset = fromOffsetString(isoString.sliced(signIndex), &ok); + int offset = fromOffsetString(isoString.sliced(signIndex), &ok); if (!ok) return QDateTime(); isoString = isoString.first(signIndex); - spec = Qt::OffsetFromUTC; + zone = QTimeZone::fromSecondsAheadOfUtc(offset); } } @@ -4935,8 +5732,8 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) if (!time.isValid()) return QDateTime(); if (isMidnight24) // time is 0:0, but we want the start of next day: - return date.addDays(1).startOfDay(spec, offset); - return QDateTime(date, time, spec, offset); + return date.addDays(1).startOfDay(zone); + return QDateTime(date, time, zone); } case Qt::TextDate: { QVarLengthArray<QStringView, 6> parts; @@ -4948,7 +5745,7 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) // Documented as "ddd MMM d HH:mm:ss yyyy" with optional offset-suffix; // and allow time either before or after year. - if (parts.count() < 5 || it != tokens.end()) + if (parts.size() < 5 || it != tokens.end()) return QDateTime(); // Year and time can be in either order. @@ -4977,8 +5774,8 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) if (!time.isValid()) return QDateTime(); - if (parts.count() == 5) - return QDateTime(date, time, Qt::LocalTime); + if (parts.size() == 5) + return QDateTime(date, time); QStringView tz = parts.at(5); if (tz.startsWith("UTC"_L1) @@ -4986,10 +5783,11 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) || tz.startsWith("GMT"_L1, Qt::CaseInsensitive)) { tz = tz.sliced(3); if (tz.isEmpty()) - return QDateTime(date, time, Qt::UTC); + return QDateTime(date, time, QTimeZone::UTC); int offset = fromOffsetString(tz, &ok); - return ok ? QDateTime(date, time, Qt::OffsetFromUTC, offset) : QDateTime(); + return ok ? QDateTime(date, time, QTimeZone::fromSecondsAheadOfUtc(offset)) + : QDateTime(); } return QDateTime(); } @@ -4999,20 +5797,33 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) } /*! - \fn QDateTime QDateTime::fromString(const QString &string, const QString &format, QCalendar cal) + \fn QDateTime QDateTime::fromString(const QString &string, const QString &format, int baseYear, QCalendar cal) Returns the QDateTime represented by the \a string, using the \a format given, or an invalid datetime if the string cannot be parsed. Uses the calendar \a cal if supplied, else Gregorian. + \include qlocale.cpp base-year-for-two-digit + In addition to the expressions, recognized in the format string to represent parts of the date and time, by QDate::fromString() and QTime::fromString(), this method supports: \table \header \li Expression \li Output - \row \li t \li the timezone (for example "CEST") + \row \li t + \li the timezone (offset, name, "Z" or offset with "UTC" prefix) + \row \li tt + \li the timezone in offset format with no colon between hours and + minutes (for example "+0200") + \row \li ttt + \li the timezone in offset format with a colon between hours and + minutes (for example "+02:00") + \row \li tttt + \li the timezone name (for example "Europe/Berlin"). The name + recognized are those known to \l QTimeZone, which may depend on the + operating system in use. \endtable If no 't' format specifier is present, the system's local time-zone is used. @@ -5029,11 +5840,9 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) \snippet code/src_corelib_time_qdatetime.cpp 12 If the format is not satisfied, an invalid QDateTime is returned. If the - format is satisfied but \a string represents an invalid date-time (e.g. in a - gap skipped by a time-zone transition), an invalid QDateTime is returned, - whose toMSecsSinceEpoch() represents a near-by date-time that is - valid. Passing that to fromMSecsSinceEpoch() will produce a valid date-time - that isn't faithfully represented by the string parsed. + format is satisfied but \a string represents an invalid datetime (e.g. in a + gap skipped by a time-zone transition), an valid QDateTime is returned, that + represents a near-by datetime that is valid. The expressions that don't have leading zeroes (d, M, h, m, s, z) will be greedy. This means that they will use two digits (or three, for z) even if this will @@ -5061,6 +5870,15 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) English (C locale). If localized month and day names or localized forms of AM/PM are to be recognized, use QLocale::system().toDateTime(). + \note If a format character is repeated more times than the longest + expression in the table above using it, this part of the format will be read + as several expressions with no separator between them; the longest above, + possibly repeated as many times as there are copies of it, ending with a + residue that may be a shorter expression. Thus \c{'tttttt'} would match + \c{"Europe/BerlinEurope/Berlin"} and set the zone to Berlin time; if the + datetime string contained "Europe/BerlinZ" it would "match" but produce an + inconsistent result, leading to an invalid datetime. + \sa toString(), QDate::fromString(), QTime::fromString(), QLocale::toDateTime() */ @@ -5075,49 +5893,72 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) \overload \since 6.0 */ -QDateTime QDateTime::fromString(const QString &string, QStringView format, QCalendar cal) +QDateTime QDateTime::fromString(const QString &string, QStringView format, int baseYear, + QCalendar cal) { #if QT_CONFIG(datetimeparser) QDateTime datetime; QDateTimeParser dt(QMetaType::QDateTime, QDateTimeParser::FromString, cal); dt.setDefaultLocale(QLocale::c()); - if (dt.parseFormat(format) && (dt.fromString(string, &datetime) || !datetime.isValid())) + if (dt.parseFormat(format) && (dt.fromString(string, &datetime, baseYear) + || !datetime.isValid())) { return datetime; + } #else Q_UNUSED(string); Q_UNUSED(format); + Q_UNUSED(baseYear); Q_UNUSED(cal); #endif return QDateTime(); } -#endif // datestring /*! - \fn QDateTime QDateTime::toLocalTime() const + \fn QDateTime QDateTime::fromString(const QString &string, const QString &format, QCalendar cal) + \overload + \since 5.14 +*/ - Returns a datetime containing the date and time information in - this datetime, but specified using the Qt::LocalTime definition. +/*! + \fn QDateTime QDateTime::fromString(const QString &string, QStringView format, QCalendar cal) + \overload + \since 6.0 +*/ - Example: +/*! + \fn QDateTime QDateTime::fromString(QStringView string, QStringView format, int baseYear, QCalendar cal) + \overload + \since 6.7 +*/ - \snippet code/src_corelib_time_qdatetime.cpp 17 +/*! + \fn QDateTime QDateTime::fromString(QStringView string, QStringView format, int baseYear) + \overload + \since 6.7 - \sa toTimeSpec() + Uses a default-constructed QCalendar. */ /*! - \fn QDateTime QDateTime::toUTC() const - - Returns a datetime containing the date and time information in - this datetime, but specified using the Qt::UTC definition. + \overload + \since 6.7 - Example: + Uses a default-constructed QCalendar. +*/ +QDateTime QDateTime::fromString(const QString &string, QStringView format, int baseYear) +{ + return fromString(string, format, baseYear, QCalendar()); +} - \snippet code/src_corelib_time_qdatetime.cpp 18 +/*! + \fn QDateTime QDateTime::fromString(const QString &string, const QString &format, int baseYear) + \overload + \since 6.7 - \sa toTimeSpec() + Uses a default-constructed QCalendar. */ +#endif // datestring /***************************************************************************** Date/time stream functions @@ -5156,9 +5997,7 @@ QDataStream &operator>>(QDataStream &in, QDate &date) // Older versions consider 0 an invalid jd. date.jd = (jd != 0 ? jd : QDate::nullJd()); } else { - qint64 jd; - in >> jd; - date.jd = jd; + in >> date.jd; } return in; @@ -5212,11 +6051,12 @@ QDataStream &operator>>(QDataStream &in, QTime &time) */ QDataStream &operator<<(QDataStream &out, const QDateTime &dateTime) { - QPair<QDate, QTime> dateAndTime; + std::pair<QDate, QTime> dateAndTime; + // TODO: new version, route spec and details via QTimeZone if (out.version() >= QDataStream::Qt_5_2) { - // In 5.2 we switched to using Qt::TimeSpec and added offset support + // In 5.2 we switched to using Qt::TimeSpec and added offset and zone support dateAndTime = getDateTime(dateTime.d); out << dateAndTime << qint8(dateTime.timeSpec()); if (dateTime.timeSpec() == Qt::OffsetFromUTC) @@ -5279,67 +6119,61 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime) QDate dt; QTime tm; qint8 ts = 0; - Qt::TimeSpec spec = Qt::LocalTime; - qint32 offset = 0; -#if QT_CONFIG(timezone) - QTimeZone tz; -#endif // timezone + QTimeZone zone(QTimeZone::LocalTime); if (in.version() >= QDataStream::Qt_5_2) { - // In 5.2 we switched to using Qt::TimeSpec and added offset support + // In 5.2 we switched to using Qt::TimeSpec and added offset and zone support in >> dt >> tm >> ts; - spec = static_cast<Qt::TimeSpec>(ts); - if (spec == Qt::OffsetFromUTC) { + switch (static_cast<Qt::TimeSpec>(ts)) { + case Qt::UTC: + zone = QTimeZone::UTC; + break; + case Qt::OffsetFromUTC: { + qint32 offset = 0; in >> offset; - dateTime = QDateTime(dt, tm, spec, offset); -#if QT_CONFIG(timezone) - } else if (spec == Qt::TimeZone) { - in >> tz; - dateTime = QDateTime(dt, tm, tz); -#endif // timezone - } else { - dateTime = QDateTime(dt, tm, spec); + zone = QTimeZone::fromSecondsAheadOfUtc(offset); + break; } + case Qt::LocalTime: + break; + case Qt::TimeZone: + in >> zone; + break; + } + // Note: no way to resolve transition ambiguity, when relevant; use default. + dateTime = QDateTime(dt, tm, zone); } else if (in.version() == QDataStream::Qt_5_0) { // In Qt 5.0 we incorrectly serialised all datetimes as UTC in >> dt >> tm >> ts; - spec = static_cast<Qt::TimeSpec>(ts); - dateTime = QDateTime(dt, tm, Qt::UTC); - dateTime = dateTime.toTimeSpec(spec); + dateTime = QDateTime(dt, tm, QTimeZone::UTC); + if (static_cast<Qt::TimeSpec>(ts) == Qt::LocalTime) + dateTime = dateTime.toTimeZone(zone); } else if (in.version() >= QDataStream::Qt_4_0) { // From 4.0 to 5.1 (except 5.0) we used QDateTimePrivate::Spec in >> dt >> tm >> ts; - switch ((QDateTimePrivate::Spec)ts) { + switch (static_cast<QDateTimePrivate::Spec>(ts)) { + case QDateTimePrivate::OffsetFromUTC: // No offset was stored, so treat as UTC. case QDateTimePrivate::UTC: - spec = Qt::UTC; - break; - case QDateTimePrivate::OffsetFromUTC: - spec = Qt::OffsetFromUTC; - break; - case QDateTimePrivate::TimeZone: - spec = Qt::TimeZone; -#if QT_CONFIG(timezone) - // FIXME: need to use a different constructor ! -#endif + zone = QTimeZone::UTC; break; + case QDateTimePrivate::TimeZone: // No zone was stored, so treat as LocalTime: case QDateTimePrivate::LocalUnknown: case QDateTimePrivate::LocalStandard: case QDateTimePrivate::LocalDST: - spec = Qt::LocalTime; break; } - dateTime = QDateTime(dt, tm, spec, offset); + dateTime = QDateTime(dt, tm, zone); } else { // version < QDataStream::Qt_4_0 // Before 4.0 there was no TimeSpec, only Qt::LocalTime was supported in >> dt >> tm; - dateTime = QDateTime(dt, tm, spec, offset); + dateTime = QDateTime(dt, tm); } @@ -5357,7 +6191,11 @@ QDebug operator<<(QDebug dbg, QDate date) QDebugStateSaver saver(dbg); dbg.nospace() << "QDate("; if (date.isValid()) - dbg.nospace() << date.toString(Qt::ISODate); + // QTBUG-91070, ISODate only supports years in the range 0-9999 + if (int y = date.year(); y > 0 && y <= 9999) + dbg.nospace() << date.toString(Qt::ISODate); + else + dbg.nospace() << date.toString(Qt::TextDate); else dbg.nospace() << "Invalid"; dbg.nospace() << ')'; |