1 files changed, 21 insertions, 21 deletions

diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 9c37e0af6d..1ff9973e00 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QColumnView>
 #include <QScrollBar>
@@ -497,11 +497,11 @@ void tst_QColumnView::selectAll()
 
     view.setModel(&m_fakeDirModel);
     view.selectAll();
-    QVERIFY(view.selectionModel()->selectedIndexes().count() >= 0);
+    QVERIFY(view.selectionModel()->selectedIndexes().size() >= 0);
 
     view.setCurrentIndex(m_fakeDirHomeIndex);
     view.selectAll();
-    QVERIFY(view.selectionModel()->selectedIndexes().count() > 0);
+    QVERIFY(view.selectionModel()->selectedIndexes().size() > 0);
 
     QModelIndex file;
     for (int i = 0; i < m_fakeDirModel.rowCount(m_fakeDirHomeIndex); ++i) {
@@ -512,10 +512,10 @@ void tst_QColumnView::selectAll()
     }
     view.setCurrentIndex(file);
     view.selectAll();
-    QVERIFY(view.selectionModel()->selectedIndexes().count() > 0);
+    QVERIFY(view.selectionModel()->selectedIndexes().size() > 0);
 
     view.setCurrentIndex(QModelIndex());
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 0);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 0);
 }
 
 void tst_QColumnView::clicked()
@@ -536,13 +536,13 @@ void tst_QColumnView::clicked()
 
     QPoint localPoint = view.visualRect(m_fakeDirHomeIndex).center();
     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, localPoint);
-    QCOMPARE(clickedSpy.count(), 1);
+    QCOMPARE(clickedSpy.size(), 1);
     QCoreApplication::processEvents();
 
     if (sizeof(qreal) != sizeof(double))
         QSKIP("Skipped due to rounding errors");
 
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         if (column && column->selectionModel() && (column->rootIndex() == m_fakeDirHomeIndex))
                 QVERIFY(column->selectionModel()->selectedIndexes().isEmpty());
@@ -560,7 +560,7 @@ void tst_QColumnView::selectedColumns()
 
     QTest::qWait(ANIMATION_DELAY);
 
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         if (!column)
             continue;
@@ -591,7 +591,7 @@ void tst_QColumnView::setSelectionModel()
     view.setSelectionModel(selectionModel);
 
     bool found = false;
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         if (view.createdColumns.at(i)->selectionModel() == selectionModel) {
             found = true;
             break;
@@ -631,7 +631,7 @@ void tst_QColumnView::moveGrip_basic()
     view.setMinimumWidth(200);
     grip->moveGrip(-800);
     QCOMPARE(view.width(), 200);
-    QCOMPARE(spy.count(), 5);
+    QCOMPARE(spy.size(), 5);
 }
 
 void tst_QColumnView::moveGrip_data()
@@ -659,7 +659,7 @@ void tst_QColumnView::moveGrip()
     topLevel.show();
     QVERIFY(QTest::qWaitForWindowActive(&topLevel));
 
-    int columnNum = view.createdColumns.count() - 2;
+    int columnNum = view.createdColumns.size() - 2;
     QVERIFY(columnNum >= 0);
     const QObjectList list = view.createdColumns[columnNum]->children();
     QColumnViewGrip *grip = nullptr;
@@ -687,7 +687,7 @@ void tst_QColumnView::doubleClick()
     QCOMPARE(view.width(), 200);
     QTest::mouseDClick(grip, Qt::LeftButton);
     QCOMPARE(view.width(), view.sizeHint().width());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_QColumnView::gripMoved()
@@ -711,7 +711,7 @@ void tst_QColumnView::gripMoved()
     QCoreApplication::processEvents();
     QTest::mouseRelease(grip, Qt::LeftButton);
 
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(view.width(), oldWidth + 65);
 }
 
@@ -776,7 +776,7 @@ void tst_QColumnView::setPreviewWidget()
 void tst_QColumnView::sizes()
 {
     QColumnView view;
-    QCOMPARE(view.columnWidths().count(), 0);
+    QCOMPARE(view.columnWidths().size(), 0);
 
     const QList<int> newSizes{ 10, 4, 50, 6 };
 
@@ -787,16 +787,16 @@ void tst_QColumnView::sizes()
     view.setModel(&m_fakeDirModel);
     view.setCurrentIndex(m_fakeDirHomeIndex);
 
-    QList<int> postSizes = view.columnWidths().mid(0, newSizes.count());
-    QCOMPARE(postSizes, newSizes.mid(0, postSizes.count()));
+    QList<int> postSizes = view.columnWidths().mid(0, newSizes.size());
+    QCOMPARE(postSizes, newSizes.mid(0, postSizes.size()));
 
-    QVERIFY(view.columnWidths().count() > 1);
+    QVERIFY(view.columnWidths().size() > 1);
     QList<int> smallerSizes{ 6 };
     view.setColumnWidths(smallerSizes);
     QList<int> expectedSizes = newSizes;
     expectedSizes[0] = 6;
-    postSizes = view.columnWidths().mid(0, newSizes.count());
-    QCOMPARE(postSizes, expectedSizes.mid(0, postSizes.count()));
+    postSizes = view.columnWidths().mid(0, newSizes.size());
+    QCOMPARE(postSizes, expectedSizes.mid(0, postSizes.size()));
 }
 
 void tst_QColumnView::rowDelegate()
@@ -806,7 +806,7 @@ void tst_QColumnView::rowDelegate()
     view.setItemDelegateForRow(3, d);
 
     view.setModel(&m_fakeDirModel);
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         QCOMPARE(column->itemDelegateForRow(3), d);
     }
@@ -956,7 +956,7 @@ void tst_QColumnView::dynamicModelChanges()
     model.appendRow(item);
 
     QVERIFY(QTest::qWaitForWindowExposed(&view)); //let the time for painting to occur
-    QTRY_COMPARE(delegate.paintedIndexes.count(), 1);
+    QTRY_COMPARE(delegate.paintedIndexes.size(), 1);
     QCOMPARE(*delegate.paintedIndexes.begin(), model.index(0,0));
 }