QtPrivate::ResultIteratorBase: use modernize comparisons

Replace class operators operator==(), operator!=() of
QtPrivate::ResultIteratorBase to friend method comparesEqual() and
Q_DECLARE_EQUALITY_COMPARABLE macro.

Use QT_CORE_REMOVED_SINCE and removed_api.cpp to get rid of
current comparison methods and replace them with a friend.

Task-number: QTBUG-120304
Change-Id: Ib9a50a400df86d1dc034d2a0cfee804109a2b93f
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

2 files changed, 22 insertions, 12 deletions

diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
index 0f9d8d9e52..5abfc14ac6 100644
--- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
@@ -16,4 +16,5 @@ qt_internal_add_test(tst_qresultstore
         tst_qresultstore.cpp
     LIBRARIES
         Qt::CorePrivate
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
index 265b2cd1f6..722184a72a 100644
--- a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
+++ b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
-
+#include <QtTest/private/qcomparisontesthelper_p.h>
 #include <qresultstore.h>
 
 using namespace QtPrivate;
@@ -23,6 +23,7 @@ class tst_QtConcurrentResultStore : public QObject
 public slots:
     void init();
 private slots:
+    void compareCompiles();
     void construction();
     void iterators();
     void addResult();
@@ -52,6 +53,11 @@ void tst_QtConcurrentResultStore::init()
     vec1 = QList<int> { 4, 5 };
 }
 
+void tst_QtConcurrentResultStore::compareCompiles()
+{
+    QTestPrivate::testEqualityOperatorsCompile<ResultIteratorBase>();
+}
+
 void tst_QtConcurrentResultStore::construction()
 {
     ResultStoreBase store;
@@ -74,17 +80,20 @@ void tst_QtConcurrentResultStore::iterators()
         storebase.addResult(1, &int1);  // ResultStoreBase does not take ownership, only ResultStore<> does.
         ResultIteratorBase it = storebase.begin();
         QCOMPARE(it.resultIndex(), 0);
-        QCOMPARE(it, storebase.begin());
+        QT_TEST_EQUALITY_OPS(it, storebase.begin(), true);
         QVERIFY(it != storebase.end());
 
         ++it;
         QCOMPARE(it.resultIndex(), 1);
         QVERIFY(it != storebase.begin());
         QVERIFY(it != storebase.end());
+        QT_TEST_EQUALITY_OPS(it, storebase.begin(), false);
+        QT_TEST_EQUALITY_OPS(it, storebase.end(), false);
 
         ++it;
         QVERIFY(it != storebase.begin());
         QCOMPARE(it, storebase.end());
+        QT_TEST_EQUALITY_OPS(it, storebase.end(), true);
     }
 }
 
@@ -147,8 +156,8 @@ void tst_QtConcurrentResultStore::addResults()
     store.addResults(-1, &vec1);
     ResultIteratorBase it = store.begin();
     QCOMPARE(it.resultIndex(), 0);
-    QCOMPARE(it, store.begin());
-    QVERIFY(it != store.end());
+    QT_TEST_EQUALITY_OPS(it, store.begin(), true);
+    QT_TEST_EQUALITY_OPS(it, store.end(), false);
 
     ++it;
     QCOMPARE(it.resultIndex(), 1);
@@ -162,7 +171,7 @@ void tst_QtConcurrentResultStore::addResults()
     QCOMPARE(it.resultIndex(), 3);
 
     ++it;
-    QCOMPARE(it, store.end());
+    QT_TEST_EQUALITY_OPS(it, store.end(), true);
 
     QList<int> empty;
     const auto countBefore = store.count();
@@ -184,22 +193,22 @@ void tst_QtConcurrentResultStore::resultIndex()
 
     ResultIteratorBase it = store.begin();
     QCOMPARE(it.resultIndex(), 0);
-    QVERIFY(it == store.begin());
-    QVERIFY(it != store.end());
+    QT_TEST_EQUALITY_OPS(it, store.begin(), true);
+    QT_TEST_EQUALITY_OPS(it, store.end(), false);
 
     ++it;
     QCOMPARE(it.resultIndex(), 1);
-    QVERIFY(it != store.begin());
-    QVERIFY(it != store.end());
+    QT_TEST_EQUALITY_OPS(it, store.begin(), false);
+    QT_TEST_EQUALITY_OPS(it, store.end(), false);
 
     ++it;
     QCOMPARE(it.resultIndex(), 2);
-    QVERIFY(it != store.end());
+    QT_TEST_EQUALITY_OPS(it, store.end(), false);
     ++it;
     QCOMPARE(it.resultIndex(), 3);
-    QVERIFY(it != store.end());
+    QT_TEST_EQUALITY_OPS(it, store.end(), false);
     ++it;
-    QVERIFY(it == store.end());
+    QT_TEST_EQUALITY_OPS(it, store.end(), true);
 
     QCOMPARE(store.resultAt(0).value<int>(), int0);
     QCOMPARE(store.resultAt(1).value<int>(), vec0[0]);