QPoint(F): use comparison helper macros

Explicitly add QPointF vs QPoint comparison. Previously such
comparison was implicitly converting QPoint to QPointF, and
doing the fuzzy comparison. We have to keep the old behavior to
avoid breaking user code, so explicitly use fuzzy comparison in
the new operators.

As a drive-by: move the friend functions into the private section,
so that they are actually hidden friends.

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

4 files changed, 39 insertions, 17 deletions

diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
index f1402d8815..82ece1fc15 100644
--- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
@@ -14,4 +14,6 @@ endif()
 qt_internal_add_test(tst_qpoint
     SOURCES
         tst_qpoint.cpp
+    LIBRARIES
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
index 7fea787131..4763c1bf07 100644
--- a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
+++ b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
@@ -5,6 +5,7 @@
 #ifdef QVARIANT_H
 # error "This test requires qpoint.h to not include qvariant.h"
 #endif
+#include <private/qcomparisontesthelper_p.h>
 
 // don't assume <type_traits>
 template <typename T, typename U>
@@ -71,6 +72,7 @@ private slots:
     void operator_unary_minus_data();
     void operator_unary_minus();
 
+    void operatorsCompile();
     void operator_eq_data();
     void operator_eq();
 
@@ -155,6 +157,8 @@ void tst_QPoint::toPointF()
     QFETCH(const QPointF, result);
 
     QCOMPARE(input.toPointF(), result);
+    // test also mixed-type comparison
+    QT_TEST_EQUALITY_OPS(input, result, true);
 }
 
 void tst_QPoint::transposed()
@@ -350,6 +354,12 @@ void tst_QPoint::operator_unary_minus()
     QCOMPARE(-point, expected);
 }
 
+void tst_QPoint::operatorsCompile()
+{
+    // Mixed-type comparison is tested in tst_QPointF.
+    QTestPrivate::testEqualityOperatorsCompile<QPoint>();
+}
+
 void tst_QPoint::operator_eq_data()
 {
     QTest::addColumn<QPoint>("point1");
@@ -371,12 +381,9 @@ void tst_QPoint::operator_eq()
     QFETCH(QPoint, point2);
     QFETCH(bool, expectEqual);
 
-    bool equal = point1 == point2;
-    QCOMPARE(equal, expectEqual);
-    bool notEqual = point1 != point2;
-    QCOMPARE(notEqual, !expectEqual);
+    QT_TEST_EQUALITY_OPS(point1, point2, expectEqual);
 
-    if (equal)
+    if (expectEqual)
         QCOMPARE(qHash(point1), qHash(point2));
 }
 
diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
index 16e5a9036a..28cbe185b2 100644
--- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
@@ -14,4 +14,6 @@ endif()
 qt_internal_add_test(tst_qpointf
     SOURCES
         tst_qpointf.cpp
+    LIBRARIES
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
index 392c22c70a..e75dd9d5ab 100644
--- a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
+++ b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
@@ -5,6 +5,7 @@
 #ifdef QVARIANT_H
 # error "This test requires qpoint.h to not include qvariant.h"
 #endif
+#include <private/qcomparisontesthelper_p.h>
 
 // don't assume <type_traits>
 template <typename T, typename U>
@@ -71,6 +72,7 @@ private slots:
     void operator_unary_minus_data();
     void operator_unary_minus();
 
+    void operatorsCompile();
     void operator_eq_data();
     void operator_eq();
 
@@ -345,21 +347,29 @@ void tst_QPointF::operator_unary_minus()
     QCOMPARE(-point, expected);
 }
 
+void tst_QPointF::operatorsCompile()
+{
+    QTestPrivate::testEqualityOperatorsCompile<QPointF>();
+    QTestPrivate::testEqualityOperatorsCompile<QPointF, QPoint>();
+}
+
 void tst_QPointF::operator_eq_data()
 {
     QTest::addColumn<QPointF>("point1");
     QTest::addColumn<QPointF>("point2");
     QTest::addColumn<bool>("expectEqual");
-
-    QTest::newRow("(0, 0) == (0, 0)") << QPointF(0, 0) << QPointF(0, 0) << true;
-    QTest::newRow("(-1, 0) == (-1, 0)") << QPointF(-1, 0) << QPointF(-1, 0) << true;
-    QTest::newRow("(-1, 0) != (0, 0)") << QPointF(-1, 0) << QPointF(0, 0) << false;
-    QTest::newRow("(-1, 0) != (0, -1)") << QPointF(-1, 0) << QPointF(0, -1) << false;
-    QTest::newRow("(-1.125, 0.25) == (-1.125, 0.25)") << QPointF(-1.125, 0.25) << QPointF(-1.125, 0.25) << true;
+    QTest::addColumn<bool>("expectIntEqual");
+
+    QTest::newRow("(0, 0) == (0, 0)") << QPointF(0, 0) << QPointF(0, 0) << true << true;
+    QTest::newRow("(-1, 0) == (-1, 0)") << QPointF(-1, 0) << QPointF(-1, 0) << true << true;
+    QTest::newRow("(-1, 0) != (0, 0)") << QPointF(-1, 0) << QPointF(0, 0) << false << false;
+    QTest::newRow("(-1, 0) != (0, -1)") << QPointF(-1, 0) << QPointF(0, -1) << false << false;
+    QTest::newRow("(-1.125, 0.25) == (-1.125, 0.25)")
+            << QPointF(-1.125, 0.25) << QPointF(-1.125, 0.25) << true << false;
     QTest::newRow("(QREAL_MIN, QREAL_MIN) == (QREAL_MIN, QREAL_MIN)")
-        << QPointF(QREAL_MIN, QREAL_MIN) << QPointF(QREAL_MIN, QREAL_MIN) << true;
+            << QPointF(QREAL_MIN, QREAL_MIN) << QPointF(QREAL_MIN, QREAL_MIN) << true << true;
     QTest::newRow("(QREAL_MAX, QREAL_MAX) == (QREAL_MAX, QREAL_MAX)")
-        << QPointF(QREAL_MAX, QREAL_MAX) << QPointF(QREAL_MAX, QREAL_MAX) << true;
+            << QPointF(QREAL_MAX, QREAL_MAX) << QPointF(QREAL_MAX, QREAL_MAX) << true << false;
 }
 
 void tst_QPointF::operator_eq()
@@ -367,11 +377,12 @@ void tst_QPointF::operator_eq()
     QFETCH(QPointF, point1);
     QFETCH(QPointF, point2);
     QFETCH(bool, expectEqual);
+    QFETCH(bool, expectIntEqual);
+
+    QT_TEST_EQUALITY_OPS(point1, point2, expectEqual);
 
-    bool equal = point1 == point2;
-    QCOMPARE(equal, expectEqual);
-    bool notEqual = point1 != point2;
-    QCOMPARE(notEqual, !expectEqual);
+    const QPoint intPoint2 = point2.toPoint();
+    QT_TEST_EQUALITY_OPS(point1, intPoint2, expectIntEqual);
 }
 
 void tst_QPointF::toPoint_data()