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>

10 files changed, 100 insertions, 100 deletions

diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 989f5fcde8..077bc58259 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -1102,7 +1102,7 @@ void tst_QDebug::threadSafety() const
     s_sema.release(numThreads);
     sync.waitForFinished();
     QMutexLocker lock(&s_mutex);
-    QCOMPARE(s_messages.count(), numThreads);
+    QCOMPARE(s_messages.size(), numThreads);
     for (int i = 0; i < numThreads; ++i) {
         QCOMPARE(s_messages.at(i), QStringLiteral("doDebug"));
     }
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 0c6014cc82..65a7daaf7d 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -521,12 +521,12 @@ void tst_QDir::removeRecursively_data()
          << tmpdir + "two/three"
          << "relative";
     QDir dir;
-    for (int i = 0; i < dirs.count(); ++i)
+    for (int i = 0; i < dirs.size(); ++i)
         dir.mkpath(dirs.at(i));
     QStringList files;
     files << tmpdir + "one/file";
     files << tmpdir + "two/three/file";
-    for (int i = 0; i < files.count(); ++i) {
+    for (int i = 0; i < files.size(); ++i) {
         QFile file(files.at(i));
         QVERIFY(file.open(QIODevice::WriteOnly));
         file.write("Hello");
@@ -1045,7 +1045,7 @@ void tst_QDir::entryListSimple()
 
     QDir dir(dirName);
     QStringList actual = dir.entryList();
-    QVERIFY2(actual.count() >= countMin, msgEntryListFailed(actual.count(), countMin, dirName).constData());
+    QVERIFY2(actual.size() >= countMin, msgEntryListFailed(actual.size(), countMin, dirName).constData());
 }
 
 void tst_QDir::entryListWithSymLinks()
@@ -1254,11 +1254,11 @@ void tst_QDir::setNameFilters()
 
     dir.setNameFilters(nameFilters);
     QStringList actual = dir.entryList();
-    int max = qMin(actual.count(), expected.count());
+    int max = qMin(actual.size(), expected.size());
 
     for (int i=0; i<max; ++i)
         QCOMPARE(actual[i], expected[i]);
-    QCOMPARE(actual.count(), expected.count());
+    QCOMPARE(actual.size(), expected.size());
 }
 
 void
@@ -1748,7 +1748,7 @@ void tst_QDir::homePath()
 #endif
 
     QStringList entries = homeDir.entryList();
-    for (int i = 0; i < entries.count(); ++i) {
+    for (int i = 0; i < entries.size(); ++i) {
         QFileInfo fi(QDir::homePath() + "/" + entries[i]);
         QCOMPARE(fi.exists(), true);
     }
@@ -1845,10 +1845,10 @@ void tst_QDir::searchPaths()
     QFETCH(QString, expectedAbsolutePath);
     bool exists = !expectedAbsolutePath.isEmpty();
 
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QDir::setSearchPaths(searchPathPrefixList.at(i), searchPathsList.at(i).split(","));
     }
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QCOMPARE(QDir::searchPaths(searchPathPrefixList.at(i)), searchPathsList.at(i).split(","));
     }
 
@@ -1859,19 +1859,19 @@ void tst_QDir::searchPaths()
         QCOMPARE(QFileInfo(filename).absoluteFilePath(), expectedAbsolutePath);
     }
 
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QDir::setSearchPaths(searchPathPrefixList.at(i), QStringList());
     }
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QVERIFY(QDir::searchPaths(searchPathPrefixList.at(i)).isEmpty());
     }
 
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         foreach (QString path, searchPathsList.at(i).split(",")) {
             QDir::addSearchPath(searchPathPrefixList.at(i), path);
         }
     }
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QCOMPARE(QDir::searchPaths(searchPathPrefixList.at(i)), searchPathsList.at(i).split(","));
     }
 
@@ -1882,10 +1882,10 @@ void tst_QDir::searchPaths()
         QCOMPARE(QFileInfo(filename).absoluteFilePath(), expectedAbsolutePath);
     }
 
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QDir::setSearchPaths(searchPathPrefixList.at(i), QStringList());
     }
