Port from container.count()/length() to size()

This is semantic patch using ClangTidyTransformator:

  auto QtContainerClass = 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'.

<classes> are:

    // sequential:
    "QByteArray",
    "QList",
    "QQueue",
    "QStack",
    "QString",
    "QVarLengthArray",
    "QVector",
    // associative:
    "QHash",
    "QMultiHash",
    "QMap",
    "QMultiMap",
    "QSet",
    // Qt has no QMultiSet

Change-Id: Ibe8837be96e8d30d1846881ecd65180c1bc459af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 33 insertions, 33 deletions

diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index c2a9f27295..430e5034af 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -97,7 +97,7 @@ void tst_QDialogButtonBox::testConstructor1()
     QDialogButtonBox buttonbox;
     QCOMPARE(buttonbox.orientation(), Qt::Horizontal);
 
-    QCOMPARE(buttonbox.buttons().count(), 0);
+    QCOMPARE(buttonbox.buttons().size(), 0);
 }
 
 void tst_QDialogButtonBox::layoutReuse()
@@ -130,7 +130,7 @@ void tst_QDialogButtonBox::testConstructor2()
     QDialogButtonBox buttonBox(orient);
 
     QCOMPARE(buttonBox.orientation(), orient);
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
 }
 
 void tst_QDialogButtonBox::testConstructor3_data()
@@ -167,7 +167,7 @@ void tst_QDialogButtonBox::testConstructor3()
 
     QDialogButtonBox buttonBox(buttons, (Qt::Orientation)orientation);
     QCOMPARE(int(buttonBox.orientation()), orientation);
-    QTEST(int(buttonBox.buttons().count()), "buttonCount");
+    QTEST(int(buttonBox.buttons().size()), "buttonCount");
 }
 
 void tst_QDialogButtonBox::testConstructor4_data()
@@ -202,7 +202,7 @@ void tst_QDialogButtonBox::testConstructor4()
 
     QDialogButtonBox buttonBox(buttons);
     QCOMPARE(buttonBox.orientation(), Qt::Horizontal);
-    QTEST(int(buttonBox.buttons().count()), "buttonCount");
+    QTEST(int(buttonBox.buttons().size()), "buttonCount");
 }
 
 void tst_QDialogButtonBox::setOrientation_data()
@@ -265,12 +265,12 @@ void tst_QDialogButtonBox::addButton1()
 {
     QFETCH(QDialogButtonBox::ButtonRole, role);
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     QPushButton *button = new QPushButton();
     buttonBox.addButton(button, role);
-    QTEST(int(buttonBox.buttons().count()), "totalCount");
+    QTEST(int(buttonBox.buttons().size()), "totalCount");
     QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
-    QTEST(int(children.count()), "totalCount");
+    QTEST(int(children.size()), "totalCount");
     delete button;
 }
 
@@ -293,11 +293,11 @@ void tst_QDialogButtonBox::addButton2()
     QFETCH(QString, text);
     QFETCH(QDialogButtonBox::ButtonRole, role);
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     buttonBox.addButton(text, role);
-    QTEST(int(buttonBox.buttons().count()), "totalCount");
+    QTEST(int(buttonBox.buttons().size()), "totalCount");
     QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
-    QTEST(int(children.count()), "totalCount");
+    QTEST(int(children.size()), "totalCount");
 }
 
 void tst_QDialogButtonBox::addButton3_data()
@@ -320,11 +320,11 @@ void tst_QDialogButtonBox::addButton3()
 {
     QFETCH(QDialogButtonBox::StandardButton, button);
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     buttonBox.addButton(button);
-    QTEST(int(buttonBox.buttons().count()), "totalCount");
+    QTEST(int(buttonBox.buttons().size()), "totalCount");
     QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
-    QTEST(int(children.count()), "totalCount");
+    QTEST(int(children.size()), "totalCount");
 }
 
 void tst_QDialogButtonBox::clear_data()
@@ -344,9 +344,9 @@ void tst_QDialogButtonBox::clear()
     for (int i = 1; i < rolesToAdd; ++i)
         buttonBox.addButton("Happy", QDialogButtonBox::ButtonRole(i));
     buttonBox.clear();
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
-    QCOMPARE(children.count(), 0);
+    QCOMPARE(children.size(), 0);
 }
 
 void tst_QDialogButtonBox::removeButton_data()
@@ -362,31 +362,31 @@ void tst_QDialogButtonBox::removeButton()
     QFETCH(QDialogButtonBox::ButtonRole, roleToAdd);
 
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     QPushButton *button = new QPushButton("RemoveButton test");
     buttonBox.addButton(button, roleToAdd);
