Use QList instead of QVector in corelib tests

Task-number: QTBUG-84469
Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

5 files changed, 37 insertions, 37 deletions

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));
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 149d272594..95743ddb9e 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -50,7 +50,7 @@ public:
     void changeData()
     {
         const QModelIndex idx = index(0, 0, QModelIndex());
-        Q_EMIT dataChanged(idx, idx, QVector<int>() << 1);
+        Q_EMIT dataChanged(idx, idx, QList<int>() << 1);
     }
 };
 
@@ -94,7 +94,7 @@ tst_QIdentityProxyModel::tst_QIdentityProxyModel()
 
 void tst_QIdentityProxyModel::initTestCase()
 {
-    qRegisterMetaType<QVector<int> >();
+    qRegisterMetaType<QList<int> >();
     m_model = new QStandardItemModel(0, 1);
     m_proxy = new QIdentityProxyModel();
     m_modelTest = new QAbstractItemModelTester(m_proxy, this);
@@ -389,7 +389,7 @@ void tst_QIdentityProxyModel::dataChanged()
 
     model.changeData();
 
-    QCOMPARE(modelSpy.first().at(2).value<QVector<int> >(), QVector<int>() << 1);
+    QCOMPARE(modelSpy.first().at(2).value<QList<int> >(), QList<int>() << 1);
     QCOMPARE(modelSpy.first().at(2), proxySpy.first().at(2));
 
     verifyIdentity(&model);
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 2d8813050b..66a9e85dff 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -41,8 +41,8 @@
 Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
 
 using IntPair = QPair<int, int>;
-using IntList = QVector<int>;
-using IntPairList = QVector<IntPair>;
+using IntList = QList<int>;
+using IntPairList = QList<IntPair>;
 
 // Testing get/set functions
 void tst_QSortFilterProxyModel::getSetCheck()
@@ -1462,8 +1462,8 @@ void tst_QSortFilterProxyModel::changeSourceLayout()
     QSortFilterProxyModel proxy;
     proxy.setSourceModel(&model);
 
-    QVector<QPersistentModelIndex> persistentSourceIndexes;
-    QVector<QPersistentModelIndex> persistentProxyIndexes;
+    QList<QPersistentModelIndex> persistentSourceIndexes;
+    QList<QPersistentModelIndex> persistentProxyIndexes;
     for (int row = 0; row < model.rowCount(); ++row) {
         persistentSourceIndexes.append(model.index(row, 0));
         persistentProxyIndexes.append(proxy.index(row, 0));
@@ -2146,7 +2146,7 @@ void tst_QSortFilterProxyModel::changeSourceDataForwardsRoles_qtbug35440()
 
     // QStringListModel doesn't distinguish between edit and display roles,
     // so changing one always changes the other, too.
-    QVector<int> expectedChangedRoles;
+    QList<int> expectedChangedRoles;
     expectedChangedRoles.append(Qt::DisplayRole);
     expectedChangedRoles.append(Qt::EditRole);
 
@@ -2154,13 +2154,13 @@ void tst_QSortFilterProxyModel::changeSourceDataForwardsRoles_qtbug35440()
     QVERIFY(index.isValid());
     model.setData(index, QStringLiteral("teststring"), Qt::DisplayRole);
     QCOMPARE(spy.length(), 1);
-    QCOMPARE(spy.at(0).at(2).value<QVector<int> >(), expectedChangedRoles);
+    QCOMPARE(spy.at(0).at(2).value<QList<int> >(), expectedChangedRoles);
 
     index = model.index(1, 0);
     QVERIFY(index.isValid());
     model.setData(index, QStringLiteral("teststring2"), Qt::EditRole);
     QCOMPARE(spy.length(), 2);
-    QCOMPARE(spy.at(1).at(2).value<QVector<int> >(), expectedChangedRoles);
+    QCOMPARE(spy.at(1).at(2).value<QList<int> >(), expectedChangedRoles);
 }
 
 void tst_QSortFilterProxyModel::sortFilterRole()
@@ -2170,12 +2170,12 @@ void tst_QSortFilterProxyModel::sortFilterRole()
     proxy.setSourceModel(&model);
     model.insertColumns(0, 1);
 
-    const QVector<QPair<QVariant, QVariant>>
+    const QList<QPair<QVariant, QVariant>>
         sourceItems({QPair<QVariant, QVariant>("b", 3),
                      QPair<QVariant, QVariant>("c", 2),
                      QPair<QVariant, QVariant>("a", 1)});
 
-    const QVector<int> orderedItems({2, 1});
+    const QList<int> orderedItems({2, 1});
 
     model.insertRows(0, sourceItems.count());
     for (int i = 0; i < sourceItems.count(); ++i) {
@@ -4947,7 +4947,7 @@ public:
             return QVariant();
         return m_data[index.row()][index.column()];
     }
-    QVector<QVector<QVariant>> m_data;
+    QList<QList<QVariant>> m_data;
 };
 
 class SortFilterProxyModel final : public QSortFilterProxyModel
diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
index 7182553f27..5585587717 100644
--- a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -340,7 +340,7 @@ void tst_QStringListModel::setData_emits_both_roles()
     QFETCH(int, role);
 
     QStringListModel model(QStringList() << "one" << "two");
-    QVector<int> expected;
+    QList<int> expected;
     expected.reserve(2);
     expected.append(Qt::DisplayRole);
     expected.append(Qt::EditRole);
@@ -349,7 +349,7 @@ void tst_QStringListModel::setData_emits_both_roles()
     QVERIFY(spy.isValid());
     model.setData(model.index(row, 0), data, role);
     QCOMPARE(spy.size(), 1);