-    for (int i = 0; i < searchPathPrefixList.count(); ++i) {
+    for (int i = 0; i < searchPathPrefixList.size(); ++i) {
         QVERIFY(QDir::searchPaths(searchPathPrefixList.at(i)).isEmpty());
     }
 }
@@ -2212,7 +2212,7 @@ void tst_QDir::drives()
     }
     QCOMPARE(foundsystem, true);
 #else
-    QCOMPARE(list.count(), 1); //root
+    QCOMPARE(list.size(), 1); //root
     QCOMPARE(list.at(0).absolutePath(), QLatin1String("/"));
 #endif
 }
@@ -2224,7 +2224,7 @@ void tst_QDir::arrayOperator()
 
     QStringList entries(dir1.entryList());
     int i = dir2.count();
-    QCOMPARE(i, entries.count());
+    QCOMPARE(i, entries.size());
     --i;
     for (;i>=0;--i) {
         QCOMPARE(dir2[i], entries.at(i));
@@ -2477,7 +2477,7 @@ void tst_QDir::stdfilesystem()
         QCOMPARE(entries, QStringList() << "subdir2" << "subdir1");
         QCOMPARE(filteredDir.sorting(), QDir::SortFlag::Reversed);
         QCOMPARE(filteredDir.filter(), QDir::Filter::Dirs);
-        QCOMPARE(filteredDir.nameFilters().length(), 1);
+        QCOMPARE(filteredDir.nameFilters().size(), 1);
         QCOMPARE(filteredDir.nameFilters().first(), "subdir*");
     }
 #else
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 361daf8dc7..5acab6e473 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -147,7 +147,7 @@ void tst_QFileSystemWatcher::basicTest()
     testFile.close();
 
     // waiting max 5 seconds for notification for file modification to trigger
-    QTRY_COMPARE(changedSpy.count(), 1);
+    QTRY_COMPARE(changedSpy.size(), 1);
     QCOMPARE(changedSpy.at(0).size(), 1);
 
     QString fileName = changedSpy.at(0).at(0).toString();
@@ -165,7 +165,7 @@ void tst_QFileSystemWatcher::basicTest()
     timer.start(5000);
     eventLoop.exec();
 
-    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(changedSpy.size(), 0);
 
     // readd the file watch with a relative path
     const QString relativeTestFileName = QDir::current().relativeFilePath(testFile.fileName());
@@ -175,7 +175,7 @@ void tst_QFileSystemWatcher::basicTest()
     testFile.write(QByteArray("hello multiverse!"));
     testFile.close();
 
-    QTRY_VERIFY(changedSpy.count() > 0);
+    QTRY_VERIFY(changedSpy.size() > 0);
 
     QVERIFY(watcher.removePath(relativeTestFileName));
 
@@ -191,7 +191,7 @@ void tst_QFileSystemWatcher::basicTest()
 #if !defined(Q_OS_QNX)
 
     // waiting max 5 seconds for notification for file permission modification to trigger
-    QTRY_COMPARE(changedSpy.count(), 1);
+    QTRY_COMPARE(changedSpy.size(), 1);
     QCOMPARE(changedSpy.at(0).size(), 1);
 
     fileName = changedSpy.at(0).at(0).toString();
@@ -209,7 +209,7 @@ void tst_QFileSystemWatcher::basicTest()
     timer.start(5000);
     eventLoop.exec();
 
-    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(changedSpy.size(), 0);
 
     // readd the file watch
     QVERIFY(watcher.addPath(testFile.fileName()));
@@ -220,7 +220,7 @@ void tst_QFileSystemWatcher::basicTest()
     // waiting max 5 seconds for notification for file removal to trigger
     // > 0 && < 3 because some platforms may emit two changes
     // XXX: which platforms? (QTBUG-23370)
-    QTRY_VERIFY(changedSpy.count() > 0 && changedSpy.count() < 3);
+    QTRY_VERIFY(changedSpy.size() > 0 && changedSpy.size() < 3);
     QCOMPARE(changedSpy.at(0).size(), 1);
 
     fileName = changedSpy.at(0).at(0).toString();
@@ -237,7 +237,7 @@ void tst_QFileSystemWatcher::basicTest()
     timer.start(5000);
     eventLoop.exec();
 
-    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(changedSpy.size(), 0);
 
     QVERIFY(testFile.remove());
 }
