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 <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

27 files changed, 78 insertions, 78 deletions

diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index c6e339b4bb2..e650a591518 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -1811,12 +1811,12 @@ QRect AtSpiAdaptor::getExtents(QAccessibleInterface *interface, uint coordType)
 bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
 {
     if (function == "GetNActions"_L1) {
-        int count = QAccessibleBridgeUtils::effectiveActionNames(interface).count();
+        int count = QAccessibleBridgeUtils::effectiveActionNames(interface).size();
         sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(count))));
     } else if (function == "DoAction"_L1) {
         int index = message.arguments().at(0).toInt();
         const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
-        if (index < 0 || index >= actionNames.count())
+        if (index < 0 || index >= actionNames.size())
             return false;
         const QString actionName = actionNames.at(index);
         bool success = QAccessibleBridgeUtils::performEffectiveAction(interface, actionName);
@@ -1826,13 +1826,13 @@ bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QStrin
     } else if (function == "GetName"_L1) {
         int index = message.arguments().at(0).toInt();
         const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
-        if (index < 0 || index >= actionNames.count())
+        if (index < 0 || index >= actionNames.size())
             return false;
         sendReply(connection, message, actionNames.at(index));
     } else if (function == "GetDescription"_L1) {
         int index = message.arguments().at(0).toInt();
         const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
-        if (index < 0 || index >= actionNames.count())
+        if (index < 0 || index >= actionNames.size())
             return false;
         QString description;
         if (QAccessibleActionInterface *actionIface = interface->actionInterface())
@@ -1843,7 +1843,7 @@ bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QStrin
     } else if (function == "GetKeyBinding"_L1) {
         int index = message.arguments().at(0).toInt();
         const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
-        if (index < 0 || index >= actionNames.count())
+        if (index < 0 || index >= actionNames.size())
             return false;
         QStringList keyBindings;
         if (QAccessibleActionInterface *actionIface = interface->actionInterface())
@@ -1853,7 +1853,7 @@ bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QStrin
             if (!acc.isEmpty())
                 keyBindings.append(acc);
         }
-        if (keyBindings.length() > 0)
+        if (keyBindings.size() > 0)
             sendReply(connection, message, keyBindings.join(u';'));
         else
             sendReply(connection, message, QString());
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 233231c7979..e54738e075e 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -670,7 +670,7 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
         const QString cn = QLatin1StringView(mo->className());
 
         // Check if the class has a InterfaceFactory installed.
