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

diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 6e2e6b3e49..57bd4515ad 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -575,7 +575,7 @@ void tst_QApplication::lastWindowClosed()
     QTimer::singleShot(1000, dialog.data(), &QDialog::accept);
     dialog->exec();
     QVERIFY(dialog);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     QPointer<CloseWidget>widget = new CloseWidget;
     widget->setWindowTitle(QLatin1String(QTest::currentTestFunction()) + QLatin1String("CloseWidget"));
@@ -584,7 +584,7 @@ void tst_QApplication::lastWindowClosed()
     QObject::connect(&app, &QGuiApplication::lastWindowClosed, widget.data(), &QObject::deleteLater);
     QCoreApplication::exec();
     QVERIFY(!widget);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     spy.clear();
 
     delete dialog;
@@ -602,7 +602,7 @@ void tst_QApplication::lastWindowClosed()
 
     QTimer::singleShot(1000, &app, &QApplication::closeAllWindows);
     QCoreApplication::exec();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 class QuitOnLastWindowClosedDialog : public QDialog
@@ -635,8 +635,8 @@ public slots:
         other.exec();
 
         // verify that the eventloop ran and let the timer fire
-        QCOMPARE(spy.count(), 1);
-        QCOMPARE(appSpy.count(), 1);
+        QCOMPARE(spy.size(), 1);
+        QCOMPARE(appSpy.size(), 1);
     }
 
 private:
@@ -661,7 +661,7 @@ public slots:
         timer1.setSingleShot(true);
         timer1.start(1000);
         dialog.exec();
-        QCOMPARE(spy1.count(), 1);
+        QCOMPARE(spy1.size(), 1);
 
         show();
     }
@@ -682,7 +682,7 @@ void tst_QApplication::quitOnLastWindowClosed()
         QCoreApplication::exec();
 
         // lastWindowClosed() signal should only be sent after the last dialog is closed
-        QCOMPARE(appSpy.count(), 2);
+        QCOMPARE(appSpy.size(), 2);
     }
     {
         int argc = 0;
@@ -697,8 +697,8 @@ void tst_QApplication::quitOnLastWindowClosed()
         timer1.setSingleShot(true);
         timer1.start(1000);
         dialog.exec();
-        QCOMPARE(spy1.count(), 1);
-        QCOMPARE(appSpy.count(), 0);
+        QCOMPARE(spy1.size(), 1);
+        QCOMPARE(appSpy.size(), 0);
 
         QTimer timer2;
         connect(&timer2, &QTimer::timeout, &app, &QCoreApplication::quit);
@@ -707,8 +707,8 @@ void tst_QApplication::quitOnLastWindowClosed()
         timer2.start(1000);
         int returnValue = QCoreApplication::exec();
         QCOMPARE(returnValue, 0);
-        QCOMPARE(spy2.count(), 1);
-        QCOMPARE(appSpy.count(), 0);
+        QCOMPARE(spy2.size(), 1);
+        QCOMPARE(appSpy.size(), 0);
     }
     {
         int argc = 0;
@@ -739,8 +739,8 @@ void tst_QApplication::quitOnLastWindowClosed()
 
         QCoreApplication::exec();
 
-        QCOMPARE(spy.count(), 1);
-        QVERIFY(spy2.count() < 15);      // Should be around 10 if closing caused the quit
+        QCOMPARE(spy.size(), 1);
+        QVERIFY(spy2.size() < 15);      // Should be around 10 if closing caused the quit
     }
 
     bool quitApplicationTriggered = false;
@@ -770,7 +770,7 @@ void tst_QApplication::quitOnLastWindowClosed()
 
         QCoreApplication::exec();
 
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QVERIFY(quitApplicationTriggered);
     }
     {
@@ -792,8 +792,8 @@ void tst_QApplication::quitOnLastWindowClosed()
         QCOMPARE(returnValue, 0);
         // failure here means the timer above didn't fire, and the
         // quit was caused the dialog being closed (not the window)
-        QCOMPARE(timerSpy.count(), 1);
-        QCOMPARE(appSpy.count(), 2);
+        QCOMPARE(timerSpy.size(), 1);
+        QCOMPARE(appSpy.size(), 2);
     }
     {
         int argc = 0;
@@ -842,7 +842,7 @@ void tst_QApplication::quitOnLastWindowClosed()
         QTimer::singleShot(100, &w1, &QWidget::close);
         QCoreApplication::exec();
 
-        QVERIFY(timerSpy.count() < 10);
+        QVERIFY(timerSpy.size() < 10);
     }
 }
 
