Port from container.count()/length() to size()

This is semantic patch using ClangTidyTransformator:

  auto QtContainerClass = expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container'.

<classes> are:

    // sequential:
    "QByteArray",
    "QList",
    "QQueue",
    "QStack",
    "QString",
    "QVarLengthArray",
    "QVector",
    // associative:
    "QHash",
    "QMultiHash",
    "QMap",
    "QMultiMap",
    "QSet",
    // Qt has no QMultiSet

Change-Id: Ibe8837be96e8d30d1846881ecd65180c1bc459af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

8 files changed, 72 insertions, 72 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index f509f9fb27..43f0dd39c0 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -694,7 +694,7 @@ void tst_QAbstractItemView::persistentEditorFocus()
 
     //these are spinboxes because we put numbers inside
     const QList<QSpinBox*> list = view.viewport()->findChildren<QSpinBox*>();
-    QCOMPARE(list.count(), 2); //these should be the 2 editors
+    QCOMPARE(list.size(), 2); //these should be the 2 editors
 
     view.setCurrentIndex(model.index(0, 0));
     QCOMPARE(view.currentIndex(), model.index(0, 0));
@@ -1378,17 +1378,17 @@ void tst_QAbstractItemView::task257481_emptyEditor()
 
     treeView.edit(model.index(0, 0));
     QList<QLineEdit *> lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
     QVERIFY(!lineEditors.constFirst()->size().isEmpty());
 
     treeView.edit(model.index(1, 0));
     lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
     QVERIFY(!lineEditors.constFirst()->size().isEmpty());
 
     treeView.edit(model.index(2, 0));
     lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
     QVERIFY(!lineEditors.constFirst()->size().isEmpty());
 }
 
@@ -1578,21 +1578,21 @@ void tst_QAbstractItemView::QTBUG6407_extendedSelection()
     QVERIFY(view.viewport()->rect().contains(p));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, p);
     QCOMPARE(view.currentIndex(), index49);
-    QCOMPARE(view.selectedItems().count(), 1);
+    QCOMPARE(view.selectedItems().size(), 1);
 
     QModelIndex index47 = view.model()->index(47,0);
     p = view.visualRect(index47).center();
     QVERIFY(view.viewport()->rect().contains(p));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::ShiftModifier, p);
     QCOMPARE(view.currentIndex(), index47);
-    QCOMPARE(view.selectedItems().count(), 3); //49, 48, 47;
+    QCOMPARE(view.selectedItems().size(), 3); //49, 48, 47;
 
     QModelIndex index44 = view.model()->index(44,0);
     p = view.visualRect(index44).center();
     QVERIFY(view.viewport()->rect().contains(p));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::ShiftModifier, p);
     QCOMPARE(view.currentIndex(), index44);
-    QCOMPARE(view.selectedItems().count(), 6); //49 .. 44;
+    QCOMPARE(view.selectedItems().size(), 6); //49 .. 44;
 
 }
 
@@ -1617,7 +1617,7 @@ void tst_QAbstractItemView::QTBUG6753_selectOnSelection()
     QTest::mouseMove(table.viewport(), itemRect.center());
     QTest::mouseClick(table.viewport(), Qt::LeftButton, Qt::NoModifier, itemRect.center());
 
-    QCOMPARE(table.selectedItems().count(), 1);
+    QCOMPARE(table.selectedItems().size(), 1);
     QCOMPARE(table.selectedItems().first(), table.item(item.row(), item.column()));
 }
 
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 9c37e0af6d..820c65dd26 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -542,7 +542,7 @@ void tst_QColumnView::clicked()
     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;
@@ -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;
@@ -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));
 }
 
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 4a694ee070..5ec35391cd 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -328,7 +328,7 @@ void tst_QItemDelegate::editorKeyPress()
     view.edit(index);
 
     QList<QLineEdit*> lineEditors = view.viewport()->findChildren<QLineEdit *>();
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
 
     QLineEdit *editor = lineEditors.at(0);
     QCOMPARE(editor->selectedText(), initial);
@@ -356,7 +356,7 @@ void tst_QItemDelegate::doubleEditorNegativeInput()
     view.edit(index);
 
     QList<QDoubleSpinBox*> editors = view.viewport()->findChildren<QDoubleSpinBox *>();
-    QCOMPARE(editors.count(), 1);
+    QCOMPARE(editors.size(), 1);
 
     QDoubleSpinBox *editor = editors.at(0);
     QCOMPARE(editor->value(), double(10));