@@ -301,7 +301,7 @@ void tst_QFileSystemWatcher::watchDirectory()
     timer.start(5000);
     eventLoop.exec();
 
-    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(changedSpy.size(), 0);
 
     QVERIFY(watcher.addPaths(testDirs).isEmpty());
 
@@ -321,8 +321,8 @@ void tst_QFileSystemWatcher::watchDirectory()
         signalCounter[testDirName] = 0;
 
     // waiting max 5 seconds for notification for directory removal to trigger
-    QTRY_COMPARE(changedSpy.count(), testDirs.size() * 2);
-    for (int i = 0; i < changedSpy.count(); i++) {
+    QTRY_COMPARE(changedSpy.size(), testDirs.size() * 2);
+    for (int i = 0; i < changedSpy.size(); i++) {
         const auto &signal = changedSpy.at(i);
         QCOMPARE(signal.size(), 1);
 
@@ -352,7 +352,7 @@ void tst_QFileSystemWatcher::watchDirectory()
     timer.start(5000);
     eventLoop.exec();
 
-    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(changedSpy.size(), 0);
 
     for (const auto &testDirName : testDirs)
         QVERIFY(temporaryDir.rmdir(testDirName));
@@ -364,12 +364,12 @@ void tst_QFileSystemWatcher::addPath()
     QFileSystemWatcher watcher;
     QString home = QDir::homePath();
     QVERIFY(watcher.addPath(home));
-    QCOMPARE(watcher.directories().count(), 1);
+    QCOMPARE(watcher.directories().size(), 1);
     QCOMPARE(watcher.directories().first(), home);
 
     // second watch on an already-watched path should fail
     QVERIFY(!watcher.addPath(home));
-    QCOMPARE(watcher.directories().count(), 1);
+    QCOMPARE(watcher.directories().size(), 1);
 
     // With empty string
     QTest::ignoreMessage(QtWarningMsg, "QFileSystemWatcher::addPath: path is empty");
@@ -382,9 +382,9 @@ void tst_QFileSystemWatcher::removePath()
     QString home = QDir::homePath();
     QVERIFY(watcher.addPath(home));
     QVERIFY(watcher.removePath(home));
-    QCOMPARE(watcher.directories().count(), 0);
+    QCOMPARE(watcher.directories().size(), 0);
     QVERIFY(!watcher.removePath(home));
-    QCOMPARE(watcher.directories().count(), 0);
+    QCOMPARE(watcher.directories().size(), 0);
 
     // With empty string
     QTest::ignoreMessage(QtWarningMsg, "QFileSystemWatcher::removePath: path is empty");
@@ -397,7 +397,7 @@ void tst_QFileSystemWatcher::addPaths()
     QStringList paths;
     paths << QDir::homePath() << QDir::tempPath();
     QCOMPARE(watcher.addPaths(paths), QStringList());
-    QCOMPARE(watcher.directories().count(), 2);
+    QCOMPARE(watcher.directories().size(), 2);
 
     // With empty list
     paths.clear();
@@ -465,9 +465,9 @@ void tst_QFileSystemWatcher::removePaths()
     QStringList paths;
     paths << QDir::homePath() << QDir::tempPath();
     QCOMPARE(watcher.addPaths(paths), QStringList());
-    QCOMPARE(watcher.directories().count(), 2);
+    QCOMPARE(watcher.directories().size(), 2);
     QCOMPARE(watcher.removePaths(paths), QStringList());
-    QCOMPARE(watcher.directories().count(), 0);
+    QCOMPARE(watcher.directories().size(), 0);
 
     //With empty list
     paths.clear();
@@ -556,7 +556,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
     QTest::qWait(2000);
 #endif
 
-    QTRY_VERIFY(fileChangedSpy.count() > 0);
+    QTRY_VERIFY(fileChangedSpy.size() > 0);
     QVERIFY2(dirChangedSpy.count() == 0, dirChangedSpy.receivedFilesMessage());
 
     fileChangedSpy.clear();
@@ -567,7 +567,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
 
     timer.start(3000);
     eventLoop.exec();
-    int fileChangedSpyCount = fileChangedSpy.count();
+    int fileChangedSpyCount = fileChangedSpy.size();
 #ifdef Q_OS_WIN
     if (fileChangedSpyCount != 0)
         QEXPECT_FAIL("", "See QTBUG-30943", Continue);
@@ -579,7 +579,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
 
     QVERIFY(QFile::remove(testFileName));
 
-    QTRY_VERIFY(fileChangedSpy.count() > 0);
+    QTRY_VERIFY(fileChangedSpy.size() > 0);
     QTRY_COMPARE(dirChangedSpy.count(), 1);
 
     fileChangedSpy.clear();
@@ -591,7 +591,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
 
     timer.start(3000);
     eventLoop.exec();
-    QCOMPARE(fileChangedSpy.count(), 0);
+    QCOMPARE(fileChangedSpy.size(), 0);
     QCOMPARE(dirChangedSpy.count(), 1);
 
     // QTBUG-61792, removal should succeed (bug on Windows which uses one change
@@ -694,7 +694,7 @@ void tst_QFileSystemWatcher::QTBUG2331()
     // remove directory, we should get one change signal, and we should no longer
     // be watching the directory.
     QVERIFY(temporaryDirectory.remove());
-    QTRY_COMPARE(changedSpy.count(), 1);
+    QTRY_COMPARE(changedSpy.size(), 1);
     QCOMPARE(watcher.directories(), QStringList());
 }
 #endif // QT_BUILD_INTERNAL
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
index a2363eedfc..d2bfdb54ca 100644
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@@ -78,7 +78,7 @@ public:
     {
         QString ret;
         QTextStream out(&ret);
-        for (int a = 0; a < _configitemEntryOrder.count(); a++) {
+        for (int a = 0; a < _configitemEntryOrder.size(); a++) {
             out << _configitemEntryOrder[a]
                    << " = "
                    << _values.value(_configitemEntryOrder[a]) << Qt::endl;
@@ -903,7 +903,7 @@ private slots:
         buf = QStringLiteral("Digia.Berlin.Office.com.debug: Berlin  \"from Thread 2\"  :false");
         compareagainst.append(cleanLogLine(buf));
 
-        for (int i = 0; i < threadtest.count(); i++) {
+        for (int i = 0; i < threadtest.size(); i++) {
             if (!compareagainst.contains(cleanLogLine(threadtest[i]))){
                 fprintf(stdout, "%s\r\n", threadtest[i].toLatin1().constData());
                 QVERIFY2(false, "Multithread log is not complete!");
diff --git a/tests/auto/corelib/io/qprocess/testDetached/main.cpp b/tests/auto/corelib/io/qprocess/testDetached/main.cpp
index 57d39f4f13..4282621f0b 100644
--- a/tests/auto/corelib/io/qprocess/testDetached/main.cpp
+++ b/tests/auto/corelib/io/qprocess/testDetached/main.cpp
@@ -41,7 +41,7 @@ struct Args
 static Args parseArguments(const QStringList &args)
 {
     Args result;
-    if (args.count() < 2) {
+    if (args.size() < 2) {
         result.exitCode = 128;
         result.errorMessage = "Usage: testDetached [--out-channel={stdout|stderr}] filename.txt\n";
         return result;
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 331567b178..4506e18f8b 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -244,7 +244,7 @@ void tst_QProcess::simpleStart()
 
     process.reset();
 
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(spy.at(0).at(0)), QProcess::Starting);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(spy.at(1).at(0)), QProcess::Running);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(spy.at(2).at(0)), QProcess::NotRunning);
@@ -379,10 +379,10 @@ void tst_QProcess::crashTest()
 
     QVERIFY(process->waitForFinished(30000));
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(*static_cast<const QProcess::ProcessError *>(spy.at(0).at(0).constData()), QProcess::Crashed);
 
-    QCOMPARE(spy2.count(), 1);
+    QCOMPARE(spy2.size(), 1);
     QCOMPARE(*static_cast<const QProcess::ExitStatus *>(spy2.at(0).at(1).constData()), QProcess::CrashExit);
 
     QCOMPARE(process->exitStatus(), QProcess::CrashExit);
@@ -390,7 +390,7 @@ void tst_QProcess::crashTest()
     // delete process;
     process.reset();
 
-    QCOMPARE(stateSpy.count(), 3);
+    QCOMPARE(stateSpy.size(), 3);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(stateSpy.at(0).at(0)), QProcess::Starting);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(stateSpy.at(1).at(0)), QProcess::Running);
     QCOMPARE(qvariant_cast<QProcess::ProcessState>(stateSpy.at(2).at(0)), QProcess::NotRunning);
@@ -417,10 +417,10 @@ void tst_QProcess::crashTest2()
     if (QTestEventLoop::instance().timeout())
         QFAIL("Failed to detect crash : operation timed out");
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(*static_cast<const QProcess::ProcessError *>(spy.at(0).at(0).constData()), QProcess::Crashed);
 
-    QCOMPARE(spy2.count(), 1);
+    QCOMPARE(spy2.size(), 1);
     QCOMPARE(*static_cast<const QProcess::ExitStatus *>(spy2.at(0).at(1).constData()), QProcess::CrashExit);
 
     QCOMPARE(process.exitStatus(), QProcess::CrashExit);
@@ -526,9 +526,9 @@ void tst_QProcess::echoTest2()
             break;
     }
 
-    QVERIFY(spy0.count() > 0);
-    QVERIFY(spy1.count() > 0);
-    QVERIFY(spy2.count() > 0);
+    QVERIFY(spy0.size() > 0);
+    QVERIFY(spy1.size() > 0);
+    QVERIFY(spy2.size() > 0);
 
     QCOMPARE(process.readAllStandardOutput(), QByteArray("Hello"));
     QCOMPARE(process.readAllStandardError(), QByteArray("Hello"));
@@ -629,8 +629,8 @@ void tst_QProcess::exitStatus()
     QFETCH(QStringList, processList);
     QFETCH(QList<QProcess::ExitStatus>, exitStatus);
 
-    QCOMPARE(exitStatus.size(), processList.count());
-    for (int i = 0; i < processList.count(); ++i) {
+    QCOMPARE(exitStatus.size(), processList.size());
+    for (int i = 0; i < processList.size(); ++i) {
         process.start(processList.at(i));
         QVERIFY(process.waitForStarted(5000));
         QVERIFY(process.waitForFinished(30000));
@@ -683,7 +683,7 @@ void tst_QProcess::readTimeoutAndThenCrash()
     QVERIFY(process.waitForFinished(5000));
     QCOMPARE(process.state(), QProcess::NotRunning);
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(*static_cast<const QProcess::ProcessError *>(spy.at(0).at(0).constData()), QProcess::Crashed);
 }
 
@@ -860,7 +860,7 @@ void tst_QProcess::emitReadyReadOnlyWhenNewDataArrives()
 
     proc.start("testProcessEcho/testProcessEcho");
 
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     proc.write("A");
 
@@ -868,7 +868,7 @@ void tst_QProcess::emitReadyReadOnlyWhenNewDataArrives()
     if (QTestEventLoop::instance().timeout())
         QFAIL("Operation timed out");
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QTestEventLoop::instance().enterLoop(1);
     QVERIFY(QTestEventLoop::instance().timeout());
@@ -1280,7 +1280,7 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlot()
     QTestEventLoop::instance().enterLoop(30);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     process.disconnect();
     QVERIFY(process.waitForFinished(5000));
@@ -1316,7 +1316,7 @@ void tst_QProcess::waitForBytesWrittenInABytesWrittenSlot()
     QTestEventLoop::instance().enterLoop(30);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     process.write("", 1);
     process.disconnect();
     QVERIFY(process.waitForFinished());
@@ -1506,7 +1506,7 @@ void tst_QProcess::failToStart()
 
     for (int j = 0; j < 8; ++j) {
         for (int i = 0; i < attempts; ++i) {
-            QCOMPARE(errorSpy.count(), j * attempts + i);
+            QCOMPARE(errorSpy.size(), j * attempts + i);
             process.start("/blurp");
 
             switch (j) {
@@ -1530,12 +1530,12 @@ void tst_QProcess::failToStart()
             }
 
             QCOMPARE(process.error(), QProcess::FailedToStart);
-            QCOMPARE(errorSpy.count(), j * attempts + i + 1);
-            QCOMPARE(finishedSpy.count(), 0);
+            QCOMPARE(errorSpy.size(), j * attempts + i + 1);
+            QCOMPARE(finishedSpy.size(), 0);
 
             int it = j * attempts + i + 1;
 
-            QCOMPARE(stateSpy.count(), it * 2);
+            QCOMPARE(stateSpy.size(), it * 2);
             QCOMPARE(qvariant_cast<QProcess::ProcessState>(stateSpy.at(it * 2 - 2).at(0)), QProcess::Starting);
             QCOMPARE(qvariant_cast<QProcess::ProcessState>(stateSpy.at(it * 2 - 1).at(0)), QProcess::NotRunning);
         }
@@ -1559,8 +1559,8 @@ void tst_QProcess::failToStartWithWait()
         process.waitForStarted();
 
         QCOMPARE(process.error(), QProcess::FailedToStart);
-        QCOMPARE(errorSpy.count(), i + 1);
-        QCOMPARE(finishedSpy.count(), 0);
+        QCOMPARE(errorSpy.size(), i + 1);
+        QCOMPARE(finishedSpy.size(), 0);
     }
 }
 
@@ -1586,8 +1586,8 @@ void tst_QProcess::failToStartWithEventLoop()
         loop.exec();
 
         QCOMPARE(process.error(), QProcess::FailedToStart);
-        QCOMPARE(errorSpy.count(), i + 1);
-        QCOMPARE(finishedSpy.count(), 0);
+        QCOMPARE(errorSpy.size(), i + 1);
+        QCOMPARE(finishedSpy.size(), 0);
     }
 }
 
@@ -1619,7 +1619,7 @@ void tst_QProcess::failToStartEmptyArgs()
     };
 
     QVERIFY(!process.waitForStarted());
-    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorSpy.size(), 1);
     QCOMPARE(process.error(), QProcess::FailedToStart);
 }
 
