Use QList instead of QVector in benchmarks tests

Task-number: QTBUG-84469
Change-Id: Id61d6036067da0bcd0811b1b97df5f1334007b7e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 25 insertions, 33 deletions

diff --git a/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp b/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp
index 10c013c080..f8ca632beb 100644
--- a/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp
+++ b/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp
@@ -28,7 +28,7 @@
 
 #include <QDate>
 #include <QTest>
-#include <QVector>
+#include <QList>
 
 class tst_QDate : public QObject
 {
@@ -41,8 +41,8 @@ class tst_QDate : public QObject
         JULIAN_DAY_2020 = 2458850,
     };
 
-    static QVector<QDate> daily(qint64 start, qint64 end);
-    static QVector<QDate> yearly(qint32 first, qint32 last);
+    static QList<QDate> daily(qint64 start, qint64 end);
+    static QList<QDate> yearly(qint32 first, qint32 last);
 
 private Q_SLOTS:
     void create();
@@ -60,18 +60,18 @@ private Q_SLOTS:
     void addYears();
 };
 
-QVector<QDate> tst_QDate::daily(qint64 start, qint64 end)
+QList<QDate> tst_QDate::daily(qint64 start, qint64 end)
 {
-    QVector<QDate> list;
+    QList<QDate> list;
     list.reserve(end - start);
     for (qint64 jd = start; jd < end; ++jd)
         list.append(QDate::fromJulianDay(jd));
     return list;
 }
 
-QVector<QDate> tst_QDate::yearly(qint32 first, qint32 last)
+QList<QDate> tst_QDate::yearly(qint32 first, qint32 last)
 {
-    QVector<QDate> list;
+    QList<QDate> list;
     list.reserve(last + 1 - first);
     for (qint32 year = first; year <= last; ++year)
         list.append(QDate(year, 3, 21));
diff --git a/tests/benchmarks/corelib/time/qdatetime/main.cpp b/tests/benchmarks/corelib/time/qdatetime/main.cpp
index 740e08cc46..1d63547f8f 100644
--- a/tests/benchmarks/corelib/time/qdatetime/main.cpp
+++ b/tests/benchmarks/corelib/time/qdatetime/main.cpp
@@ -29,7 +29,7 @@
 #include <QDateTime>
 #include <QTimeZone>
 #include <QTest>
-#include <QVector>
+#include <QList>
 #include <qdebug.h>
 
 class tst_QDateTime : public QObject
@@ -50,8 +50,8 @@ class tst_QDateTime : public QObject
         JULIAN_DAY_2060 = 2473460
     };
 
-    static QVector<QDateTime> daily(qint64 start, qint64 end);
-    static QVector<QDateTime> norse(qint64 start, qint64 end);
+    static QList<QDateTime> daily(qint64 start, qint64 end);
+    static QList<QDateTime> norse(qint64 start, qint64 end);
 
 private Q_SLOTS:
     void create();
@@ -102,19 +102,19 @@ private Q_SLOTS:
     void fromMSecsSinceEpochTz();
 };
 
-QVector<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end)
+QList<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end)
 {
-    QVector<QDateTime> list;
+    QList<QDateTime> list;
     list.reserve(end - start);
     for (int jd = start; jd < end; ++jd)
         list.append(QDateTime(QDate::fromJulianDay(jd), QTime::fromMSecsSinceStartOfDay(0)));
     return list;
 }
 
-QVector<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
+QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
 {
     const QTimeZone cet("Europe/Oslo");
-    QVector<QDateTime> list;
+    QList<QDateTime> list;
     list.reserve(end - start);
     for (int jd = start; jd < end; ++jd)
         list.append(QDateTime(QDate::fromJulianDay(jd), QTime::fromMSecsSinceStartOfDay(0), cet));
diff --git a/tests/benchmarks/corelib/time/qtimezone/main.cpp b/tests/benchmarks/corelib/time/qtimezone/main.cpp
index 133e6451bc..509d62d3bb 100644
--- a/tests/benchmarks/corelib/time/qtimezone/main.cpp
+++ b/tests/benchmarks/corelib/time/qtimezone/main.cpp
@@ -51,32 +51,24 @@ private Q_SLOTS:
     void transitionsReverse();
 };
 
-static QVector<QByteArray> enoughZones()
+static QList<QByteArray> enoughZones()
 {
 #ifdef EXHAUSTIVE
     auto available = QTimeZone::availableTimeZoneIds();
-    QVector<QByteArray> result;
+    QList<QByteArray> result;
     result.reserve(available.size() + 1);
     for (conat auto &name : available)
         result << name;
 #else
-    QVector<QByteArray> result{
-        QByteArray("UTC"),
-        // Those named overtly in tst_QDateTime:
-        QByteArray("Europe/Oslo"),
-        QByteArray("America/Vancouver"),
-        QByteArray("Europe/Berlin"),
-        QByteArray("America/Sao_Paulo"),
-        QByteArray("Pacific/Auckland"),
-        QByteArray("Australia/Eucla"),
-        QByteArray("Asia/Kathmandu"),
-        QByteArray("Pacific/Kiritimati"),
-        QByteArray("Pacific/Apia"),
-        QByteArray("UTC+12:00"),
-        QByteArray("Australia/Sydney"),
-        QByteArray("Asia/Singapore"),
-        QByteArray("Australia/Brisbane")
-    };
+    QList<QByteArray> result { QByteArray("UTC"),
+                               // Those named overtly in tst_QDateTime:
+                               QByteArray("Europe/Oslo"), QByteArray("America/Vancouver"),
+                               QByteArray("Europe/Berlin"), QByteArray("America/Sao_Paulo"),
+                               QByteArray("Pacific/Auckland"), QByteArray("Australia/Eucla"),
+                               QByteArray("Asia/Kathmandu"), QByteArray("Pacific/Kiritimati"),
+                               QByteArray("Pacific/Apia"), QByteArray("UTC+12:00"),
+                               QByteArray("Australia/Sydney"), QByteArray("Asia/Singapore"),
+                               QByteArray("Australia/Brisbane") };
 #endif
     result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
     return result;