@@ -1315,7 +1315,7 @@ void tst_QItemDelegate::enterKey()
     view.edit(index);
 
     QList<QWidget*> lineEditors = view.viewport()->findChildren<QWidget *>(QString::fromLatin1("TheEditor"));
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
 
     QPointer<QWidget> editor = lineEditors.at(0);
     QCOMPARE(editor->hasFocus(), true);
@@ -1349,7 +1349,7 @@ void tst_QItemDelegate::task257859_finalizeEdit()
     view.edit(index);
 
     QList<QLineEdit *> lineEditors = view.viewport()->findChildren<QLineEdit *>();
-    QCOMPARE(lineEditors.count(), 1);
+    QCOMPARE(lineEditors.size(), 1);
 
     QPointer<QWidget> editor = lineEditors.at(0);
     QCOMPARE(editor->hasFocus(), true);
@@ -1480,7 +1480,7 @@ void tst_QItemDelegate::testLineEditValidation()
     const auto findEditors = [&]() {
         return view.findChildren<QLineEdit *>(QStringLiteral("TheEditor"));
     };
-    QCOMPARE(findEditors().count(), 1);
+    QCOMPARE(findEditors().size(), 1);
     editor = findEditors().at(0);
     editor->clear();
 
@@ -1500,7 +1500,7 @@ void tst_QItemDelegate::testLineEditValidation()
     view.setCurrentIndex(index);
     view.edit(index);
 
-    QTRY_COMPARE(findEditors().count(), 1);
+    QTRY_COMPARE(findEditors().size(), 1);
     editor = findEditors().at(0);
     editor->clear();
 
@@ -1522,13 +1522,13 @@ void tst_QItemDelegate::testLineEditValidation()
 
     // reset the view to forcibly close the editor
     view.reset();
-    QTRY_COMPARE(findEditors().count(), 0);
+    QTRY_COMPARE(findEditors().size(), 0);
 
     // set a valid text again
     view.setCurrentIndex(index);
     view.edit(index);
 
-    QTRY_COMPARE(findEditors().count(), 1);
+    QTRY_COMPARE(findEditors().size(), 1);
     editor = findEditors().at(0);
     editor->clear();
 
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 1203debe68..0e09beb563 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -2716,9 +2716,9 @@ public:
         if (idxPar.isValid()) {
             TstMoveItem *parentItem = static_cast<TstMoveItem *>(idxPar.internalPointer());
             Q_ASSERT(parentItem);
-            cnt = parentItem->childItems.count();
+            cnt = parentItem->childItems.size();
         } else {
-            cnt = rootItem->childItems.count();
+            cnt = rootItem->childItems.size();
         }
         return cnt;
     }
@@ -2735,9 +2735,9 @@ public:
         if (parent.isValid()) {
             TstMoveItem *parentItem = static_cast<TstMoveItem *>(parent.internalPointer());
             Q_ASSERT(parentItem);
-            ret = parentItem->childItems.count() > 0;
+            ret = parentItem->childItems.size() > 0;
         } else {
-            ret = rootItem->childItems.count() > 0;
+            ret = rootItem->childItems.size() > 0;
         }
         return ret;
     }
@@ -2759,8 +2759,8 @@ public:
         TstMoveItem *itmDestParent = itemAt(destinationParent);
 
         if (itmSrcParent && sourceRow >= 0
-            && sourceRow + count <= itmSrcParent->childItems.count()
-            && itmDestParent && destinationChild <= itmDestParent->childItems.count()) {
+            && sourceRow + count <= itmSrcParent->childItems.size()
+            && itmDestParent && destinationChild <= itmDestParent->childItems.size()) {
             beginMoveRows(sourceParent, sourceRow, sourceRow + count - 1,
                           destinationParent, destinationChild);
             QList<TstMoveItem *> itemsToMove;
@@ -2768,7 +2768,7 @@ public:
                 TstMoveItem *itm = itmSrcParent->childItems.at(sourceRow+i);
                 itemsToMove.append(itm);
             }
