1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QList instead of QVector in testlib

Browse Source 
Task-number: QTBUG-84469
Change-Id: Icbc3c3130399296f6b5a7e9a313ad4737669de00
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Jarek Kobus 2020-06-22 12:50:08 +02:00
parent d8f814cdb7
commit 5bb3d64682
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qsignalspy.h
View File

@ -233,7 +233,7 @@ private:
// the full, normalized signal name // the full, normalized signal name
QByteArray sig; QByteArray sig;
// holds the QMetaType types for the argument list of the signal // holds the QMetaType types for the argument list of the signal
QVector<int> args; QList<int> args;
QTestEventLoop m_loop; QTestEventLoop m_loop;
bool m_waiting; bool m_waiting;

8
src/testlib/qtestcase.cpp
View File

@ -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); 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(); const int count = container.count();
if (count == 0) if (count == 0)
@ -873,7 +873,7 @@ QBenchmarkResult qMedian(const QVector<QBenchmarkResult> &container)
if (count == 1) if (count == 1)
return container.front(); return container.front();
QVector<QBenchmarkResult> containerCopy = container; QList<QBenchmarkResult> containerCopy = container;
std::sort(containerCopy.begin(), containerCopy.end()); std::sort(containerCopy.begin(), containerCopy.end());
const int middle = count / 2; const int middle = count / 2;
@ -910,7 +910,7 @@ void TestMethods::invokeTestOnData(int index) const
bool isBenchmark = false; bool isBenchmark = false;
int i = (QBenchmarkGlobalData::current->measurer->needsWarmupIteration()) ? -1 : 0; int i = (QBenchmarkGlobalData::current->measurer->needsWarmupIteration()) ? -1 : 0;
QVector<QBenchmarkResult> results; QList<QBenchmarkResult> results;
bool minimumTotalReached = false; bool minimumTotalReached = false;
do { do {
QBenchmarkTestMethodData::current->beginDataRun(); QBenchmarkTestMethodData::current->beginDataRun();
@ -1984,7 +1984,7 @@ int QTest::qExec(QObject *testObject, const QStringList &arguments)
const int argc = arguments.count(); const int argc = arguments.count();
QVarLengthArray<char *> argv(argc); QVarLengthArray<char *> argv(argc);
QVector<QByteArray> args; QList<QByteArray> args;
args.reserve(argc); args.reserve(argc);
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)

2
src/testlib/qtestlog.cpp
View File

@ -168,7 +168,7 @@ namespace QTest {
static IgnoreResultList *ignoreResultList = nullptr; static IgnoreResultList *ignoreResultList = nullptr;
static QVector<QAbstractTestLogger*> loggers; static QList<QAbstractTestLogger *> loggers;
static bool loggerUsingStdout = false; static bool loggerUsingStdout = false;
static int verbosity = 0; static int verbosity = 0;