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

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.

Change-Id: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

5 files changed, 38 insertions, 38 deletions

diff --git a/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp b/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp
index 3d7188a53..1dd0374d8 100644
--- a/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp
+++ b/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp
@@ -49,8 +49,8 @@ SCENARIO("Binding a QString to a length range", "[QString][Bounds]") {
                 QString generated_string = GENERATE_COPY(take(1, string(character(), minimum_length, maximum_length)));
 
                 THEN("The generated string's length is in the range [minimum_length, maximum_length]") {
-                    REQUIRE(generated_string.length() >= minimum_length);
-                    REQUIRE(generated_string.length() <= maximum_length);
+                    REQUIRE(generated_string.size() >= minimum_length);
+                    REQUIRE(generated_string.size() <= maximum_length);
                 }
             }
         }
@@ -67,7 +67,7 @@ TEST_CASE("When the maximum length and the minimum length are equal, all generat
     auto length = GENERATE(take(100, random(0, 100)));
     auto generated_string = GENERATE_COPY(take(100, string(character(), length, length)));
 
-    REQUIRE(generated_string.length() == length);
+    REQUIRE(generated_string.size() == length);
 }
 
 SCENARIO("Limiting the characters that can compose a QString", "[QString][Contents]") {
diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
index 5f6f47d62..3743ca620 100644
--- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
+++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
@@ -90,7 +90,7 @@ void tst_QHelpEngineCore::setCollectionFile()
     QCOMPARE(help.collectionFile(), QFileInfo(col1File).absoluteFilePath());
 
     QStringList docs = help.registeredDocumentations();
-    QCOMPARE(docs.count(), 1);
+    QCOMPARE(docs.size(), 1);
     QCOMPARE(docs.first(), QLatin1String("trolltech.com.1.0.0.test"));
 }
 
@@ -164,7 +164,7 @@ void tst_QHelpEngineCore::registeredDocumentations()
     QHelpEngineCore help(m_colFile, 0);
     QCOMPARE(help.setupData(), true);
     const QStringList docs = help.registeredDocumentations();
-    QCOMPARE(docs.count(), 3);
+    QCOMPARE(docs.size(), 3);
     QStringList lst;
     lst << "trolltech.com.3-3-8.qmake" << "trolltech.com.4-3-0.qmake"
         << "trolltech.com.1.0.0.test";
@@ -182,11 +182,11 @@ void tst_QHelpEngineCore::registerDocumentation()
         c.setReadOnly(false);
         QCOMPARE(c.setupData(), true);
         c.registerDocumentation(m_path + "/data/qmake-3.3.8.qch");
-        QCOMPARE(c.registeredDocumentations().count(), 1);
+        QCOMPARE(c.registeredDocumentations().size(), 1);
         c.registerDocumentation(m_path + "/data/qmake-3.3.8.qch");
-        QCOMPARE(c.registeredDocumentations().count(), 1);
+        QCOMPARE(c.registeredDocumentations().size(), 1);
         c.registerDocumentation(m_path + "/data/linguist-3.3.8.qch");
-        QCOMPARE(c.registeredDocumentations().count(), 2);
+        QCOMPARE(c.registeredDocumentations().size(), 2);
     }
 
     {
@@ -213,9 +213,9 @@ void tst_QHelpEngineCore::unregisterDocumentation()
     QHelpEngineCore c(m_colFile);
     c.setReadOnly(false);
     QCOMPARE(c.setupData(), true);
-    QCOMPARE(c.registeredDocumentations().count(), 3);
+    QCOMPARE(c.registeredDocumentations().size(), 3);
     c.unregisterDocumentation("trolltech.com.3-3-8.qmake");
-    QCOMPARE(c.registeredDocumentations().count(), 2);
+    QCOMPARE(c.registeredDocumentations().size(), 2);
     QCOMPARE(c.unregisterDocumentation("noexisting"), false);
 }
 
@@ -236,13 +236,13 @@ void tst_QHelpEngineCore::customFilters()
     QHelpEngineCore help(m_colFile, 0);
     QCOMPARE(help.setupData(), true);
     const QStringList custom = help.customFilters();
-    QCOMPARE(custom.count(), 4);
+    QCOMPARE(custom.size(), 4);
     QStringList lst;
     lst << "qmake Manual" << "Custom Filter 1"
         << "Custom Filter 2" << "unfiltered";
     for (const QString &s : custom)
         lst.removeAll(s);
