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>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index c6e339b4bb..e650a59151 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 233231c797..e54738e075 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 af9d3aa0fc..61d3a90632 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 92936c74e6..ae7635ff7c 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);
     }