@@ -1858,9 +1858,9 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
     QVERIFY(!process.waitForReadyRead()); // used to crash
     process.start("doesntexist");
     QVERIFY(!process.waitForReadyRead());
-    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorSpy.size(), 1);
     QCOMPARE(errorSpy.at(0).at(0).toInt(), 0);
-    QCOMPARE(finishedSpy.count(), 0);
+    QCOMPARE(finishedSpy.size(), 0);
 }
 
 void tst_QProcess::setStandardInputFile()
@@ -2315,7 +2315,7 @@ void tst_QProcess::invalidProgramString()
 
     process.start(programString);
     QCOMPARE(process.error(), QProcess::FailedToStart);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QVERIFY(!QProcess::startDetached(programString));
 }
@@ -2334,8 +2334,8 @@ void tst_QProcess::onlyOneStartedSignal()
     process.start("testProcessNormal/testProcessNormal");
     QVERIFY(process.waitForStarted(5000));
     QVERIFY(process.waitForFinished(5000));
-    QCOMPARE(spyStarted.count(), 1);
-    QCOMPARE(spyFinished.count(), 1);
+    QCOMPARE(spyStarted.size(), 1);
+    QCOMPARE(spyFinished.size(), 1);
 
     spyStarted.clear();
     spyFinished.clear();