-            for (int i = itemsToMove.count() -1; i >= 0; --i) {
+            for (int i = itemsToMove.size() -1; i >= 0; --i) {
                 TstMoveItem *itm = itemsToMove.at(i);
                 itm->parentItem->childItems.removeAll(itm);
                 itm->parentItem = itmDestParent;
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 0c3abe0cb0..5bdc3c9269 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -539,7 +539,7 @@ void tst_QListWidget::editItem()
     // There doesn't seem to be a way to detect if the item has already been edited...
     if (!existsAlready && flags & Qt::ItemIsEditable && flags & Qt::ItemIsEnabled) {
         QList<QObject *> children = testWidget->viewport()->children();
-        QVERIFY(children.count() > childCount);
+        QVERIFY(children.size() > childCount);
         bool found = false;
         for (int i = 0; i < children.size(); ++i) {
             if (children.at(i)->inherits("QExpandingLineEdit"))
@@ -556,12 +556,12 @@ void tst_QListWidget::findItems()
     // This really just tests that the items that are returned are converted from index's to items correctly.
 
     // Boundary checking
-    QCOMPARE(testWidget->findItems("GirlsCanWearJeansAndCutTheirHairShort", Qt::MatchExactly).count(), 0);
+    QCOMPARE(testWidget->findItems("GirlsCanWearJeansAndCutTheirHairShort", Qt::MatchExactly).size(), 0);
 
     populate();
 
     for (int i = 0; i < testWidget->count(); ++i)
-        QCOMPARE(testWidget->findItems(testWidget->item(i)->text(), Qt::MatchExactly).count(), 1);
+        QCOMPARE(testWidget->findItems(testWidget->item(i)->text(), Qt::MatchExactly).size(), 1);
 }
 
 
@@ -827,7 +827,7 @@ void tst_QListWidget::selectedItems()
         QListWidgetItem *item = testWidget->item(i);
         item->setSelected(true);
         QVERIFY(item->isSelected());
-        QCOMPARE(testWidget->selectedItems().count(), 1);
+        QCOMPARE(testWidget->selectedItems().size(), 1);
     }
     //let's clear the selection
     testWidget->clearSelection();
@@ -845,7 +845,7 @@ void tst_QListWidget::selectedItems()
 
     // check that the correct number of items and the expected items are there
     QList<QListWidgetItem *> selectedItems = testWidget->selectedItems();
-    QCOMPARE(selectedItems.count(), expectedRows.count());
+    QCOMPARE(selectedItems.size(), expectedRows.count());
     for (int row : expectedRows)
         QVERIFY(selectedItems.contains(testWidget->item(row)));
 
@@ -1386,7 +1386,7 @@ void tst_QListWidget::insertItemsWithSorting()
         for (int i = 0; i < w.count(); ++i)
             QCOMPARE(w.item(i)->text(), expectedItems.at(i));
 
-        for (int k = 0; k < persistent.count(); ++k)
+        for (int k = 0; k < persistent.size(); ++k)
             QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
     }
 }
@@ -1482,7 +1482,7 @@ void tst_QListWidget::itemData()
         QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i });
     }
     QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
-    QCOMPARE(flags.count(), 6);
+    QCOMPARE(flags.size(), 6);
     for (int i = 0; i < 4; ++i)
         QCOMPARE(flags[Qt::UserRole + i].toString(), QString::number(i + 1));
 
@@ -1528,13 +1528,13 @@ void tst_QListWidget::changeDataWithSorting()
     item->setText(newValue);
     for (int i = 0; i < expectedItems.count(); ++i) {
         QCOMPARE(w.item(i)->text(), expectedItems.at(i));
-        for (int j = 0; j < persistent.count(); ++j) {
+        for (int j = 0; j < persistent.size(); ++j) {
             if (persistent.at(j).row() == i) // the same toplevel row
                 QCOMPARE(persistent.at(j).internalPointer(), static_cast<void *>(w.item(i)));
         }
     }
 
-    for (int k = 0; k < persistent.count(); ++k)
+    for (int k = 0; k < persistent.size(); ++k)
         QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
 
     QCOMPARE(dataChangedSpy.count(), 1);
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 39cbe0ab66..4a20349c00 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -192,8 +192,8 @@ void tst_QTableWidget::clear()
     QVERIFY(bla.isNull());
 
     QVERIFY(!testWidget->item(0,0));
-    QVERIFY(!testWidget->selectedRanges().count());
-    QVERIFY(!testWidget->selectedItems().count());
+    QVERIFY(!testWidget->selectedRanges().size());
+    QVERIFY(!testWidget->selectedItems().size());
 }
 
 void tst_QTableWidget::rowCount()
@@ -525,24 +525,24 @@ void tst_QTableWidget::selectedItems()
         testWidget->setColumnHidden(column, true);
 
     // make sure we don't have any previous selections hanging around