-    QTEST(int(buttonBox.buttons().count()), "expectedCount");
+    QTEST(int(buttonBox.buttons().size()), "expectedCount");
 
     buttonBox.removeButton(button);
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
     delete button;
 }
 
 void tst_QDialogButtonBox::testDelete()
 {
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
 
     QPushButton *deleteMe = new QPushButton("Happy");
     buttonBox.addButton(deleteMe, QDialogButtonBox::HelpRole);
-    QCOMPARE(buttonBox.buttons().count(), 1);
+    QCOMPARE(buttonBox.buttons().size(), 1);
     QList<QAbstractButton *> children = buttonBox.findChildren<QAbstractButton *>();
-    QCOMPARE(children.count(), 1);
+    QCOMPARE(children.size(), 1);
 
     delete deleteMe;
     children = buttonBox.findChildren<QAbstractButton *>();
-    QCOMPARE(children.count(), 0);
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(children.size(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
 }
 
 class ObjectDeleter : public QObject
@@ -408,7 +408,7 @@ void tst_QDialogButtonBox::testSignalEmissionAfterDelete_QTBUG_45835()
 {
     {
         QDialogButtonBox buttonBox;
-        QCOMPARE(buttonBox.buttons().count(), 0);
+        QCOMPARE(buttonBox.buttons().size(), 0);
 
         QSignalSpy buttonClickedSpy(&buttonBox, &QDialogButtonBox::clicked);
         QVERIFY(buttonClickedSpy.isValid());
@@ -417,21 +417,21 @@ void tst_QDialogButtonBox::testSignalEmissionAfterDelete_QTBUG_45835()
         QVERIFY(buttonBoxAcceptedSpy.isValid());
 
         QPushButton *button = buttonBox.addButton("Test", QDialogButtonBox::AcceptRole);
-        QCOMPARE(buttonBox.buttons().count(), 1);
+        QCOMPARE(buttonBox.buttons().size(), 1);
 
         ObjectDeleter objectDeleter;
         connect(&buttonBox, &QDialogButtonBox::clicked, &objectDeleter, &ObjectDeleter::deleteButton);
 
         button->click();
 
-        QCOMPARE(buttonBox.buttons().count(), 0);
+        QCOMPARE(buttonBox.buttons().size(), 0);
         QCOMPARE(buttonClickedSpy.count(), 1);
         QCOMPARE(buttonBoxAcceptedSpy.count(), 1);
     }
 
     {
         QPointer<QDialogButtonBox> buttonBox(new QDialogButtonBox);
-        QCOMPARE(buttonBox->buttons().count(), 0);
+        QCOMPARE(buttonBox->buttons().size(), 0);
 
         QSignalSpy buttonClickedSpy(buttonBox.data(), &QDialogButtonBox::clicked);
         QVERIFY(buttonClickedSpy.isValid());
@@ -440,7 +440,7 @@ void tst_QDialogButtonBox::testSignalEmissionAfterDelete_QTBUG_45835()
         QVERIFY(buttonBoxAcceptedSpy.isValid());
 
         QPushButton *button = buttonBox->addButton("Test", QDialogButtonBox::AcceptRole);
-        QCOMPARE(buttonBox->buttons().count(), 1);
+        QCOMPARE(buttonBox->buttons().size(), 1);
 
         ObjectDeleter objectDeleter;
         connect(buttonBox.data(), &QDialogButtonBox::clicked, &objectDeleter, &ObjectDeleter::deleteSender);
@@ -457,24 +457,24 @@ void tst_QDialogButtonBox::testMultipleAdd()
 {
     // Add a button into the thing multiple times.
     QDialogButtonBox buttonBox;
-    QCOMPARE(buttonBox.buttons().count(), 0);
+    QCOMPARE(buttonBox.buttons().size(), 0);
 
     QPushButton *button = new QPushButton("Foo away");
     buttonBox.addButton(button, QDialogButtonBox::AcceptRole);
-    QCOMPARE(buttonBox.buttons().count(), 1);
+    QCOMPARE(buttonBox.buttons().size(), 1);
     QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::AcceptRole);
     buttonBox.addButton(button, QDialogButtonBox::AcceptRole);
-    QCOMPARE(buttonBox.buttons().count(), 1);
+    QCOMPARE(buttonBox.buttons().size(), 1);
     QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::AcceptRole);
 
     // Add it again with a different role
     buttonBox.addButton(button, QDialogButtonBox::RejectRole);
-    QCOMPARE(buttonBox.buttons().count(), 1);
+    QCOMPARE(buttonBox.buttons().size(), 1);
     QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::RejectRole);
 
     // Add it as an "invalid" role
     buttonBox.addButton(button, QDialogButtonBox::InvalidRole);
-    QCOMPARE(buttonBox.buttons().count(), 1);
+    QCOMPARE(buttonBox.buttons().size(), 1);
     QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::RejectRole);
 }