@@ -2344,8 +2344,8 @@ void tst_QProcess::onlyOneStartedSignal()
     QVERIFY(process.waitForFinished(5000));
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
     QCOMPARE(process.exitCode(), 0);
-    QCOMPARE(spyStarted.count(), 1);
-    QCOMPARE(spyFinished.count(), 1);
+    QCOMPARE(spyStarted.size(), 1);
+    QCOMPARE(spyFinished.size(), 1);
 }
 
 class BlockOnReadStdOut : public QObject
@@ -2595,7 +2595,7 @@ void tst_QProcess::startFromCurrentWorkingDir()
     }
 
     QCOMPARE(process.waitForStarted(), success);
-    QCOMPARE(errorSpy.count(), int(!success));
+    QCOMPARE(errorSpy.size(), int(!success));
     if (success) {
         QVERIFY(process.waitForFinished());
     } else {
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
index 32a12c30bd..9bf8508697 100644
--- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -130,7 +130,7 @@ void tst_QProcessEnvironment::toStringList()
     e.insert("FOO", "bar");
     QStringList result = e.toStringList();
     QVERIFY(!result.isEmpty());
-    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.size(), 1);
     QCOMPARE(result.at(0), QString("FOO=bar"));
 
     e.clear();
@@ -142,7 +142,7 @@ void tst_QProcessEnvironment::toStringList()
     e.insert("A", "bc");
     e.insert("HELLO", "World");
     result = e.toStringList();
