From 989fca660c3556fa957ed9a3f7cd3b948a4166a2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 16:15:23 +0200
Subject: Use QList instead of QVector in corelib tests

Task-number: QTBUG-84469
Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../qabstractitemmodel/tst_qabstractitemmodel.cpp  | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp')

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 20255b996e..bf4f33fbd1 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -122,7 +122,7 @@ class QtTestModel: public QAbstractItemModel
 {
 public:
     QtTestModel(int rows, int columns, QObject *parent = 0);
-    QtTestModel(const QVector<QVector<QString> > tbl, QObject *parent = 0);
+    QtTestModel(const QList<QList<QString> > tbl, QObject *parent = 0);
     QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     QModelIndex parent(const QModelIndex &) const;
     int rowCount(const QModelIndex &parent) const;
@@ -146,7 +146,7 @@ public:
 
     int cCount, rCount;
     mutable bool wrongIndex;
-    QVector<QVector<QString> > table;
+    QList<QList<QString> > table;
 };
 
 Q_DECLARE_METATYPE(QAbstractItemModel::LayoutChangeHint);
@@ -163,7 +163,7 @@ QtTestModel::QtTestModel(int rows, int columns, QObject *parent)
     }
 }
 
-QtTestModel::QtTestModel(const QVector<QVector<QString> > tbl, QObject *parent)
+QtTestModel::QtTestModel(const QList<QList<QString> > tbl, QObject *parent)
     : QAbstractItemModel(parent), wrongIndex(false)
 {
     table = tbl;
@@ -201,7 +201,7 @@ bool QtTestModel::insertRows(int row, int count, const QModelIndex &parent)
 {
     QAbstractItemModel::beginInsertRows(parent, row, row + count - 1);
     int cc = columnCount(parent);
-    table.insert(row, count, QVector<QString>(cc));
+    table.insert(row, count, QList<QString>(cc));
     rCount = table.count();
     QAbstractItemModel::endInsertRows();
     return true;
@@ -256,7 +256,7 @@ bool QtTestModel::moveRows(const QModelIndex &sourceParent, int src, int cnt,
                                            destinationParent, dst))
         return false;
 
-    QVector<QString> buf;
+    QList<QString> buf;
     if (dst < src) {
         for (int i  = 0; i < cnt; ++i) {
             buf.swap(table[src + i]);
@@ -489,9 +489,9 @@ void tst_QAbstractItemModel::match()
 }
 
 typedef QPair<int, int> Position;
-typedef QVector<QPair<int, int> > Selection;
-typedef QVector<QVector<QString> > StringTable;
-typedef QVector<QString> StringTableRow;
+typedef QList<QPair<int, int> > Selection;
+typedef QList<QList<QString> > StringTable;
+typedef QList<QString> StringTableRow;
 
 static StringTableRow qStringTableRow(const QString &s1, const QString &s2, const QString &s3)
 {
@@ -1940,8 +1940,8 @@ public:
         const QModelIndex bottom = index(2, 0);
 
         emit dataChanged(top, bottom);
-        emit dataChanged(top, bottom, QVector<int>() << Qt::ToolTipRole);
-        emit dataChanged(top, bottom, QVector<int>() << Qt::ToolTipRole << Custom1);
+        emit dataChanged(top, bottom, QList<int>() << Qt::ToolTipRole);
+        emit dataChanged(top, bottom, QList<int>() << Qt::ToolTipRole << Custom1);
     }
 };
 
@@ -1963,8 +1963,8 @@ void tst_QAbstractItemModel::testDataChanged()
     const QVariantList secondEmission = withRoles.at(1);
     const QVariantList thirdEmission = withRoles.at(2);
 
-    const QVector<int> secondRoles = secondEmission.at(2).value<QVector<int> >();
-    const QVector<int> thirdRoles = thirdEmission.at(2).value<QVector<int> >();
+    const QList<int> secondRoles = secondEmission.at(2).value<QList<int> >();
+    const QList<int> thirdRoles = thirdEmission.at(2).value<QList<int> >();
 
     QCOMPARE(secondRoles.size(), 1);
     QVERIFY(secondRoles.contains(Qt::ToolTipRole));
-- 
cgit v1.2.3