-    QVERIFY(!testWidget->selectedRanges().count());
-    QVERIFY(!testWidget->selectedItems().count());
+    QVERIFY(!testWidget->selectedRanges().size());
+    QVERIFY(!testWidget->selectedItems().size());
 
     // select range and check that it is set correctly
     testWidget->setRangeSelected(selectionRange, true);
     if (selectionRange.topRow() >= 0) {
-        QCOMPARE(testWidget->selectedRanges().count(), 1);
+        QCOMPARE(testWidget->selectedRanges().size(), 1);
         QCOMPARE(testWidget->selectedRanges().at(0).topRow(), selectionRange.topRow());
         QCOMPARE(testWidget->selectedRanges().at(0).bottomRow(), selectionRange.bottomRow());
         QCOMPARE(testWidget->selectedRanges().at(0).leftColumn(), selectionRange.leftColumn());
         QCOMPARE(testWidget->selectedRanges().at(0).rightColumn(), selectionRange.rightColumn());
     } else {
-        QCOMPARE(testWidget->selectedRanges().count(), 0);
+        QCOMPARE(testWidget->selectedRanges().size(), 0);
     }
 
     // check that the correct number of items and the expected items are there
     const QList<QTableWidgetItem *> selectedItems = testWidget->selectedItems();
-    QCOMPARE(selectedItems.count(), expectedItems.count());
+    QCOMPARE(selectedItems.size(), expectedItems.count());
     for (const auto &intPair : expectedItems)
         QVERIFY(selectedItems.contains(testWidget->item(intPair.first, intPair.second)));
 
@@ -627,7 +627,7 @@ void tst_QTableWidget::selectedSpannedCells() // QTBUG-255
                       testWidget.visualRect(testWidget.model()->index(selectionEndCell.y(), selectionEndCell.x())).center());
 
     auto ranges = testWidget.selectedRanges();
-    QCOMPARE(ranges.count(), expectedSelectionRangeCount);
+    QCOMPARE(ranges.size(), expectedSelectionRangeCount);
     QCOMPARE(ranges.first(), expectedFirstSelectionRange);
 }
 
@@ -1397,7 +1397,7 @@ void tst_QTableWidget::setItemWithSorting()
             }
         }
 
-        for (int k = 0; k < persistent.count(); ++k) {
+        for (int k = 0; k < persistent.size(); ++k) {
             QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
             int i = (persistent.at(k).row() * columnCount) + sortColumn;
             QCOMPARE(persistent.at(k).data().toString(), expectedValues.at(i));
@@ -1444,7 +1444,7 @@ void tst_QTableWidget::itemData()
         QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i });
     }
     QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
-    QCOMPARE(flags.count(), 6);
+    QCOMPARE(flags.size(), 6);
     for (int i = 0; i < 4; ++i)
         QCOMPARE(flags[Qt::UserRole + i].toString(), QString::number(i + 1));
 }
@@ -1746,7 +1746,7 @@ void tst_QTableWidget::selectedRowAfterSorting()
     table.setProperty("sortingEnabled",true);
     table.selectRow(1);
     table.item(1,1)->setText("9");
-    QCOMPARE(table.selectedItems().count(),3);
+    QCOMPARE(table.selectedItems().size(),3);
     const auto selectedItems = table.selectedItems();
     for (QTableWidgetItem *item : selectedItems)
         QCOMPARE(item->row(), 0);
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 9a32728456..cd11b0e45d 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -2872,7 +2872,7 @@ public:
         }
         void kill()
         {
-            for (int i = children.count() -1; i >= 0; --i) {
+            for (int i = children.size() -1; i >= 0; --i) {
                 children.at(i)->kill();
                 if (parent == nullptr) {
                     deadChildren.append(children.at(i));
@@ -2945,7 +2945,7 @@ public:
             if (parentNode->isDead)
                 qFatal("%s: parentNode is dead!", Q_FUNC_INFO);
         }
-        return parentNode->children.count();
+        return parentNode->children.size();
     }
     int columnCount(const QModelIndex &parent = QModelIndex()) const override
     {
@@ -5119,7 +5119,7 @@ void tst_QTreeView::fetchUntilScreenFull()
 
             TreeItem* parentItem = parent.isValid() ? static_cast<TreeItem*>(parent.internalPointer())
                 : m_root;
-            return parentItem->children.count();
+            return parentItem->children.size();
         }
 
         int columnCount(const QModelIndex&) const override { return 2; }
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 652d6f76d9..bddcd4de9e 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -281,8 +281,8 @@ void tst_QTreeWidget::addTopLevelItem()
     while (!tops.isEmpty()) {
         TreeItem *ti = tops.takeFirst();
         delete ti;
-        QCOMPARE(tree.topLevelItemCount(), tops.count());
-        for (int i = 0; i < tops.count(); ++i)
+        QCOMPARE(tree.topLevelItemCount(), tops.size());
+        for (int i = 0; i < tops.size(); ++i)
             QCOMPARE(tree.topLevelItem(i), tops.at(i));
     }
 
@@ -821,7 +821,7 @@ void tst_QTreeWidget::selectedItems()
 
     // check selectedItems
     const auto sel = testWidget->selectedItems();
-    QCOMPARE(sel.count(), expectedItems.count());
+    QCOMPARE(sel.size(), expectedItems.count());
     for (const auto &itemPath : expectedItems) {
         QTreeWidgetItem *item = nullptr;
         for (int index : itemPath) {
@@ -857,7 +857,7 @@ void tst_QTreeWidget::selectedItems()
         }
         item->setSelected(false);
     }
-    QCOMPARE(testWidget->selectedItems().count(), 0);
+    QCOMPARE(testWidget->selectedItems().size(), 0);
 }
 
 void tst_QTreeWidget::itemAssignment()
@@ -1090,9 +1090,9 @@ void tst_QTreeWidget::findItems()
 
     QList<QTreeWidgetItem*> result = testWidget->findItems(pattern,
                                                            Qt::MatchExactly|Qt::MatchRecursive);
-    QCOMPARE(result.count(), resultCount);
+    QCOMPARE(result.size(), resultCount);
 
-    for (int k = 0; k < result.count() && k < resultText.count(); ++k)
+    for (int k = 0; k < result.size() && k < resultText.count(); ++k)
         QCOMPARE(result.at(k)->text(column), resultText.at(k));
 }
 
