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

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 4970dbd64d..00c38b9752 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -208,7 +208,7 @@ void tst_QFiledialog::currentChangedSignal()
     QVERIFY(listView->model()->hasChildren(folder));
     listView->setCurrentIndex(folder);
 
-    QCOMPARE(spyCurrentChanged.count(), 1);
+    QCOMPARE(spyCurrentChanged.size(), 1);
 }
 
 // only emitted from the views, sidebar, or lookin combo
@@ -230,7 +230,7 @@ void tst_QFiledialog::directoryEnteredSignal()
     QVERIFY(secondItem.isValid());
     sidebar->setCurrentIndex(secondItem);
     QTest::keyPress(sidebar->viewport(), Qt::Key_Return);
-    QCOMPARE(spyDirectoryEntered.count(), 1);
+    QCOMPARE(spyDirectoryEntered.size(), 1);
     spyDirectoryEntered.clear();
 
     // lookInCombo
@@ -239,7 +239,7 @@ void tst_QFiledialog::directoryEnteredSignal()
     QVERIFY(comboBox->view()->model()->index(1, 0).isValid());
     comboBox->view()->setCurrentIndex(comboBox->view()->model()->index(1, 0));
     QTest::keyPress(comboBox->view()->viewport(), Qt::Key_Return);
-    QCOMPARE(spyDirectoryEntered.count(), 1);
+    QCOMPARE(spyDirectoryEntered.size(), 1);
     spyDirectoryEntered.clear();
 
     // view
@@ -316,7 +316,7 @@ void tst_QFiledialog::filesSelectedSignal()
     QVERIFY(button->isEnabled());
     button->animateClick();
     QTRY_COMPARE(fd.isVisible(), false);
-    QCOMPARE(spyFilesSelected.count(), 1);
+    QCOMPARE(spyFilesSelected.size(), 1);
 }
 
 // only emitted when the combo box is activated
@@ -341,7 +341,7 @@ void tst_QFiledialog::filterSelectedSignal()
 
     QTest::keyPress(filters, Qt::Key_Down);
 
-    QCOMPARE(spyFilterSelected.count(), 1);
+    QCOMPARE(spyFilterSelected.size(), 1);
 }
 
 void tst_QFiledialog::args()
@@ -382,10 +382,10 @@ void tst_QFiledialog::directory()
 #ifndef Q_OS_WIN
     QCOMPARE(tempPath, fd.directory().absolutePath());
 #endif
