Port from container::count() and length() to size() - V5

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:

    const std::string o = "object";

    auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };

    auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
        auto exprOfDeclaredType = [&](auto decl) {
            return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
        };
        return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
    };

    auto renameMethod = [&] (ArrayRef<StringRef> classes,
                            StringRef from, StringRef to) {
        return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
                            callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
                        changeTo(cat(access(o, cat(to)), "()")),
                        cat("use '", to, "' instead of '", from, "'"));
    };

    renameMethod(<classes>, "count", "size");
    renameMethod(<classes>, "length", "size");

except that the on() matcher has been replaced by one that doesn't
ignoreParens().

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

Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().

Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

22 files changed, 79 insertions, 79 deletions

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 7d165cadd1..ac8ec224b9 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -420,7 +420,7 @@ QAccessibleInterface *QAccessibleAbstractScrollArea::child(int index) const
 
 int QAccessibleAbstractScrollArea::childCount() const
 {
-    return accessibleChildren().count();
+    return accessibleChildren().size();
 }
 
 int QAccessibleAbstractScrollArea::indexOfChild(const QAccessibleInterface *child) const
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 79a7228369..073f373d03 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -154,21 +154,21 @@ int QAccessibleTable::selectedCellCount() const
 {
     if (!view()->selectionModel())
         return 0;
-    return view()->selectionModel()->selectedIndexes().count();
+    return view()->selectionModel()->selectedIndexes().size();
 }
 
 int QAccessibleTable::selectedColumnCount() const
 {
     if (!view()->selectionModel())
         return 0;
-    return view()->selectionModel()->selectedColumns().count();
+    return view()->selectionModel()->selectedColumns().size();
 }
 
 int QAccessibleTable::selectedRowCount() const
 {
     if (!view()->selectionModel())
         return 0;
-    return view()->selectionModel()->selectedRows().count();
+    return view()->selectionModel()->selectedRows().size();
 }
 
 QString QAccessibleTable::rowDescription(int row) const
