diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
10 files changed, 131 insertions, 144 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 42cbad14c0..99f82f92b2 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(Qt::ItemFlags); using namespace QTestPrivate; -using IntList = QVector<int>; +using IntList = QList<int>; // Move cursor out of widget area to avoid undesired interaction on Mac. static inline void moveCursorAway(const QWidget *topLevel) @@ -305,7 +305,7 @@ void tst_QAbstractItemView::emptyModels_data() { QTest::addColumn<QByteArray>("viewType"); - const QVector<QByteArray> widgets{ "QListView", "QTreeView", "QTableView", "QHeaderView" }; + const QList<QByteArray> widgets { "QListView", "QTreeView", "QTableView", "QHeaderView" }; for (const QByteArray &widget : widgets) QTest::newRow(widget) << widget; } @@ -1059,7 +1059,7 @@ void tst_QAbstractItemView::setCurrentIndex_data() QTest::addColumn<Qt::ItemFlags>("itemFlags"); QTest::addColumn<bool>("result"); - const QVector<QByteArray> widgets{ "QListView", "QTreeView", "QTableView", "QHeaderView" }; + const QList<QByteArray> widgets { "QListView", "QTreeView", "QTableView", "QHeaderView" }; for (const QByteArray &widget : widgets) { QTest::newRow(widget + ": no flags") << widget << Qt::ItemFlags(Qt::NoItemFlags) << false; @@ -1117,49 +1117,45 @@ void tst_QAbstractItemView::checkIntersectedRect_data() return model; }; QTest::addColumn<QStandardItemModel *>("model"); - QTest::addColumn<QVector<QModelIndex>>("changedIndexes"); + QTest::addColumn<QList<QModelIndex>>("changedIndexes"); QTest::addColumn<bool>("isEmpty"); { auto model = createModel(5); - QTest::newRow("multiple columns") << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(0, 1)}) - << false; + QTest::newRow("multiple columns") + << model << QList<QModelIndex>({ model->index(0, 0), model->index(0, 1) }) << false; } { auto model = createModel(5); - QTest::newRow("multiple rows") << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(1, 0), - model->index(2, 0)}) - << false; + QTest::newRow("multiple rows") + << model + << QList<QModelIndex>( + { model->index(0, 0), model->index(1, 0), model->index(2, 0) }) + << false; } { auto model = createModel(5); - QTest::newRow("hidden rows") << model - << QVector<QModelIndex>({model->index(3, 0), - model->index(4, 0)}) - << true; + QTest::newRow("hidden rows") + << model << QList<QModelIndex>({ model->index(3, 0), model->index(4, 0) }) << true; } { auto model = createModel(500); - QTest::newRow("rows outside viewport") << model - << QVector<QModelIndex>({model->index(498, 0), - model->index(499, 0)}) - << true; + QTest::newRow("rows outside viewport") + << model << QList<QModelIndex>({ model->index(498, 0), model->index(499, 0) }) + << true; } } void tst_QAbstractItemView::checkIntersectedRect() { QFETCH(QStandardItemModel *, model); - QFETCH(const QVector<QModelIndex>, changedIndexes); + QFETCH(const QList<QModelIndex>, changedIndexes); QFETCH(bool, isEmpty); class TableView : public QTableView { public: - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override { QTableView::dataChanged(topLeft, bottomRight, roles); // we want to check the base class implementation here! @@ -2337,7 +2333,7 @@ void tst_QAbstractItemView::inputMethodEnabled_data() QTest::addColumn<Qt::ItemFlags>("itemFlags"); QTest::addColumn<bool>("result"); - const QVector<QByteArray> widgets{ "QListView", "QTreeView", "QTableView" }; + const QList<QByteArray> widgets { "QListView", "QTreeView", "QTableView" }; for (const QByteArray &widget : widgets) { QTest::newRow(widget + ": no flags") << widget << Qt::ItemFlags(Qt::NoItemFlags) << false; @@ -2434,7 +2430,7 @@ void tst_QAbstractItemView::currentFollowsIndexWidget_data() { QTest::addColumn<QByteArray>("viewType"); - const QVector<QByteArray> widgets{ "QListView", "QTreeView", "QTableView" }; + const QList<QByteArray> widgets { "QListView", "QTreeView", "QTableView" }; for (const QByteArray &widget : widgets) QTest::newRow(widget) << widget; } diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index cca791fe5a..6dd39d5d2a 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -134,7 +134,7 @@ public: friend class tst_QColumnView; - QVector<QPointer<QAbstractItemView>> createdColumns; + QList<QPointer<QAbstractItemView>> createdColumns; protected: QAbstractItemView *createColumn(const QModelIndex &index) override diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index afb1b18af0..3da8e344bd 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -38,9 +38,9 @@ #include <QTreeWidget> #include <QtWidgets/private/qheaderview_p.h> -using BoolList = QVector<bool>; -using IntList = QVector<int>; -using ResizeVec = QVector<QHeaderView::ResizeMode>; +using BoolList = QList<bool>; +using IntList = QList<int>; +using ResizeVec = QList<QHeaderView::ResizeMode>; class TestStyle : public QProxyStyle { diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp index 93da040af6..244998eb1c 100644 --- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp +++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp @@ -569,8 +569,10 @@ void walkIndex(const QModelIndex &index, const QAbstractItemView *view) if (width == 0 || height == 0) return; - const auto widths = (width < 2) ? QVector<int>({ 0, 1 }) : QVector<int>({ 0, 1, width / 2, width - 2, width - 1 }); - const auto heights = (height < 2) ? QVector<int>({ 0, 1 }) : QVector<int>({ 0, 1, height / 2, height - 2, height - 1 }); + const auto widths = (width < 2) ? QList<int>({ 0, 1 }) + : QList<int>({ 0, 1, width / 2, width - 2, width - 1 }); + const auto heights = (height < 2) ? QList<int>({ 0, 1 }) + : QList<int>({ 0, 1, height / 2, height - 2, height - 1 }); for (int w : widths) { for (int h : heights) diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 79ce1e970e..f5fcc35084 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -62,7 +62,7 @@ static inline HWND getHWNDForWidget(const QWidget *widget) Q_DECLARE_METATYPE(QAbstractItemView::ScrollMode) Q_DECLARE_METATYPE(QMargins) Q_DECLARE_METATYPE(QSize) -using IntList = QVector<int>; +using IntList = QList<int>; static QStringList generateList(const QString &prefix, int size) { diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 4a3c886430..48b0cb8d6b 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -35,7 +35,7 @@ #include <QTest> #include <private/qlistwidget_p.h> -using IntList = QVector<int>; +using IntList = QList<int>; class tst_QListWidget : public QObject { @@ -154,9 +154,9 @@ protected slots: private: QListWidget *testWidget = nullptr; - QVector<QModelIndex> rcParent{8}; - QVector<int> rcFirst = QVector<int>(8, 0); - QVector<int> rcLast = QVector<int>(8, 0); + QList<QModelIndex> rcParent { 8 }; + QList<int> rcFirst = QList<int>(8, 0); + QList<int> rcLast = QList<int>(8, 0); void populate(); void checkDefaultValues(); @@ -1062,7 +1062,7 @@ void tst_QListWidget::sortItems() } QAbstractItemModel *model = testWidget->model(); - QVector<QPersistentModelIndex> persistent; + QList<QPersistentModelIndex> persistent; for (int j = 0; j < model->rowCount(QModelIndex()); ++j) persistent << model->index(j, 0, QModelIndex()); @@ -1129,7 +1129,7 @@ void tst_QListWidget::sortHiddenItems() tw->addItems(initialList); QAbstractItemModel *model = tw->model(); - QVector<QPersistentModelIndex> persistent; + QList<QPersistentModelIndex> persistent; for (int j = 0; j < model->rowCount(QModelIndex()); ++j) { persistent << model->index(j, 0, QModelIndex()); tw->setRowHidden(j, j & 1); // every odd is hidden @@ -1479,12 +1479,13 @@ class QListWidgetDataChanged : public QListWidget public: using QListWidget::QListWidget; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles) override { QListWidget::dataChanged(topLeft, bottomRight, roles); currentRoles = roles; } - QVector<int> currentRoles; + QList<int> currentRoles; }; void tst_QListWidget::itemData() @@ -1493,13 +1494,13 @@ void tst_QListWidget::itemData() QListWidgetItem item(&widget); item.setFlags(item.flags() | Qt::ItemIsEditable); item.setData(Qt::DisplayRole, QString("0")); - QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); + QCOMPARE(widget.currentRoles, QList<int>({ Qt::DisplayRole, Qt::EditRole })); item.setData(Qt::CheckStateRole, Qt::PartiallyChecked); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::CheckStateRole }); for (int i = 0; i < 4; ++i) { item.setData(Qt::UserRole + i, QString::number(i + 1)); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i }); } QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QCOMPARE(flags.count(), 6); @@ -1537,7 +1538,7 @@ void tst_QListWidget::changeDataWithSorting() w.addItems(initialItems); QAbstractItemModel *model = w.model(); - QVector<QPersistentModelIndex> persistent; + QList<QPersistentModelIndex> persistent; for (int j = 0; j < model->rowCount(QModelIndex()); ++j) persistent << model->index(j, 0, QModelIndex()); @@ -1859,7 +1860,7 @@ void tst_QListWidget::clearItemData() const QList<QVariant> dataChangeArgs = dataChangeSpy.takeFirst(); QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), list.model()->index(0, 0)); QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), list.model()->index(0, 0)); - QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty()); + QVERIFY(dataChangeArgs.at(2).value<QList<int>>().isEmpty()); QVERIFY(list.model()->clearItemData(list.model()->index(0, 0))); QCOMPARE(dataChangeSpy.size(), 0); } diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index aa5a05f9dc..1cbfb4d7be 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -57,10 +57,10 @@ using namespace QTestPrivate; Q_DECLARE_METATYPE(Qt::Key); Q_DECLARE_METATYPE(Qt::KeyboardModifier); Q_DECLARE_METATYPE(QItemSelectionModel::SelectionFlag); -using BoolList = QVector<bool>; -using IntList = QVector<int>; -using KeyList = QVector<Qt::Key>; -using SpanList = QVector<QRect>; +using BoolList = QList<bool>; +using IntList = QList<int>; +using KeyList = QList<Qt::Key>; +using SpanList = QList<QRect>; class QtTestTableModel: public QAbstractTableModel { @@ -243,7 +243,8 @@ public: verticalHeader()->setMinimumSectionSize(0); } - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override { QTableView::dataChanged(topLeft, bottomRight, roles); QTableViewPrivate *av = static_cast<QTableViewPrivate*>(qt_widget_private(this)); @@ -296,7 +297,7 @@ class tst_QTableView : public QObject Q_OBJECT private: - using CursorActionList = QVector<QtTestTableView::CursorAction>; + using CursorActionList = QList<QtTestTableView::CursorAction>; private slots: void getSetCheck(); @@ -3841,7 +3842,7 @@ void tst_QTableView::setCurrentIndex() void tst_QTableView::checkIntersectedRect_data() { QTest::addColumn<QtTestTableModel *>("model"); - QTest::addColumn<QVector<QModelIndex>>("changedIndexes"); + QTest::addColumn<QList<QModelIndex>>("changedIndexes"); QTest::addColumn<bool>("isEmpty"); QTest::addColumn<bool>("swapFirstAndLastIndexRow"); // for QHeaderView::sectionsMoved() QTest::addColumn<bool>("swapFirstAndLastIndexColumn"); // for QHeaderView::sectionsMoved() @@ -3863,35 +3864,28 @@ void tst_QTableView::checkIntersectedRect_data() { QtTestTableModel *model = new QtTestTableModel(10, 3); QTest::newRow(testName("multiple columns", dir, swapRow, swapColumn).data()) - << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(0, 1)}) - << false << swapRow << swapColumn << dir << -1 << -1; + << model << QList<QModelIndex>({ model->index(0, 0), model->index(0, 1) }) + << false << swapRow << swapColumn << dir << -1 << -1; } { QtTestTableModel *model = new QtTestTableModel(10, 3); QTest::newRow(testName("multiple rows", dir, swapRow, swapColumn).data()) - << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(1, 0), - model->index(2, 0)}) - << false << swapRow << swapColumn << dir << -1 << -1; + << model + << QList<QModelIndex>( + { model->index(0, 0), model->index(1, 0), model->index(2, 0) }) + << false << swapRow << swapColumn << dir << -1 << -1; } { QtTestTableModel *model = new QtTestTableModel(10, 3); QTest::newRow(testName("hidden row", dir, swapRow, swapColumn).data()) - << model - << QVector<QModelIndex>({model->index(3, 0), - model->index(3, 1)}) - << true << swapRow << swapColumn << dir << 3 << -1; + << model << QList<QModelIndex>({ model->index(3, 0), model->index(3, 1) }) + << true << swapRow << swapColumn << dir << 3 << -1; } { QtTestTableModel *model = new QtTestTableModel(50, 2); QTest::newRow(testName("row outside viewport", dir, swapRow, swapColumn).data()) - << model - << QVector<QModelIndex>({model->index(49, 0), - model->index(49, 1)}) - << true << swapRow << swapColumn << dir << -1 << -1; + << model << QList<QModelIndex>({ model->index(49, 0), model->index(49, 1) }) + << true << swapRow << swapColumn << dir << -1 << -1; } } } @@ -3900,7 +3894,7 @@ void tst_QTableView::checkIntersectedRect_data() void tst_QTableView::checkIntersectedRect() { QFETCH(QtTestTableModel *, model); - QFETCH(const QVector<QModelIndex>, changedIndexes); + QFETCH(const QList<QModelIndex>, changedIndexes); QFETCH(bool, isEmpty); QFETCH(bool, swapFirstAndLastIndexRow); QFETCH(bool, swapFirstAndLastIndexColumn); diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index 38dae7743f..345d048093 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -97,8 +97,8 @@ private: }; using IntPair = QPair<int, int>; -using IntList = QVector<int>; -using IntIntList = QVector<IntPair>; +using IntList = QList<int>; +using IntIntList = QList<IntPair>; Q_DECLARE_METATYPE(QTableWidgetSelectionRange) @@ -1118,7 +1118,7 @@ void tst_QTableWidget::sortItems() testWidget->setColumnCount(columnCount); QAbstractItemModel *model = testWidget->model(); - QVector<QPersistentModelIndex> persistent; + QList<QPersistentModelIndex> persistent; int ti = 0; for (int r = 0; r < rowCount; ++r) { @@ -1300,7 +1300,7 @@ void tst_QTableWidget::setItemWithSorting() QTableWidget w(rowCount, columnCount); QAbstractItemModel *model = w.model(); - QVector<QPersistentModelIndex> persistent; + QList<QPersistentModelIndex> persistent; int ti = 0; for (int r = 0; r < rowCount; ++r) { @@ -1356,12 +1356,13 @@ class QTableWidgetDataChanged : public QTableWidget public: using QTableWidget::QTableWidget; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles) override { QTableWidget::dataChanged(topLeft, bottomRight, roles); currentRoles = roles; } - QVector<int> currentRoles; + QList<int> currentRoles; }; void tst_QTableWidget::itemData() @@ -1372,13 +1373,13 @@ void tst_QTableWidget::itemData() QVERIFY(item); item->setFlags(item->flags() | Qt::ItemIsEditable); item->setData(Qt::DisplayRole, QString("0")); - QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); + QCOMPARE(widget.currentRoles, QList<int>({ Qt::DisplayRole, Qt::EditRole })); item->setData(Qt::CheckStateRole, Qt::PartiallyChecked); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::CheckStateRole }); for (int i = 0; i < 4; ++i) { item->setData(Qt::UserRole + i, QString::number(i + 1)); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i }); } QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QCOMPARE(flags.count(), 6); @@ -1401,7 +1402,7 @@ void tst_QTableWidget::setItemData() data.insert(Qt::DisplayRole, QLatin1String("Display")); data.insert(Qt::ToolTipRole, QLatin1String("ToolTip")); table.model()->setItemData(idx, data); - QCOMPARE(table.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole, Qt::ToolTipRole})); + QCOMPARE(table.currentRoles, QList<int>({ Qt::DisplayRole, Qt::EditRole, Qt::ToolTipRole })); QCOMPARE(table.model()->data(idx, Qt::DisplayRole).toString(), QLatin1String("Display")); QCOMPARE(table.model()->data(idx, Qt::EditRole).toString(), QLatin1String("Display")); @@ -1409,7 +1410,7 @@ void tst_QTableWidget::setItemData() QCOMPARE(dataChangedSpy.count(), 1); QCOMPARE(idx, qvariant_cast<QModelIndex>(dataChangedSpy.first().at(0))); QCOMPARE(idx, qvariant_cast<QModelIndex>(dataChangedSpy.first().at(1))); - const auto roles = qvariant_cast<QVector<int>>(dataChangedSpy.first().at(2)); + const auto roles = qvariant_cast<QList<int>>(dataChangedSpy.first().at(2)); QCOMPARE(roles.size(), 3); QVERIFY(roles.contains(Qt::DisplayRole)); QVERIFY(roles.contains(Qt::EditRole)); @@ -1424,7 +1425,8 @@ void tst_QTableWidget::setItemData() table.model()->setItemData(idx, data); QCOMPARE(table.model()->data(idx, Qt::DisplayRole).toString(), QLatin1String("dizplaye")); QCOMPARE(dataChangedSpy.count(), 1); - QCOMPARE(QVector<int>({Qt::DisplayRole, Qt::EditRole}), qvariant_cast<QVector<int>>(dataChangedSpy.first().at(2))); + QCOMPARE(QList<int>({ Qt::DisplayRole, Qt::EditRole }), + qvariant_cast<QList<int>>(dataChangedSpy.first().at(2))); item->setBackground(QBrush(Qt::red)); item->setForeground(QBrush(Qt::green)); @@ -1697,8 +1699,7 @@ void tst_QTableWidget::search() return item; }; - auto checkSeries = [](TestTableWidget &tw, const QVector<QPair<QKeyEvent, int>> &series) - { + auto checkSeries = [](TestTableWidget &tw, const QList<QPair<QKeyEvent, int>> &series) { for (const auto &p : series) { QKeyEvent e = p.first; tw.keyPressEvent(&e); @@ -1745,7 +1746,7 @@ void tst_QTableWidget::clearItemData() const QList<QVariant> dataChangeArgs = dataChangeSpy.takeFirst(); QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), table.model()->index(0, 0)); QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), table.model()->index(0, 0)); - QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty()); + QVERIFY(dataChangeArgs.at(2).value<QList<int>>().isEmpty()); QVERIFY(table.model()->clearItemData(table.model()->index(0, 0))); QCOMPARE(dataChangeSpy.size(), 0); } diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 531d1e823a..7fc1c4dc9f 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -88,7 +88,8 @@ public: QTreeView::paintEvent(event); wasPainted = true; } - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override { QTreeView::dataChanged(topLeft, bottomRight, roles); QTreeViewPrivate *av = static_cast<QTreeViewPrivate*>(qt_widget_private(this)); @@ -1998,7 +1999,7 @@ public: { return QSize(200, 50); } }; -typedef QVector<QPoint> PointList; +typedef QList<QPoint> PointList; void tst_QTreeView::setSelection_data() { @@ -2898,8 +2899,8 @@ public: } } - QVector<Node *> children; - QVector<Node *> deadChildren; + QList<Node *> children; + QList<Node *> deadChildren; Node *parent; bool isDead = false; }; @@ -2923,7 +2924,7 @@ public: { emit layoutAboutToBeChanged(); QModelIndexList oldList = persistentIndexList(); - QVector<QStack<int>> oldListPath; + QList<QStack<int>> oldListPath; for (int i = 0; i < oldList.count(); ++i) { QModelIndex idx = oldList.at(i); QStack<int> path; @@ -4861,59 +4862,54 @@ void tst_QTreeView::checkIntersectedRect_data() return model; }; QTest::addColumn<QStandardItemModel *>("model"); - QTest::addColumn<QVector<QModelIndex>>("changedIndexes"); + QTest::addColumn<QList<QModelIndex>>("changedIndexes"); QTest::addColumn<bool>("isEmpty"); { auto model = createModel(5); - QTest::newRow("multiple columns") << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(0, 1)}) - << false; + QTest::newRow("multiple columns") + << model << QList<QModelIndex>({ model->index(0, 0), model->index(0, 1) }) << false; } { auto model = createModel(5); - QTest::newRow("multiple rows") << model - << QVector<QModelIndex>({model->index(0, 0), - model->index(1, 0), - model->index(2, 0)}) - << false; + QTest::newRow("multiple rows") + << model + << QList<QModelIndex>( + { model->index(0, 0), model->index(1, 0), model->index(2, 0) }) + << false; } { auto model = createModel(5); const QModelIndex idxRow2(model->indexFromItem(model->item(2))); - QTest::newRow("child row") << model - << QVector<QModelIndex>({model->index(0, 0, idxRow2), - model->index(0, 1, idxRow2)}) - << false; + QTest::newRow("child row") + << model + << QList<QModelIndex>({ model->index(0, 0, idxRow2), model->index(0, 1, idxRow2) }) + << false; } { auto model = createModel(5); - QTest::newRow("hidden row") << model - << QVector<QModelIndex>({model->index(3, 0), - model->index(3, 1)}) - << true; + QTest::newRow("hidden row") + << model << QList<QModelIndex>({ model->index(3, 0), model->index(3, 1) }) << true; } { auto model = createModel(5); const QModelIndex idxRow3(model->indexFromItem(model->item(3))); - QTest::newRow("hidden child row") << model - << QVector<QModelIndex>({model->index(0, 0, idxRow3), - model->index(0, 1, idxRow3)}) - << true; + QTest::newRow("hidden child row") + << model + << QList<QModelIndex>({ model->index(0, 0, idxRow3), model->index(0, 1, idxRow3) }) + << true; } { auto model = createModel(50); - QTest::newRow("row outside viewport") << model - << QVector<QModelIndex>({model->index(49, 0), - model->index(49, 1)}) - << true; + QTest::newRow("row outside viewport") + << model << QList<QModelIndex>({ model->index(49, 0), model->index(49, 1) }) + << true; } } void tst_QTreeView::checkIntersectedRect() { QFETCH(QStandardItemModel *, model); - QFETCH(const QVector<QModelIndex>, changedIndexes); + QFETCH(const QList<QModelIndex>, changedIndexes); QFETCH(bool, isEmpty); TreeView view; diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 74cf514c12..f7b1cfec65 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -218,11 +218,11 @@ void tst_QTreeWidget::getSetCheck() QCOMPARE(obj1.currentItem(), nullptr); } -using IntList = QVector<int>; -using ListIntList = QVector<IntList>; -using PersistentModelIndexVec = QVector<QPersistentModelIndex>; +using IntList = QList<int>; +using ListIntList = QList<IntList>; +using PersistentModelIndexVec = QList<QPersistentModelIndex>; using TreeItem = QTreeWidgetItem; -using TreeItemList = QVector<TreeItem*>; +using TreeItemList = QList<TreeItem *>; Q_DECLARE_METATYPE(Qt::Orientation) Q_DECLARE_METATYPE(QTreeWidgetItem*) @@ -1466,19 +1466,15 @@ void tst_QTreeWidget::keyboardNavigation() fillTreeWidget(testWidget, rows); - const QVector<Qt::Key> keymoves { - Qt::Key_Down, Qt::Key_Right, Qt::Key_Left, - Qt::Key_Down, Qt::Key_Down, Qt::Key_Down, Qt::Key_Down, - Qt::Key_Right, - Qt::Key_Up, Qt::Key_Left, Qt::Key_Left, - Qt::Key_Up, Qt::Key_Down, Qt::Key_Up, Qt::Key_Up, - Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, - Qt::Key_Down, Qt::Key_Right, Qt::Key_Down, Qt::Key_Down, - Qt::Key_Down, Qt::Key_Right, Qt::Key_Down, Qt::Key_Down, - Qt::Key_Left, Qt::Key_Left, Qt::Key_Up, Qt::Key_Down, - Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, Qt::Key_Left, - Qt::Key_Down, Qt::Key_Right, Qt::Key_Right, Qt::Key_Right, - Qt::Key_Left, Qt::Key_Left, Qt::Key_Right, Qt::Key_Left + const QList<Qt::Key> keymoves { + Qt::Key_Down, Qt::Key_Right, Qt::Key_Left, Qt::Key_Down, Qt::Key_Down, Qt::Key_Down, + Qt::Key_Down, Qt::Key_Right, Qt::Key_Up, Qt::Key_Left, Qt::Key_Left, Qt::Key_Up, + Qt::Key_Down, Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, + Qt::Key_Up, Qt::Key_Down, Qt::Key_Right, Qt::Key_Down, Qt::Key_Down, Qt::Key_Down, + Qt::Key_Right, Qt::Key_Down, Qt::Key_Down, Qt::Key_Left, Qt::Key_Left, Qt::Key_Up, + Qt::Key_Down, Qt::Key_Up, Qt::Key_Up, Qt::Key_Up, Qt::Key_Left, Qt::Key_Down, + Qt::Key_Right, Qt::Key_Right, Qt::Key_Right, Qt::Key_Left, Qt::Key_Left, Qt::Key_Right, + Qt::Key_Left }; int row = 0; @@ -1957,12 +1953,13 @@ class QTreeWidgetDataChanged : public QTreeWidget public: using QTreeWidget::QTreeWidget; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles) override { QTreeWidget::dataChanged(topLeft, bottomRight, roles); currentRoles = roles; } - QVector<int> currentRoles; + QList<int> currentRoles; }; void tst_QTreeWidget::itemData() @@ -1972,12 +1969,12 @@ void tst_QTreeWidget::itemData() widget.setColumnCount(2); item.setFlags(item.flags() | Qt::ItemIsEditable); item.setData(0, Qt::DisplayRole, QString("0")); - QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); + QCOMPARE(widget.currentRoles, QList<int>({ Qt::DisplayRole, Qt::EditRole })); item.setData(0, Qt::CheckStateRole, Qt::PartiallyChecked); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::CheckStateRole }); for (int i = 0; i < 4; ++i) { item.setData(0, Qt::UserRole + i, QString::number(i + 1)); - QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i}); + QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i }); } QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QCOMPARE(flags.count(), 6); @@ -2318,7 +2315,7 @@ void tst_QTreeWidget::insertExpandedItemsWithSorting() tree.setSortingEnabled(true); // insert expanded items in unsorted order - QVector<QTreeWidgetItem *> items; + QList<QTreeWidgetItem *> items; for (const QString &text : parentTexts) { QTreeWidgetItem *parent = new QTreeWidgetItem(&tree, {text}); parent->setExpanded(true); @@ -2725,7 +2722,7 @@ void tst_QTreeWidget::sortedIndexOfChild() QFETCH(const IntList, expectedIndexes); QTreeWidget tw; - QVector<QTreeWidgetItem *> itms; + QList<QTreeWidgetItem *> itms; auto *top = new QTreeWidgetItem(&tw, {"top"}); for (const QString &str : itemTexts) @@ -2998,7 +2995,7 @@ protected: } private: int timerId; - QVector<QTreeWidgetItem*> m_list; + QList<QTreeWidgetItem *> m_list; }; void tst_QTreeWidget::sortAndSelect() @@ -3612,7 +3609,7 @@ void tst_QTreeWidget::clearItemData() QList<QVariant> dataChangeArgs = dataChangeSpy.takeFirst(); QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), parentIdx); QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), parentIdx); - QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty()); + QVERIFY(dataChangeArgs.at(2).value<QList<int>>().isEmpty()); QVERIFY(model->clearItemData(parentIdx)); QCOMPARE(dataChangeSpy.size(), 0); QVERIFY(model->clearItemData(childIdx)); @@ -3621,7 +3618,7 @@ void tst_QTreeWidget::clearItemData() dataChangeArgs = dataChangeSpy.takeFirst(); QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), childIdx); QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), childIdx); - QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty()); + QVERIFY(dataChangeArgs.at(2).value<QList<int>>().isEmpty()); } #endif |