@@ -1110,7 +1110,7 @@ void tst_QTreeWidget::findItemsInColumn()
 
     // Recursively search column one for 400.
     QList<QTreeWidgetItem*> items = testWidget->findItems("400", Qt::MatchExactly|Qt::MatchRecursive, 1);
-    QCOMPARE(items.count(), 1);
+    QCOMPARE(items.size(), 1);
 }
 
 void tst_QTreeWidget::sortItems_data()
@@ -1661,7 +1661,7 @@ void tst_QTreeWidget::addChild()
         QList<QTreeWidgetItem*> taken = item->takeChildren();
         QCOMPARE(taken, children);
         QCOMPARE(item->childCount(), 0);
-        for (int i = 0; i < taken.count(); ++i) {
+        for (int i = 0; i < taken.size(); ++i) {
             QCOMPARE(taken.at(i)->parent(), nullptr);
             QCOMPARE(taken.at(i)->treeWidget(), nullptr);
             item->addChild(taken.at(i)); // re-add
@@ -1671,8 +1671,8 @@ void tst_QTreeWidget::addChild()
         while (!children.isEmpty()) {
             QTreeWidgetItem *ti = children.takeFirst();
             delete ti;
-            QCOMPARE(item->childCount(), children.count());
-            for (int i = 0; i < children.count(); ++i)
+            QCOMPARE(item->childCount(), children.size());
+            for (int i = 0; i < children.size(); ++i)
                 QCOMPARE(item->child(i), children.at(i));
         }
 
@@ -1960,11 +1960,11 @@ void tst_QTreeWidget::itemData()
         QCOMPARE(widget.currentRoles, QList<int> { Qt::UserRole + i });
     }
     QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
-    QCOMPARE(flags.count(), 6);
+    QCOMPARE(flags.size(), 6);
     for (int i = 0; i < 4; ++i)
         QCOMPARE(flags[Qt::UserRole + i].toString(), QString::number(i + 1));
     flags = widget.model()->itemData(widget.model()->index(0, 1));
-    QCOMPARE(flags.count(), 0);
+    QCOMPARE(flags.size(), 0);
 
     item.setBackground(0, QBrush(Qt::red));
     item.setForeground(0, QBrush(Qt::green));
@@ -2714,7 +2714,7 @@ void tst_QTreeWidget::sortedIndexOfChild()
     tw.sortItems(0, sortOrder);
     tw.expandAll();
 
-    QCOMPARE(itms.count(), expectedIndexes.count());
+    QCOMPARE(itms.size(), expectedIndexes.count());
     for (int j = 0; j < expectedIndexes.count(); ++j)
         QCOMPARE(top->indexOfChild(itms.at(j)), expectedIndexes.at(j));
 }
@@ -2971,7 +2971,7 @@ protected:
             auto newItem = new QTreeWidgetItem({QString::number(i++)});
             m_list.append(newItem);
             insertTopLevelItem(0, newItem);
-            while (m_list.count() > 10)
+            while (m_list.size() > 10)
                 delete m_list.takeFirst();
         }
         QTreeWidget::timerEvent(event);