1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate ValidWhenMask; it duplicates ValidityMask

Browse Source 
Apparently I failed to notice ValidityMask when I added ValidWhenMask
to simplify some code.

Change-Id: I780f329a6b21b51ba5fe0702c5c86ba07b88d81f
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2022-08-23 17:53:21 +02:00
parent 572b12907b
commit 7833b604b6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/time/qdatetime.cpp
View File

@ -3823,11 +3823,11 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs)
if (spec == Qt::OffsetFromUTC) if (spec == Qt::OffsetFromUTC)
state.offset = d->m_offsetFromUtc; state.offset = d->m_offsetFromUtc;
if (!state.offset || !add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when)) if (!state.offset || !add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when))
status |= QDateTimePrivate::ValidWhenMask; status |= QDateTimePrivate::ValidityMask;
} else if (spec == Qt::LocalTime) { } else if (spec == Qt::LocalTime) {
state = QDateTimePrivate::expressUtcAsLocal(msecs); state = QDateTimePrivate::expressUtcAsLocal(msecs);
if (state.valid) if (state.valid)
status = mergeDaylightStatus(status | QDateTimePrivate::ValidWhenMask, state.dst); status = mergeDaylightStatus(status | QDateTimePrivate::ValidityMask, state.dst);
#if QT_CONFIG(timezone) #if QT_CONFIG(timezone)
} else if (spec == Qt::TimeZone && (d.detach(), d->m_timeZone.isValid())) { } else if (spec == Qt::TimeZone && (d.detach(), d->m_timeZone.isValid())) {
const auto data = d->m_timeZone.d->data(msecs); const auto data = d->m_timeZone.d->data(msecs);
@ -3836,7 +3836,7 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs)
Q_ASSERT(state.offset >= -SECS_PER_DAY && state.offset <= SECS_PER_DAY); Q_ASSERT(state.offset >= -SECS_PER_DAY && state.offset <= SECS_PER_DAY);
if (!state.offset if (!state.offset
|| !Q_UNLIKELY(add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when))) { || !Q_UNLIKELY(add_overflow(msecs, state.offset * MSECS_PER_SEC, &state.when))) {
d->m_status = mergeDaylightStatus(status | QDateTimePrivate::ValidWhenMask, d->m_status = mergeDaylightStatus(status | QDateTimePrivate::ValidityMask,
data.daylightTimeOffset data.daylightTimeOffset
? QDateTimePrivate::DaylightTime ? QDateTimePrivate::DaylightTime
: QDateTimePrivate::StandardTime); : QDateTimePrivate::StandardTime);
@ -3878,10 +3878,10 @@ void QDateTime::setSecsSinceEpoch(qint64 secs)
if (!mul_overflow(secs, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) { if (!mul_overflow(secs, std::integral_constant<qint64, MSECS_PER_SEC>(), &msecs)) {
setMSecsSinceEpoch(msecs); setMSecsSinceEpoch(msecs);
} else if (d.isShort()) { } else if (d.isShort()) {
d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); d.data.status &= ~int(QDateTimePrivate::ValidityMask);
} else { } else {
d.detach(); d.detach();
d->m_status &= ~QDateTimePrivate::ValidWhenMask; d->m_status &= ~QDateTimePrivate::ValidityMask;
} }
} }
@ -4186,10 +4186,10 @@ QDateTime QDateTime::addMSecs(qint64 msecs) const
if (!add_overflow(toMSecsSinceEpoch(), msecs, &msecs)) { if (!add_overflow(toMSecsSinceEpoch(), msecs, &msecs)) {
dt.setMSecsSinceEpoch(msecs); dt.setMSecsSinceEpoch(msecs);
} else if (dt.d.isShort()) { } else if (dt.d.isShort()) {
dt.d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); dt.d.data.status &= ~int(QDateTimePrivate::ValidityMask);
} else { } else {
dt.d.detach(); dt.d.detach();
dt.d->m_status &= ~QDateTimePrivate::ValidWhenMask; dt.d->m_status &= ~QDateTimePrivate::ValidityMask;
} }
break; break;
case Qt::UTC: case Qt::UTC:
@ -4197,10 +4197,10 @@ QDateTime QDateTime::addMSecs(qint64 msecs) const
// No need to convert, just add on // No need to convert, just add on
if (add_overflow(getMSecs(d), msecs, &msecs)) { if (add_overflow(getMSecs(d), msecs, &msecs)) {
if (dt.d.isShort()) { if (dt.d.isShort()) {
dt.d.data.status &= ~int(QDateTimePrivate::ValidWhenMask); dt.d.data.status &= ~int(QDateTimePrivate::ValidityMask);
} else { } else {
dt.d.detach(); dt.d.detach();
dt.d->m_status &= ~QDateTimePrivate::ValidWhenMask; dt.d->m_status &= ~QDateTimePrivate::ValidityMask;
} }
} else if (d.isShort()) { } else if (d.isShort()) {
// need to check if we need to enlarge first // need to check if we need to enlarge first

1
src/corelib/time/qdatetime_p.h
View File

@ -62,7 +62,6 @@ public:
ValidDate = 0x02, ValidDate = 0x02,
ValidTime = 0x04, ValidTime = 0x04,
ValidDateTime = 0x08, ValidDateTime = 0x08,
ValidWhenMask = ValidDate | ValidTime | ValidDateTime,
TimeSpecMask = 0x30, TimeSpecMask = 0x30,