@@ -1024,7 +1024,7 @@ void QAccessibleTableCell::unselectCell()
     //one cell is selected it cannot be unselected by the user
     if ((selectionMode != QAbstractItemView::MultiSelection)
         && (selectionMode != QAbstractItemView::ExtendedSelection)
-        && (view->selectionModel()->selectedIndexes().count() <= 1))
+        && (view->selectionModel()->selectedIndexes().size() <= 1))
         return;
 
     view->selectionModel()->select(m_index, QItemSelectionModel::Deselect);
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index 2dd7e035df..13f7eca898 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -299,14 +299,14 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel
     if (match & QAccessible::Controlled) {
         QObjectList allReceivers;
         QObject *connectionObject = object();
-        for (int sig = 0; sig < d->primarySignals.count(); ++sig) {
+        for (int sig = 0; sig < d->primarySignals.size(); ++sig) {
             const QObjectList receivers = connectionObject->d_func()->receiverList(d->primarySignals.at(sig).toLatin1());
             allReceivers += receivers;
         }
 
         allReceivers.removeAll(object());  //### The object might connect to itself internally
 
-        for (int i = 0; i < allReceivers.count(); ++i) {
+        for (int i = 0; i < allReceivers.size(); ++i) {
             const QAccessible::Relation rel = QAccessible::Controlled;
             QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(allReceivers.at(i));
             if (iface)
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index d85a2a8b0e..d301eaa7ea 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -673,7 +673,7 @@ void QFileDialogPrivate::emitFilesSelected(const QStringList &files)
 {
     Q_Q(QFileDialog);
     emit q->filesSelected(files);
-    if (files.count() == 1)
+    if (files.size() == 1)
         emit q->fileSelected(files.first());
 }
 
@@ -1352,7 +1352,7 @@ QStringList qt_strip_filters(const QStringList &filters)
 #if QT_CONFIG(regularexpression)
     QStringList strippedFilters;
     static const QRegularExpression r(QString::fromLatin1(QPlatformFileDialogHelper::filterRegExp));
-    const int numFilters = filters.count();
+    const int numFilters = filters.size();
     strippedFilters.reserve(numFilters);
     for (int i = 0; i < numFilters; ++i) {
         QString filterName;
@@ -1391,7 +1391,7 @@ void QFileDialog::setNameFilters(const QStringList &filters)
 {
     Q_D(QFileDialog);
     QStringList cleanedFilters;
-    const int numFilters = filters.count();
+    const int numFilters = filters.size();
     cleanedFilters.reserve(numFilters);
     for (int i = 0; i < numFilters; ++i) {
         cleanedFilters << filters[i].simplified();
@@ -3544,7 +3544,7 @@ void QFileDialogPrivate::_q_deleteCurrent()
         return;
 
     QModelIndexList list = qFileDialogUi->listView->selectionModel()->selectedRows();
-    for (int i = list.count() - 1; i >= 0; --i) {
+    for (int i = list.size() - 1; i >= 0; --i) {
         QPersistentModelIndex index = list.at(i);
         if (index == qFileDialogUi->listView->rootIndex())
             continue;
@@ -3600,7 +3600,7 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
     }
 
     const QStringList multipleFiles = typedFiles();
-    if (multipleFiles.count() > 0) {
+    if (multipleFiles.size() > 0) {
         QModelIndexList oldFiles = qFileDialogUi->listView->selectionModel()->selectedRows();
         QList<QModelIndex> newFiles;
         for (const auto &file : multipleFiles) {
@@ -3808,7 +3808,7 @@ void QFileDialogPrivate::_q_useNameFilter(int index)
     QStringList newNameFilters = QPlatformFileDialogHelper::cleanFilterList(nameFilter);
     if (q_func()->acceptMode() == QFileDialog::AcceptSave) {
         QString newNameFilterExtension;
-        if (newNameFilters.count() > 0)
+        if (newNameFilters.size() > 0)
             newNameFilterExtension = QFileInfo(newNameFilters.at(0)).suffix();
 
         QString fileName = lineEdit()->text();
@@ -3843,8 +3843,8 @@ void QFileDialogPrivate::_q_selectionChanged()
             continue;
         allFiles.append(index.data().toString());
     }
-    if (allFiles.count() > 1)
-        for (qsizetype i = 0; i < allFiles.count(); ++i) {
+    if (allFiles.size() > 1)
+        for (qsizetype i = 0; i < allFiles.size(); ++i) {
             allFiles.replace(i, QString(u'"' + allFiles.at(i) + u'"'));
     }
 
@@ -4012,7 +4012,7 @@ void QFileDialogComboBox::showPopup()
 
     // append history
     QList<QUrl> urls;
-    for (int i = 0; i < m_history.count(); ++i) {
+    for (int i = 0; i < m_history.size(); ++i) {
         QUrl path = QUrl::fromLocalFile(m_history.at(i));
         if (!urls.contains(path))
             urls.prepend(path);
@@ -4220,7 +4220,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const
 #else
     bool startsFromRoot = pathCopy[0] == sep;
 #endif
-    if (parts.count() == 1 || (parts.count() > 1 && !startsFromRoot)) {
+    if (parts.size() == 1 || (parts.size() > 1 && !startsFromRoot)) {
         const QFileSystemModel *dirModel;
         if (proxyModel)
             dirModel = qobject_cast<const QFileSystemModel *>(proxyModel->sourceModel());
@@ -4233,7 +4233,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const
 #endif
         if (currentLocation.contains(sep) && path != currentLocation) {
             QStringList currentLocationList = splitPath(currentLocation);
-            while (!currentLocationList.isEmpty() && parts.count() > 0 && parts.at(0) == ".."_L1) {
+            while (!currentLocationList.isEmpty() && parts.size() > 0 && parts.at(0) == ".."_L1) {
                 parts.removeFirst();
                 currentLocationList.removeLast();
             }
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index d54b65a173..7cb2831411 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -2267,11 +2267,11 @@ void QWizard::removePage(int id)
     QWizardPage *removedPage = nullptr;
 
     // update startItem accordingly
-    if (d->pageMap.count() > 0) { // only if we have any pages
+    if (d->pageMap.size() > 0) { // only if we have any pages
         if (d->start == id) {
             const int firstId = d->pageMap.constBegin().key();
             if (firstId == id) {
-                if (d->pageMap.count() > 1)
+                if (d->pageMap.size() > 1)
                     d->start = (++d->pageMap.constBegin()).key(); // secondId
                 else
                     d->start = -1; // removing the last page
@@ -2395,7 +2395,7 @@ void QWizard::setStartId(int theid)
     Q_D(QWizard);
     int newStart = theid;
     if (theid == -1)
-        newStart = d->pageMap.count() ? d->pageMap.constBegin().key() : -1;
+        newStart = d->pageMap.size() ? d->pageMap.constBegin().key() : -1;
 
     if (d->start == newStart) {
         d->startSetByUser = theid != -1;
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index fb49983bbf..f7dab4724b 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -2413,7 +2413,7 @@ QPolygonF QGraphicsView::mapToScene(const QRect &rect) const
 QPolygonF QGraphicsView::mapToScene(const QPolygon &polygon) const
 {
     QPolygonF poly;
-    poly.reserve(polygon.count());
+    poly.reserve(polygon.size());
     for (const QPoint &point : polygon)
         poly << mapToScene(point);
     return poly;
@@ -2509,7 +2509,7 @@ QPolygon QGraphicsView::mapFromScene(const QRectF &rect) const
 QPolygon QGraphicsView::mapFromScene(const QPolygonF &polygon) const
 {
     QPolygon poly;
-    poly.reserve(polygon.count());
+    poly.reserve(polygon.size());
     for (const QPointF &point : polygon)
         poly << mapFromScene(point);
     return poly;
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index e0334de6f0..7a7b5c4753 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -2829,10 +2829,10 @@ void QAbstractItemView::updateEditorGeometries()
 
     //we hide and release the editor outside of the loop because it might change the focus and try
     //to change the editors hashes.
-    for (int i = 0; i < editorsToHide.count(); ++i) {
+    for (int i = 0; i < editorsToHide.size(); ++i) {
         editorsToHide.at(i)->hide();
     }
-    for (int i = 0; i < editorsToRelease.count(); ++i) {
+    for (int i = 0; i < editorsToRelease.size(); ++i) {
         d->releaseEditor(editorsToRelease.at(i));
     }
 }
@@ -3793,7 +3793,7 @@ void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
 {
     Q_D(QAbstractItemView);
     QModelIndexList indexes = d->selectedDraggableIndexes();
-    if (indexes.count() > 0) {
+    if (indexes.size() > 0) {
         QMimeData *data = d->model->mimeData(indexes);
         if (!data)
             return;
@@ -4636,7 +4636,7 @@ QPixmap QAbstractItemViewPrivate::renderToPixmap(const QModelIndexList &indexes,
     QStyleOptionViewItem option;
     q->initViewItemOption(&option);
     option.state |= QStyle::State_Selected;
-    for (int j = 0; j < paintPairs.count(); ++j) {
+    for (int j = 0; j < paintPairs.size(); ++j) {
         option.rect = paintPairs.at(j).rect.translated(-r->topLeft());
         const QModelIndex &current = paintPairs.at(j).index;
         adjustViewOptionsForIndex(&option, current);
diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 551645cb3d..040bddb311 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -420,7 +420,7 @@ int QColumnView::verticalOffset() const
 */
 QRegion QColumnView::visualRegionForSelection(const QItemSelection &selection) const
 {
-    int ranges = selection.count();
+    int ranges = selection.size();
 
     if (ranges == 0)
         return QRect();
@@ -984,9 +984,9 @@ void QColumnView::selectAll()
     QModelIndexList indexList = selectionModel()->selectedIndexes();
     QModelIndex parent = rootIndex();
     QItemSelection selection;
-    if (indexList.count() >= 1)
+    if (indexList.size() >= 1)
         parent = indexList.at(0).parent();
-    if (indexList.count() == 1) {
+    if (indexList.size() == 1) {
         parent = indexList.at(0);
         if (!model()->hasChildren(parent))
             parent = parent.parent();
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index e231345437..b5b0f17f4a 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -3453,7 +3453,7 @@ void QHeaderView::initStyleOption(QStyleOptionFrame *option) const
 bool QHeaderViewPrivate::isSectionSelected(int section) const
 {
     int i = section * 2;
-    if (i < 0 || i >= sectionSelected.count())
+    if (i < 0 || i >= sectionSelected.size())
         return false;
     if (sectionSelected.testBit(i)) // if the value was cached
         return sectionSelected.testBit(i + 1);
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index 16b98b3ae3..c599aeff8d 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -120,7 +120,7 @@ public:
     inline void prepareSectionSelected() {
         if (!selectionModel || !selectionModel->hasSelection())
             sectionSelected.clear();
-        else if (sectionSelected.count() != sectionCount() * 2)
+        else if (sectionSelected.size() != sectionCount() * 2)
             sectionSelected.fill(false, sectionCount() * 2);
         else sectionSelected.fill(false);
     }
@@ -332,7 +332,7 @@ public:
 
     void setHiddenSectionsFromBitVector(const QBitArray &sectionHidden) {
         SectionItem *sectionData = sectionItems.data();
-        for (int i = 0; i < sectionHidden.count(); ++i)
+        for (int i = 0; i < sectionHidden.size(); ++i)
             sectionData[i].isHidden = sectionHidden.at(i);
     }
 
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 359f6da0bd..3ce159e185 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -2885,7 +2885,7 @@ bool QIconModeViewBase::filterStartDrag(Qt::DropActions supportedActions)
     // plus adding viewitems to the draggedItems list.
     // We need these items to draw the drag items
     QModelIndexList indexes = dd->selectionModel->selectedIndexes();
-    if (indexes.count() > 0 ) {
+    if (indexes.size() > 0 ) {
         if (viewport()->acceptDrops()) {
             QModelIndexList::ConstIterator it = indexes.constBegin();
             for (; it != indexes.constEnd(); ++it)
@@ -3140,7 +3140,7 @@ void QIconModeViewBase::doDynamicLayout(const QListViewLayoutInfo &info)
         segPosition = topLeft.x();
     }
 
-    if (moved.count() != items.size())
+    if (moved.size() != items.size())
         moved.resize(items.size());
 
     QRect rect(QPoint(), topLeft);
@@ -3335,7 +3335,7 @@ void QIconModeViewBase::moveItem(int index, const QPoint &dest)
     contentsSize = (QRect(QPoint(0, 0), contentsSize)|QRect(dest, rect.size())).size();
 
     // mark the item as moved
-    if (moved.count() != items.size())
+    if (moved.size() != items.size())
         moved.resize(items.size());
     moved.setBit(index, true);
 }
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 68f4a547f9..cc0ccf84da 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -91,7 +91,7 @@ void QListModel::insert(int row, QListWidgetItem *item)
 
 void QListModel::insert(int row, const QStringList &labels)
 {
-    const int count = labels.count();
+    const int count = labels.size();
     if (count <= 0)
         return;
     QListWidget *view = qobject_cast<QListWidget*>(QObject::parent());
@@ -376,7 +376,7 @@ void QListModel::ensureSorted(int column, Qt::SortOrder order, int start, int en
                 else if (oldRow > otherRow && newRow <= otherRow)
                     ++sorting[j].second;
             }
-            for (int k = 0; k < newPersistentIndexes.count(); ++k) {
+            for (int k = 0; k < newPersistentIndexes.size(); ++k) {
                 QModelIndex pi = newPersistentIndexes.at(k);
                 int oldPersistentRow = pi.row();
                 int newPersistentRow = oldPersistentRow;
@@ -444,7 +444,7 @@ QMimeData *QListModel::internalMimeData()  const
 QMimeData *QListModel::mimeData(const QModelIndexList &indexes) const
 {
     QList<QListWidgetItem*> itemlist;
-    const int indexesCount = indexes.count();
+    const int indexesCount = indexes.size();
     itemlist.reserve(indexesCount);
     for (int i = 0; i < indexesCount; ++i)
         itemlist << at(indexes.at(i).row());
@@ -1760,7 +1760,7 @@ QList<QListWidgetItem*> QListWidget::selectedItems() const
     Q_D(const QListWidget);
     QModelIndexList indexes = selectionModel()->selectedIndexes();
     QList<QListWidgetItem*> items;
-    const int numIndexes = indexes.count();
+    const int numIndexes = indexes.size();
     items.reserve(numIndexes);
     for (int i = 0; i < numIndexes; ++i)
         items.append(d->listModel()->at(indexes.at(i).row()));
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 3cd93f9337..cfde93a477 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -2197,7 +2197,7 @@ QModelIndexList QTableView::selectedIndexes() const
     QModelIndexList modelSelected;
     if (d->selectionModel)
         modelSelected = d->selectionModel->selectedIndexes();
-    for (int i = 0; i < modelSelected.count(); ++i) {
+    for (int i = 0; i < modelSelected.size(); ++i) {
         QModelIndex index = modelSelected.at(i);
         if (!isIndexHidden(index) && index.parent() == d->root)
             viewSelected.append(index);
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index d646cae406..67886be94f 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -809,7 +809,7 @@ QMimeData *QTableModel::internalMimeData()  const
 QMimeData *QTableModel::mimeData(const QModelIndexList &indexes) const
 {
     QList<QTableWidgetItem*> items;
-    const int indexesCount = indexes.count();
+    const int indexesCount = indexes.size();
     items.reserve(indexesCount);
     for (int i = 0; i < indexesCount; ++i)
         items << item(indexes.at(i));
@@ -2087,7 +2087,7 @@ void QTableWidget::setVerticalHeaderLabels(const QStringList &labels)
     Q_D(QTableWidget);
     QTableModel *model = d->tableModel();
     QTableWidgetItem *item = nullptr;
-    for (int i = 0; i < model->rowCount() && i < labels.count(); ++i) {
+    for (int i = 0; i < model->rowCount() && i < labels.size(); ++i) {
         item = model->verticalHeaderItem(i);
         if (!item) {
             item = model->createItem();
@@ -2105,7 +2105,7 @@ void QTableWidget::setHorizontalHeaderLabels(const QStringList &labels)
     Q_D(QTableWidget);
     QTableModel *model = d->tableModel();
     QTableWidgetItem *item = nullptr;
-    for (int i = 0; i < model->columnCount() && i < labels.count(); ++i) {
+    for (int i = 0; i < model->columnCount() && i < labels.size(); ++i) {
         item = model->horizontalHeaderItem(i);
         if (!item) {
             item = model->createItem();
@@ -2697,7 +2697,7 @@ void QTableWidget::dropEvent(QDropEvent *event) {
             }
 
             QList<QTableWidgetItem *> taken;
-            const int indexesCount = indexes.count();
+            const int indexesCount = indexes.size();
             taken.reserve(indexesCount);
             for (const auto &index : indexes)
                 taken.append(takeItem(index.row(), index.column()));
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 6cf05c411f..065c42d6b7 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -1037,7 +1037,7 @@ void QTreeView::keyboardSearch(const QString &search)
             if (searchFrom.parent() == start.parent())
                 searchFrom = start;
             QModelIndexList match = d->model->match(searchFrom, Qt::DisplayRole, searchString);
-            if (match.count()) {
+            if (match.size()) {
                 int hitIndex = d->viewIndex(match.at(0));
                 if (hitIndex >= 0 && hitIndex < startIndex)
                     bestAbove = bestAbove == -1 ? hitIndex : qMin(hitIndex, bestAbove);
@@ -1556,11 +1556,11 @@ void QTreeViewPrivate::calcLogicalIndices(
         }
     }
 
-    itemPositions->resize(logicalIndices->count());
-    for (int currentLogicalSection = 0; currentLogicalSection < logicalIndices->count(); ++currentLogicalSection) {
+    itemPositions->resize(logicalIndices->size());
+    for (int currentLogicalSection = 0; currentLogicalSection < logicalIndices->size(); ++currentLogicalSection) {
         const int headerSection = logicalIndices->at(currentLogicalSection);
         // determine the viewItemPosition depending on the position of column 0
-        int nextLogicalSection = currentLogicalSection + 1 >= logicalIndices->count()
+        int nextLogicalSection = currentLogicalSection + 1 >= logicalIndices->size()
                                  ? logicalIndexAfterRight
                                  : logicalIndices->at(currentLogicalSection + 1);
         int prevLogicalSection = currentLogicalSection - 1 < 0
@@ -2409,7 +2409,7 @@ QModelIndexList QTreeView::selectedIndexes() const
     QModelIndexList modelSelected;
     if (selectionModel())
         modelSelected = selectionModel()->selectedIndexes();
-    for (int i = 0; i < modelSelected.count(); ++i) {
+    for (int i = 0; i < modelSelected.size(); ++i) {
         // check that neither the parents nor the index is hidden before we add
         QModelIndex index = modelSelected.at(i);
         while (index.isValid() && !isIndexHidden(index))
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 3fe843895c..3fa8a7e1b9 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -627,7 +627,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order,
                 else if (oldRow > otherRow && newRow <= otherRow)
                     ++sorting[j].second;
             }
-            for (int k = 0; k < newPersistentIndexes.count(); ++k) {
+            for (int k = 0; k < newPersistentIndexes.size(); ++k) {
                 QModelIndex pi = newPersistentIndexes.at(k);
                 if (pi.parent() != parent)
                     continue;
@@ -827,7 +827,7 @@ void QTreeModel::sortItems(QList<QTreeWidgetItem*> *items, int column, Qt::SortO
         return;
 
     // store the original order of indexes
-    QList<QPair<QTreeWidgetItem *, int>> sorting(items->count());
+    QList<QPair<QTreeWidgetItem *, int>> sorting(items->size());
     for (int i = 0; i < sorting.size(); ++i) {
         sorting[i].first = items->at(i);
         sorting[i].second = i;
@@ -1396,7 +1396,7 @@ QTreeWidgetItem::QTreeWidgetItem(int type) : rtti(type), d(new QTreeWidgetItemPr
 QTreeWidgetItem::QTreeWidgetItem(const QStringList &strings, int type)
     : rtti(type), d(new QTreeWidgetItemPrivate(this))
 {
-    for (int i = 0; i < strings.count(); ++i)
+    for (int i = 0; i < strings.size(); ++i)
         setText(i, strings.at(i));
 }
 
@@ -1432,7 +1432,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, int type)
 QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, const QStringList &strings, int type)
     : rtti(type), d(new QTreeWidgetItemPrivate(this))
 {
-    for (int i = 0; i < strings.count(); ++i)
+    for (int i = 0; i < strings.size(); ++i)
         setText(i, strings.at(i));
     // do not set this->view here otherwise insertChild() will fail
     if (QTreeModel *model = treeModel(treeview)) {
@@ -1481,7 +1481,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, int type)
 QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &strings, int type)
     : rtti(type), d(new QTreeWidgetItemPrivate(this))
 {
-    for (int i = 0; i < strings.count(); ++i)
+    for (int i = 0; i < strings.size(); ++i)
         setText(i, strings.at(i));
     if (parent)
         parent->addChild(this);
@@ -1755,8 +1755,8 @@ void QTreeWidgetItem::setData(int column, int role, const QVariant &value)
             else
                 values.resize(column + 1);
         }
-        if (d->display.count() <= column) {
-            for (int i = d->display.count() - 1; i < column - 1; ++i)
+        if (d->display.size() <= column) {
+            for (int i = d->display.size() - 1; i < column - 1; ++i)
                 d->display.append(QVariant());
             d->display.append(value);
         } else if (d->display[column] != value) {
@@ -1823,7 +1823,7 @@ QVariant QTreeWidgetItem::data(int column, int role) const
     switch (role) {
     case Qt::EditRole:
     case Qt::DisplayRole:
-        if (column >= 0 && column < d->display.count())
+        if (column >= 0 && column < d->display.size())
             return d->display.at(column);
         break;
     case Qt::CheckStateRole:
@@ -2375,13 +2375,13 @@ void QTreeWidgetPrivate::_q_selectionChanged(const QItemSelection &selected, con
     QModelIndexList indices = selected.indexes();
     int i;
     QTreeModel *m = treeModel();
-    for (i = 0; i < indices.count(); ++i) {
+    for (i = 0; i < indices.size(); ++i) {
         QTreeWidgetItem *item = m->item(indices.at(i));
         item->d->selected = true;
     }
 
     indices = deselected.indexes();
-    for (i = 0; i < indices.count(); ++i) {
+    for (i = 0; i < indices.size(); ++i) {
         QTreeWidgetItem *item = m->item(indices.at(i));
         item->d->selected = false;
     }
@@ -2806,10 +2806,10 @@ void QTreeWidget::setHeaderItem(QTreeWidgetItem *item)
 void QTreeWidget::setHeaderLabels(const QStringList &labels)
 {
     Q_D(QTreeWidget);
-    if (columnCount() < labels.count())
-        setColumnCount(labels.count());
+    if (columnCount() < labels.size())
+        setColumnCount(labels.size());
     QTreeWidgetItem *item = d->treeModel()->headerItem;
-    for (int i = 0; i < labels.count(); ++i)
+    for (int i = 0; i < labels.size(); ++i)
         item->setText(i, labels.at(i));
 }
 
@@ -3052,8 +3052,8 @@ QList<QTreeWidgetItem*> QTreeWidget::selectedItems() const
     Q_D(const QTreeWidget);
     const QModelIndexList indexes = selectionModel()->selectedIndexes();
     QList<QTreeWidgetItem*> items;
-    items.reserve(indexes.count());
-    QDuplicateTracker<QTreeWidgetItem *> seen(indexes.count());
+    items.reserve(indexes.size());
+    QDuplicateTracker<QTreeWidgetItem *> seen(indexes.size());
     for (const auto &index : indexes) {
         QTreeWidgetItem *item = d->item(index);
         if (item->isHidden() || seen.hasSeen(item))
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 854d638abb..13897e1218 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3330,7 +3330,7 @@ void QApplicationPrivate::closePopup(QWidget *popup)
          qt_popup_down = nullptr;
      }
 
-    if (QApplicationPrivate::popupWidgets->count() == 0) { // this was the last popup
+    if (QApplicationPrivate::popupWidgets->size() == 0) { // this was the last popup
         delete QApplicationPrivate::popupWidgets;
         QApplicationPrivate::popupWidgets = nullptr;
         qt_popup_down_closed = false;
@@ -3375,7 +3375,7 @@ void QApplicationPrivate::closePopup(QWidget *popup)
 
         // can become nullptr due to setFocus() above
         if (QApplicationPrivate::popupWidgets &&
-            QApplicationPrivate::popupWidgets->count() == 1) // grab mouse/keyboard
+            QApplicationPrivate::popupWidgets->size() == 1) // grab mouse/keyboard
             grabForPopup(aw);
     }
 
@@ -3390,7 +3390,7 @@ void QApplicationPrivate::openPopup(QWidget *popup)
         popupWidgets = new QWidgetList;
     popupWidgets->append(popup); // add to end of list
 
-    if (QApplicationPrivate::popupWidgets->count() == 1) // grab mouse/keyboard
+    if (QApplicationPrivate::popupWidgets->size() == 1) // grab mouse/keyboard
         grabForPopup(popup);
 
     // popups are not focus-handled by the window system (the first
@@ -3398,7 +3398,7 @@ void QApplicationPrivate::openPopup(QWidget *popup)
     // new popup gets the focus
     if (popup->focusWidget()) {
         popup->focusWidget()->setFocus(Qt::PopupFocusReason);
-    } else if (popupWidgets->count() == 1) { // this was the first popup
+    } else if (popupWidgets->size() == 1) { // this was the first popup
         if (QWidget *fw = QApplication::focusWidget()) {
             QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason);
             QCoreApplication::sendEvent(fw, &e);
diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index e83f9d4bb2..cf16d2a005 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -302,7 +302,7 @@ void QWidgetRepaintManager::removeDirtyWidget(QWidget *w)
     needsFlushWidgets.removeAll(w);
 
     QWidgetPrivate *wd = w->d_func();
-    const int n = wd->children.count();
+    const int n = wd->children.size();
     for (int i = 0; i < n; ++i) {
         if (QWidget *child = qobject_cast<QWidget*>(wd->children.at(i)))
             removeDirtyWidget(child);
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index abf3566e1c..1b519bf4c5 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -326,7 +326,7 @@ int QCompletionModel::rowCount(const QModelIndex &parent) const
 
     if (showAll) {
         // Show all items below current parent, even if we have no valid matches
-        if (engine->curParts.count() != 1  && !engine->matchCount()
+        if (engine->curParts.size() != 1  && !engine->matchCount()
             && !engine->curParent.isValid())
             return 0;
         return d->model->rowCount(engine->curParent);
@@ -411,7 +411,7 @@ void QCompletionEngine::filter(const QStringList& parts)
         return;
 
     QModelIndex parent;
-    for (int i = 0; i < curParts.count() - 1; i++) {
+    for (int i = 0; i < curParts.size() - 1; i++) {
         QString part = curParts.at(i);
         int emi = filter(part, parent, -1).exactMatchIndex;
         if (emi == -1)
@@ -432,7 +432,7 @@ void QCompletionEngine::filter(const QStringList& parts)
 QMatchData QCompletionEngine::filterHistory()
 {
     QAbstractItemModel *source = c->proxy->sourceModel();
-    if (curParts.count() <= 1 || c->proxy->showAll || !source)
+    if (curParts.size() <= 1 || c->proxy->showAll || !source)
         return QMatchData();
 
 #if QT_CONFIG(filesystemmodel)
@@ -516,7 +516,7 @@ void QCompletionEngine::saveInCache(QString part, const QModelIndex& parent, con
         QMap<QModelIndex, CacheItem>::iterator it1 = cache.begin();
         while (it1 != cache.end()) {
             CacheItem& ci = it1.value();
-            int sz = ci.count()/2;
+            int sz = ci.size()/2;
             QMap<QString, QMatchData>::iterator it2 = ci.begin();
             int i = 0;
             while (it2 != ci.end() && i < sz) {
@@ -524,7 +524,7 @@ void QCompletionEngine::saveInCache(QString part, const QModelIndex& parent, con
                 it2 = ci.erase(it2);
                 i++;
             }
-            if (ci.count() == 0) {
+            if (ci.size() == 0) {
               it1 = cache.erase(it1);
             } else {
               ++it1;
@@ -1811,7 +1811,7 @@ QString QCompleter::pathFromIndex(const QModelIndex& index) const
     } while (idx.isValid());
 
 #if !defined(Q_OS_WIN)
-    if (list.count() == 1) // only the separator or some other text
+    if (list.size() == 1) // only the separator or some other text
         return list[0];
     list[0].clear() ; // the join below will provide the separator
 #endif
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index b3a2531c18..331764efa8 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -2289,7 +2289,7 @@ void QComboBox::insertItems(int index, const QStringList &list)
     if (list.isEmpty())
         return;
     index = qBound(0, index, count());
-    int insertCount = qMin(d->maxCount - index, list.count());
+    int insertCount = qMin(d->maxCount - index, list.size());
     if (insertCount <= 0)
         return;
     // For the common case where we are using the built in QStandardItemModel
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 0fbda907a1..0c2777698a 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1577,7 +1577,7 @@ bool QDockWidget::event(QEvent *event)
         bool onTop = false;
         if (win != nullptr) {
             const QObjectList &siblings = win->children();
-            onTop = siblings.count() > 0 && siblings.last() == (QObject*)this;
+            onTop = siblings.size() > 0 && siblings.last() == (QObject*)this;
         }
 #if QT_CONFIG(tabbar)
         if (!isFloating() && layout != nullptr && onTop)
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 036d470f9f..a7f31995e1 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -317,7 +317,7 @@ void QFontComboBoxPrivate::_q_updateModel()
         }
         result += list.at(i);
         if (list.at(i) == fi.family() || list.at(i).startsWith(fi.family() + " ["_L1))
-            offset = result.count() - 1;
+            offset = result.size() - 1;
     }
     list = result;