diff options
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
-rw-r--r-- | src/corelib/tools/qdatetime.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index e5c1e104a2..83c92858ee 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -203,6 +203,8 @@ public: QDateTime(); explicit QDateTime(const QDate &); QDateTime(const QDate &, const QTime &, Qt::TimeSpec spec = Qt::LocalTime); + // ### Qt 6: Merge with above with default offsetSeconds = 0 + QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec, int offsetSeconds); QDateTime(const QDateTime &other); ~QDateTime(); @@ -216,15 +218,20 @@ public: QDate date() const; QTime time() const; Qt::TimeSpec timeSpec() const; + int offsetFromUtc() const; + qint64 toMSecsSinceEpoch() const; // ### Qt 6: use quint64 instead of uint uint toTime_t() const; + void setDate(const QDate &date); void setTime(const QTime &time); void setTimeSpec(Qt::TimeSpec spec); + void setOffsetFromUtc(int offsetSeconds); void setMSecsSinceEpoch(qint64 msecs); // ### Qt 6: use quint64 instead of uint void setTime_t(uint secsSince1Jan1970UTC); + #ifndef QT_NO_DATESTRING QString toString(Qt::DateFormat f = Qt::TextDate) const; QString toString(const QString &format) const; @@ -234,9 +241,12 @@ public: QDateTime addYears(int years) const; QDateTime addSecs(qint64 secs) const; QDateTime addMSecs(qint64 msecs) const; + QDateTime toTimeSpec(Qt::TimeSpec spec) const; inline QDateTime toLocalTime() const { return toTimeSpec(Qt::LocalTime); } inline QDateTime toUTC() const { return toTimeSpec(Qt::UTC); } + QDateTime toOffsetFromUtc(int offsetSeconds) const; + qint64 daysTo(const QDateTime &) const; qint64 secsTo(const QDateTime &) const; qint64 msecsTo(const QDateTime &) const; @@ -248,8 +258,10 @@ public: inline bool operator>(const QDateTime &other) const { return other < *this; } inline bool operator>=(const QDateTime &other) const { return !(*this < other); } - void setUtcOffset(int seconds); - int utcOffset() const; +#if QT_DEPRECATED_SINCE(5, 2) + QT_DEPRECATED void setUtcOffset(int seconds); + QT_DEPRECATED int utcOffset() const; +#endif // QT_DEPRECATED_SINCE static QDateTime currentDateTime(); static QDateTime currentDateTimeUtc(); |