From 1c6bf3e09ea9722717caedcfcceaaf3d607615cf Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 30 Sep 2022 14:09:04 +0200
Subject: 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>
---
 src/gui/accessible/qaccessibleobject.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui/accessible/qaccessibleobject.cpp')

diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index af9d3aa0fcb..61d3a90632f 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -124,7 +124,7 @@ static QObjectList topLevelObjects()
 {
     QObjectList list;
     const QWindowList tlw(QGuiApplication::topLevelWindows());
-    for (int i = 0; i < tlw.count(); ++i) {
+    for (int i = 0; i < tlw.size(); ++i) {
         QWindow *w = tlw.at(i);
         if (w->type() != Qt::Popup && w->type() != Qt::Desktop) {
             if (QAccessibleInterface *root = w->accessibleRoot()) {
@@ -140,7 +140,7 @@ static QObjectList topLevelObjects()
 /*! \reimp */
 int QAccessibleApplication::childCount() const
 {
-    return topLevelObjects().count();
+    return topLevelObjects().size();
 }
 
 /*! \reimp */
@@ -160,7 +160,7 @@ QAccessibleInterface *QAccessibleApplication::parent() const
 QAccessibleInterface *QAccessibleApplication::child(int index) const
 {
     const QObjectList tlo(topLevelObjects());
-    if (index >= 0 && index < tlo.count())
+    if (index >= 0 && index < tlo.size())
         return QAccessible::queryAccessibleInterface(tlo.at(index));
     return nullptr;
 }
-- 
cgit v1.2.3