QDateTime: use new comparison helper macros

The unit-tests were already ported to the new comparison helper
functions from QTestPrivate.

Task-number: QTBUG-104111
Change-Id: I95fccb33433b3bbf1167545e347a271140727f23
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 9 insertions, 16 deletions

diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index 6b260a36ec..4fef0190b6 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -5067,26 +5067,19 @@ bool QDateTime::equals(const QDateTime &other) const
     \sa operator==()
 */
 
-/*!
-    \internal
-    Returns \c true if \a lhs is earlier than the \a rhs
-    datetime; otherwise returns \c false.
-
-    \sa equals(), operator<()
-*/
-
-bool QDateTime::precedes(const QDateTime &other) const
+Qt::weak_ordering compareThreeWay(const QDateTime &lhs, const QDateTime &rhs)
 {
-    if (!isValid())
-        return other.isValid();
-    if (!other.isValid())
-        return false;
+    if (!lhs.isValid())
+        return rhs.isValid() ? Qt::weak_ordering::less : Qt::weak_ordering::equivalent;
 
-    if (usesSameOffset(d, other.d))
-        return getMSecs(d) < getMSecs(other.d);
+    if (!rhs.isValid())
+        return Qt::weak_ordering::greater; // we know that lhs is valid here
+
+    if (usesSameOffset(lhs.d, rhs.d))
+        return Qt::compareThreeWay(getMSecs(lhs.d), getMSecs(rhs.d));
 
     // Convert to UTC and compare
-    return toMSecsSinceEpoch() < other.toMSecsSinceEpoch();
+    return Qt::compareThreeWay(lhs.toMSecsSinceEpoch(), rhs.toMSecsSinceEpoch());
 }
 
 /*!