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

diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
index f316cb0de8..62198322f6 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
@@ -212,8 +212,8 @@ void tst_QTimeZone::createTest()
         tran.daylightTimeOffset = 3600;
         expected << tran;
         QTimeZone::OffsetDataList result = tz.transitions(janPrev, jan);
-        QCOMPARE(result.count(), expected.count());
-        for (int i = 0; i < expected.count(); ++i) {
+        QCOMPARE(result.size(), expected.size());
+        for (int i = 0; i < expected.size(); ++i) {
             QCOMPARE(result.at(i).atUtc, expected.at(i).atUtc);
             QCOMPARE(result.at(i).offsetFromUtc, expected.at(i).offsetFromUtc);
             QCOMPARE(result.at(i).standardTimeOffset, expected.at(i).standardTimeOffset);
@@ -551,7 +551,7 @@ void tst_QTimeZone::specificTransition()
         QSKIP("Missing time-zone data");
     QTimeZone::OffsetDataList transits =
         timeZone.transitions(start.startOfDay(timeZone), stop.endOfDay(timeZone));
-    QCOMPARE(transits.length(), count);
+    QCOMPARE(transits.size(), count);
     if (count) {
         const QTimeZone::OffsetData &transition = transits.at(0);
         QCOMPARE(transition.offsetFromUtc, offset);
@@ -1530,8 +1530,8 @@ void tst_QTimeZone::testCetPrivate(const QTimeZonePrivate &tzp)
         tran.daylightTimeOffset = 0;
         expected << tran;
         QTimeZonePrivate::DataList result = tzp.transitions(prev, std);
-        QCOMPARE(result.count(), expected.count());
-        for (int i = 0; i < expected.count(); ++i) {
+        QCOMPARE(result.size(), expected.size());
+        for (int i = 0; i < expected.size(); ++i) {
             QCOMPARE(QDateTime::fromMSecsSinceEpoch(result.at(i).atMSecsSinceEpoch,
                                                     Qt::OffsetFromUTC, 3600),
                      QDateTime::fromMSecsSinceEpoch(expected.at(i).atMSecsSinceEpoch,