diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 16:15:23 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 11:48:45 +0200 |
commit | 989fca660c3556fa957ed9a3f7cd3b948a4166a2 (patch) | |
tree | 8479b302afd3458cd2583dffc9e5dc52e512d9a1 /tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp | |
parent | d33655a9531b750e1574742ff575f871c19ed808 (diff) |
Use QList instead of QVector in corelib tests
Task-number: QTBUG-84469
Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp')
-rw-r--r-- | tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp | 16 |
1 files changed, 8 insertions, 8 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(); |