-    QCOMPARE(result.length(), 4);
+    QCOMPARE(result.size(), 4);
 
     // order is not specified, so use contains()
     QVERIFY(result.contains("FOO=bar"));
@@ -159,7 +159,7 @@ void tst_QProcessEnvironment::keys()
 
     e.insert("FOO", "bar");
     QStringList result = e.keys();
-    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.size(), 1);
     QCOMPARE(result.at(0), QString("FOO"));
 
     e.clear();
@@ -171,7 +171,7 @@ void tst_QProcessEnvironment::keys()
     e.insert("A", "bc");
     e.insert("HELLO", "World");
     result = e.keys();
-    QCOMPARE(result.length(), 4);
+    QCOMPARE(result.size(), 4);
 
     // order is not specified, so use contains()
     QVERIFY(result.contains("FOO"));
@@ -194,7 +194,7 @@ void tst_QProcessEnvironment::insertEnv()
 
     e.insert(e2);
     QStringList keys = e.keys();
-    QCOMPARE(keys.length(), 5);
+    QCOMPARE(keys.size(), 5);
 
     QCOMPARE(e.value("FOO"), QString("bar"));
     QCOMPARE(e.value("A"), QString("bc"));
@@ -244,7 +244,7 @@ void tst_QProcessEnvironment::caseSensitivity()
     QCOMPARE(e.value("foo"), QString("bar"));
 
     QStringList list = e.toStringList();
