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>

3 files changed, 12 insertions, 12 deletions

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index fbf0c0d4fb..8b190b8e5f 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -327,7 +327,7 @@ static QByteArray buildMatchRule(const QString &service,
     // add the argument string-matching now
     if (!argMatch.args.isEmpty()) {
         const QString keyValue = "arg%1='%2',"_L1;
-        for (int i = 0; i < argMatch.args.count(); ++i)
+        for (int i = 0; i < argMatch.args.size(); ++i)
             if (!argMatch.args.at(i).isNull())
                 result += keyValue.arg(i).arg(argMatch.args.at(i));
     }
@@ -945,7 +945,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q
         outputArgs.reserve(numMetaTypes - i + 1);
         QVariant arg{QMetaType(metaTypes[0])};
         outputArgs.append( arg );
-        params[0] = const_cast<void*>(outputArgs.at( outputArgs.count() - 1 ).constData());
+        params[0] = const_cast<void*>(outputArgs.at( outputArgs.size() - 1 ).constData());
     } else {
         outputArgs.reserve(numMetaTypes - i);
     }
@@ -953,7 +953,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q
     for ( ; i < numMetaTypes; ++i) {
         QVariant arg{QMetaType(metaTypes[i])};
         outputArgs.append( arg );
-        params.append(const_cast<void*>(outputArgs.at( outputArgs.count() - 1 ).constData()));
+        params.append(const_cast<void*>(outputArgs.at( outputArgs.size() - 1 ).constData()));
     }
 
     // make call:
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 2cb6e97f22..054bc448e6 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -221,7 +221,7 @@ void QDBusMetaObjectGenerator::parseMethods()
         bool ok = true;
 
         // build the input argument list
-        for (qsizetype i = 0; i < m.inputArgs.count(); ++i) {
+        for (qsizetype i = 0; i < m.inputArgs.size(); ++i) {
             const QDBusIntrospection::Argument &arg = m.inputArgs.at(i);
 
             Type type = findType(arg.type.toLatin1(), m.annotations, "In", i);
@@ -240,7 +240,7 @@ void QDBusMetaObjectGenerator::parseMethods()
         if (!ok) continue;
 
         // build the output argument list:
-        for (qsizetype i = 0; i < m.outputArgs.count(); ++i) {
+        for (qsizetype i = 0; i < m.outputArgs.size(); ++i) {
             const QDBusIntrospection::Argument &arg = m.outputArgs.at(i);
 
             Type type = findType(arg.type.toLatin1(), m.annotations, "Out", i);
@@ -297,7 +297,7 @@ void QDBusMetaObjectGenerator::parseSignals()
         bool ok = true;
 
         // build the output argument list
-        for (qsizetype i = 0; i < s.outputArgs.count(); ++i) {
+        for (qsizetype i = 0; i < s.outputArgs.size(); ++i) {
             const QDBusIntrospection::Argument &arg = s.outputArgs.at(i);
 
             Type type = findType(arg.type.toLatin1(), s.annotations, "Out", i);
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index 7390e8d7a4..eb5aab4fd6 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -306,7 +306,7 @@ namespace QDBusUtil
             return false;       // can't be valid if it's empty
 
         const QChar *c = part.data();
-        for (int i = 0; i < part.length(); ++i)
+        for (int i = 0; i < part.size(); ++i)
             if (!isValidCharacterNoDash(c[i]))
                 return false;
 
@@ -358,7 +358,7 @@ namespace QDBusUtil
     */
     bool isValidUniqueConnectionName(QStringView connName)
     {
-        if (connName.isEmpty() || connName.length() > DBUS_MAXIMUM_NAME_LENGTH ||
+        if (connName.isEmpty() || connName.size() > DBUS_MAXIMUM_NAME_LENGTH ||
             !connName.startsWith(u':'))
             return false;
 
@@ -371,7 +371,7 @@ namespace QDBusUtil
                  return false;
 
             const QChar* c = part.data();
-            for (int j = 0; j < part.length(); ++j)
+            for (int j = 0; j < part.size(); ++j)
                 if (!isValidCharacter(c[j]))
                     return false;
         }
@@ -419,7 +419,7 @@ namespace QDBusUtil
             const QChar *c = part.data();
             if (isValidNumber(c[0]))
                 return false;
-            for (int j = 0; j < part.length(); ++j)
+            for (int j = 0; j < part.size(); ++j)
                 if (!isValidCharacter(c[j]))
                     return false;
         }
@@ -435,13 +435,13 @@ namespace QDBusUtil
     */
     bool isValidMemberName(QStringView memberName)
     {
-        if (memberName.isEmpty() || memberName.length() > DBUS_MAXIMUM_NAME_LENGTH)
+        if (memberName.isEmpty() || memberName.size() > DBUS_MAXIMUM_NAME_LENGTH)
             return false;
 
         const QChar* c = memberName.data();
         if (isValidNumber(c[0]))
             return false;
-        for (int j = 0; j < memberName.length(); ++j)
+        for (int j = 0; j < memberName.size(); ++j)
             if (!isValidCharacterNoDash(c[j]))
                 return false;
         return true;