From ecb0878cbc3bc677d0f440950d2d1e304bcea495 Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Fri, 19 Apr 2024 16:22:05 +0200
Subject: QVersionNumber: use new comparison helper macros

Replace public friend operators operator==(), operator!=(),
operator<(), etc of QVersionNumber to friend methods
comparesEqual() / compareThreeWay().

Task-number: QTBUG-120304
Change-Id: Ib94a1a28ca9843ca5d5a8d07f41c63de9fe584bb
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
---
 src/corelib/tools/qversionnumber.cpp |  1 +
 src/corelib/tools/qversionnumber.h   | 32 ++++++++++++++------------------
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 4b8ace71cc..af95875b44 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -30,6 +30,7 @@ QT_IMPL_METATYPE_EXTERN(QVersionNumber)
     \brief The QVersionNumber class contains a version number with an arbitrary
            number of segments.
 
+    \compares strong
     \snippet qversionnumber/main.cpp 0
 */
 
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index 95217a6eff..e7ae107226 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -6,6 +6,7 @@
 #ifndef QVERSIONNUMBER_H
 #define QVERSIONNUMBER_H
 
+#include <QtCore/qcompare.h>
 #include <QtCore/qcontainertools_impl.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
@@ -355,25 +356,20 @@ public:
     [[nodiscard]] Q_CORE_EXPORT static QVersionNumber fromString(QStringView string, int *suffixIndex);
 #endif
 
-    [[nodiscard]] friend bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) > 0; }
-
-    [[nodiscard]] friend bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) >= 0; }
-
-    [[nodiscard]] friend bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) < 0; }
-
-    [[nodiscard]] friend bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) <= 0; }
-
-    [[nodiscard]] friend bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) == 0; }
-
-    [[nodiscard]] friend bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
-    { return compare(lhs, rhs) != 0; }
-
 private:
+    [[nodiscard]] friend bool comparesEqual(const QVersionNumber &lhs,
+                                            const QVersionNumber &rhs) noexcept
+    {
+        return compare(lhs, rhs) == 0;
+    }
+    [[nodiscard]] friend Qt::strong_ordering compareThreeWay(const QVersionNumber &lhs,
+                                                             const QVersionNumber &rhs) noexcept
+    {
+        int c = compare(lhs, rhs);
+        return Qt::compareThreeWay(c, 0);
+    }
+    Q_DECLARE_STRONGLY_ORDERED(QVersionNumber)
+
 #ifndef QT_NO_DATASTREAM
     friend Q_CORE_EXPORT QDataStream& operator>>(QDataStream &in, QVersionNumber &version);
 #endif
-- 
cgit v1.2.3