QEasingCurve: use comparison helper macros

Like with the QLine(F) case, we have to use QT_CORE_REMOVED_SINCE to
remove the old member operators, but also need to guard the new friend
functions with !(QT_CORE_REMOVED_SINCE), because QEasingCurve is also
one of the core types, and on Windows the metatype interface for it is
instantiated in removed_api.cpp.

Task-number: QTBUG-120308
Change-Id: I1bd66f7230afd3eba868d05fd496ab13a0331178
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>

2 files changed, 27 insertions, 14 deletions

diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index d8b3367de3..52602a0256 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -1153,32 +1153,37 @@ QEasingCurve::~QEasingCurve()
 */
 
 /*!
-    Compare this easing curve with \a other and returns \c true if they are
-    equal. It will also compare the properties of a curve.
+    \fn bool QEasingCurve::operator==(const QEasingCurve &lhs, const QEasingCurve &rhs)
+
+    Compares easing curve \a lhs with \a rhs and returns \c true if they are
+    equal; otherwise returns \c false.
+    It will also compare the properties of the curves.
  */
-bool QEasingCurve::operator==(const QEasingCurve &other) const
+bool comparesEqual(const QEasingCurve &lhs, const QEasingCurve &rhs) noexcept
 {
-    bool res = d_ptr->func == other.d_ptr->func
-            && d_ptr->type == other.d_ptr->type;
+    bool res = lhs.d_ptr->func == rhs.d_ptr->func
+            && lhs.d_ptr->type == rhs.d_ptr->type;
     if (res) {
-        if (d_ptr->config && other.d_ptr->config) {
+        if (lhs.d_ptr->config && rhs.d_ptr->config) {
             // catch the config content
-            res = d_ptr->config->operator==(*(other.d_ptr->config));
+            res = lhs.d_ptr->config->operator==(*(rhs.d_ptr->config));
 
-        } else if (d_ptr->config || other.d_ptr->config) {
+        } else if (lhs.d_ptr->config || rhs.d_ptr->config) {
             // one one has a config object, which could contain default values
-            res = qFuzzyCompare(amplitude(), other.amplitude())
-               && qFuzzyCompare(period(), other.period())
-               && qFuzzyCompare(overshoot(), other.overshoot());
+            res = qFuzzyCompare(lhs.amplitude(), rhs.amplitude())
+               && qFuzzyCompare(lhs.period(), rhs.period())
+               && qFuzzyCompare(lhs.overshoot(), rhs.overshoot());
         }
     }
     return res;
 }
 
 /*!
-    \fn bool QEasingCurve::operator!=(const QEasingCurve &other) const
-    Compare this easing curve with \a other and returns \c true if they are not equal.
-    It will also compare the properties of a curve.
+    \fn bool QEasingCurve::operator!=(const QEasingCurve &lhs, const QEasingCurve &rhs)
+
+    Compares easing curve \a lhs with \a rhs and returns \c true if they are
+    not equal; otherwise returns \c false.
+    It will also compare the properties of the curves.
 
     \sa operator==()
 */
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index 5b112d7d7d..61e9aa247d 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -8,6 +8,7 @@
 
 QT_REQUIRE_CONFIG(easingcurve);
 
+#include <QtCore/qcompare.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qobjectdefs.h>
 
@@ -47,9 +48,11 @@ public:
 
     void swap(QEasingCurve &other) noexcept { qt_ptr_swap(d_ptr, other.d_ptr); }
 
+#if QT_CORE_REMOVED_SINCE(6, 8)
     bool operator==(const QEasingCurve &other) const;
     inline bool operator!=(const QEasingCurve &other) const
     { return !(this->operator==(other)); }
+#endif
 
     qreal amplitude() const;
     void setAmplitude(qreal amplitude);
@@ -81,6 +84,11 @@ private:
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QEasingCurve &);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QEasingCurve &);
 #endif
+    friend Q_CORE_EXPORT bool
+    comparesEqual(const QEasingCurve &lhs, const QEasingCurve &rhs) noexcept;
+#if !QT_CORE_REMOVED_SINCE(6, 8)
+    Q_DECLARE_EQUALITY_COMPARABLE(QEasingCurve)
+#endif
 };
 Q_DECLARE_SHARED(QEasingCurve)