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

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");

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

Change-Id: I3e6fef8eca212da0c4f0b464545ba96183b4476f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index d372f77fa..afdccdea8 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -41,10 +41,10 @@ void tst_ProxyPac::proxypac()
 
     const bool v8_proxy_resolver_enabled = !fromEnv.contains("--single-process");
     page.load(QUrl("http://test.proxy1.com"));
-    QTRY_COMPARE(proxySpy1.count() >= 1, v8_proxy_resolver_enabled);
-    QVERIFY(proxySpy2.count() == 0);
+    QTRY_COMPARE(proxySpy1.size() >= 1, v8_proxy_resolver_enabled);
+    QVERIFY(proxySpy2.size() == 0);
     page.load(QUrl("http://test.proxy2.com"));
-    QTRY_COMPARE(proxySpy2.count() >= 1, v8_proxy_resolver_enabled);
+    QTRY_COMPARE(proxySpy2.size() >= 1, v8_proxy_resolver_enabled);
 
     // check for crash
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);