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>

9 files changed, 18 insertions, 18 deletions

diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp
index 2add1acfca..eb52d28d59 100644
--- a/src/testlib/qabstractitemmodeltester.cpp
+++ b/src/testlib/qabstractitemmodeltester.cpp
@@ -867,7 +867,7 @@ void QAbstractItemModelTesterPrivate::layoutChanged()
     MODELTESTER_COMPARE(changeInFlight, ChangeInFlight::LayoutChanged);
     changeInFlight = ChangeInFlight::None;
 
-    for (int i = 0; i < changing.count(); ++i) {
+    for (int i = 0; i < changing.size(); ++i) {
         QPersistentModelIndex p = changing[i];
         MODELTESTER_COMPARE(model->index(p.row(), p.column(), p.parent()), QModelIndex(p));
     }
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index e716c38a73..75443c96dc 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -120,10 +120,10 @@ namespace QTest {
 
         QString beforeDecimalPoint = QString::number(qint64(number), 'f', 0);
         QString afterDecimalPoint = QString::number(number, 'f', 20);
-        afterDecimalPoint.remove(0, beforeDecimalPoint.length() + 1);
+        afterDecimalPoint.remove(0, beforeDecimalPoint.size() + 1);
 
-        int beforeUse = qMin(beforeDecimalPoint.length(), significantDigits);
-        int beforeRemove = beforeDecimalPoint.length() - beforeUse;
+        int beforeUse = qMin(beforeDecimalPoint.size(), significantDigits);
+        int beforeRemove = beforeDecimalPoint.size() - beforeUse;
 
         // Replace insignificant digits before the decimal point with zeros.
         beforeDecimalPoint.chop(beforeRemove);
@@ -138,21 +138,21 @@ namespace QTest {
             ++afterUse;
 
             int i = 0;
-            while (i < afterDecimalPoint.length() && afterDecimalPoint.at(i) == u'0')
+            while (i < afterDecimalPoint.size() && afterDecimalPoint.at(i) == u'0')
                 ++i;
 
             afterUse += i;
         }
 
-        int afterRemove = afterDecimalPoint.length() - afterUse;
+        int afterRemove = afterDecimalPoint.size() - afterUse;
         afterDecimalPoint.chop(afterRemove);
 
         QChar separator = u',';
         QChar decimalPoint = u'.';
 
         // insert thousands separators
-        int length = beforeDecimalPoint.length();
-        for (int i = beforeDecimalPoint.length() -1; i >= 1; --i) {
+        int length = beforeDecimalPoint.size();
+        for (int i = beforeDecimalPoint.size() -1; i >= 1; --i) {
             if ((length - i) % 3 == 0)
                 beforeDecimalPoint.insert(i, separator);
         }
@@ -172,7 +172,7 @@ namespace QTest {
     int formatResult(char * buffer, int bufferSize, T number, int significantDigits)
     {
         QString result = formatResult(number, significantDigits);
-        int size = result.length();
+        int size = result.size();
         qstrncpy(buffer, std::move(result).toLatin1().constData(), bufferSize);
         return size;
     }
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index 7bef9a8f11..86c6c521ff 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -60,7 +60,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
     str += " (";
 
     QList<QByteArray> args = member.parameterTypes();
-    for (int i = 0; i < args.count(); ++i) {
+    for (int i = 0; i < args.size(); ++i) {
         const QByteArray &arg = args.at(i);
         int typeId = QMetaType::fromName(args.at(i).constData()).id();
         if (arg.endsWith('*') || arg.endsWith('&')) {
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index d31370cbd0..4189d30156 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -177,8 +177,8 @@ private:
     void appendArgs(void **a)
     {
         QList<QVariant> list;
-        list.reserve(args.count());
-        for (int i = 0; i < args.count(); ++i) {
+        list.reserve(args.size());
+        for (int i = 0; i < args.size(); ++i) {
             const QMetaType::Type type = static_cast<QMetaType::Type>(args.at(i));
             if (type == QMetaType::QVariant)
                 list << *reinterpret_cast<QVariant *>(a[i + 1]);
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 841751fac1..7b845a61a9 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -65,7 +65,7 @@ template<> inline char *toString(const QLatin1StringView &str)
 
 template<> inline char *toString(const QByteArray &ba)
 {
-    return QTest::toPrettyCString(ba.constData(), ba.length());
+    return QTest::toPrettyCString(ba.constData(), ba.size());
 }
 
 template<> inline char *toString(const QBitArray &ba)
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index d60af9466b..2b6b759023 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -259,7 +259,7 @@ void parseBlackList()
         if (line.isEmpty())
             continue;
         if (line.startsWith('[')) {
-            function = line.mid(1, line.length() - 2);
+            function = line.mid(1, line.size() - 2);
             continue;
         }
         bool condition = checkCondition(line);
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 22aa3541ff..d9ffefa775 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1069,7 +1069,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) {
 
 QBenchmarkResult qMedian(const QList<QBenchmarkResult> &container)
 {
-    const int count = container.count();
+    const int count = container.size();
     if (count == 0)
         return QBenchmarkResult();
 
@@ -2680,7 +2680,7 @@ QSharedPointer<QTemporaryDir> QTest::qExtractTestData(const QString &dirName)
           QFileInfo fileInfo = it.nextFileInfo();
 
           if (!fileInfo.isDir()) {
-              const QString destination = dataPath + u'/' + QStringView{fileInfo.filePath()}.mid(resourcePath.length());
+              const QString destination = dataPath + u'/' + QStringView{fileInfo.filePath()}.mid(resourcePath.size());
               QFileInfo destinationFileInfo(destination);
               QDir().mkpath(destinationFileInfo.path());
               if (!QFile::copy(fileInfo.filePath(), destination)) {
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index efa11afbde..b051bd9124 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -259,7 +259,7 @@ namespace QTest
     inline static void keyClicks(QWidget *widget, const QString &sequence,
                                  Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1)
     {
-        for (int i=0; i < sequence.length(); i++)
+        for (int i=0; i < sequence.size(); i++)
             keyEvent(Click, widget, sequence.at(i).toLatin1(), modifier, delay);
     }
 
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 9a339c2be7..9867e8c5b2 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -116,7 +116,7 @@ namespace QTest {
             // (the space was added automatically by ~QDebug() until Qt 5.3,
             //  so autotests still might expect it)
             if (expected.endsWith(u' '))
-                return actual == QStringView{expected}.left(expected.length() - 1);
+                return actual == QStringView{expected}.left(expected.size() - 1);
 
             return false;
         }