-    QCOMPARE(sorted(spy.at(0).at(2).value<QVector<int> >()),
+    QCOMPARE(sorted(spy.at(0).at(2).value<QList<int> >()),
              expected);
 }
 
@@ -380,7 +380,7 @@ void tst_QStringListModel::setItemData()
     }};
     QSignalSpy dataChangedSpy(&testModel, &QAbstractItemModel::dataChanged);
     QModelIndex changeIndex = testModel.index(1, 0);
-    const QVector<int> changeRoles{Qt::DisplayRole, Qt::EditRole};
+    const QList<int> changeRoles{Qt::DisplayRole, Qt::EditRole};
     const QString changedString("Changed");
     QMap<int, QVariant> newItemData{std::make_pair<int>(Qt::DisplayRole, changedString)};
     // invalid index does nothing and returns false
@@ -393,7 +393,7 @@ void tst_QStringListModel::setItemData()
     QVariantList dataChangedArguments = dataChangedSpy.takeFirst();
     QCOMPARE(dataChangedArguments.at(0).value<QModelIndex>(), changeIndex);
     QCOMPARE(dataChangedArguments.at(1).value<QModelIndex>(), changeIndex);
-    QCOMPARE(dataChangedArguments.at(2).value<QVector<int> >(), changeRoles);
+    QCOMPARE(dataChangedArguments.at(2).value<QList<int> >(), changeRoles);
     // Unsupported roles do nothing return false
     newItemData.clear();
     newItemData.insert(Qt::UserRole, changedString);
@@ -418,7 +418,7 @@ void tst_QStringListModel::setItemData()
     dataChangedArguments = dataChangedSpy.takeFirst();
     QCOMPARE(dataChangedArguments.at(0).value<QModelIndex>(), changeIndex);
     QCOMPARE(dataChangedArguments.at(1).value<QModelIndex>(), changeIndex);
-    QCOMPARE(dataChangedArguments.at(2).value<QVector<int> >(), changeRoles);
+    QCOMPARE(dataChangedArguments.at(2).value<QList<int> >(), changeRoles);
 }
 
 void tst_QStringListModel::setData_emits_on_change_only()
@@ -433,8 +433,8 @@ void tst_QStringListModel::setData_emits_on_change_only()
     const QList<QVariant> spyList = dataChangedSpy.takeFirst();
     QCOMPARE(spyList.at(0).value<QModelIndex>(), modelIdx);
     QCOMPARE(spyList.at(1).value<QModelIndex>(), modelIdx);
-    const QVector<int> expectedRoles{Qt::DisplayRole, Qt::EditRole};
-    QCOMPARE(spyList.at(2).value<QVector<int> >(), expectedRoles);
+    const QList<int> expectedRoles{Qt::DisplayRole, Qt::EditRole};
+    QCOMPARE(spyList.at(2).value<QList<int> >(), expectedRoles);
     QVERIFY(model.setData(modelIdx, newStringData));
     QVERIFY(dataChangedSpy.isEmpty());
 }
diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp b/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp
index a30ac46571..ea44980657 100644
--- a/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp
@@ -769,15 +769,15 @@ void tst_QTransposeProxyModel::setItemData()
     auto signalData = proxyDataChangeSpy.takeFirst();
     QCOMPARE(signalData.at(0).value<QModelIndex>(), idx);
     QCOMPARE(signalData.at(1).value<QModelIndex>(), idx);
-    const QVector<int> expectedRoles{Qt::DisplayRole, Qt::UserRole, Qt::EditRole, Qt::UserRole + 1};
-    QVector<int> receivedRoles = signalData.at(2).value<QVector<int> >();
+    const QList<int> expectedRoles{Qt::DisplayRole, Qt::UserRole, Qt::EditRole, Qt::UserRole + 1};
+    QList<int> receivedRoles = signalData.at(2).value<QList<int> >();
     QCOMPARE(receivedRoles.size(), expectedRoles.size());
     for (int role : expectedRoles)
         QVERIFY(receivedRoles.contains(role));
     signalData = sourceDataChangeSpy.takeFirst();
     QCOMPARE(signalData.at(0).value<QModelIndex>(), proxy.mapToSource(idx));
     QCOMPARE(signalData.at(1).value<QModelIndex>(), proxy.mapToSource(idx));
-    receivedRoles = signalData.at(2).value<QVector<int> >();
+    receivedRoles = signalData.at(2).value<QList<int> >();
     QCOMPARE(receivedRoles.size(), expectedRoles.size());
     for (int role : expectedRoles)
         QVERIFY(receivedRoles.contains(role));
@@ -793,14 +793,14 @@ void tst_QTransposeProxyModel::setItemData()
     signalData = proxyDataChangeSpy.takeFirst();
     QCOMPARE(signalData.at(0).value<QModelIndex>(), idx);
     QCOMPARE(signalData.at(1).value<QModelIndex>(), idx);
-    receivedRoles = signalData.at(2).value<QVector<int> >();
+    receivedRoles = signalData.at(2).value<QList<int> >();
     QCOMPARE(receivedRoles.size(), expectedRoles.size());
     for (int role : expectedRoles)
         QVERIFY(receivedRoles.contains(role));
     signalData = sourceDataChangeSpy.takeFirst();
     QCOMPARE(signalData.at(0).value<QModelIndex>(), proxy.mapToSource(idx));
     QCOMPARE(signalData.at(1).value<QModelIndex>(), proxy.mapToSource(idx));
-    receivedRoles = signalData.at(2).value<QVector<int> >();
+    receivedRoles = signalData.at(2).value<QList<int> >();
     QCOMPARE(receivedRoles.size(), expectedRoles.size());
     for (int role : expectedRoles)
         QVERIFY(receivedRoles.contains(role));