-    QCOMPARE(lst.count(), 0);
+    QCOMPARE(lst.size(), 0);
 }
 
 void tst_QHelpEngineCore::removeCustomFilter()
@@ -251,7 +251,7 @@ void tst_QHelpEngineCore::removeCustomFilter()
     QCOMPARE(help.setupData(), true);
     help.removeCustomFilter("Custom Filter 1");
     QStringList custom = help.customFilters();
-    QCOMPARE(custom.count(), 3);
+    QCOMPARE(custom.size(), 3);
     QCOMPARE((bool)custom.contains("Custom Filter 1"), false);
 }
 
@@ -261,7 +261,7 @@ void tst_QHelpEngineCore::addCustomFilter()
     QCOMPARE(help.setupData(), true);
     help.addCustomFilter("Qt Tools", QStringList() << "tools" << "qt");
     QStringList custom = help.customFilters();
-    QCOMPARE(custom.count(), 5);
+    QCOMPARE(custom.size(), 5);
     QCOMPARE((bool)custom.contains("Qt Tools"), true);
 }
 
@@ -270,12 +270,12 @@ void tst_QHelpEngineCore::filterAttributes()
     QHelpEngineCore help(m_colFile, 0);
     QCOMPARE(help.setupData(), true);
     const QStringList atts = help.filterAttributes("qmake Manual");
-    QCOMPARE(atts.count(), 3);
+    QCOMPARE(atts.size(), 3);
     QStringList lst;
     lst << "qmake" << "tools" << "qt";
     for (const QString &s : atts)
         lst.removeAll(s);
-    QCOMPARE(lst.count(), 0);
+    QCOMPARE(lst.size(), 0);
 }
 
 void tst_QHelpEngineCore::currentFilter()
@@ -302,8 +302,8 @@ void tst_QHelpEngineCore::filterAttributeSets()
     help.setReadOnly(false);
     QCOMPARE(help.setupData(), true);
     QList<QStringList> lst = help.filterAttributeSets("trolltech.com.1.0.0.test");
-    QCOMPARE(lst.count(), 2);
-    QCOMPARE(lst.first().count(), 2);
+    QCOMPARE(lst.size(), 2);
+    QCOMPARE(lst.first().size(), 2);
     QCOMPARE((bool)lst.first().contains("filter1"), true);
     QCOMPARE((bool)lst.last().contains("filter2"), true);
 }
@@ -315,26 +315,26 @@ void tst_QHelpEngineCore::files()
     QCOMPARE(help.setupData(), true);
     QList<QUrl> lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList());
-    QCOMPARE(lst.count(), 16);
+    QCOMPARE(lst.size(), 16);
     lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList(), "png");
-    QCOMPARE(lst.count(), 2);
+    QCOMPARE(lst.size(), 2);
     lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList() << "qt", "html");
-    QCOMPARE(lst.count(), 13);
+    QCOMPARE(lst.size(), 13);
     lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList() << "qt" << "qmake", "html");
-    QCOMPARE(lst.count(), 13);
+    QCOMPARE(lst.size(), 13);
     lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList() << "qt" << "qmake" << "bla", "html");
-    QCOMPARE(lst.count(), 0);
+    QCOMPARE(lst.size(), 0);
     lst = help.files("trolltech.com.4-3-0.qmake",
         QStringList() << "qt" << "qmake", "foo");
 
     // print 'lst' if test fails:
     auto printRemainder = qScopeGuard([&]{ for (const QUrl &url : lst) qDebug() << url; });
 
-    QCOMPARE(lst.count(), 0);
+    QCOMPARE(lst.size(), 0);
 
     printRemainder.dismiss();
 }
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
index 6131ea9f7..43a87214d 100644
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
+++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
@@ -133,7 +133,7 @@ void tst_QHelpGenerator::checkFiles()
         "AND b.FileId=a.FileID AND c.Name=\'filter1\'");
     while (m_query->next())
         lst.removeAll(m_query->value(0).toString());
-    QCOMPARE(lst.count(), 0);
+    QCOMPARE(lst.size(), 0);
 
     QMap<int, QStringList> fileAtts;
     m_query->exec("SELECT a.Id, b.Name FROM FileAttributeSetTable a, "
@@ -144,7 +144,7 @@ void tst_QHelpGenerator::checkFiles()
             fileAtts.insert(id, QStringList());
         fileAtts[id].append(m_query->value(1).toString());
     }
