diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 12:50:08 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:30:54 +0200 |
| commit | 5bb3d64682cea8698a0229d10620e0861d461431 (patch) | |
| tree | 885b9ba71ce5522c9d8654e629024a4c2f76243e /src/testlib | |
| parent | d8f814cdb7c56902665f95c3890c6ceaf069f0c2 (diff) | |
Use QList instead of QVector in testlib
Task-number: QTBUG-84469
Change-Id: Icbc3c3130399296f6b5a7e9a313ad4737669de00
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qsignalspy.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 8 | ||||
| -rw-r--r-- | src/testlib/qtestlog.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index dc0c58044f..a91e3032c8 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -233,7 +233,7 @@ private: // the full, normalized signal name QByteArray sig; // holds the QMetaType types for the argument list of the signal - QVector<int> args; + QList<int> args; QTestEventLoop m_loop; bool m_waiting; diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 57beed3c7c..002709a736 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -864,7 +864,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) { qtest_qParseArgs(argc, const_cast<const char *const *>(argv), qml); } -QBenchmarkResult qMedian(const QVector<QBenchmarkResult> &container) +QBenchmarkResult qMedian(const QList<QBenchmarkResult> &container) { const int count = container.count(); if (count == 0) @@ -873,7 +873,7 @@ QBenchmarkResult qMedian(const QVector<QBenchmarkResult> &container) if (count == 1) return container.front(); - QVector<QBenchmarkResult> containerCopy = container; + QList<QBenchmarkResult> containerCopy = container; std::sort(containerCopy.begin(), containerCopy.end()); const int middle = count / 2; @@ -910,7 +910,7 @@ void TestMethods::invokeTestOnData(int index) const bool isBenchmark = false; int i = (QBenchmarkGlobalData::current->measurer->needsWarmupIteration()) ? -1 : 0; - QVector<QBenchmarkResult> results; + QList<QBenchmarkResult> results; bool minimumTotalReached = false; do { QBenchmarkTestMethodData::current->beginDataRun(); @@ -1984,7 +1984,7 @@ int QTest::qExec(QObject *testObject, const QStringList &arguments) const int argc = arguments.count(); QVarLengthArray<char *> argv(argc); - QVector<QByteArray> args; + QList<QByteArray> args; args.reserve(argc); for (int i = 0; i < argc; ++i) diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index f831b51a53..51dbc89963 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -168,7 +168,7 @@ namespace QTest { static IgnoreResultList *ignoreResultList = nullptr; - static QVector<QAbstractTestLogger*> loggers; + static QList<QAbstractTestLogger *> loggers; static bool loggerUsingStdout = false; static int verbosity = 0; |