diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2016-05-11 22:07:17 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-10 17:56:28 +0000 |
commit | 0358b8710245f17d41596371b63e4728c2840d90 (patch) | |
tree | 826f0a86e1c2b0bda28622387b2fd34a93d9abd3 /src/corelib/tools/qdatetime.cpp | |
parent | 6d311a23ad5c592cb9713fa343bd92e01cde4a4a (diff) |
Remove QDateTimePrivate::isNull{Date,Time}()
They're superfluous, since b491fab02a6a67fcd18d8076ac802d2f8c4f6972
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>
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
-rw-r--r-- | src/corelib/tools/qdatetime.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 6ab4e3a118..6b3c2f9c26 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -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); |