whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QDateTimePrivate::isNull{Date,Time}() 

They're superfluous, since b491fab02a
removed the distinction between null and invalid. Just use the
isValidXxx equivalents.

Change-Id: I06bae9392f534e45b3f1ffff144db9badad010fd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Thiago Macieira 2016-05-11 22:07:17 -07:00
parent 6d311a23ad
commit 0358b87102
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/tools/qdatetime.cpp
View File

@ -2577,10 +2577,10 @@ QPair<QDate, QTime> QDateTimePrivate::getDateTime() const
QPair<QDate, QTime> result;
msecsToTime(m_msecs, &result.first, &result.second);
if (isNullDate())
if (!isValidDate())
result.first = QDate();
if (isNullTime())
if (!isValidTime())
result.second = QTime();
return result;
@ -2979,7 +2979,7 @@ QDateTime &QDateTime::operator=(const QDateTime &other)
bool QDateTime::isNull() const
{
return d->isNullDate() && d->isNullTime();
return !d->isValidDate() && !d->isValidTime();
}
/*!
@ -3007,7 +3007,7 @@ bool QDateTime::isValid() const
QDate QDateTime::date() const
{
if (d->isNullDate())
if (!d->isValidDate())
return QDate();
QDate dt;
msecsToTime(d->m_msecs, &dt, 0);
@ -3022,7 +3022,7 @@ QDate QDateTime::date() const
QTime QDateTime::time() const
{
if (d->isNullTime())
if (!d->isValidTime())
return QTime();
QTime tm;
msecsToTime(d->m_msecs, 0, &tm);

2
src/corelib/tools/qdatetime_p.h
View File

@ -139,8 +139,6 @@ public:
void refreshDateTime();
// Get/set date and time status
inline bool isNullDate() const { return !(m_status & ValidDate); }
inline bool isNullTime() const { return !(m_status & ValidTime); }
inline bool isValidDate() const { return m_status & ValidDate; }
inline bool isValidTime() const { return m_status & ValidTime; }
inline bool isValidDateTime() const { return m_status & ValidDateTime; }