Use QList instead of QVector in corelib tests

Task-number: QTBUG-84469
Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

8 files changed, 43 insertions, 56 deletions

diff --git a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
index ad973f73fc..98cbd0b4a5 100644
--- a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
@@ -167,7 +167,7 @@ bool operator!=(const Match &m, const QRegularExpressionMatch &rem)
 }
 
 
-bool operator==(const QRegularExpressionMatchIterator &iterator, const QVector<Match> &expectedMatchList)
+bool operator==(const QRegularExpressionMatchIterator &iterator, const QList<Match> &expectedMatchList)
 {
     QRegularExpressionMatchIterator i = iterator;
 
@@ -186,17 +186,17 @@ bool operator==(const QRegularExpressionMatchIterator &iterator, const QVector<M
     return true;
 }
 
-bool operator==(const QVector<Match> &expectedMatchList, const QRegularExpressionMatchIterator &iterator)
+bool operator==(const QList<Match> &expectedMatchList, const QRegularExpressionMatchIterator &iterator)
 {
     return operator==(iterator, expectedMatchList);
 }
 
-bool operator!=(const QRegularExpressionMatchIterator &iterator, const QVector<Match> &expectedMatchList)
+bool operator!=(const QRegularExpressionMatchIterator &iterator, const QList<Match> &expectedMatchList)
 {
     return !operator==(iterator, expectedMatchList);
 }
 
-bool operator!=(const QVector<Match> &expectedMatchList, const QRegularExpressionMatchIterator &iterator)
+bool operator!=(const QList<Match> &expectedMatchList, const QRegularExpressionMatchIterator &iterator)
 {
     return !operator==(expectedMatchList, iterator);
 }
@@ -1150,9 +1150,9 @@ void tst_QRegularExpression::globalMatch_data()
     QTest::addColumn<int>("offset");
     QTest::addColumn<QRegularExpression::MatchType>("matchType");
     QTest::addColumn<QRegularExpression::MatchOptions>("matchOptions");
-    QTest::addColumn<QVector<Match> >("matchList");
+    QTest::addColumn<QList<Match> >("matchList");
 
-    QVector<Match> matchList;
+    QList<Match> matchList;
     Match m;
 
     matchList.clear();
@@ -1408,7 +1408,7 @@ void tst_QRegularExpression::globalMatch()
     QFETCH(int, offset);
     QFETCH(QRegularExpression::MatchType, matchType);
     QFETCH(QRegularExpression::MatchOptions, matchOptions);
-    QFETCH(QVector<Match>, matchList);
+    QFETCH(QList<Match>, matchList);
 
     testMatch<QRegularExpressionMatchIterator>(regexp,
                                                static_cast<QREGlobalMatchStringPMF>(&QRegularExpression::globalMatch),
@@ -2136,7 +2136,7 @@ void tst_QRegularExpression::threadSafety()
     for (int threadSafetyIteration = 0; threadSafetyIteration < THREAD_SAFETY_ITERATIONS && time.elapsed() < 2000; ++threadSafetyIteration) {
         QRegularExpression re(pattern);
 
-        QVector<MatcherThread *> threads;
+        QList<MatcherThread *> threads;
         for (int i = 0; i < threadCount; ++i) {
             MatcherThread *thread = new MatcherThread(re, subject);
             thread->start();
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index e1857e31ee..376a4cb5dc 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -667,7 +667,7 @@ QString verifyZeroTermination(const QString &str)
     } while (0)                                                         \
     /**/
 
-typedef QVector<int> IntList;
+typedef QList<int> IntList;
 
 tst_QString::tst_QString()
 {
@@ -4627,7 +4627,7 @@ void tst_QString::fromUcs4()
 void tst_QString::toUcs4()
 {
     QString s;
-    QVector<uint> ucs4;
+    QList<uint> ucs4;
     QCOMPARE( s.toUcs4().size(), 0 );
 
     static const QChar bmp = QLatin1Char('a');
@@ -5683,9 +5683,9 @@ template<> struct StringSplitWrapper<QString>
 template<> struct StringSplitWrapper<QStringRef>
 {
     const QString &string;
-    QVector<QStringRef> split(const QString &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.splitRef(sep, behavior, cs); }
-    QVector<QStringRef> split(QChar sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.splitRef(sep, behavior, cs); }
-    QVector<QStringRef> split(const QRegularExpression &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts) const { return string.splitRef(sep, behavior); }
+    QList<QStringRef> split(const QString &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.splitRef(sep, behavior, cs); }
+    QList<QStringRef> split(QChar sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return string.splitRef(sep, behavior, cs); }
+    QList<QStringRef> split(const QRegularExpression &sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts) const { return string.splitRef(sep, behavior); }
 };
 
 template<> struct StringSplitWrapper<QStringView>
@@ -5710,20 +5710,14 @@ static bool operator==(const QList<QStringView> &result, const QStringList &expe
 }
 
 
-static bool operator ==(const QStringList &left, const QVector<QStringRef> &right)
+static bool operator ==(const QStringList &left, const QList<QStringRef> &right)
 {
     if (left.size() != right.size())
         return false;
 
-    QStringList::const_iterator iLeft = left.constBegin();
-    QVector<QStringRef>::const_iterator iRight = right.constBegin();
-    for (; iLeft != left.end(); ++iLeft, ++iRight) {
-        if (*iLeft != *iRight)
-            return false;
-    }
-    return true;
+    return std::equal(left.constBegin(), left.constEnd(), right.constBegin());
 }
-static inline bool operator ==(const QVector<QStringRef> &left, const QStringList &right) { return right == left; }
+static inline bool operator ==(const QList<QStringRef> &left, const QStringList &right) { return right == left; }
 
 template<class List>
 void tst_QString::split(const QString &string, const QString &sep, QStringList result)
@@ -5771,7 +5765,7 @@ void tst_QString::split()
     QFETCH(QString, sep);
     QFETCH(QStringList, result);
     split<QStringList>(str, sep, result);
-    split<QVector<QStringView>>(str, sep, result);
+    split<QList<QStringView>>(str, sep, result);
 }
 
 void tst_QString::splitRef_data()
@@ -5784,7 +5778,7 @@ void tst_QString::splitRef()
     QFETCH(QString, str);
     QFETCH(QString, sep);
     QFETCH(QStringList, result);
-    split<QVector<QStringRef> >(str, sep, result);
+    split<QList<QStringRef> >(str, sep, result);
 }
 
 void tst_QString::split_regularexpression_data()
@@ -5840,7 +5834,7 @@ void tst_QString::splitRef_regularexpression()
     QFETCH(QString, string);
     QFETCH(QString, pattern);
     QFETCH(QStringList, result);
-    split_regexp<QVector<QStringRef>, QRegularExpression>(string, pattern, result);
+    split_regexp<QList<QStringRef>, QRegularExpression>(string, pattern, result);
 }
 
 void tst_QString::fromUtf16_data()
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
index 69ad52c08b..3e1f10cc11 100644
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -31,15 +31,14 @@
 #undef QT_NO_CAST_TO_ASCII
 #undef QT_ASCII_CAST_WARNINGS
 
-#include <QString>
-#include <QStringView>
-#include <QStringTokenizer>
 #include <QChar>
+#include <QLatin1String>
+#include <QList>
 #include <QScopedArrayPointer>
+#include <QString>
 #include <QStringRef>
-#include <QLatin1String>
-#include <QVector>
-
+#include <QStringTokenizer>
+#include <QStringView>
 #include <QTest>
 
 Q_DECLARE_METATYPE(QLatin1String)
@@ -2304,12 +2303,12 @@ void tst_QStringApiSymmetry::toUtf8_impl()
 void tst_QStringApiSymmetry::toUcs4_data()
 {
     QTest::addColumn<QString>("unicode");
-    QTest::addColumn<QVector<uint>>("ucs4");
+    QTest::addColumn<QList<uint>>("ucs4");
 
     auto add = [](const char *l1) {
         const QByteArray ba(l1);
         QString s;
-        QVector<uint> ucs4;
+        QList<uint> ucs4;
         for (char c : ba) {
             s += QLatin1Char(c);
             ucs4.append(uint(uchar(c)));
@@ -2317,8 +2316,8 @@ void tst_QStringApiSymmetry::toUcs4_data()
         QTest::newRow(rowName(ba).constData()) << s << ucs4;
     };
 
-    QTest::addRow("null") << QString() << QVector<uint>();
-    QTest::addRow("empty") << QString("") << QVector<uint>();
+    QTest::addRow("null") << QString() << QList<uint>();
+    QTest::addRow("empty") << QString("") << QList<uint>();
 
     add("M\xF6" "bius");
     add(LONG_STRING_256);
@@ -2328,7 +2327,7 @@ template <typename String>
 void tst_QStringApiSymmetry::toUcs4_impl()
 {
     QFETCH(const QString, unicode);
-    QFETCH(const QVector<uint>, ucs4);
+    QFETCH(const QList<uint>, ucs4);
 
     const auto str = make<String>(unicode);
 
diff --git a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
index bf3f30bb82..5de3beff77 100644
--- a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
+++ b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
@@ -1839,7 +1839,7 @@ void tst_QStringConverter::threadSafety()
 {
     QThreadPool::globalInstance()->setMaxThreadCount(12);
 
-    QVector<QString> res;
+    QList<QString> res;
     res.resize(QStringConverter::LastEncoding + 1);
     for (int i = 0; i < QStringConverter::LastEncoding + 1; ++i) {
         QThreadPool::globalInstance()->start(new LoadAndConvert(QStringConverter::Encoding(i), &res[i]));
diff --git a/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
index 16720a1d40..aaaf31593a 100644
--- a/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
@@ -27,9 +27,9 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
+#include <qlist.h>
 #include <qregularexpression.h>
 #include <qstringlist.h>
-#include <qvector.h>
 
 #include <locale.h>
 
@@ -88,7 +88,7 @@ void tst_QStringList::constructors()
         QCOMPARE(list.at(2), "c");
     }
     {
-        const QVector<QString> reference{ "a", "b", "c" };
+        const QList<QString> reference{ "a", "b", "c" };
         QCOMPARE(reference.size(), 3);
 
         QStringList list(reference.cbegin(), reference.cend());
diff --git a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
index 021e7f2967..3e05d7af4f 100644
--- a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
@@ -2081,20 +2081,14 @@ void tst_QStringRef::mid()
     QVERIFY(emptyRef.mid(-10, 3).isEmpty());
 }
 
-static bool operator ==(const QStringList &left, const QVector<QStringRef> &right)
+static bool operator ==(const QStringList &left, const QList<QStringRef> &right)
 {
     if (left.size() != right.size())
         return false;
 
-    QStringList::const_iterator iLeft = left.constBegin();
-    QVector<QStringRef>::const_iterator iRight = right.constBegin();
-    for (; iLeft != left.end(); ++iLeft, ++iRight) {
-        if (*iLeft != *iRight)
-            return false;
-    }
-    return true;
+    return std::equal(left.constBegin(), left.constEnd(), right.constBegin());
 }
-static inline bool operator ==(const QVector<QStringRef> &left, const QStringList &right) { return right == left; }
+static inline bool operator ==(const QList<QStringRef> &left, const QStringList &right) { return right == left; }
 
 void tst_QStringRef::split_data()
 {
@@ -2124,7 +2118,7 @@ void tst_QStringRef::split()
     QFETCH(QString, sep);
     QFETCH(QStringList, result);
 
-    QVector<QStringRef> list;
+    QList<QStringRef> list;
     // we construct a bigger valid string to check
     // if ref.split is using the right size
     QString source = str + str + str;
diff --git a/tests/auto/corelib/text/qstringtokenizer/tst_qstringtokenizer.cpp b/tests/auto/corelib/text/qstringtokenizer/tst_qstringtokenizer.cpp
index 0f50c389b4..1d2658c38f 100644
--- a/tests/auto/corelib/text/qstringtokenizer/tst_qstringtokenizer.cpp
+++ b/tests/auto/corelib/text/qstringtokenizer/tst_qstringtokenizer.cpp
@@ -137,13 +137,13 @@ void tst_QStringTokenizer::toContainer() const
     {
         auto tok = qTokenize(u"a,b,c", u',');
         auto v = tok.toContainer();
-        QVERIFY((std::is_same_v<decltype(v), QVector<QStringView>>));
+        QVERIFY((std::is_same_v<decltype(v), QList<QStringView>>));
     }
     // QLatin1String value_type
     {
         auto tok = qTokenize(QLatin1String{"a,b,c"}, u',');
         auto v = tok.toContainer();
-        QVERIFY((std::is_same_v<decltype(v), QVector<QLatin1String>>));
+        QVERIFY((std::is_same_v<decltype(v), QList<QLatin1String>>));
     }
 }
 
diff --git a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
index 83bb372490..55e23570d7 100644
--- a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
@@ -32,7 +32,7 @@
 #include <QChar>
 #include <QStringRef>
 #include <QVarLengthArray>
-#include <QVector>
+#include <QList>
 
 #include <QTest>
 
@@ -89,7 +89,7 @@ static_assert(CanConvert<ushort[123]>::value);
 static_assert(CanConvert<      ushort*>::value);
 static_assert(CanConvert<const ushort*>::value);
 
-static_assert(CanConvert<QVector<ushort>>::value);
+static_assert(CanConvert<QList<ushort>>::value);
 static_assert(CanConvert<QVarLengthArray<ushort>>::value);
 static_assert(CanConvert<std::vector<ushort>>::value);
 static_assert(CanConvert<std::array<ushort, 123>>::value);
@@ -115,7 +115,7 @@ static_assert(CanConvert<const std::u16string_view >::value);
 static_assert(CanConvert<      std::u16string_view&>::value);
 static_assert(CanConvert<const std::u16string_view&>::value);
 
-static_assert(CanConvert<QVector<char16_t>>::value);
+static_assert(CanConvert<QList<char16_t>>::value);
 static_assert(CanConvert<QVarLengthArray<char16_t>>::value);
 static_assert(CanConvert<std::vector<char16_t>>::value);
 static_assert(CanConvert<std::array<char16_t, 123>>::value);
@@ -149,7 +149,7 @@ static_assert(CanConvert<const std::wstring_view >::value == CanConvertFromWChar
 static_assert(CanConvert<      std::wstring_view&>::value == CanConvertFromWCharT);
 static_assert(CanConvert<const std::wstring_view&>::value == CanConvertFromWCharT);
 
-static_assert(CanConvert<QVector<wchar_t>>::value == CanConvertFromWCharT);
+static_assert(CanConvert<QList<wchar_t>>::value == CanConvertFromWCharT);
 static_assert(CanConvert<QVarLengthArray<wchar_t>>::value == CanConvertFromWCharT);
 static_assert(CanConvert<std::vector<wchar_t>>::value == CanConvertFromWCharT);
 static_assert(CanConvert<std::array<wchar_t, 123>>::value == CanConvertFromWCharT);
@@ -732,7 +732,7 @@ void tst_QStringView::fromContainer() const
 template <typename Char>
 void tst_QStringView::fromContainers() const
 {
-    fromContainer<Char, QVector<Char>>();
+    fromContainer<Char, QList<Char>>();
     fromContainer<Char, QVarLengthArray<Char>>();
     fromContainer<Char, std::vector<Char>>();
 }