@@ -930,8 +930,8 @@ void tst_QApplication::closeAllWindows()
 
 bool isPathListIncluded(const QStringList &l, const QStringList &r)
 {
-    int size = r.count();
-    if (size > l.count())
+    int size = r.size();
+    if (size > l.size())
         return false;
 #if defined (Q_OS_WIN)
     Qt::CaseSensitivity cs = Qt::CaseInsensitive;
@@ -939,13 +939,13 @@ bool isPathListIncluded(const QStringList &l, const QStringList &r)
     Qt::CaseSensitivity cs = Qt::CaseSensitive;
 #endif
     int i = 0, j = 0;
-    for ( ; i < l.count() && j < r.count(); ++i) {
+    for ( ; i < l.size() && j < r.size(); ++i) {
         if (QDir::toNativeSeparators(l[i]).compare(QDir::toNativeSeparators(r[j]), cs) == 0) {
             ++j;
             i = -1;
         }
     }
-    return j == r.count();
+    return j == r.size();
 }
 
 #if QT_CONFIG(library)
@@ -1005,7 +1005,7 @@ void tst_QApplication::libraryPaths()
     {
         qCDebug(lcTests) << "Initial library path:" << QApplication::libraryPaths();
 
-        int count = QApplication::libraryPaths().count();
+        int count = QApplication::libraryPaths().size();
 #if 0
         // this test doesn't work if KDE 4 is installed
         QCOMPARE(count, 1); // before creating QApplication, only the PluginsPath is in the libraryPaths()
@@ -1014,9 +1014,9 @@ void tst_QApplication::libraryPaths()
         QApplication::addLibraryPath(installPathPlugins);
         qCDebug(lcTests) << "installPathPlugins" << installPathPlugins;
         qCDebug(lcTests) << "After adding plugins path:" << QApplication::libraryPaths();
-        QCOMPARE(QApplication::libraryPaths().count(), count);
+        QCOMPARE(QApplication::libraryPaths().size(), count);
         QApplication::addLibraryPath(testDir);
-        QCOMPARE(QApplication::libraryPaths().count(), count + 1);
+        QCOMPARE(QApplication::libraryPaths().size(), count + 1);
 
         // creating QApplication adds the applicationDirPath to the libraryPath
         int argc = 1;
@@ -1026,19 +1026,19 @@ void tst_QApplication::libraryPaths()
         // On Windows CE these are identical and might also be the case for other
         // systems too
         if (appDirPath != installPathPlugins)
-            QCOMPARE(QApplication::libraryPaths().count(), count + 2);
+            QCOMPARE(QApplication::libraryPaths().size(), count + 2);
     }
     {
         int argc = 1;
         QApplication app(argc, &argv0);
 
         qCDebug(lcTests) << "Initial library path:" << QCoreApplication::libraryPaths();
-        int count = QCoreApplication::libraryPaths().count();
+        int count = QCoreApplication::libraryPaths().size();
         QString installPathPlugins =  QLibraryInfo::path(QLibraryInfo::PluginsPath);
         QCoreApplication::addLibraryPath(installPathPlugins);
         qCDebug(lcTests) << "installPathPlugins" << installPathPlugins;
         qCDebug(lcTests) << "After adding plugins path:" << QCoreApplication::libraryPaths();
-        QCOMPARE(QCoreApplication::libraryPaths().count(), count);
+        QCOMPARE(QCoreApplication::libraryPaths().size(), count);
 
         QString appDirPath = QCoreApplication::applicationDirPath();
 
@@ -1046,14 +1046,14 @@ void tst_QApplication::libraryPaths()
         QCoreApplication::addLibraryPath(appDirPath + "/..");
         qCDebug(lcTests) << "appDirPath" << appDirPath;
         qCDebug(lcTests) << "After adding appDirPath && appDirPath + /..:" << QCoreApplication::libraryPaths();
-        QCOMPARE(QCoreApplication::libraryPaths().count(), count + 1);
+        QCOMPARE(QCoreApplication::libraryPaths().size(), count + 1);
 #ifdef Q_OS_MACOS
         QCoreApplication::addLibraryPath(appDirPath + "/../MacOS");
 #else
         QCoreApplication::addLibraryPath(appDirPath + "/tmp/..");
 #endif
         qCDebug(lcTests) << "After adding appDirPath + /tmp/..:" << QCoreApplication::libraryPaths();
-        QCOMPARE(QCoreApplication::libraryPaths().count(), count + 1);
+        QCOMPARE(QCoreApplication::libraryPaths().size(), count + 1);
     }
 }
 
@@ -1656,11 +1656,11 @@ void tst_QApplication::focusChanged()
     hbox1.addWidget(&le1);
     hbox1.addWidget(&pb1);
 
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     parent1.show();
     QApplicationPrivate::setActiveWindow(&parent1); // needs this on twm (focus follows mouse)
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.at(0).size(), 2);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
@@ -1668,10 +1668,10 @@ void tst_QApplication::focusChanged()
     QCOMPARE(now, QApplication::focusWidget());
     QVERIFY(!old);
     spy.clear();
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     pb1.setFocus();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
     QCOMPARE(now, &pb1);
@@ -1680,7 +1680,7 @@ void tst_QApplication::focusChanged()
     spy.clear();
 
     lb1.setFocus();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
     QCOMPARE(now, &lb1);
