diff --git a/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp index 3642865e9c2..9a14825de05 100644 --- a/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp +++ b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp @@ -11,8 +11,8 @@ using namespace Timeline; class DummyPassState : public TimelineRenderPass::State { private: - QVector m_collapsedRows; - QVector m_expandedRows; + QList m_collapsedRows; + QList m_expandedRows; QSGNode *m_collapsedOverlay; QSGNode *m_expandedOverlay; @@ -20,8 +20,8 @@ public: DummyPassState(); ~DummyPassState(); - const QVector &expandedRows() const; - const QVector &collapsedRows() const; + const QList &expandedRows() const; + const QList &collapsedRows() const; QSGNode *expandedOverlay() const; QSGNode *collapsedOverlay() const; }; @@ -49,12 +49,12 @@ DummyPassState::~DummyPassState() qDeleteAll(m_expandedRows); } -const QVector &DummyPassState::expandedRows() const +const QList &DummyPassState::expandedRows() const { return m_expandedRows; } -const QVector &DummyPassState::collapsedRows() const +const QList &DummyPassState::collapsedRows() const { return m_collapsedRows; } diff --git a/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp b/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp index d140b5e508f..f6229b60a09 100644 --- a/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp +++ b/tests/auto/utils/fuzzymatcher/tst_fuzzymatcher.cpp @@ -102,7 +102,7 @@ void tst_FuzzyMatcher::fuzzyMatcherMultiWord_data() QTest::newRow("inword_second_match") << "foar" << "foo bar" << -1; } -typedef QVector> Matches; +typedef QList> Matches; void tst_FuzzyMatcher::highlighting() { diff --git a/tests/auto/valgrind/callgrind/callgrindparsertests.cpp b/tests/auto/valgrind/callgrind/callgrindparsertests.cpp index cc90f0b20ca..89a235d342b 100644 --- a/tests/auto/valgrind/callgrind/callgrindparsertests.cpp +++ b/tests/auto/valgrind/callgrind/callgrindparsertests.cpp @@ -282,11 +282,11 @@ void CallgrindParserTests::testMultiCost() QCOMPARE(data->totalCost(1), quint64(400)); const Function *main = data->functions().at(0); - QCOMPARE(main->costItems().first()->costs(), QVector() << 1 << 100); - QCOMPARE(main->costItems().first()->positions(), QVector() << 1); + QCOMPARE(main->costItems().first()->costs(), QList() << 1 << 100); + QCOMPARE(main->costItems().first()->positions(), QList() << 1); QVERIFY(main->costItems().last()->call()); - QCOMPARE(main->costItems().last()->call()->destinations(), QVector() << 1); + QCOMPARE(main->costItems().last()->call()->destinations(), QList() << 1); } void CallgrindParserTests::testMultiPos() @@ -300,11 +300,11 @@ void CallgrindParserTests::testMultiPos() QCOMPARE(data->totalCost(0), quint64(4)); const Function *main = data->functions().at(0); - QCOMPARE(main->costItems().first()->costs(), QVector() << 1); - QCOMPARE(main->costItems().first()->positions(), QVector() << 1 << 0x01); + QCOMPARE(main->costItems().first()->costs(), QList() << 1); + QCOMPARE(main->costItems().first()->positions(), QList() << 1 << 0x01); QVERIFY(main->costItems().last()->call()); - QCOMPARE(main->costItems().last()->call()->destinations(), QVector() << 1 << 0x04); + QCOMPARE(main->costItems().last()->call()->destinations(), QList() << 1 << 0x04); } void CallgrindParserTests::testMultiPosAndCost() @@ -319,14 +319,14 @@ void CallgrindParserTests::testMultiPosAndCost() QCOMPARE(data->totalCost(1), quint64(400)); const Function *main = data->functions().at(0); - QCOMPARE(main->costItems().first()->costs(), QVector() << 1 << 100); - QCOMPARE(main->costItems().first()->positions(), QVector() << 1 << 0x01); + QCOMPARE(main->costItems().first()->costs(), QList() << 1 << 100); + QCOMPARE(main->costItems().first()->positions(), QList() << 1 << 0x01); QVERIFY(main->costItems().last()->call()); - QCOMPARE(main->costItems().last()->call()->destinations(), QVector() << 1 << 0x04); + QCOMPARE(main->costItems().last()->call()->destinations(), QList() << 1 << 0x04); } -const Function *findFunction(const QString &needle, const QVector &haystack) +const Function *findFunction(const QString &needle, const QList &haystack) { for (const Function *function : haystack) { if (function->name() == needle) { diff --git a/tests/auto/valgrind/callgrind/callgrindparsertests.h b/tests/auto/valgrind/callgrind/callgrindparsertests.h index e28e98b9fc5..5cd4e09b61a 100644 --- a/tests/auto/valgrind/callgrind/callgrindparsertests.h +++ b/tests/auto/valgrind/callgrind/callgrindparsertests.h @@ -6,7 +6,6 @@ #include #include #include -#include #include class CallgrindParserTests : public QObject diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp index 915e63765ec..ac2001266b4 100644 --- a/tests/manual/debugger/gui/mainwindow.cpp +++ b/tests/manual/debugger/gui/mainwindow.cpp @@ -262,7 +262,7 @@ void MainWindow::on_actionExtTypes_triggered() { QVariant v1(QLatin1String("hallo")); QVariant v2(QStringList(QLatin1String("hallo"))); - QVector vec; + QList vec; vec.push_back("Hallo"); vec.push_back("Hallo2"); std::set stdSet; diff --git a/tests/manual/shootout/tst_codesize.cpp b/tests/manual/shootout/tst_codesize.cpp index 91f3144d509..532cea2ded8 100644 --- a/tests/manual/shootout/tst_codesize.cpp +++ b/tests/manual/shootout/tst_codesize.cpp @@ -40,7 +40,7 @@ struct Suite QByteArray title; int flags; QByteArray cmd; - QVector cases; + QList cases; }; Q_DECLARE_METATYPE(Case) diff --git a/tests/unit/tests/printers/gtest-creator-printing.cpp b/tests/unit/tests/printers/gtest-creator-printing.cpp index 6d82128ab18..ad7522c9709 100644 --- a/tests/unit/tests/printers/gtest-creator-printing.cpp +++ b/tests/unit/tests/printers/gtest-creator-printing.cpp @@ -29,7 +29,7 @@ #include namespace std { -template ostream &operator<<(ostream &out, const QVector &vector) +template ostream &operator<<(ostream &out, const QList &vector) { out << "["; copy(vector.cbegin(), vector.cend(), ostream_iterator(out, ", "));