From 2a6cdec718934ca2cc7f6f9c616ebe62f6912123 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 22 Jun 2020 14:52:01 +0200
Subject: Use QList instead of QVector in widgets

Task-number: QTBUG-84469
Change-Id: I3007734f8e4f164ece9dd8850ef007cbef9e12ef
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
---
 src/widgets/itemviews/qtreewidget.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/widgets/itemviews/qtreewidget.cpp')

diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 5bcd6c8b3a..a186a243fd 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -407,7 +407,7 @@ bool QTreeModel::clearItemData(const QModelIndex &index)
     }
     itm->d->display[index.column()] = QVariant();
     itm->values[index.column()].clear();
-    emit dataChanged(index, index, QVector<int>{});
+    emit dataChanged(index, index, QList<int> {});
     return true;
 }
 
@@ -491,7 +491,7 @@ bool QTreeModel::insertColumns(int column, int count, const QModelIndex &parent)
             QTreeWidgetItem *child = children.at(row);
             if (child->children.count())
                 itemstack.push(child);
-            child->values.insert(column, count, QVector<QWidgetItemData>());
+            child->values.insert(column, count, QList<QWidgetItemData>());
         }
     }
 
@@ -622,7 +622,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order,
     QList<QTreeWidgetItem*> lst = itm->children;
 
     int count = end - start + 1;
-    QVector < QPair<QTreeWidgetItem*,int> > sorting(count);
+    QList<QPair<QTreeWidgetItem *, int>> sorting(count);
     for (int i = 0; i < count; ++i) {
         sorting[i].first = lst.at(start + i);
         sorting[i].second = start + i;
@@ -798,7 +798,7 @@ bool QTreeModel::isChanging() const
     if column is -1 then all columns have changed
 */
 
-void QTreeModel::emitDataChanged(QTreeWidgetItem *item, int column, const QVector<int> &roles)
+void QTreeModel::emitDataChanged(QTreeWidgetItem *item, int column, const QList<int> &roles)
 {
     if (signalsBlocked())
         return;
@@ -864,7 +864,7 @@ void QTreeModel::sortItems(QList<QTreeWidgetItem*> *items, int column, Qt::SortO
         return;
 
     // store the original order of indexes
-    QVector< QPair<QTreeWidgetItem*,int> > sorting(items->count());
+    QList<QPair<QTreeWidgetItem *, int>> sorting(items->count());
     for (int i = 0; i < sorting.count(); ++i) {
         sorting[i].first = items->at(i);
         sorting[i].second = i;
@@ -1836,7 +1836,7 @@ void QTreeWidgetItem::setData(int column, int role, const QVariant &value)
     default:
         if (column < values.count()) {
             bool found = false;
-            const QVector<QWidgetItemData> column_values = values.at(column);
+            const QList<QWidgetItemData> column_values = values.at(column);
             for (int i = 0; i < column_values.count(); ++i) {
                 if (column_values.at(i).role == role) {
                     if (column_values.at(i).value == value)
@@ -1858,9 +1858,9 @@ void QTreeWidgetItem::setData(int column, int role, const QVariant &value)
     }
 
     if (model) {
-        const QVector<int> roles((role == Qt::DisplayRole || role == Qt::EditRole) ?
-                                     QVector<int>({Qt::DisplayRole, Qt::EditRole}) :
-                                     QVector<int>({role}));
+        const QList<int> roles((role == Qt::DisplayRole || role == Qt::EditRole)
+                                       ? QList<int>({ Qt::DisplayRole, Qt::EditRole })
+                                       : QList<int>({ role }));
         model->emitDataChanged(this, column, roles);
         if (role == Qt::CheckStateRole) {
             QTreeWidgetItem *p;
@@ -1888,7 +1888,7 @@ QVariant QTreeWidgetItem::data(int column, int role) const
         Q_FALLTHROUGH();
    default:
         if (column >= 0 && column < values.size()) {
-            const QVector<QWidgetItemData> &column_values = values.at(column);
+            const QList<QWidgetItemData> &column_values = values.at(column);
             for (const auto &column_value : column_values) {
                 if (column_value.role == role)
                     return column_value.value;
-- 
cgit v1.2.3