@@ -1689,7 +1689,7 @@ void tst_QApplication::focusChanged()
     spy.clear();
 
     lb1.clearFocus();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
     QVERIFY(!now);
@@ -1709,9 +1709,9 @@ void tst_QApplication::focusChanged()
 
     parent2.show();
     QApplicationPrivate::setActiveWindow(&parent2); // needs this on twm (focus follows mouse)
-    QVERIFY(spy.count() > 0); // one for deactivation, one for activation on Windows
-    old = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(0));
-    now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
+    QVERIFY(spy.size() > 0); // one for deactivation, one for activation on Windows
+    old = qvariant_cast<QWidget*>(spy.at(spy.size()-1).at(0));
+    now = qvariant_cast<QWidget*>(spy.at(spy.size()-1).at(1));
     QCOMPARE(now, &le2);
     QCOMPARE(now, QApplication::focusWidget());
     QVERIFY(!old);
@@ -1736,10 +1736,10 @@ void tst_QApplication::focusChanged()
 
     tab.simulate(now);
     if (!tabAllControls) {
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(now, QApplication::focusWidget());
     } else {
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &pb2);
@@ -1749,11 +1749,11 @@ void tst_QApplication::focusChanged()
     }
 
     if (!tabAllControls) {
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(now, QApplication::focusWidget());
     } else {
         tab.simulate(now);
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &le2);
@@ -1763,11 +1763,11 @@ void tst_QApplication::focusChanged()
     }
 
     if (!tabAllControls) {
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(now, QApplication::focusWidget());
     } else {
         backtab.simulate(now);
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &pb2);
@@ -1778,12 +1778,12 @@ void tst_QApplication::focusChanged()
 
 
     if (!tabAllControls) {
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(now, QApplication::focusWidget());
         old = &pb2;
     } else {
         backtab.simulate(now);
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &le2);
@@ -1794,10 +1794,10 @@ void tst_QApplication::focusChanged()
 
     click.simulate(old);
     if (!(pb2.focusPolicy() & Qt::ClickFocus)) {
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(now, QApplication::focusWidget());
     } else {
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &pb2);
@@ -1806,7 +1806,7 @@ void tst_QApplication::focusChanged()
         spy.clear();
 
         click.simulate(old);
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
         QCOMPARE(now, &le2);
@@ -1817,15 +1817,15 @@ void tst_QApplication::focusChanged()
 
     parent1.activateWindow();
     QApplicationPrivate::setActiveWindow(&parent1); // needs this on twm (focus follows mouse)
-    QVERIFY(spy.count() == 1 || spy.count() == 2); // one for deactivation, one for activation on Windows
+    QVERIFY(spy.size() == 1 || spy.size() == 2); // one for deactivation, one for activation on Windows
 
     //on windows, the change of focus is made in 2 steps
     //(the focusChanged SIGNAL is emitted twice)
-    if (spy.count()==1)
-        old = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(0));
+    if (spy.size()==1)
+        old = qvariant_cast<QWidget*>(spy.at(spy.size()-1).at(0));
     else
-        old = qvariant_cast<QWidget*>(spy.at(spy.count()-2).at(0));
-    now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
+        old = qvariant_cast<QWidget*>(spy.at(spy.size()-2).at(0));
+    now = qvariant_cast<QWidget*>(spy.at(spy.size()-1).at(1));
     QCOMPARE(now, &le1);
     QCOMPARE(now, QApplication::focusWidget());
     QCOMPARE(old, &le2);
@@ -2060,11 +2060,11 @@ void tst_QApplication::topLevelWidgets()
 #endif
     QCoreApplication::processEvents();
     QVERIFY(QApplication::topLevelWidgets().contains(w));
-    QCOMPARE(QApplication::topLevelWidgets().count(), 1);
+    QCOMPARE(QApplication::topLevelWidgets().size(), 1);
     delete w;
     w = nullptr;
     QCoreApplication::processEvents();
-    QCOMPARE(QApplication::topLevelWidgets().count(), 0);
+    QCOMPARE(QApplication::topLevelWidgets().size(), 0);
 }
 
 
@@ -2492,10 +2492,10 @@ void tst_QApplication::wheelEventPropagation()
         else
             ++hcount;
         QCoreApplication::processEvents();
-        QCOMPARE(innerVSpy.count(), innerScrolls ? vcount : 0);
-        QCOMPARE(innerHSpy.count(), innerScrolls ? hcount : 0);
-        QCOMPARE(outerVSpy.count(), innerScrolls ? 0 : vcount);
-        QCOMPARE(outerHSpy.count(), innerScrolls ? 0 : hcount);
+        QCOMPARE(innerVSpy.size(), innerScrolls ? vcount : 0);
+        QCOMPARE(innerHSpy.size(), innerScrolls ? hcount : 0);
+        QCOMPARE(outerVSpy.size(), innerScrolls ? 0 : vcount);
+        QCOMPARE(outerHSpy.size(), innerScrolls ? 0 : hcount);
     }
 }