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, 28 insertions, 28 deletions

diff --git a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
index 6c80334a5c..7ac2c6690e 100644
--- a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
+++ b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
@@ -99,12 +99,12 @@ void tst_QDBusServiceWatcher::watchForCreation()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyU.count(), 0);
+    QCOMPARE(spyU.size(), 0);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QVERIFY(spyO.at(0).at(1).toString().isEmpty());
     QCOMPARE(spyO.at(0).at(2).toString(), con.baseService());
@@ -122,12 +122,12 @@ void tst_QDBusServiceWatcher::watchForCreation()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyU.count(), 0);
+    QCOMPARE(spyU.size(), 0);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QVERIFY(spyO.at(0).at(1).toString().isEmpty());
     QCOMPARE(spyO.at(0).at(2).toString(), con.baseService());
@@ -163,12 +163,12 @@ void tst_QDBusServiceWatcher::watchForDisappearance()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 0);
+    QCOMPARE(spyR.size(), 0);
 
-    QCOMPARE(spyU.count(), 1);
+    QCOMPARE(spyU.size(), 1);
     QCOMPARE(spyU.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QCOMPARE(spyO.at(0).at(1).toString(), con.baseService());
     QVERIFY(spyO.at(0).at(2).toString().isEmpty());
@@ -197,12 +197,12 @@ void tst_QDBusServiceWatcher::watchForDisappearanceUniqueConnection()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 0);
+    QCOMPARE(spyR.size(), 0);
 
-    QCOMPARE(spyU.count(), 1);
+    QCOMPARE(spyU.size(), 1);
     QCOMPARE(spyU.at(0).at(0).toString(), watchedName);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), watchedName);
     QCOMPARE(spyO.at(0).at(1).toString(), watchedName);
     QVERIFY(spyO.at(0).at(2).toString().isEmpty());
@@ -234,12 +234,12 @@ void tst_QDBusServiceWatcher::watchForOwnerChange()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyU.count(), 0);
+    QCOMPARE(spyU.size(), 0);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QVERIFY(spyO.at(0).at(1).toString().isEmpty());
     QCOMPARE(spyO.at(0).at(2).toString(), con.baseService());
@@ -257,13 +257,13 @@ void tst_QDBusServiceWatcher::watchForOwnerChange()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyU.count(), 1);
+    QCOMPARE(spyU.size(), 1);
     QCOMPARE(spyU.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyO.count(), 2);
+    QCOMPARE(spyO.size(), 2);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QCOMPARE(spyO.at(0).at(1).toString(), con.baseService());
     QVERIFY(spyO.at(0).at(2).toString().isEmpty());
@@ -298,12 +298,12 @@ void tst_QDBusServiceWatcher::modeChange()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyU.count(), 0);
+    QCOMPARE(spyU.size(), 0);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QVERIFY(spyO.at(0).at(1).toString().isEmpty());
     QCOMPARE(spyO.at(0).at(2).toString(), con.baseService());
@@ -321,12 +321,12 @@ void tst_QDBusServiceWatcher::modeChange()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 0);
+    QCOMPARE(spyR.size(), 0);
 
-    QCOMPARE(spyU.count(), 1);
+    QCOMPARE(spyU.size(), 1);
     QCOMPARE(spyU.at(0).at(0).toString(), registeredName);
 
-    QCOMPARE(spyO.count(), 1);
+    QCOMPARE(spyO.size(), 1);
     QCOMPARE(spyO.at(0).at(0).toString(), registeredName);
     QCOMPARE(spyO.at(0).at(1).toString(), con.baseService());
     QVERIFY(spyO.at(0).at(2).toString().isEmpty());
@@ -377,9 +377,9 @@ void tst_QDBusServiceWatcher::setConnection()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 1);
+    QCOMPARE(spyR.size(), 1);
     QCOMPARE(spyR.at(0).at(0).toString(), serviceName);
-    QCOMPARE(spyU.count(), 0);
+    QCOMPARE(spyU.size(), 0);
 
     // is the system bus available?
     if (!QDBusConnection::systemBus().isConnected())
@@ -400,9 +400,9 @@ void tst_QDBusServiceWatcher::setConnection()
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spyR.count(), 0);
+    QCOMPARE(spyR.size(), 0);
 
-    QCOMPARE(spyU.count(), 1);
+    QCOMPARE(spyU.size(), 1);
     QCOMPARE(spyU.at(0).at(0).toString(), watchedName);
 }