-    QCOMPARE(list.length(), 2);
+    QCOMPARE(list.size(), 2);
     QVERIFY(list.contains("foo=bar"));
     QVERIFY(list.contains("FOO=baz"));
 #endif
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index b168dd96c3..753d3f8b8a 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -550,7 +550,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings1.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings1.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings1.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings1.allKeys().count(), 6);
+        QCOMPARE(settings1.allKeys().size(), 6);
 
         QCOMPARE(settings2.value("alpha/beta/geometry").toInt(), -7);
         QCOMPARE(settings2.value("alpha/beta/geometry/x").toInt(), 1);
@@ -558,7 +558,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings2.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings2.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings2.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings2.allKeys().count(), 6);
+        QCOMPARE(settings2.allKeys().size(), 6);
     }
 
     {
@@ -569,7 +569,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings1.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings1.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings1.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings1.allKeys().count(), 6);
+        QCOMPARE(settings1.allKeys().size(), 6);
     }
 
     {
@@ -1731,12 +1731,12 @@ void tst_QSettings::sync()
     QCOMPARE(settings2.value("moo/beta/geometry/width").toInt(), 3);
     QCOMPARE(settings2.value("moo/beta/geometry/height").toInt(), 4);
     QCOMPARE(settings2.value("moo/gamma/splitter").toInt(), 5);
-    QCOMPARE(settings2.allKeys().count(), 11);
+    QCOMPARE(settings2.allKeys().size(), 11);
 
     // Now, software.org.ini no longer exists, this is same as another app
     // clearing all settings.
     settings1.sync();
-    QCOMPARE(settings1.allKeys().count(), 0);
+    QCOMPARE(settings1.allKeys().size(), 0);
 
     // Now "some other app" will change software.org.ini
     QVERIFY(QFile::rename((userConfDir + "other.software.org.ini").toLatin1(),
@@ -1754,7 +1754,7 @@ void tst_QSettings::sync()
     QCOMPARE(settings1.value("moo/beta/geometry/width").toInt(), 3);
     QCOMPARE(settings1.value("moo/beta/geometry/height").toInt(), 4);
     QCOMPARE(settings1.value("moo/gamma/splitter").toInt(), 5);
-    QCOMPARE(settings1.allKeys().count(), 11);
+    QCOMPARE(settings1.allKeys().size(), 11);
 }
 
 void tst_QSettings::syncNonWriteableDir()
@@ -2441,17 +2441,17 @@ void tst_QSettings::testArrays()
         QCOMPARE(settings1.value("ene").toInt(), 2);
         QCOMPARE(settings1.value("due").toInt(), 3);
         QCOMPARE(settings1.value("rike").toInt(), 4);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(1);
         QCOMPARE(settings1.value("ene").toInt(), 5);
         QCOMPARE(settings1.value("due").toInt(), 6);
         QCOMPARE(settings1.value("rike").toInt(), 7);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(2);
         QCOMPARE(settings1.value("ene").toInt(), 8);
         QCOMPARE(settings1.value("due").toInt(), 9);
         QCOMPARE(settings1.value("rike").toInt(), 10);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
 
         settings1.endArray();
         settings1.endGroup();
@@ -2501,17 +2501,17 @@ void tst_QSettings::testArrays()
         QCOMPARE(settings1.value("ene").toInt(), 2);
         QCOMPARE(settings1.value("due").toInt(), 3);
         QCOMPARE(settings1.value("rike").toInt(), 4);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(1);
         QCOMPARE(settings1.value("ene").toInt(), 5);
         QCOMPARE(settings1.value("due").toInt(), 6);
         QCOMPARE(settings1.value("rike").toInt(), 7);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(2);
         QCOMPARE(settings1.value("ene").toInt(), 8);
         QCOMPARE(settings1.value("due").toInt(), 9);
         QCOMPARE(settings1.value("rike").toInt(), 10);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
 
         settings1.endArray();
         settings1.endGroup();
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index b2bb14180e..8f96f1d49b 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -147,12 +147,12 @@ void tst_qstandardpaths::testDefaultLocations()
     QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation), expectedConfHome);
     QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation), expectedConfHome);
     const QStringList confDirs = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation);
