Deprecate conversion functions between QList and QSet

Users should use range constructors instead to do the conversion.
Keep conversion methods between QList and QVector as these will turn
into a no-op in Qt 6, whereas forcing people to use range constructors
would lead to deep copies of the data.

Change-Id: Id9fc9e4d007044e019826da523e8418857c91283
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 33 insertions, 4 deletions

diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index 9bd90d21cd..734b018b39 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -2531,14 +2531,18 @@ void tst_Collections::conversions()
         QCOMPARE(list2.size(), 4);
         QVERIFY(list2 == (QList<QString>() << STUFF));
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         QSet<QString> set1 = list1.toSet();
+#else
+        QSet<QString> set1(list1.begin(), list1.end());
+#endif
         QCOMPARE(set1.size(), 3);
         QVERIFY(set1.contains("A"));
         QVERIFY(set1.contains("B"));
         QVERIFY(set1.contains("C"));
         QVERIFY(!set1.contains("D"));
 
-        QList<QString> list3 = set1.toList();
+        QList<QString> list3 = set1.values();
         QCOMPARE(list3.size(), 3);
         QVERIFY(list3.contains("A"));
         QVERIFY(list3.contains("B"));
@@ -2546,9 +2550,11 @@ void tst_Collections::conversions()
         QVERIFY(!list3.contains("D"));
 
         QVERIFY(QList<int>().toVector().isEmpty());
-        QVERIFY(QList<int>().toSet().isEmpty());
         QVERIFY(QVector<int>().toList().isEmpty());
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+        QVERIFY(QList<int>().toSet().isEmpty());
         QVERIFY(QSet<int>().toList().isEmpty());
+#endif
     }
 
     {
@@ -2563,14 +2569,22 @@ void tst_Collections::conversions()
         QCOMPARE(list2.size(), 4);
         QVERIFY(list2 == (QList<QString>() << STUFF));
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         QSet<QString> set1 = QSet<QString>::fromList(list1);
+#else
+        QSet<QString> set1(list1.begin(), list1.end());
+#endif
         QCOMPARE(set1.size(), 3);
         QVERIFY(set1.contains("A"));
         QVERIFY(set1.contains("B"));
         QVERIFY(set1.contains("C"));
         QVERIFY(!set1.contains("D"));
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         QList<QString> list3 = QList<QString>::fromSet(set1);
+#else
+        QList<QString> list3 = set1.values();
+#endif
         QCOMPARE(list3.size(), 3);
         QVERIFY(list3.contains("A"));
         QVERIFY(list3.contains("B"));
@@ -2578,9 +2592,11 @@ void tst_Collections::conversions()
         QVERIFY(!list3.contains("D"));
 
         QVERIFY(QVector<int>::fromList(QList<int>()).isEmpty());
-        QVERIFY(QSet<int>::fromList(QList<int>()).isEmpty());
         QVERIFY(QList<int>::fromVector(QVector<int>()).isEmpty());
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+        QVERIFY(QSet<int>::fromList(QList<int>()).isEmpty());
         QVERIFY(QList<int>::fromSet(QSet<int>()).isEmpty());
+#endif
     }
 #undef STUFF
 }
@@ -2776,15 +2792,21 @@ void tst_Collections::vector_stl()
     for (int i = 0; i < elements.count(); ++i)
         vector << elements.at(i);
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     std::vector<QString> stdVector = vector.toStdVector();
-
+#else
+    std::vector<QString> stdVector(vector.begin(), vector.end());
+#endif
     QCOMPARE(int(stdVector.size()), elements.size());
 
     std::vector<QString>::const_iterator it = stdVector.begin();
     for (uint j = 0; j < stdVector.size() && it != stdVector.end(); ++j, ++it)
         QCOMPARE(*it, vector[j]);
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     QCOMPARE(QVector<QString>::fromStdVector(stdVector), vector);
+#endif
+    QCOMPARE(QVector<QString>(stdVector.begin(), stdVector.end()), vector);
 }
 
 void tst_Collections::linkedlist_stl_data()
@@ -2830,7 +2852,11 @@ void tst_Collections::list_stl()
     for (int i = 0; i < elements.count(); ++i)
         list << elements.at(i);
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     std::list<QString> stdList = list.toStdList();
+#else
+    std::list<QString> stdList(list.begin(), list.end());
+#endif
 
     QCOMPARE(int(stdList.size()), elements.size());
 
@@ -2838,7 +2864,10 @@ void tst_Collections::list_stl()
     for (uint j = 0; j < stdList.size() && it != stdList.end(); ++j, ++it)
         QCOMPARE(*it, list[j]);
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     QCOMPARE(QList<QString>::fromStdList(stdList), list);
+#endif
+    QCOMPARE(QList<QString>(stdList.begin(), stdList.end()), list);
 }
 
 template <typename T>