From e29d440a4750a90d5369c200467bd7e42060bf6b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 9 Apr 2025 12:58:46 +0200
Subject: [PATCH] Various tests: Replace QVector by QList

Change-Id: I3d7d8233da2402229e56ceef387c3df9effecd20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/auto/algorithm/tst_algorithm.cpp             | 14 +++++++-------
 .../cplusplus/preprocessor/tst_preprocessor.cpp    |  9 ++++-----
 .../auto/pointeralgorithm/tst_pointeralgorithm.cpp |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp
index 74d2b47004f..2e60bf63629 100644
--- a/tests/auto/algorithm/tst_algorithm.cpp
+++ b/tests/auto/algorithm/tst_algorithm.cpp
@@ -238,9 +238,9 @@ void tst_Algorithm::transform()
         QCOMPARE(trans, QList<double>({1.5, 7.5, 17.5}));
     }
     {
-        // specific result container with one template parameter (QVector)
+        // specific result container with one template parameter (QList)
         std::vector<int> v({1, 2, 3, 4});
-        const QVector<BaseStruct *> trans = Utils::transform<QVector<BaseStruct *>>(v, [](int i) {
+        const QList<BaseStruct *> trans = Utils::transform<QList<BaseStruct *>>(v, [](int i) {
             return new Struct(i);
         });
         QCOMPARE(trans.size(), 4);
@@ -279,14 +279,14 @@ void tst_Algorithm::transform()
     {
         // specific result container with member function
         QList<Struct> v({1, 2, 3, 4});
-        const QVector<double> trans = Utils::transform<QVector<double>>(v, &Struct::getMember);
-        QCOMPARE(trans, QVector<double>({1.0, 2.0, 3.0, 4.0}));
+        const QList<double> trans = Utils::transform<QList<double>>(v, &Struct::getMember);
+        QCOMPARE(trans, QList<double>({1.0, 2.0, 3.0, 4.0}));
     }
     {
         // specific result container with member
         QList<Struct> v({1, 2, 3, 4});
-        const QVector<double> trans = Utils::transform<QVector<double>>(v, &Struct::member);
-        QCOMPARE(trans, QVector<double>({1.0, 2.0, 3.0, 4.0}));
+        const QList<double> trans = Utils::transform<QList<double>>(v, &Struct::member);
+        QCOMPARE(trans, QList<double>({1.0, 2.0, 3.0, 4.0}));
     }
     {
         // non-const container and function parameter
@@ -295,7 +295,7 @@ void tst_Algorithm::transform()
         const std::vector<std::reference_wrapper<Struct>> trans
             = Utils::transform(v, [](Struct &s) { return std::ref(s); });
         // different container type
-        QVector<Struct> v2({1, 2, 3, 4});
+        QList<Struct> v2({1, 2, 3, 4});
         const std::vector<std::reference_wrapper<Struct>> trans2
             = Utils::transform<std::vector>(v, [](Struct &s) { return std::ref(s); });
         // temporaries
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index e06a70ecdcf..c1894b0fc83 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -141,8 +141,7 @@ public:
                              int /*utf16charsOffset*/,
                              int line,
                              const Macro &macro,
-                             const QVector<MacroArgumentReference> &actuals
-                                    = QVector<MacroArgumentReference>()) override
+                             const QList<MacroArgumentReference> &actuals = {}) override
     {
         m_expandedMacros.append(macro.name());
         m_expandedMacrosOffset.append(bytesOffset);
@@ -266,7 +265,7 @@ public:
     const QList<int> macroArgsCount() const
     { return m_macroArgsCount; }
 
-    const QMap<QByteArray, QVector<MacroArgumentReference >> usedMacros() const
+    const QMap<QByteArray, QList<MacroArgumentReference >> usedMacros() const
     { return m_usedMacros; }
 
     const QList<Pragma> &pragmas() const { return m_pragmas; }
@@ -288,7 +287,7 @@ private:
     QHash<QByteArray, QList<int> > m_definitionsResolvedFromLines;
     QSet<QByteArray> m_unresolvedDefines;
     QList<int> m_macroArgsCount;
-    QMap<QByteArray, QVector<MacroArgumentReference >> m_usedMacros;
+    QMap<QByteArray, QList<MacroArgumentReference >> m_usedMacros;
     QList<Pragma> m_pragmas;
 };
 
@@ -539,7 +538,7 @@ void tst_Preprocessor::macro_args_offsets()
     Preprocessor preprocess(&client, &env);
     preprocess.run(fileName, source, true, false);
 
-    QMap<QByteArray, QVector<MacroArgumentReference >> usedMacros = client.usedMacros();
+    QMap<QByteArray, QList<MacroArgumentReference>> usedMacros = client.usedMacros();
     QCOMPARE(usedMacros.size(), 1);
     QVERIFY(usedMacros.contains(macroName));
     MacroArgumentReference argRef = usedMacros.value(macroName).at(0);
diff --git a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
index fbaa8bef0c8..4160b71864a 100644
--- a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
+++ b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
@@ -204,11 +204,11 @@ void tst_PointerAlgorithm::toRawPointer()
     const std::vector<Struct *> x1 = Utils::toRawPointer(v);
     // different result container
     const std::vector<Struct *> x2 = Utils::toRawPointer<std::vector>(v);
-    const QVector<Struct *> x3 = Utils::toRawPointer<QVector>(v);
+    const QList<Struct *> x3 = Utils::toRawPointer<QList>(v);
     const std::list<Struct *> x4 = Utils::toRawPointer<std::list>(v);
     // different fully specified result container
     const std::vector<BaseStruct *> x5 = Utils::toRawPointer<std::vector<BaseStruct *>>(v);
-    const QVector<BaseStruct *> x6 = Utils::toRawPointer<QVector<BaseStruct *>>(v);
+    const QList<BaseStruct *> x6 = Utils::toRawPointer<QList<BaseStruct *>>(v);
 }
 
 void tst_PointerAlgorithm::toReferences()