-    QCOMPARE(fileAtts.count(), 2);
+    QCOMPARE(fileAtts.size(), 2);
     QVERIFY(fileAtts.value(1).contains("test"));
     QVERIFY(fileAtts.value(1).contains("filter1"));
     QVERIFY(!fileAtts.value(1).contains("filter2"));
diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
index df88d11f0..10dccfc40 100644
--- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
+++ b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp
@@ -84,7 +84,7 @@ void tst_QHelpIndexModel::setupIndex()
         QTest::qWait(500);
 
     QCOMPARE(h.currentFilter(), QString("unfiltered"));
-    QCOMPARE(m->stringList().count(), 19);
+    QCOMPARE(m->stringList().size(), 19);
 
     w.start();
     h.setCurrentFilter("Custom Filter 1");
@@ -95,7 +95,7 @@ void tst_QHelpIndexModel::setupIndex()
     QStringList lst;
     lst << "foo" << "bar" << "bla" << "einstein" << "newton";
     const auto stringList = m->stringList();
-    QCOMPARE(stringList.count(), 5);
+    QCOMPARE(stringList.size(), 5);
     for (const QString &s : stringList)
         lst.removeAll(s);
     QCOMPARE(lst.isEmpty(), true);
@@ -116,16 +116,16 @@ void tst_QHelpIndexModel::filter()
         QTest::qWait(500);
 
     QCOMPARE(h.currentFilter(), QString("unfiltered"));
-    QCOMPARE(m->stringList().count(), 19);
+    QCOMPARE(m->stringList().size(), 19);
 
     m->filter("foo");
-    QCOMPARE(m->stringList().count(), 2);
+    QCOMPARE(m->stringList().size(), 2);
 
     m->filter("fo");
-    QCOMPARE(m->stringList().count(), 3);
+    QCOMPARE(m->stringList().size(), 3);
 
     m->filter("qmake");
-    QCOMPARE(m->stringList().count(), 11);
+    QCOMPARE(m->stringList().size(), 11);
 }
 
 QTEST_MAIN(tst_QHelpIndexModel)
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
index 210230420..ee945fbd2 100644
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
+++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
@@ -61,7 +61,7 @@ void tst_QHelpProjectData::customFilters()
         QFAIL("Cannot read qhp file!");
 
     const QList<QHelpDataCustomFilter> filters = data.customFilters();
-    QCOMPARE(filters.count(), 2);
+    QCOMPARE(filters.size(), 2);
 
     for (const QHelpDataCustomFilter &f : filters) {
         if (f.name == QLatin1String("Custom Filter 1")) {
@@ -89,7 +89,7 @@ void tst_QHelpProjectData::filterSections()
         QFAIL("Cannot read qhp file!");
 
     const QList<QHelpDataFilterSection> sections = data.filterSections();
-    QCOMPARE(sections.count(), 2);
+    QCOMPARE(sections.size(), 2);
 
     for (const QHelpDataFilterSection &s : sections) {
         if (s.filterAttributes().contains("filter1")) {
@@ -110,10 +110,10 @@ void tst_QHelpProjectData::filterSections()
                     QFAIL("Unexpected index!");
                 }
             }
-            QCOMPARE(s.contents().count(), 1);
-            QCOMPARE(s.contents().first()->children().count(), 5);
+            QCOMPARE(s.contents().size(), 1);
+            QCOMPARE(s.contents().first()->children().size(), 5);
         } else if (s.filterAttributes().contains("filter2")) {
-            QCOMPARE(s.contents().count(), 1);
+            QCOMPARE(s.contents().size(), 1);
             const QStringList lst = {
                 "cars.html",
                 "classic.css",
@@ -134,7 +134,7 @@ void tst_QHelpProjectData::metaData()
     if (!data.readData(m_inputFile))
         QFAIL("Cannot read qhp file!");
 
-    QCOMPARE(data.metaData().count(), 2);
+    QCOMPARE(data.metaData().size(), 2);
     QCOMPARE(data.metaData().value("author").toString(),
         QString("Digia Plc and/or its subsidiary(-ies)"));
 }