Use QList instead of QVector in widgets tests

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

3 files changed, 15 insertions, 19 deletions

diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp
index e2dc7006b3..2479fa07a7 100644
--- a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp
+++ b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp
@@ -33,7 +33,7 @@
 #include <QtWidgets/QGestureEvent>
 #include <QtGui/QScreen>
 #include <QtGui/QPointingDevice>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QString>
 #include <QtCore/QHash>
 #include <QtCore/QDebug>
@@ -73,7 +73,7 @@ void tst_QGestureRecognizer::initTestCase()
 
 #ifndef QT_NO_GESTURES
 
-typedef QVector<Qt::GestureType> GestureTypeVector;
+typedef QList<Qt::GestureType> GestureTypeVector;
 
 class TestWidget : public QWidget
 {
@@ -126,8 +126,7 @@ bool TestWidget::event(QEvent * event)
     return QWidget::event(event);
 }
 
-static void pressSequence(QTest::QTouchEventSequence &sequence,
-                          QVector<QPoint> &points,
+static void pressSequence(QTest::QTouchEventSequence &sequence, QList<QPoint> &points,
                           QWidget *widget)
 {
     const int pointCount = points.size();
@@ -136,10 +135,8 @@ static void pressSequence(QTest::QTouchEventSequence &sequence,
     sequence.commit();
 }
 
-static void linearSequence(int n, const QPoint &delta,
-                           QTest::QTouchEventSequence &sequence,
-                           QVector<QPoint> &points,
-                           QWidget *widget)
+static void linearSequence(int n, const QPoint &delta, QTest::QTouchEventSequence &sequence,
+                           QList<QPoint> &points, QWidget *widget)
 {
     const int pointCount = points.size();
     for (int s = 0; s < n; ++s) {
@@ -151,8 +148,7 @@ static void linearSequence(int n, const QPoint &delta,
     }
 }
 
-static void releaseSequence(QTest::QTouchEventSequence &sequence,
-                            QVector<QPoint> &points,
+static void releaseSequence(QTest::QTouchEventSequence &sequence, QList<QPoint> &points,
                             QWidget *widget)
 {
     const int pointCount = points.size();
@@ -188,7 +184,7 @@ void tst_QGestureRecognizer::panGesture()
     widget.show();
     QVERIFY(QTest::qWaitForWindowExposed(&widget));
 
-    QVector<QPoint> points;
+    QList<QPoint> points;
     for (int i = 0; i < panPoints; ++i)
         points.append(QPoint(10 + i *20, 10 + i *20));
 
@@ -231,7 +227,7 @@ void tst_QGestureRecognizer::pinchGesture()
     widget.show();
     QVERIFY(QTest::qWaitForWindowExposed(&widget));
 
-    QVector<QPoint> points;
+    QList<QPoint> points;
     points.append(widget.rect().center());
     points.append(points.front() + QPoint(0, 20));
 
@@ -288,7 +284,7 @@ void tst_QGestureRecognizer::swipeGesture()
 
     // Start a swipe sequence with 2 points (QTBUG-15768)
     const QPoint fingerDistance(m_fingerDistance, m_fingerDistance);
-    QVector<QPoint> points;
+    QList<QPoint> points;
     for (int i = 0; i < swipePoints - 1; ++i)
         points.append(fingerDistance + i * fingerDistance);
 
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 55116fe8c0..e5e0a48503 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -140,7 +140,7 @@ void tst_QLayout::geometry()
 
 void tst_QLayout::smartMaxSize()
 {
-    QVector<int> expectedWidths;
+    QList<int> expectedWidths;
 
     QFile f(QFINDTESTDATA("baseline/smartmaxsize"));
 
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 5aefc0f7f6..4b6703e07e 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -2095,9 +2095,9 @@ void tst_QWidget::tabOrderWithCompoundWidgets()
     QVERIFY(lastEdit->hasFocus());
 }
 
-static QVector<QWidget*> getFocusChain(QWidget *start, bool bForward)
+static QList<QWidget *> getFocusChain(QWidget *start, bool bForward)
 {
-    QVector<QWidget*> ret;
+    QList<QWidget *> ret;
     QWidget *cur = start;
     do {
         ret += cur;
@@ -5130,14 +5130,14 @@ void tst_QWidget::qobject_castInDestroyedSlot()
 // Since X11 WindowManager operations are all async, and we have no way to know if the window
 // manager has finished playing with the window geometry, this test can't be reliable on X11.
 
-using Rects = QVector<QRect>;
+using Rects = QList<QRect>;
 
 void tst_QWidget::setWindowGeometry_data()
 {
     QTest::addColumn<Rects>("rects");
     QTest::addColumn<int>("windowFlags");
 
-    QVector<Rects> rects;
+    QList<Rects> rects;
     const int width = m_testWidgetSize.width();
     const int height = m_testWidgetSize.height();
     const QRect availableAdjusted = QGuiApplication::primaryScreen()->availableGeometry().adjusted(100, 100, -100, -100);
@@ -8344,7 +8344,7 @@ void tst_QWidget::alienWidgets()
     }
 }
 
-using WidgetAttributes = QVector<Qt::WidgetAttribute>;
+using WidgetAttributes = QList<Qt::WidgetAttribute>;
 
 void tst_QWidget::nativeWindowPosition_data()
 {