aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-29 11:41:55 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-29 12:32:56 +0200
commita80e3b21acdc942963d4c5a2b8d620cfb9cb75a2 (patch)
treeeef6d5637a4c121a8150dd03ba9218e4785c5be0
parente7228a680411ba6a6fcb7e59c6ad3c2c7143063a (diff)
Use QList instead of QVector
Task-number: QTBUG-84469 Change-Id: I808bff554878809d7921db2e2b54356f56a1c40f Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--tests/manual/x11vkbtest/testlanguagechange.cpp4
-rw-r--r--tests/manual/x11vkbtest/testreporter.cpp6
-rw-r--r--tests/manual/x11vkbtest/testreporter.h4
-rw-r--r--tests/manual/x11vkbtest/testthread.cpp2
-rw-r--r--tests/manual/x11vkbwrapper/handleatspievents.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/manual/x11vkbtest/testlanguagechange.cpp b/tests/manual/x11vkbtest/testlanguagechange.cpp
index 082c00a..4214c21 100644
--- a/tests/manual/x11vkbtest/testlanguagechange.cpp
+++ b/tests/manual/x11vkbtest/testlanguagechange.cpp
@@ -31,7 +31,7 @@
#include <QJsonObject>
#include <QLoggingCategory>
#include <QFile>
-#include <QVector>
+#include <QList>
#include <QTextStream>
#include <QDir>
#include <QElapsedTimer>
@@ -51,7 +51,7 @@ const quint32 KTime_Wait_After_Click = 180000;
const quint32 KTime_Wait_To_Start_Process = 350000;
const quint32 KTestRepeats = 10;
-const QVector< QPair< QString, quint8 > > KLanguage_List = {
+const QList<QPair<QString, quint8>> KLanguage_List = {
QPair< QString, quint8 >("العربية", 1),
QPair< QString, quint8 >("български", 1),
QPair< QString, quint8 >("čeština", 1),
diff --git a/tests/manual/x11vkbtest/testreporter.cpp b/tests/manual/x11vkbtest/testreporter.cpp
index 11e2452..49c2800 100644
--- a/tests/manual/x11vkbtest/testreporter.cpp
+++ b/tests/manual/x11vkbtest/testreporter.cpp
@@ -29,7 +29,7 @@
#include <QFile>
#include <QTextStream>
-#include <QVectorIterator>
+#include <QListIterator>
#include <QTextStream>
#include "testreporter.h"
#include "testbase.h"
@@ -56,7 +56,7 @@ void TestReporter::startMemoryReport()
}
}
-void TestReporter::printTestResultsToCSV(const QVector<TestBase *> &tests) const
+void TestReporter::printTestResultsToCSV(const QList<TestBase *> &tests) const
{
QFile file(KReport_CSV_File);
if (file.open(QIODevice::WriteOnly | QIODevice::Append)) {
@@ -115,7 +115,7 @@ void TestReporter::printMemoryResultToCSV(QString minPeakMemoryReport) const
}
}
-void TestReporter::printTestResultToConsole(const QVector<TestBase *> &tests) const
+void TestReporter::printTestResultToConsole(const QList<TestBase *> &tests) const
{
QTextStream stream(stdout);
diff --git a/tests/manual/x11vkbtest/testreporter.h b/tests/manual/x11vkbtest/testreporter.h
index 2a6d2c5..d53f754 100644
--- a/tests/manual/x11vkbtest/testreporter.h
+++ b/tests/manual/x11vkbtest/testreporter.h
@@ -42,8 +42,8 @@ public:
public:
void startMemoryReport();
- void printTestResultsToCSV(const QVector<TestBase*> &tests) const;
- void printTestResultToConsole(const QVector<TestBase *> &tests) const;
+ void printTestResultsToCSV(const QList<TestBase *> &tests) const;
+ void printTestResultToConsole(const QList<TestBase *> &tests) const;
public slots:
void printMemoryResultToCSV(const QString minPeakMemoryReport) const;
diff --git a/tests/manual/x11vkbtest/testthread.cpp b/tests/manual/x11vkbtest/testthread.cpp
index 8bf4556..c68ce2a 100644
--- a/tests/manual/x11vkbtest/testthread.cpp
+++ b/tests/manual/x11vkbtest/testthread.cpp
@@ -60,7 +60,7 @@ void TestThread::run()
QElapsedTimer testTimer;
testTimer.start();
- QVector<TestBase*> tests;
+ QList<TestBase *> tests;
TestReporter reporter;
WindowHelper windowHelper;
diff --git a/tests/manual/x11vkbwrapper/handleatspievents.h b/tests/manual/x11vkbwrapper/handleatspievents.h
index 677015f..1583782 100644
--- a/tests/manual/x11vkbwrapper/handleatspievents.h
+++ b/tests/manual/x11vkbwrapper/handleatspievents.h
@@ -31,7 +31,7 @@
#define HANDLEATSPIEVENTS_H
#include <QObject>
-#include <QVector>
+#include <QList>
#include <atspi/atspi.h>
class HandleATSPIEvents : public QObject
@@ -56,7 +56,7 @@ public slots:
private:
bool m_keyboardVisible;
- QVector<qint8> m_focuses;
+ QList<qint8> m_focuses;
};
#endif // HANDLEATSPIEVENTS_H