From df9d882d41b741fef7c5beeddb0abe9d904443d8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 30 Sep 2022 14:09:04 +0200
Subject: 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>
---
 src/tools/androiddeployqt/main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/tools/androiddeployqt/main.cpp')

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 29df1ba2b1..46f5c76ed9 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -648,10 +648,10 @@ bool quasiLexicographicalReverseLessThan(const QFileInfo &fi1, const QFileInfo &
     QString s1 = fi1.baseName();
     QString s2 = fi2.baseName();
 
-    if (s1.length() == s2.length())
+    if (s1.size() == s2.size())
         return s1 > s2;
     else
-        return s1.length() > s2.length();
+        return s1.size() > s2.size();
 }
 
 // Files which contain templates that need to be overwritten by build data should be overwritten every
@@ -741,10 +741,10 @@ QString cleanPackageName(QString packageName)
 
     // No keywords
     qsizetype index = -1;
-    while (index < packageName.length()) {
+    while (index < packageName.size()) {
         qsizetype next = packageName.indexOf(u'.', index + 1);
         if (next == -1)
-            next = packageName.length();
+            next = packageName.size();
         QString word = packageName.mid(index + 1, next - index - 1);
         if (!word.isEmpty()) {
             QChar c = word[0];
@@ -1129,7 +1129,7 @@ bool readInputFile(Options *options)
                             QString subPath = iterator.filePath();
                             auto arch = fileArchitecture(*options, subPath);
                             if (!arch.isEmpty()) {
-                                options->qtDependencies[arch].append(QtDependency(subPath.mid(options->qtInstallDirectory.length() + 1),
+                                options->qtDependencies[arch].append(QtDependency(subPath.mid(options->qtInstallDirectory.size() + 1),
                                                                                   subPath));
                             } else if (options->verbose) {
                                 fprintf(stderr, "Skipping \"%s\", unknown architecture\n", qPrintable(subPath));
@@ -1403,7 +1403,7 @@ bool updateFile(const QString &fileName, const QHash<QString, QString> &replacem
         forever {
             int index = contents.indexOf(it.key().toUtf8());
             if (index >= 0) {
-                contents.replace(index, it.key().length(), it.value().toUtf8());
+                contents.replace(index, it.key().size(), it.value().toUtf8());
                 hasReplacements = true;
             } else {
                 break;
@@ -1717,7 +1717,7 @@ QList<QtDependency> findFilesRecursively(const Options &options, const QFileInfo
 
         return ret;
     } else {
-        return QList<QtDependency>() << QtDependency(info.absoluteFilePath().mid(rootPath.length()), info.absoluteFilePath());
+        return QList<QtDependency>() << QtDependency(info.absoluteFilePath().mid(rootPath.size()), info.absoluteFilePath());
     }
 }
 
-- 
cgit v1.2.3