From 97eae54083d5a0a29b9ea6f0d3c3c02802986958 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 11 May 2016 23:14:46 -0700 Subject: QDateTimePrivate refactor: static'fy access to d->m_status This commit changes most accesses to the d->m_status (including d->spec() and d->setSpec() uses) to use new static functions. This is done in preparation to the "Short QDateTime Optimization" as the status byte will be kept in the short data. Change-Id: I06bae9392f534e45b3f1ffff144dbd795d03227a Reviewed-by: Edward Welbourne Reviewed-by: Lars Knoll --- src/corelib/tools/qdatetime_p.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/corelib/tools/qdatetime_p.h') diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h index 3c6c2111af..1b7bfc4ad1 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/tools/qdatetime_p.h @@ -129,24 +129,9 @@ public: void setDateTime(const QDate &date, const QTime &time); QPair getDateTime() const; - void setDaylightStatus(DaylightStatus status); - DaylightStatus daylightStatus() const; - void checkValidDateTime(); void refreshDateTime(); - // Get/set date and time status - inline bool isValidDate() const { return m_status & ValidDate; } - inline bool isValidTime() const { return m_status & ValidTime; } - inline bool isValidDateTime() const { return m_status & ValidDateTime; } - inline void setValidDateTime() { m_status |= ValidDateTime; } - inline void clearValidDateTime() { m_status &= ~ValidDateTime; } - inline void clearSetToDaylightStatus() { m_status &= ~(SetToStandardTime | SetToDaylightTime); } - - inline Qt::TimeSpec spec() const { return Qt::TimeSpec((m_status & TimeSpecMask) >> TimeSpecShift); } - inline void setSpec(Qt::TimeSpec spec) - { m_status &= ~TimeSpecMask; m_status |= StatusFlag(uint(spec) << TimeSpecShift); } - #ifndef QT_BOOTSTRAPPED static qint64 zoneMSecsToEpochMSecs(qint64 msecs, const QTimeZone &zone, QDate *localDate = 0, QTime *localTime = 0); -- cgit v1.2.3