From d1612610e650ffd7f2fbdef535c431647f57f0ac Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 23 Jun 2020 10:04:16 +0200
Subject: Use QList instead of QVector in gui tests

Task-number: QTBUG-84469
Change-Id: Ia86f39597de418dde6cd9ae3170ef919bd27416a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 .../qstandarditemmodel/tst_qstandarditemmodel.cpp  | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'tests/auto/gui/itemmodels')

diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 04a3fe7a62..038e82f539 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -138,10 +138,10 @@ private slots:
 private:
     QStandardItemModel *m_model = nullptr;
     QPersistentModelIndex persistent;
-    QVector<QModelIndex> rcParent = QVector<QModelIndex>(8);
-    QVector<int> rcFirst = QVector<int>(8, 0);
-    QVector<int> rcLast = QVector<int>(8, 0);
-    QVector<int> currentRoles;
+    QList<QModelIndex> rcParent = QList<QModelIndex>(8);
+    QList<int> rcFirst = QList<int>(8, 0);
+    QList<int> rcLast = QList<int>(8, 0);
+    QList<int> currentRoles;
 
     //return true if models have the same structure, and all child have the same text
     static bool compareModels(QStandardItemModel *model1, QStandardItemModel *model2);
@@ -193,11 +193,10 @@ void tst_QStandardItemModel::init()
     connect(m_model, &QStandardItemModel::columnsRemoved,
             this, &tst_QStandardItemModel::columnsRemoved);
 
-    connect(m_model, &QAbstractItemModel::dataChanged,
-            this, [this](const QModelIndex &, const QModelIndex &, const QVector<int> &roles)
-    {
-        currentRoles = roles;
-    });
+    connect(m_model, &QAbstractItemModel::dataChanged, this,
+            [this](const QModelIndex &, const QModelIndex &, const QList<int> &roles) {
+                currentRoles = roles;
+            });
 
     rcFirst.fill(-1);
     rcLast.fill(-1);
@@ -723,17 +722,17 @@ void tst_QStandardItemModel::data()
     currentRoles.clear();
     // bad args
     m_model->setData(QModelIndex(), "bla", Qt::DisplayRole);
-    QCOMPARE(currentRoles, QVector<int>{});
+    QCOMPARE(currentRoles, QList<int> {});
 
     QIcon icon;
     for (int r = 0; r < m_model->rowCount(); ++r) {
         for (int c = 0; c < m_model->columnCount(); ++c) {
             m_model->setData(m_model->index(r,c), "initialitem", Qt::DisplayRole);
-            QCOMPARE(currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole}));
+            QCOMPARE(currentRoles, QList<int>({ Qt::DisplayRole, Qt::EditRole }));
             m_model->setData(m_model->index(r,c), "tooltip", Qt::ToolTipRole);
-            QCOMPARE(currentRoles, QVector<int>{Qt::ToolTipRole});
+            QCOMPARE(currentRoles, QList<int> { Qt::ToolTipRole });
             m_model->setData(m_model->index(r,c), icon, Qt::DecorationRole);
-            QCOMPARE(currentRoles, QVector<int>{Qt::DecorationRole});
+            QCOMPARE(currentRoles, QList<int> { Qt::DecorationRole });
         }
     }
 
@@ -750,7 +749,7 @@ void tst_QStandardItemModel::clearItemData()
 {
     currentRoles.clear();
     QVERIFY(!m_model->clearItemData(QModelIndex()));
-    QCOMPARE(currentRoles, QVector<int>{});
+    QCOMPARE(currentRoles, QList<int> {});
     const QModelIndex idx = m_model->index(0, 0);
     const QMap<int, QVariant> oldData = m_model->itemData(idx);
     m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole);
@@ -762,7 +761,7 @@ void tst_QStandardItemModel::clearItemData()
     QCOMPARE(idx.data(Qt::ToolTipRole), QVariant());
     QCOMPARE(idx.data(Qt::DisplayRole), QVariant());
     QCOMPARE(idx.data(Qt::EditRole), QVariant());
-    QCOMPARE(currentRoles, QVector<int>{});
+    QCOMPARE(currentRoles, QList<int> {});
     m_model->setItemData(idx, oldData);
     currentRoles.clear();
 }
@@ -1561,8 +1560,8 @@ void tst_QStandardItemModel::removeRowsAndColumns()
         for (int r = 0; r < row_list.count(); r++) \
             QCOMPARE(model.item(r,c)->text() , row_list[r] + QLatin1Char('x') + col_list[c]);
 
-    QVector<QString> row_list = QString("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20").split(',').toVector();
-    QVector<QString> col_list = row_list;
+    QStringList row_list = QString("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20").split(',');
+    QStringList col_list = row_list;
     QStandardItemModel model;
     for (int c = 0; c < col_list.count(); c++)
         for (int r = 0; r < row_list.count(); r++)
@@ -1608,8 +1607,8 @@ void tst_QStandardItemModel::defaultItemRoles()
 
 void tst_QStandardItemModel::itemRoleNames()
 {
-    QVector<QString> row_list = QString("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20").split(',').toVector();
-    QVector<QString> col_list = row_list;
+    QStringList row_list = QString("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20").split(',');
+    QStringList col_list = row_list;
     QStandardItemModel model;
     for (int c = 0; c < col_list.count(); c++)
         for (int r = 0; r < row_list.count(); r++)
-- 
cgit v1.2.3