-    QCOMPARE(confDirs.count(), 2);
+    QCOMPARE(confDirs.size(), 2);
     QVERIFY(confDirs.contains(expectedConfHome));
     QCOMPARE(QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation), confDirs);
 
     const QStringList genericDataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
-    QCOMPARE(genericDataDirs.count(), 3);
+    QCOMPARE(genericDataDirs.size(), 3);
     const QString expectedDataHome = QDir::homePath() + QString::fromLatin1("/.local/share");
     QCOMPARE(genericDataDirs.at(0), expectedDataHome);
     QCOMPARE(genericDataDirs.at(1), QString::fromLatin1("/usr/local/share"));
@@ -260,7 +260,7 @@ void tst_qstandardpaths::testLocateAll()
 #ifdef Q_XDG_PLATFORM
     setCustomLocations();
     const QStringList appsDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "applications", QStandardPaths::LocateDirectory);
-    QCOMPARE(appsDirs.count(), 0); // they don't exist yet
+    QCOMPARE(appsDirs.size(), 0); // they don't exist yet
     const QStringList expectedAppsDirs = QStringList() << m_localAppDir + QLatin1String("/applications")
                                                        << m_globalAppDir + QLatin1String("/applications");
     QDir().mkdir(expectedAppsDirs.at(0));
@@ -301,7 +301,7 @@ void tst_qstandardpaths::testDataLocation()
     const QString expectedAppDataDir = QDir::homePath() + QString::fromLatin1("/.local/share/Qt/QtTest");
     QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation), expectedAppDataDir);
     const QStringList appDataDirs = QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation);
-    QCOMPARE(appDataDirs.count(), 3);
+    QCOMPARE(appDataDirs.size(), 3);
     QCOMPARE(appDataDirs.at(0), expectedAppDataDir);
     QCOMPARE(appDataDirs.at(1), QString::fromLatin1("/usr/local/share/Qt/QtTest"));
     QCOMPARE(appDataDirs.at(2), QString::fromLatin1("/usr/share/Qt/QtTest"));
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index ead6afca8e..59cbba9bca 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -1090,7 +1090,7 @@ void tst_QUrl::toAndFromStringList()
     QFETCH(QStringList, strings);
 
     const QList<QUrl> urls = QUrl::fromStringList(strings);
-    QCOMPARE(urls.size(), strings.count());
+    QCOMPARE(urls.size(), strings.size());
     const QStringList converted = QUrl::toStringList(urls);
     QCOMPARE(converted, strings);
 }