-        for (int i = qAccessibleFactories()->count(); i > 0; --i) {
+        for (int i = qAccessibleFactories()->size(); i > 0; --i) {
             InterfaceFactory factory = qAccessibleFactories()->at(i - 1);
             if (QAccessibleInterface *iface = factory(cn, object)) {
                 QAccessibleCache::instance()->insert(object, iface);
@@ -787,7 +787,7 @@ bool QAccessible::isActive()
 */
 void QAccessible::setActive(bool active)
 {
-    for (int i = 0; i < qAccessibleActivationObservers()->count() ;++i)
+    for (int i = 0; i < qAccessibleActivationObservers()->size() ;++i)
         qAccessibleActivationObservers()->at(i)->accessibilityActiveChanged(active);
 }
 
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index af9d3aa0fcb..61d3a90632f 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -124,7 +124,7 @@ static QObjectList topLevelObjects()
 {
     QObjectList list;
     const QWindowList tlw(QGuiApplication::topLevelWindows());
-    for (int i = 0; i < tlw.count(); ++i) {
+    for (int i = 0; i < tlw.size(); ++i) {
         QWindow *w = tlw.at(i);
         if (w->type() != Qt::Popup && w->type() != Qt::Desktop) {
             if (QAccessibleInterface *root = w->accessibleRoot()) {
@@ -140,7 +140,7 @@ static QObjectList topLevelObjects()
 /*! \reimp */
 int QAccessibleApplication::childCount() const
 {
-    return topLevelObjects().count();
+    return topLevelObjects().size();
 }
 
 /*! \reimp */
@@ -160,7 +160,7 @@ QAccessibleInterface *QAccessibleApplication::parent() const
 QAccessibleInterface *QAccessibleApplication::child(int index) const
 {
     const QObjectList tlo(topLevelObjects());
-    if (index >= 0 && index < tlo.count())
+    if (index >= 0 && index < tlo.size())
         return QAccessible::queryAccessibleInterface(tlo.at(index));
     return nullptr;
 }
diff --git a/src/gui/accessible/qplatformaccessibility.cpp b/src/gui/accessible/qplatformaccessibility.cpp
index 92936c74e64..ae7635ff7c9 100644
--- a/src/gui/accessible/qplatformaccessibility.cpp
+++ b/src/gui/accessible/qplatformaccessibility.cpp
@@ -50,7 +50,7 @@ void QPlatformAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
     if (!bridges() || bridges()->isEmpty())
         return;
 
-    for (int i = 0; i < bridges()->count(); ++i)
+    for (int i = 0; i < bridges()->size(); ++i)
         bridges()->at(i)->notifyAccessibilityUpdate(event);
 }
 
@@ -63,7 +63,7 @@ void QPlatformAccessibility::setRootObject(QObject *o)
     if (!o)
         return;
 
-    for (int i = 0; i < bridges()->count(); ++i) {
+    for (int i = 0; i < bridges()->size(); ++i) {
         QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(o);
         bridges()->at(i)->setRootObject(iface);
     }
diff --git a/src/gui/itemmodels/qfileinfogatherer.cpp b/src/gui/itemmodels/qfileinfogatherer.cpp
index f7c36b4ca85..1b88b3e0181 100644
--- a/src/gui/itemmodels/qfileinfogatherer.cpp
+++ b/src/gui/itemmodels/qfileinfogatherer.cpp
@@ -344,13 +344,13 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
         if (files.isEmpty()) {
             infoList = QDir::drives();
         } else {
-            infoList.reserve(files.count());
+            infoList.reserve(files.size());
             for (const auto &file : files)
                 infoList << QFileInfo(file);
         }
         QList<QPair<QString, QFileInfo>> updatedFiles;
-        updatedFiles.reserve(infoList.count());
-        for (int i = infoList.count() - 1; i >= 0; --i) {
+        updatedFiles.reserve(infoList.size());
+        for (int i = infoList.size() - 1; i >= 0; --i) {
             QFileInfo driveInfo = infoList.at(i);
             driveInfo.stat();
             QString driveName = translateDriveName(driveInfo);
diff --git a/src/gui/itemmodels/qfilesystemmodel.cpp b/src/gui/itemmodels/qfilesystemmodel.cpp
index 44278f86bea..d44e89fde02 100644
--- a/src/gui/itemmodels/qfilesystemmodel.cpp
+++ b/src/gui/itemmodels/qfilesystemmodel.cpp
@@ -394,12 +394,12 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
 
     QFileSystemModelPrivate::QFileSystemNode *parent = node(index);
 
-    for (int i = 0; i < pathElements.count(); ++i) {
+    for (int i = 0; i < pathElements.size(); ++i) {
         QString element = pathElements.at(i);
         if (i != 0)
             elementPath.append(separator);
         elementPath.append(element);
-        if (i == pathElements.count() - 1)
+        if (i == pathElements.size() - 1)
             elementPath.append(trailingSeparator);
 #ifdef Q_OS_WIN
         // On Windows, "filename    " and "filename" are equivalent and
@@ -1106,7 +1106,7 @@ void QFileSystemModel::sort(int column, Qt::SortOrder order)
     emit layoutAboutToBeChanged();
     QModelIndexList oldList = persistentIndexList();
     QList<QPair<QFileSystemModelPrivate::QFileSystemNode *, int>> oldNodes;
-    const int nodeCount = oldList.count();
+    const int nodeCount = oldList.size();
     oldNodes.reserve(nodeCount);
     for (int i = 0; i < nodeCount; ++i) {
         const QModelIndex &oldNode = oldList.at(i);
@@ -1752,7 +1752,7 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
         if ((iterator == newFiles.end()) || (i.value()->fileName < *iterator))
             toRemove.append(i.value()->fileName);
     }
-    for (int i = 0 ; i < toRemove.count() ; ++i )
+    for (int i = 0 ; i < toRemove.size() ; ++i )
         removeNode(parentNode, toRemove[i]);
 }
 
@@ -1844,7 +1844,7 @@ void QFileSystemModelPrivate::addVisibleFiles(QFileSystemNode *parentNode, const
     QModelIndex parent = index(parentNode);
     bool indexHidden = isHiddenByFilter(parentNode, parent);
     if (!indexHidden) {
-        q->beginInsertRows(parent, parentNode->visibleChildren.size() , parentNode->visibleChildren.size() + newFiles.count() - 1);
+        q->beginInsertRows(parent, parentNode->visibleChildren.size() , parentNode->visibleChildren.size() + newFiles.size() - 1);
     }
 
     if (parentNode->dirtyChildrenIndex == -1)
@@ -1974,11 +1974,11 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path,
         max = QString();*/
     }
 
-    if (newFiles.count() > 0) {
+    if (newFiles.size() > 0) {
         addVisibleFiles(parentNode, newFiles);
     }
 
-    if (newFiles.count() > 0 || (sortColumn != 0 && rowsToUpdate.size() > 0)) {
+    if (newFiles.size() > 0 || (sortColumn != 0 && rowsToUpdate.size() > 0)) {
         forceSort = true;
         delayedSort();
     }
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 8a21190e49b..09203986106 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -2529,9 +2529,9 @@ QStandardItem *QStandardItemModel::verticalHeaderItem(int row) const
 void QStandardItemModel::setHorizontalHeaderLabels(const QStringList &labels)
 {
     Q_D(QStandardItemModel);
-    if (columnCount() < labels.count())
-        setColumnCount(labels.count());
-    for (int i = 0; i < labels.count(); ++i) {
+    if (columnCount() < labels.size())
+        setColumnCount(labels.size());
+    for (int i = 0; i < labels.size(); ++i) {
         QStandardItem *item = horizontalHeaderItem(i);
         if (!item) {
             item = d->createItem();
@@ -2552,9 +2552,9 @@ void QStandardItemModel::setHorizontalHeaderLabels(const QStringList &labels)
 void QStandardItemModel::setVerticalHeaderLabels(const QStringList &labels)
 {
     Q_D(QStandardItemModel);
-    if (rowCount() < labels.count())
-        setRowCount(labels.count());
-    for (int i = 0; i < labels.count(); ++i) {
+    if (rowCount() < labels.size())
+        setRowCount(labels.size());
+    for (int i = 0; i < labels.size(); ++i) {
         QStandardItem *item = verticalHeaderItem(i);
         if (!item) {
             item = d->createItem();
@@ -3112,9 +3112,9 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
 
     QSet<QStandardItem*> itemsSet;
     QStack<QStandardItem*> stack;
-    itemsSet.reserve(indexes.count());
-    stack.reserve(indexes.count());
-    for (int i = 0; i < indexes.count(); ++i) {
+    itemsSet.reserve(indexes.size());
+    stack.reserve(indexes.size());
+    for (int i = 0; i < indexes.size(); ++i) {
         if (QStandardItem *item = itemFromIndex(indexes.at(i))) {
             itemsSet << item;
             stack.push(item);
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 646c705148c..36030cac42a 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -883,7 +883,7 @@ bool QGuiApplicationPrivate::isWindowBlocked(QWindow *window, QWindow **blocking
     if (modalWindowList.isEmpty() || windowNeverBlocked(window))
         return false;
 
-    for (int i = 0; i < modalWindowList.count(); ++i) {
+    for (int i = 0; i < modalWindowList.size(); ++i) {
         QWindow *modalWindow = modalWindowList.at(i);
 
         // A window is not blocked by another modal window if the two are
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 338ec08357e..7085e65ae43 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1129,7 +1129,7 @@ int QKeySequencePrivate::decodeString(QString accel, QKeySequence::SequenceForma
         // except for a single '+' at the end of the string.
 
         // Only '+' can have length 1.
-        if (sub.length() == 1) {
+        if (sub.size() == 1) {
             // Make sure we only encounter a single '+' at the end of the accel
             if (accel.lastIndexOf(u'+') != accel.size()-1)
                 return Qt::Key_unknown;
@@ -1157,7 +1157,7 @@ int QKeySequencePrivate::decodeString(QString accel, QKeySequence::SequenceForma
         accelRef = accelRef.mid(p + 1);
 
     int fnum = 0;
-    if (accelRef.length() == 1) {
+    if (accelRef.size() == 1) {
 #if defined(Q_OS_MACOS)
         int qtKey = qtkeyForMacSymbol(accelRef.at(0));
         if (qtKey != -1) {
@@ -1554,7 +1554,7 @@ QList<QKeySequence> QKeySequence::listFromString(const QString &str, SequenceFor
     QList<QKeySequence> result;
 
     const QStringList strings = str.split("; "_L1);
-    result.reserve(strings.count());
+    result.reserve(strings.size());
     for (const QString &string : strings) {
         result << fromString(string, format);
     }
diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
index ceec540784a..77cbfd2b964 100644
--- a/src/gui/kernel/qsimpledrag.cpp
+++ b/src/gui/kernel/qsimpledrag.cpp
@@ -35,7 +35,7 @@ Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
 static QWindow* topLevelAt(const QPoint &pos)
 {
     QWindowList list = QGuiApplication::topLevelWindows();
-    for (int i = list.count()-1; i >= 0; --i) {
+    for (int i = list.size()-1; i >= 0; --i) {
         QWindow *w = list.at(i);
         if (w->isVisible() && w->handle() && w->geometry().contains(pos) && !qobject_cast<QShapedPixmapWindow*>(w))
             return w;
diff --git a/src/gui/painting/qpageranges.cpp b/src/gui/painting/qpageranges.cpp
index 2c4d5cca6c9..500673b22fa 100644
--- a/src/gui/painting/qpageranges.cpp
+++ b/src/gui/painting/qpageranges.cpp
@@ -162,7 +162,7 @@ QPageRanges QPageRanges::fromString(const QString &ranges)
 
         if (item.contains(u'-')) {
             const QStringList rangeItems = item.split(u'-');
-            if (rangeItems.count() != 2)
+            if (rangeItems.size() != 2)
                 return QPageRanges();
 
             bool ok;
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index f3dc7588f9d..66123eee7d4 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -4278,7 +4278,7 @@ protected:
 void QGradientCache::generateGradientColorTable(const QGradient& gradient, QRgba64 *colorTable, int size, int opacity) const
 {
     const QGradientStops stops = gradient.stops();
-    int stopCount = stops.count();
+    int stopCount = stops.size();
     Q_ASSERT(stopCount > 0);
 
     bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index 99d67599ed7..a3a89d7504a 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -421,7 +421,7 @@ QDebug operator<<(QDebug dbg, const QPolygon &a)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QPolygon(";
-    for (int i = 0; i < a.count(); ++i)
+    for (int i = 0; i < a.size(); ++i)
         dbg.nospace() << a.at(i);
     dbg.nospace() << ')';
     return dbg;
@@ -742,7 +742,7 @@ QDebug operator<<(QDebug dbg, const QPolygonF &a)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QPolygonF(";
-    for (int i = 0; i < a.count(); ++i)
+    for (int i = 0; i < a.size(); ++i)
         dbg.nospace() << a.at(i);
     dbg.nospace() << ')';
     return dbg;
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index fc403f60b13..457c2cc2594 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -3818,7 +3818,7 @@ QRegion::QRegion(const QRect &r, RegionType t)
 
 QRegion::QRegion(const QPolygon &a, Qt::FillRule fillRule)
 {
-    if (a.count() > 2) {
+    if (a.size() > 2) {
         QRegionPrivate *qt_rgn = PolygonRegion(a.constData(), a.size(),
                                                fillRule == Qt::WindingFill ? WindingRule : EvenOddRule);
         if (qt_rgn) {
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 8aecf167298..6c49cd35ead 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1760,7 +1760,7 @@ QPolygon QTransform::mapToPolygon(const QRect &rect) const
 */
 bool QTransform::squareToQuad(const QPolygonF &quad, QTransform &trans)
 {
-    if (quad.count() != 4)
+    if (quad.size() != 4)
         return false;
 
     qreal dx0 = quad[0].x();
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index 01c0b402948..9ed7f89b2af 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -478,7 +478,7 @@ bool QRhiVulkan::create(QRhi::Flags flags)
             for (const VkExtensionProperties &p : std::as_const(extProps))
                 devExts.append({ p.extensionName, p.specVersion });
         }
-        qCDebug(QRHI_LOG_INFO, "%d device extensions available", int(devExts.count()));
+        qCDebug(QRHI_LOG_INFO, "%d device extensions available", int(devExts.size()));
 
         QList<const char *> requestedDevExts;
         requestedDevExts.append("VK_KHR_swapchain");
@@ -1759,7 +1759,7 @@ QRhi::FrameOpResult QRhiVulkan::beginFrame(QRhiSwapChain *swapChain, QRhi::Begin
     // when profiling is enabled, pick a free query (pair) from the pool
     int timestampQueryIdx = -1;
     if (hasGpuFrameTimeCallback() && swapChainD->bufferCount > 1) { // no timestamps if not having at least 2 frames in flight
-        for (int i = 0; i < timestampQueryPoolMap.count(); ++i) {
+        for (int i = 0; i < timestampQueryPoolMap.size(); ++i) {
             if (!timestampQueryPoolMap.testBit(i)) {
                 timestampQueryPoolMap.setBit(i);
                 timestampQueryIdx = i * 2;
@@ -3245,9 +3245,9 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
             cmd.args.copyBufferToImage.src = utexD->stagingBuffers[currentFrameSlot];
             cmd.args.copyBufferToImage.dst = utexD->image;
             cmd.args.copyBufferToImage.dstLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-            cmd.args.copyBufferToImage.count = copyInfos.count();
+            cmd.args.copyBufferToImage.count = copyInfos.size();
             cmd.args.copyBufferToImage.bufferImageCopyIndex = cbD->pools.bufferImageCopy.size();
-            cbD->pools.bufferImageCopy.append(copyInfos.constData(), copyInfos.count());
+            cbD->pools.bufferImageCopy.append(copyInfos.constData(), copyInfos.size());
 
             // no reuse of staging, this is intentional
             QRhiVulkan::DeferredReleaseEntry e;
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
index 47fc598a813..85a02712724 100644
--- a/src/gui/rhi/qshader.cpp
+++ b/src/gui/rhi/qshader.cpp
@@ -388,7 +388,7 @@ QByteArray QShader::serialized() const
         const QShaderKey &k(it.key());
         writeShaderKey(&ds, k);
         const NativeResourceBindingMap &map(it.value());
-        ds << int(map.count());
+        ds << int(map.size());
         for (auto mapIt = map.cbegin(), mapItEnd = map.cend(); mapIt != mapItEnd; ++mapIt) {
             ds << mapIt.key();
             ds << mapIt.value().first;
@@ -400,7 +400,7 @@ QByteArray QShader::serialized() const
         const QShaderKey &k(it.key());
         writeShaderKey(&ds, k);
         const SeparateToCombinedImageSamplerMappingList &list(it.value());
-        ds << int(list.count());
+        ds << int(list.size());
         for (auto listIt = list.cbegin(), listItEnd = list.cend(); listIt != listItEnd; ++listIt) {
             ds << listIt->combinedSamplerName;
             ds << listIt->textureBinding;
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 98293d436c8..2f3c04dc54e 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -697,7 +697,7 @@ static ColorData parseColorValue(QCss::Value v)
         return ColorData();
 
     QStringList lst = v.variant.toStringList();
-    if (lst.count() != 2)
+    if (lst.size() != 2)
         return ColorData();
 
     const QString &identifier = lst.at(0);
@@ -794,7 +794,7 @@ static BrushData parseBrushValue(const QCss::Value &v, const QPalette &pal)
         return BrushData();
 
     QStringList lst = v.variant.toStringList();
-    if (lst.count() != 2)
+    if (lst.size() != 2)
         return BrushData();
 
     QStringList gradFuncs;
@@ -1617,7 +1617,7 @@ QRect Declaration::rectValue() const
     if (v.type != Value::Function)
         return QRect();
     const QStringList func = v.variant.toStringList();
-    if (func.count() != 2 || func.at(0).compare("rect"_L1) != 0)
+    if (func.size() != 2 || func.at(0).compare("rect"_L1) != 0)
         return QRect();
     const auto args = QStringView{func[1]}.split(u' ', Qt::SkipEmptyParts);
     if (args.size() != 4)
@@ -1863,7 +1863,7 @@ int Selector::specificity() const
             val += 1;
 
         val += (sel.pseudos.size() + sel.attributeSelectors.size()) * 0x10;
-        val += sel.ids.count() * 0x100;
+        val += sel.ids.size() * 0x100;
     }
     return val;
 }
@@ -2128,7 +2128,7 @@ QList<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
 
         if (!styleSheet.idIndex.isEmpty()) {
             QStringList ids = nodeIds(node);
-            for (int i = 0; i < ids.count(); i++) {
+            for (int i = 0; i < ids.size(); i++) {
                 const QString &key = ids.at(i);
                 QMultiHash<QString, StyleRule>::const_iterator it = styleSheet.idIndex.constFind(key);
                 while (it != styleSheet.idIndex.constEnd() && it.key() == key) {
@@ -2139,7 +2139,7 @@ QList<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
         }
         if (!styleSheet.nameIndex.isEmpty()) {
             QStringList names = nodeNames(node);
-            for (int i = 0; i < names.count(); i++) {
+            for (int i = 0; i < names.size(); i++) {
                 QString name = names.at(i);
                 if (nameCaseSensitivity == Qt::CaseInsensitive)
                     name = std::move(name).toLower();
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 3ff73baf922..2b649a7dd82 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -179,7 +179,7 @@ static QStringList splitIntoFamilies(const QString &family)
         auto str = list.at(i).trimmed();
         if ((str.startsWith(u'"') && str.endsWith(u'"'))
             || (str.startsWith(u'\'') && str.endsWith(u'\''))) {
-            str = str.mid(1, str.length() - 2);
+            str = str.mid(1, str.size() - 2);
         }
         familyList << str.toString();
     }
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 27284d8d5a7..35d60485940 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1904,9 +1904,9 @@ void QTextEngine::itemize() const
     {
         QUnicodeTools::ScriptItemArray scriptItems;
         QUnicodeTools::initScripts(layoutData->string, &scriptItems);
-        for (int i = 0; i < scriptItems.length(); ++i) {
+        for (int i = 0; i < scriptItems.size(); ++i) {
             const auto &item = scriptItems.at(i);
-            int end = i < scriptItems.length() - 1 ? scriptItems.at(i + 1).position : length;
+            int end = i < scriptItems.size() - 1 ? scriptItems.at(i + 1).position : length;
             for (int j = item.position; j < end; ++j)
                 analysis[j].script = item.script;
         }
@@ -3171,7 +3171,7 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const
                 if (tabSpec.type == QTextOption::RightTab || tabSpec.type == QTextOption::CenterTab) {
                     // find next tab to calculate the width required.
                     tab = QFixed::fromReal(tabSpec.position);
-                    for (int i=item + 1; i < layoutData->items.count(); i++) {
+                    for (int i=item + 1; i < layoutData->items.size(); i++) {
                         const QScriptItem &item = layoutData->items[i];
                         if (item.analysis.flags == QScriptAnalysis::TabOrObject) { // found it.
                             tabSectionEnd = item.position;
@@ -3186,7 +3186,7 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const
                 if (tabSectionEnd > si.position) {
                     QFixed length;
                     // Calculate the length of text between this tab and the tabSectionEnd
-                    for (int i=item; i < layoutData->items.count(); i++) {
+                    for (int i=item; i < layoutData->items.size(); i++) {
                         const QScriptItem &item = layoutData->items.at(i);
                         if (item.position > tabSectionEnd || item.position <= si.position)
                             continue;
@@ -3258,7 +3258,7 @@ void QTextEngine::resolveFormats() const
 
     QTextFormatCollection *collection = formatCollection();
 
-    QList<QTextCharFormat> resolvedFormats(layoutData->items.count());
+    QList<QTextCharFormat> resolvedFormats(layoutData->items.size());
 
     QVarLengthArray<int, 64> formatsSortedByStart;
     formatsSortedByStart.reserve(specialData->formats.size());
@@ -3276,7 +3276,7 @@ void QTextEngine::resolveFormats() const
     const int *startIt = formatsSortedByStart.constBegin();
     const int *endIt = formatsSortedByEnd.constBegin();
 
-    for (int i = 0; i < layoutData->items.count(); ++i) {
+    for (int i = 0; i < layoutData->items.size(); ++i) {
         const QScriptItem *si = &layoutData->items.at(i);
         int end = si->position + length(si);
 
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 56b9e82be07..508d472062d 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -3988,7 +3988,7 @@ int QTextFormatCollection::createObjectIndex(const QTextFormat &f)
 
 QTextFormat QTextFormatCollection::format(int idx) const
 {
-    if (idx < 0 || idx >= formats.count())
+    if (idx < 0 || idx >= formats.size())
         return QTextFormat();
 
     return formats.at(idx);
@@ -3997,7 +3997,7 @@ QTextFormat QTextFormatCollection::format(int idx) const
 void QTextFormatCollection::setDefaultFont(const QFont &f)
 {
     defaultFnt = f;
-    for (int i = 0; i < formats.count(); ++i)
+    for (int i = 0; i < formats.size(); ++i)
         if (formats.at(i).d)
             formats[i].d->resolveFont(defaultFnt);
 }
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index fac7082c1da..1bd91205138 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -55,7 +55,7 @@ public:
     inline QTextImageFormat imageFormat(int index) const
     { return format(index).toImageFormat(); }
 
-    inline int numFormats() const { return formats.count(); }
+    inline int numFormats() const { return formats.size(); }
 
     typedef QList<QTextFormat> FormatVector;
 
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 995f5d35026..55c64bb256b 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -771,7 +771,7 @@ QString QTextHtmlParser::parseEntity(QStringView entity)
     if (!resolved.isNull())
         return QString(resolved);
 
-    if (entity.length() > 1 && entity.at(0) == u'#') {
+    if (entity.size() > 1 && entity.at(0) == u'#') {
         entity = entity.mid(1); // removing leading #
 
         int base = 10;
@@ -1029,7 +1029,7 @@ void QTextHtmlParserNode::initializeProperties(const QTextHtmlParserNode *parent
     // set element specific attributes
     switch (id) {
         case Html_a:
-            for (int i = 0; i < attributes.count(); i += 2) {
+            for (int i = 0; i < attributes.size(); i += 2) {
                 const QString key = attributes.at(i);
                 if (key.compare("href"_L1, Qt::CaseInsensitive) == 0
                     && !attributes.at(i + 1).isEmpty()) {
@@ -1575,12 +1575,12 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
     QString linkHref;
     QString linkType;
 
-    if (attributes.count() % 2 == 1)
+    if (attributes.size() % 2 == 1)
         return;
 
     QTextHtmlParserNode *node = nodes.last();
 
-    for (int i = 0; i < attributes.count(); i += 2) {
+    for (int i = 0; i < attributes.size(); i += 2) {
         QString key = attributes.at(i);
         QString value = attributes.at(i + 1);
 
@@ -1942,7 +1942,7 @@ QList<QCss::Declaration> standardDeclarationForNode(const QTextHtmlParserNode &n
     case Html_u: {
         bool needsUnderline = (node.id == Html_u) ? true : false;
         if (node.id == Html_a) {
-            for (int i = 0; i < node.attributes.count(); i += 2) {
+            for (int i = 0; i < node.attributes.size(); i += 2) {
                 const QString key = node.attributes.at(i);
                 if (key.compare("href"_L1, Qt::CaseInsensitive) == 0
                     && !node.attributes.at(i + 1).isEmpty()) {
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 286722fc4c4..14cd773834f 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1323,7 +1323,7 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition
             int neighborItem = itm;
             if (neighborItem > 0 && si->position == realCursorPosition)
                 --neighborItem;
-            else if (neighborItem < d->layoutData->items.count() - 1 && si->position + si->num_glyphs == realCursorPosition)
+            else if (neighborItem < d->layoutData->items.size() - 1 && si->position + si->num_glyphs == realCursorPosition)
                 ++neighborItem;
             const bool onBoundary = neighborItem != itm
                                  && si->analysis.bidiLevel != d->layoutData->items[neighborItem].analysis.bidiLevel;
@@ -2215,7 +2215,7 @@ int QTextLine::textStart() const
 int QTextLine::textLength() const
 {
     if (eng->option.flags() & QTextOption::ShowLineAndParagraphSeparators
-        && eng->block.isValid() && index == eng->lines.count()-1) {
+        && eng->block.isValid() && index == eng->lines.size()-1) {
         return eng->lines.at(index).length - 1;
     }
     return eng->lines.at(index).length + eng->lines.at(index).trailingSpaces;
@@ -2900,7 +2900,7 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
         int neighborItem = itm;
         if (neighborItem > 0 && scriptItem->position == pos)
             --neighborItem;
-        else if (neighborItem < eng->layoutData->items.count() - 1 && scriptItem->position + scriptItem->num_glyphs == pos)
+        else if (neighborItem < eng->layoutData->items.size() - 1 && scriptItem->position + scriptItem->num_glyphs == pos)
             ++neighborItem;
         const bool onBoundary = neighborItem != itm && scriptItem->analysis.bidiLevel != eng->layoutData->items[neighborItem].analysis.bidiLevel;
         // If we are, prioritise the neighbor item that has the same direction as the engine
@@ -3217,7 +3217,7 @@ int QTextLine::xToCursor(qreal _x, CursorPosition cpos) const
     // character between lines is a space and we want
     // to position the cursor to the left of that
     // character.
-    if (index < eng->lines.count() - 1)
+    if (index < eng->lines.size() - 1)
         pos = qMin(eng->previousLogicalPosition(pos), pos);
 
     return pos;
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index 2b178b70c98..8b4b308d0cc 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -86,7 +86,7 @@ QTextList::~QTextList()
 int QTextList::count() const
 {
     Q_D(const QTextList);
-    return d->blocks.count();
+    return d->blocks.size();
 }
 
 /*!
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 1a201969f0b..8d3195dce66 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -165,7 +165,7 @@ QTextDocument *QTextObject::document() const
 
 void QTextBlockGroupPrivate::markBlocksDirty()
 {
-    for (int i = 0; i < blocks.count(); ++i) {
+    for (int i = 0; i < blocks.size(); ++i) {
         const QTextBlock &block = blocks.at(i);
         pieceTable->documentChange(block.position(), block.length());
     }
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
index a674d715926..31e27cdac5e 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
@@ -243,13 +243,13 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const
 
         // No clever stuff with QSet and friends: the order for layers matters
         // and the user-provided order must be kept.
-        for (int i = 0; i < m_enabledLayers.count(); ++i) {
+        for (int i = 0; i < m_enabledLayers.size(); ++i) {
             const QByteArray &layerName(m_enabledLayers[i]);
             if (!m_supportedLayers.contains(layerName))
                 m_enabledLayers.removeAt(i--);
         }
         qDebug(lcPlatVk) << "Enabling Vulkan instance layers:" << m_enabledLayers;
-        for (int i = 0; i < m_enabledExtensions.count(); ++i) {
+        for (int i = 0; i < m_enabledExtensions.size(); ++i) {
             const QByteArray &extName(m_enabledExtensions[i]);
             if (!m_supportedExtensions.contains(extName))
                 m_enabledExtensions.removeAt(i--);