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>

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
index e25199c87f..5e1ff9e5b7 100644
--- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -106,9 +106,9 @@ void tst_QDBusXmlParser::parsing_common(const QString &xmlData)
     QFETCH(int, objectCount);
     QFETCH(int, annotationCount);
     QFETCH(QStringList, introspection);
-    QCOMPARE(obj.interfaces.count(), interfaceCount);
-    QCOMPARE(obj.childObjects.count(), objectCount);
-    QCOMPARE(QDBusIntrospection::parseInterface(xmlData).annotations.count(), annotationCount);
+    QCOMPARE(obj.interfaces.size(), interfaceCount);
+    QCOMPARE(obj.childObjects.size(), objectCount);
+    QCOMPARE(QDBusIntrospection::parseInterface(xmlData).annotations.size(), annotationCount);
 
     QDBusIntrospection::Interfaces ifaces = QDBusIntrospection::parseInterfaces(xmlData);
 
@@ -327,7 +327,7 @@ void tst_QDBusXmlParser::methods()
     QFETCH(MethodMap, methodMap);
     MethodMap parsedMap = iface.methods;
 
-    QCOMPARE(parsedMap.count(), methodMap.count());
+    QCOMPARE(parsedMap.size(), methodMap.size());
     QCOMPARE(parsedMap, methodMap);
 }
 
@@ -441,7 +441,7 @@ void tst_QDBusXmlParser::signals_()
     QFETCH(SignalMap, signalMap);
     SignalMap parsedMap = iface.signals_;
 
-    QCOMPARE(signalMap.count(), parsedMap.count());
+    QCOMPARE(signalMap.size(), parsedMap.size());
     QCOMPARE(signalMap, parsedMap);
 }
 
@@ -531,7 +531,7 @@ void tst_QDBusXmlParser::properties()
     QFETCH(PropertyMap, propertyMap);
     PropertyMap parsedMap = iface.properties;
 
-    QCOMPARE(propertyMap.count(), parsedMap.count());
+    QCOMPARE(propertyMap.size(), parsedMap.size());
     QCOMPARE(propertyMap, parsedMap);
 }