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

QDateTime: de-duplicate some code

Browse Source 
Change-Id: I1c842029c2b597f97418b49c894127ab43dafbf7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Ahmad Samir 2023-04-25 23:16:09 +02:00
parent d25438ebbd
commit 738a5ad4f2
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3248,6 +3248,16 @@ 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)) {
@ -4062,14 +4072,10 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs)
void QDateTime::setSecsSinceEpoch(qint64 secs)
{
qint64 msecs;
if (!qMulOverflow(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::ValidityMask);
} else {
d.detach();
d->m_status &= ~QDateTimePrivate::ValidityMask;
}
else
d.invalidate();
}
#if QT_CONFIG(datestring) // depends on, so implies, textdate
@ -4368,25 +4374,16 @@ 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 (!qAddOverflow(toMSecsSinceEpoch(), msecs, &msecs)) {
if (!qAddOverflow(toMSecsSinceEpoch(), msecs, &msecs))
dt.setMSecsSinceEpoch(msecs);
} else if (dt.d.isShort()) {
dt.d.data.status &= ~int(QDateTimePrivate::ValidityMask);
} else {
dt.d.detach();
dt.d->m_status &= ~QDateTimePrivate::ValidityMask;
}
else
dt.d.invalidate();
break;
case Qt::UTC:
case Qt::OffsetFromUTC:
// No need to convert, just add on
if (qAddOverflow(getMSecs(d), msecs, &msecs)) {
if (dt.d.isShort()) {
dt.d.data.status &= ~int(QDateTimePrivate::ValidityMask);
} else {
dt.d.detach();
dt.d->m_status &= ~QDateTimePrivate::ValidityMask;
}
dt.d.invalidate();
} else if (d.isShort() && msecsCanBeSmall(msecs)) {
dt.d.data.msecs = qintptr(msecs);
} else {

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

@ -298,6 +298,7 @@ class Q_CORE_EXPORT QDateTime
{ std::swap(data, other.data); }
bool isShort() const;
inline void invalidate();
void detach();
QTimeZone timeZone() const;