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

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 1b2989b978..0b485ab706 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -105,11 +105,11 @@ UnixMakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::
         if (!out_directory.isEmpty() && !out_directory.endsWith(Option::dir_sep))
             out_directory += Option::dir_sep;
         if (!abs_source_path.isEmpty() && out_directory.startsWith(abs_source_path))
-            out_directory = Option::output_dir + out_directory.mid(abs_source_path.length());
+            out_directory = Option::output_dir + out_directory.mid(abs_source_path.size());
 
         QString dist_directory = out_directory;
         if (dist_directory.endsWith(Option::dir_sep))
-            dist_directory.chop(Option::dir_sep.length());
+            dist_directory.chop(Option::dir_sep.size());
         if (!dist_directory.startsWith(Option::dir_sep))
             dist_directory.prepend(Option::dir_sep);
 
@@ -121,7 +121,7 @@ UnixMakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::
         QString out = subtarget->makefile;
         QString in = escapeFilePath(fileFixify(in_directory + subtarget->profile, FileFixifyAbsolute));
         if (out.startsWith(in_directory))
-            out.remove(0, in_directory.length());
+            out.remove(0, in_directory.size());
 
         t << subtarget->target << "-distdir: FORCE";
         writeSubTargetCall(t, in_directory, in, out_directory, escapeFilePath(out),
@@ -303,7 +303,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                         for(QStringList::Iterator cit = Option::c_ext.begin();
                             cit != Option::c_ext.end(); ++cit) {
                             if((*it).endsWith((*cit))) {
-                                d_file = (*it).left((*it).length() - (*cit).length()).toQString();
+                                d_file = (*it).left((*it).length() - (*cit).size()).toQString();
                                 break;
                             }
                         }
@@ -311,7 +311,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                             for(QStringList::Iterator cppit = Option::cpp_ext.begin();
                                 cppit != Option::cpp_ext.end(); ++cppit) {
                                 if((*it).endsWith((*cppit))) {
-                                    d_file = (*it).left((*it).length() - (*cppit).length()).toQString();
+                                    d_file = (*it).left((*it).length() - (*cppit).size()).toQString();
                                     break;
                                 }
                             }
@@ -388,7 +388,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             //incremental target
             QString incr_target = var("TARGET") + "_incremental";
             if(incr_target.indexOf(Option::dir_sep) != -1)
-                incr_target = incr_target.right(incr_target.length() -
+                incr_target = incr_target.right(incr_target.size() -
                                                 (incr_target.lastIndexOf(Option::dir_sep) + 1));
             QString incr_deps, incr_objs;
             if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
@@ -489,7 +489,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             QString incr_target = var("QMAKE_ORIG_TARGET").replace(
                 QRegularExpression("\\." + s_ext), "").replace(QRegularExpression("^lib"), "") + "_incremental";
             if(incr_target.indexOf(Option::dir_sep) != -1)
-                incr_target = incr_target.right(incr_target.length() -
+                incr_target = incr_target.right(incr_target.size() -
                                                 (incr_target.lastIndexOf(Option::dir_sep) + 1));
 
             if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
@@ -1395,7 +1395,7 @@ UnixMakefileGenerator::libtoolFileName(bool fixify)
     QString ret = var("TARGET");
     int slsh = ret.lastIndexOf(Option::dir_sep);
     if(slsh != -1)
-        ret = ret.right(ret.length() - slsh - 1);
+        ret = ret.right(ret.size() - slsh - 1);
     int dot = ret.indexOf('.');
     if(dot != -1)
         ret = ret.left(dot);
@@ -1465,7 +1465,7 @@ UnixMakefileGenerator::writeLibtoolFile()
     mkdir(fileInfo(fname).path());
     int slsh = lname.lastIndexOf(Option::dir_sep);
     if(slsh != -1)
-        lname = lname.right(lname.length() - slsh - 1);
+        lname = lname.right(lname.size() - slsh - 1);
     QFile ft(fname);
     if(!ft.open(QIODevice::WriteOnly))
         return;
@@ -1495,7 +1495,7 @@ UnixMakefileGenerator::writeLibtoolFile()
     t << "'\n\n";
 
     t << "# The name of the static archive.\n"
-      << "old_library='" << escapeFilePath(lname.left(lname.length()-Option::libtool_ext.length()))
+      << "old_library='" << escapeFilePath(lname.left(lname.size()-Option::libtool_ext.size()))
                          << ".a'\n\n";
 
     t << "# Libraries that this one depends upon.\n";