-    QCOMPARE(spyCurrentChanged.count(), 0);
-    QCOMPARE(spyDirectoryEntered.count(), 0);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyCurrentChanged.size(), 0);
+    QCOMPARE(spyDirectoryEntered.size(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 
     // Check my way
     QList<QListView*> list = fd.findChildren<QListView*>("listView");
@@ -574,16 +574,16 @@ void tst_QFiledialog::completer_up()
     fd.show();
     QLineEdit *lineEdit = fd.findChild<QLineEdit*>("fileNameEdit");
     QVERIFY(lineEdit);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    int depth = QDir::currentPath().split('/').count();
+    QCOMPARE(spyFilesSelected.size(), 0);
+    int depth = QDir::currentPath().split('/').size();
     for (int i = 0; i <= depth * 3 + 1; ++i) {
         lineEdit->insert("../");
         qApp->processEvents();
     }
-    QCOMPARE(spyCurrentChanged.count(), 0);
-    QCOMPARE(spyDirectoryEntered.count(), 0);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyCurrentChanged.size(), 0);
+    QCOMPARE(spyDirectoryEntered.size(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 }
 
 void tst_QFiledialog::acceptMode()
@@ -678,15 +678,15 @@ void tst_QFiledialog::filters()
     QCOMPARE(fd.nameFilters(), filters);
     fd.setNameFilter("Image files (*.png *.xpm *.jpg);;Text files (*.txt);;Any files (*.*)");
     QCOMPARE(fd.nameFilters(), filters);
-    QCOMPARE(spyCurrentChanged.count(), 0);
-    QCOMPARE(spyDirectoryEntered.count(), 0);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyCurrentChanged.size(), 0);
+    QCOMPARE(spyDirectoryEntered.size(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 
     // setting shouldn't emit any signals
     for (int i = views.at(0)->currentIndex(); i < views.at(0)->count(); ++i)
         views.at(0)->setCurrentIndex(i);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 
     //Let check if filters with whitespaces
     QFileDialog fd2;
@@ -725,7 +725,7 @@ void tst_QFiledialog::selectFilter()
     QCOMPARE(fd.selectedNameFilter(), filters.at(2));
     fd.selectNameFilter("");
     QCOMPARE(fd.selectedNameFilter(), filters.at(2));
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 }
 
 void tst_QFiledialog::history()
@@ -764,10 +764,10 @@ void tst_QFiledialog::history()
     badHistory << QDir::toNativeSeparators(QDir::current().absolutePath());
     QCOMPARE(fd.history(), badHistory);
 
-    QCOMPARE(spyCurrentChanged.count(), 0);
-    QCOMPARE(spyDirectoryEntered.count(), 0);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(spyCurrentChanged.size(), 0);
+    QCOMPARE(spyDirectoryEntered.size(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 }
 
 void tst_QFiledialog::iconProvider()
@@ -870,7 +870,7 @@ void tst_QFiledialog::selectFile()
     QVERIFY(model);
     fd->setDirectory(QDir::currentPath());
     // default value
-    QCOMPARE(fd->selectedFiles().count(), 1);
+    QCOMPARE(fd->selectedFiles().size(), 1);
 
     QScopedPointer<QTemporaryFile> tempFile;
     if (file == QLatin1String("temp")) {
@@ -880,7 +880,7 @@ void tst_QFiledialog::selectFile()
     }
 
     fd->selectFile(file);
-    QCOMPARE(fd->selectedFiles().count(), count);
+    QCOMPARE(fd->selectedFiles().size(), count);
     if (tempFile.isNull()) {
         QCOMPARE(model->index(fd->directory().path()), model->index(QDir::currentPath()));
     } else {
@@ -937,29 +937,29 @@ void tst_QFiledialog::selectFiles()
     // Get a list of files in the view and then get the corresponding index's
     QStringList list = fd.directory().entryList(QDir::Files);
     QModelIndexList toSelect;
-    QVERIFY(list.count() > 1);
+    QVERIFY(list.size() > 1);
     QListView* listView = fd.findChild<QListView*>("listView");
     QVERIFY(listView);
-    for (int i = 0; i < list.count(); ++i) {
+    for (int i = 0; i < list.size(); ++i) {
         fd.selectFile(fd.directory().path() + QLatin1Char('/') + list.at(i));
         QTRY_VERIFY(!listView->selectionModel()->selectedRows().isEmpty());
         toSelect.append(listView->selectionModel()->selectedRows().last());
     }
-    QCOMPARE(spyFilesSelected.count(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
 
     listView->selectionModel()->clear();
-    QCOMPARE(spyFilesSelected.count(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
 
     // select the indexes
-    for (int i = 0; i < toSelect.count(); ++i) {
+    for (int i = 0; i < toSelect.size(); ++i) {
         listView->selectionModel()->select(toSelect.at(i),
                 QItemSelectionModel::Select | QItemSelectionModel::Rows);
     }
-    QCOMPARE(fd.selectedFiles().count(), toSelect.count());
-    QCOMPARE(spyCurrentChanged.count(), 0);
-    QCOMPARE(spyDirectoryEntered.count(), 0);
-    QCOMPARE(spyFilesSelected.count(), 0);
-    QCOMPARE(spyFilterSelected.count(), 0);
+    QCOMPARE(fd.selectedFiles().size(), toSelect.size());
+    QCOMPARE(spyCurrentChanged.size(), 0);
+    QCOMPARE(spyDirectoryEntered.size(), 0);
+    QCOMPARE(spyFilesSelected.size(), 0);
+    QCOMPARE(spyFilterSelected.size(), 0);
 
     }
 
@@ -1160,13 +1160,13 @@ void tst_QFiledialog::historyBack()
     QCOMPARE(backButton->isEnabled(), true);
     QCOMPARE(forwardButton->isEnabled(), false);
     fd.setDirectory(desktop);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     backButton->click();
     qApp->processEvents();
     QCOMPARE(backButton->isEnabled(), true);
     QCOMPARE(forwardButton->isEnabled(), true);
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
     QString currentPath = qvariant_cast<QString>(spy.last().first());
     QCOMPARE(model->index(currentPath), model->index(temp));
 
@@ -1175,11 +1175,11 @@ void tst_QFiledialog::historyBack()
     QCOMPARE(currentPath, home);
     QCOMPARE(backButton->isEnabled(), false);
     QCOMPARE(forwardButton->isEnabled(), true);
-    QCOMPARE(spy.count(), 4);
+    QCOMPARE(spy.size(), 4);
 
     // nothing should change at this point
     backButton->click();
-    QCOMPARE(spy.count(), 4);
+    QCOMPARE(spy.size(), 4);
     QCOMPARE(backButton->isEnabled(), false);
     QCOMPARE(forwardButton->isEnabled(), true);
 }
@@ -1213,7 +1213,7 @@ void tst_QFiledialog::historyForward()
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(desktop));
     QCOMPARE(backButton->isEnabled(), true);
     QCOMPARE(forwardButton->isEnabled(), false);
-    QCOMPARE(spy.count(), 4);
+    QCOMPARE(spy.size(), 4);
 
     backButton->click();
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp));
@@ -1223,13 +1223,13 @@ void tst_QFiledialog::historyForward()
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(home));
     QCOMPARE(backButton->isEnabled(), false);
     QCOMPARE(forwardButton->isEnabled(), true);
-    QCOMPARE(spy.count(), 6);
+    QCOMPARE(spy.size(), 6);
 
     forwardButton->click();
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp));
     backButton->click();
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(home));
-    QCOMPARE(spy.count(), 8);
+    QCOMPARE(spy.size(), 8);
 
     forwardButton->click();
     QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp));