Port from container::count() and length() to size()

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      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',
with the extended set of container classes recognized.

Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

16 files changed, 67 insertions, 67 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 51adb49aa8..98fefcb838 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -364,7 +364,7 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
 
         if (dummyData && !quietMode) {
             printf("qml: Loaded dummy data: %s\n",  qPrintable(dir.filePath(qml)));
-            qml.truncate(qml.length()-4);
+            qml.truncate(qml.size()-4);
             engine.rootContext()->setContextProperty(qml, dummyData);
             dummyData->setParent(&engine);
         }
@@ -586,7 +586,7 @@ int main(int argc, char *argv[])
         QLoggingCategory::setFilterRules(QStringLiteral("*=false"));
     }
 
-    if (files.count() <= 0) {
+    if (files.size() <= 0) {
 #if defined(Q_OS_DARWIN) && defined(QT_GUI_LIB)
         if (applicationType == QmlApplicationTypeGui)
             exitTimerId = static_cast<LoaderApplication *>(app.get())->startTimer(FILE_OPEN_EVENT_WAIT_TIME);
@@ -599,7 +599,7 @@ int main(int argc, char *argv[])
     loadConf(confFile, !verboseMode);
 
     // Load files
-    QScopedPointer<LoadWatcher> lw(new LoadWatcher(&e, files.count()));
+    QScopedPointer<LoadWatcher> lw(new LoadWatcher(&e, files.size()));
 
 #if QT_DEPRECATED_SINCE(6, 3)
     QString dummyDir;
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index e5af2f8bae..1294a26603 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -137,7 +137,7 @@ int main(int argc, char **argv)
     const QStringList sources = parser.positionalArguments();
     if (sources.isEmpty()){
         parser.showHelp();
-    } else if (sources.count() > 1 && (target != GenerateLoader && target != GenerateLoaderStandAlone)) {
+    } else if (sources.size() > 1 && (target != GenerateLoader && target != GenerateLoaderStandAlone)) {
         fprintf(stderr, "%s\n", qPrintable(QStringLiteral("Too many input files specified: '") + sources.join(QStringLiteral("' '")) + QLatin1Char('\'')));
         return EXIT_FAILURE;
     }
diff --git a/tools/qmldom/qmldomtool.cpp b/tools/qmldom/qmldomtool.cpp
index 998f55d21f..2ed7d069e6 100644
--- a/tools/qmldom/qmldomtool.cpp
+++ b/tools/qmldom/qmldomtool.cpp
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
             hadFailures = hadFailures || !bool(res);
         }
     } else if (parser.isSet(dumpAstOption)) {
-        if (pathsToDump.length() > 1) {
+        if (pathsToDump.size() > 1) {
             qWarning() << "--dump-ast can only be used with a single file";
             return 1;
         }
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 4dd725afbc..700cb9ff34 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -169,7 +169,7 @@ void SplineEditor::paintEvent(QPaintEvent *)
     paintControlPoint(QPointF(0.0, 0.0), &painter, false, true, false, false);
     paintControlPoint(QPointF(1.0, 1.0), &painter, false, true, false, false);
 
-    for (int i = 0; i < m_controlPoints.count() - 1; ++i)
+    for (int i = 0; i < m_controlPoints.size() - 1; ++i)
         paintControlPoint(m_controlPoints.at(i),
                           &painter,
                           true,
@@ -344,7 +344,7 @@ void SplineEditor::smoothPoint(int index)
             before = m_controlPoints.at(index - 3);
 
         QPointF after = QPointF(1.0, 1.0);
-        if ((index + 3) < m_controlPoints.count())
+        if ((index + 3) < m_controlPoints.size())
             after = m_controlPoints.at(index + 3);
 
         QPointF tangent = (after - before) / 6;
@@ -354,7 +354,7 @@ void SplineEditor::smoothPoint(int index)
         if (index > 0)
             m_controlPoints[index - 1] = thisPoint - tangent;
 
-        if (index + 1  < m_controlPoints.count())
+        if (index + 1  < m_controlPoints.size())
             m_controlPoints[index + 1] = thisPoint + tangent;
 
         m_smoothList[index / 3] = true;
@@ -372,7 +372,7 @@ void SplineEditor::cornerPoint(int index)
         before = m_controlPoints.at(index - 3);
 
     QPointF after = QPointF(1.0, 1.0);
-    if ((index + 3) < m_controlPoints.count())
+    if ((index + 3) < m_controlPoints.size())
         after = m_controlPoints.at(index + 3);
 
     QPointF thisPoint =  m_controlPoints.at(index);
@@ -380,7 +380,7 @@ void SplineEditor::cornerPoint(int index)
     if (index > 0)
         m_controlPoints[index - 1] = (before - thisPoint) / 3 + thisPoint;
 
-    if (index + 1  < m_controlPoints.count())
+    if (index + 1  < m_controlPoints.size())
         m_controlPoints[index + 1] = (after - thisPoint) / 3 + thisPoint;
 
     m_smoothList[(index) / 3] = false;
@@ -412,7 +412,7 @@ void SplineEditor::addPoint(const QPointF point)
         before = m_controlPoints.at(splitIndex);
 
     QPointF after = QPointF(1.0, 1.0);
-    if ((splitIndex + 3) < m_controlPoints.count())
+    if ((splitIndex + 3) < m_controlPoints.size())
         after = m_controlPoints.at(splitIndex + 3);
 
     if (splitIndex > 0) {
@@ -541,7 +541,7 @@ bool SplineEditor::isControlPointSmooth(int i) const
     if (i == 0)
         return false;
 
-    if (i == m_controlPoints.count() - 1)
+    if (i == m_controlPoints.size() - 1)
         return false;
 
     if (m_numberOfSegments == 1)
@@ -552,7 +552,7 @@ bool SplineEditor::isControlPointSmooth(int i) const
     if (index == 0)
         return false;
 
-    if (index == m_controlPoints.count() - 1)
+    if (index == m_controlPoints.size() - 1)
         return false;
 
     return m_smoothList.at(index / 3);
@@ -611,7 +611,7 @@ void SplineEditor::mouseMoveEvent(QMouseEvent *e)
 
                 if ((m_activeControlPoint > 1) && (m_activeControlPoint % 3) == 0) { //right control point
                     m_controlPoints[m_activeControlPoint - 2] -= distance;
-                } else if ((m_activeControlPoint < (m_controlPoints.count() - 2)) //left control point
+                } else if ((m_activeControlPoint < (m_controlPoints.size() - 2)) //left control point
                            && (m_activeControlPoint % 3) == 1) {
                     m_controlPoints[m_activeControlPoint + 2] -= distance;
                 }
@@ -628,7 +628,7 @@ void SplineEditor::setEasingCurve(const QEasingCurve &easingCurve)
     m_block = true;
     m_easingCurve = easingCurve;
     m_controlPoints = m_easingCurve.toCubicSpline();
-    m_numberOfSegments = m_controlPoints.count() / 3;
+    m_numberOfSegments = m_controlPoints.size() / 3;
     update();
     emit easingCurveChanged();
 
@@ -652,9 +652,9 @@ void SplineEditor::setEasingCurve(const QString &code)
     if (code.startsWith(QLatin1Char('[')) && code.endsWith(QLatin1Char(']'))) {
         const auto cleanCode = QStringView(code).mid(1, code.size() - 2);
         const auto stringList = cleanCode.split(QLatin1Char(','), Qt::SkipEmptyParts);
-        if (stringList.count() >= 6 && (stringList.count() % 6 == 0)) {
+        if (stringList.size() >= 6 && (stringList.size() % 6 == 0)) {
             QVector<qreal> realList;
-            realList.reserve(stringList.count());
+            realList.reserve(stringList.size());
             for (const QStringView &string : stringList) {
                 bool ok;
                 realList.append(string.toDouble(&ok));
@@ -662,14 +662,14 @@ void SplineEditor::setEasingCurve(const QString &code)
                     return;
             }
             QVector<QPointF> points;
-            const int count = realList.count() / 2;
+            const int count = realList.size() / 2;
             points.reserve(count);
             for (int i = 0; i < count; ++i)
                 points.append(QPointF(realList.at(i * 2), realList.at(i * 2 + 1)));
             if (points.constLast() == QPointF(1.0, 1.0)) {
                 QEasingCurve easingCurve(QEasingCurve::BezierSpline);
 
-                for (int i = 0; i < points.count() / 3; ++i) {
+                for (int i = 0; i < points.size() / 3; ++i) {
                     easingCurve.addCubicBezierSegment(points.at(i * 3),
                                                       points.at(i * 3 + 1),
                                                       points.at(i * 3 + 2));
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 1b2dbf285c..ea2ddac00d 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -304,7 +304,7 @@ QPair<QString, QString> resolveImportPath(const QString &uri, const QString &ver
                     // otherwise we keep looking if we can find the module again (with a qmldir this time)
                 }
             } else {
-                for (int index = parts.count() - 1; index >= 0; --index) {
+                for (int index = parts.size() - 1; index >= 0; --index) {
                     QString relativePath = parts.mid(0, index + 1).join(slash)
                         + dot + ver + slash + parts.mid(index + 1).join(slash);
                     if (relativePath.endsWith(slash))
@@ -449,7 +449,7 @@ QVariantMap dependencyStringToImport(const QString &line) {
     QVariantMap depImport;
     depImport[typeLiteral()] = moduleLiteral();
     depImport[nameLiteral()] = name;
-    if (dep.length() > 1)
+    if (dep.size() > 1)
         depImport[versionLiteral()] = dep[1].toString();
     return depImport;
 }
@@ -772,8 +772,8 @@ QVariantList findQmlImportsRecursively(const QStringList &qmlDirs,
 {
     QVariantList ret;
 
-    qCDebug(lcImportScanner) << "Scanning" << qmlDirs.count() << "root directories and"
-                             << scanFiles.count() << "files.";
+    qCDebug(lcImportScanner) << "Scanning" << qmlDirs.size() << "root directories and"
+                             << scanFiles.size() << "files.";
 
     // Scan all app root qml directories for imports
     for (const QString &qmlDir : qmlDirs) {
@@ -891,26 +891,26 @@ int main(int argc, char *argv[])
     QString outputFile;
 
     int i = 1;
-    while (i < args.count()) {
+    while (i < args.size()) {
         const QString &arg = args.at(i);
         ++i;
         QStringList *argReceiver = nullptr;
         if (!arg.startsWith(QLatin1Char('-')) || arg == QLatin1String("-")) {
             qmlRootPaths += arg;
         } else if (arg == QLatin1String("-rootPath")) {
-            if (i >= args.count())
+            if (i >= args.size())
                 std::cerr << "-rootPath requires an argument\n";
             argReceiver = &qmlRootPaths;
         } else if (arg == QLatin1String("-qmlFiles")) {
-            if (i >= args.count())
+            if (i >= args.size())
                 std::cerr << "-qmlFiles requires an argument\n";
             argReceiver = &scanFiles;
         } else if (arg == QLatin1String("-jsFiles")) {
-            if (i >= args.count())
+            if (i >= args.size())
                 std::cerr << "-jsFiles requires an argument\n";
             argReceiver = &scanFiles;
         } else if (arg == QLatin1String("-importPath")) {
-            if (i >= args.count())
+            if (i >= args.size())
                 std::cerr << "-importPath requires an argument\n";
             argReceiver = &qmlImportPaths;
         } else if (arg == QLatin1String("-cmake-output")) {
@@ -918,7 +918,7 @@ int main(int argc, char *argv[])
         } else if (arg == QLatin1String("-qrcFiles")) {
             argReceiver = &qrcFiles;
         } else if (arg == QLatin1String("-output-file")) {
-            if (i >= args.count()) {
+            if (i >= args.size()) {
                 std::cerr << "-output-file requires an argument\n";
                 return 1;
             }
@@ -931,7 +931,7 @@ int main(int argc, char *argv[])
             return 1;
         }
 
-        while (i < args.count()) {
+        while (i < args.size()) {
             const QString arg = args.at(i);
             if (arg.startsWith(QLatin1Char('-')) && arg != QLatin1String("-"))
                 break;
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index fd06f974b6..07e0ea4c52 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
             }
             if (!script) {
                 QByteArray ba = file.readAll();
-                const QString code = QString::fromUtf8(ba.constData(), ba.length());
+                const QString code = QString::fromUtf8(ba.constData(), ba.size());
                 file.close();
 
                 script.reset(new QV4::Script(ctx, QV4::Compiler::ContextType::Global, code, fn));
diff --git a/tools/qmljsrootgen/main.cpp b/tools/qmljsrootgen/main.cpp
index 553b507664..77abd1be54 100644
--- a/tools/qmljsrootgen/main.cpp
+++ b/tools/qmljsrootgen/main.cpp
@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
 
     QStringList args = app.arguments();
 
-    if (args.length() != 2) {
+    if (args.size() != 2) {
         qWarning().noquote() << app.applicationName() << "[output json path]";
         return 1;
     }
diff --git a/tools/qmlls/qmlcompletionsupport.cpp b/tools/qmlls/qmlcompletionsupport.cpp
index 9eff66c6d3..887929e6b7 100644
--- a/tools/qmlls/qmlcompletionsupport.cpp
+++ b/tools/qmlls/qmlcompletionsupport.cpp
@@ -133,19 +133,19 @@ static qsizetype posAfterLineChar(QString code, int line, int character)
 {
     int targetLine = line;
     qsizetype i = 0;
-    while (i != code.length() && targetLine != 0) {
+    while (i != code.size() && targetLine != 0) {
         QChar c = code.at(i++);
         if (c == u'\n') {
             --targetLine;
         }
         if (c == u'\r') {
-            if (i != code.length() && code.at(i) == u'\n')
+            if (i != code.size() && code.at(i) == u'\n')
                 ++i;
             --targetLine;
         }
     }
     qsizetype leftChars = character;
-    while (i != code.length() && leftChars) {
+    while (i != code.size() && leftChars) {
         QChar c = code.at(i);
         if (c == u'\n' || c == u'\r')
             break;
@@ -302,7 +302,7 @@ static QList<CompletionItem> importCompletions(DomItem &file, const CompletionCo
     ImportCompletionType importCompletionType = ImportCompletionType::None;
     QRegularExpression spaceRe(uR"(\W+)"_s);
     QList<QStringView> linePieces = ctx.preLine().split(spaceRe, Qt::SkipEmptyParts);
-    qsizetype effectiveLength = linePieces.length()
+    qsizetype effectiveLength = linePieces.size()
             + ((!ctx.preLine().isEmpty() && ctx.preLine().last().isSpace()) ? 1 : 0);
     if (effectiveLength < 2) {
         CompletionItem comp;
@@ -335,7 +335,7 @@ static QList<CompletionItem> importCompletions(DomItem &file, const CompletionCo
             for (const QString &uri : envPtr->moduleIndexUris(env)) {
                 QStringView base = ctx.base(); // if we allow spaces we should get rid of them
                 if (uri.startsWith(base)) {
-                    QStringList rest = uri.mid(base.length()).split(u'.');
+                    QStringList rest = uri.mid(base.size()).split(u'.');
                     if (rest.isEmpty())
                         continue;
 
@@ -363,7 +363,7 @@ static QList<CompletionItem> importCompletions(DomItem &file, const CompletionCo
                 bool hasMajorVersion = ctx.base().endsWith(u'.');
                 int majorV = -1;
                 if (hasMajorVersion)
-                    majorV = ctx.base().mid(0, ctx.base().length() - 1).toInt(&hasMajorVersion);
+                    majorV = ctx.base().mid(0, ctx.base().size() - 1).toInt(&hasMajorVersion);
                 if (!hasMajorVersion)
                     break;
                 if (std::shared_ptr<ModuleIndex> mIndex =
@@ -584,7 +584,7 @@ QList<CompletionItem> CompletionRequest::completions(QmlLsp::OpenDocumentSnapsho
     QList<ItemLocation> itemsFound =
             findLastItemsContaining(file, completionParams.position.line,
                                     completionParams.position.character - ctx.filterChars().size());
-    if (itemsFound.length() > 1) {
+    if (itemsFound.size() > 1) {
         QStringList paths;
         for (auto &it : itemsFound)
             paths.append(it.domItem.canonicalPath().toString());
diff --git a/tools/qmlls/qmllanguageservertool.cpp b/tools/qmlls/qmllanguageservertool.cpp
index 04714ff02a..ee49706adc 100644
--- a/tools/qmlls/qmllanguageservertool.cpp
+++ b/tools/qmlls/qmllanguageservertool.cpp
@@ -208,7 +208,7 @@ int main(int argv, char *argc[])
     QQmlLanguageServer qmlServer(
             [&writeMutex](const QByteArray &data) {
                 QMutexLocker l(&writeMutex);
-                std::cout.write(data.constData(), data.length());
+                std::cout.write(data.constData(), data.size());
                 std::cout.flush();
             },
             (parser.isSet(ignoreSettings) ? nullptr : &settings));
diff --git a/tools/qmlls/qqmlcodemodel.cpp b/tools/qmlls/qqmlcodemodel.cpp
index b2a19ac2c5..74a310b913 100644
--- a/tools/qmlls/qqmlcodemodel.cpp
+++ b/tools/qmlls/qqmlcodemodel.cpp
@@ -410,7 +410,7 @@ void QQmlCodeModel::openUpdateEnd()
 void QQmlCodeModel::newDocForOpenFile(const QByteArray &url, int version, const QString &docText)
 {
     qCDebug(codeModelLog) << "updating doc" << url << "to version" << version << "("
-                          << docText.length() << "chars)";
+                          << docText.size() << "chars)";
     DomItem newCurrent = m_currentEnv.makeCopy(DomItem::CopyOption::EnvConnected).item();
     QStringList loadPaths = buildPathsForFileUrl(url);
     loadPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath));
@@ -529,9 +529,9 @@ QStringList QQmlCodeModel::buildPathsForFileUrl(const QByteArray &url)
     }
     // we want to longest match to be first, as it should override shorter matches
     std::sort(roots.begin(), roots.end(), [](const QByteArray &el1, const QByteArray &el2) {
-        if (el1.length() > el2.length())
+        if (el1.size() > el2.size())
             return true;
-        if (el1.length() < el2.length())
+        if (el1.size() < el2.size())
             return false;
         return el1 < el2;
     });
@@ -540,7 +540,7 @@ QStringList QQmlCodeModel::buildPathsForFileUrl(const QByteArray &url)
     if (!roots.isEmpty() && roots.last().isEmpty())
         roots.removeLast();
     QByteArray urlSlash(url);
-    if (!urlSlash.isEmpty() && isNotSeparator(urlSlash.at(urlSlash.length() - 1)))
+    if (!urlSlash.isEmpty() && isNotSeparator(urlSlash.at(urlSlash.size() - 1)))
         urlSlash.append('/');
     // look if the file has a know prefix path
     for (const QByteArray &root : roots) {
@@ -606,7 +606,7 @@ QStringList QQmlCodeModel::buildPathsForFileUrl(const QByteArray &url)
 void QQmlCodeModel::setBuildPathsForRootUrl(QByteArray url, const QStringList &paths)
 {
     QMutexLocker l(&m_mutex);
-    if (!url.isEmpty() && isNotSeparator(url.at(url.length() - 1)))
+    if (!url.isEmpty() && isNotSeparator(url.at(url.size() - 1)))
         url.append('/');
     if (paths.isEmpty())
         m_buildPathsForRootUrl.remove(url);
@@ -673,7 +673,7 @@ QDebug OpenDocumentSnapshot::dump(QDebug dbg, DumpOptions options)
             << doc.field(Fields::code).value().toString() << "\n==========\n";
     } else {
         dbg << u"  doc:"
-            << (doc ? u"%1chars"_s.arg(doc.field(Fields::code).value().toString().length())
+            << (doc ? u"%1chars"_s.arg(doc.field(Fields::code).value().toString().size())
                     : u"*none*"_s)
             << "\n";
     }
@@ -685,7 +685,7 @@ QDebug OpenDocumentSnapshot::dump(QDebug dbg, DumpOptions options)
     } else {
         dbg << u"  validDoc:"
             << (validDoc ? u"%1chars"_s.arg(
-                        validDoc.field(Fields::code).value().toString().length())
+                        validDoc.field(Fields::code).value().toString().size())
                          : u"*none*"_s)
             << "\n";
     }
diff --git a/tools/qmlls/textdocument.cpp b/tools/qmlls/textdocument.cpp
index 2e6dc2cbd9..b5d4cc6f68 100644
--- a/tools/qmlls/textdocument.cpp
+++ b/tools/qmlls/textdocument.cpp
@@ -13,7 +13,7 @@ TextDocument::TextDocument(const QString &text)
 
 TextBlock TextDocument::findBlockByNumber(int blockNumber) const
 {
-    return (blockNumber >= 0 && blockNumber < m_blocks.length())
+    return (blockNumber >= 0 && blockNumber < m_blocks.size())
             ? m_blocks.at(blockNumber).textBlock
             : TextBlock();
 }
@@ -30,7 +30,7 @@ QChar TextDocument::characterAt(int pos) const
 
 int TextDocument::characterCount() const
 {
-    return m_content.length();
+    return m_content.size();
 }
 
 TextBlock TextDocument::begin() const
@@ -70,7 +70,7 @@ void TextDocument::setPlainText(const QString &text)
 
     int blockStart = 0;
     int blockNumber = 0;
-    while (blockStart < text.length()) {
+    while (blockStart < text.size()) {
         Block block;
         block.textBlock.setBlockNumber(blockNumber++);
         block.textBlock.setPosition(blockStart);
@@ -78,7 +78,7 @@ void TextDocument::setPlainText(const QString &text)
 
         int blockEnd = text.indexOf('\n', blockStart) + 1;
         if (blockEnd == 0)
-            blockEnd = text.length();
+            blockEnd = text.size();
 
         block.textBlock.setLength(blockEnd - blockStart);
         m_blocks.append(block);
@@ -98,13 +98,13 @@ void TextDocument::setModified(bool modified)
 
 void TextDocument::setUserState(int blockNumber, int state)
 {
-    if (blockNumber >= 0 && blockNumber < m_blocks.length())
+    if (blockNumber >= 0 && blockNumber < m_blocks.size())
         m_blocks[blockNumber].userState = state;
 }
 
 int TextDocument::userState(int blockNumber) const
 {
-    return (blockNumber >= 0 && blockNumber < m_blocks.length()) ? m_blocks[blockNumber].userState
+    return (blockNumber >= 0 && blockNumber < m_blocks.size()) ? m_blocks[blockNumber].userState
                                                                  : -1;
 }
 
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 95dda5d612..9f39d1f2df 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -920,18 +920,18 @@ bool dependencyBetter(const QString &lhs, const QString &rhs)
     if (leftModule > rightModule)
         return false;
 
-    if (leftSegments.length() == 1)
+    if (leftSegments.size() == 1)
         return false;
-    if (rightSegments.length() == 1)
+    if (rightSegments.size() == 1)
         return true;
 
     const QStringList leftVersion = leftSegments.at(1).split(QLatin1Char('.'));
     const QStringList rightVersion = rightSegments.at(1).split(QLatin1Char('.'));
 
     auto compareSegment = [&](int segmentIndex) {
-        if (leftVersion.length() <= segmentIndex)
-            return rightVersion.length() > segmentIndex ? 1 : 0;
-        if (rightVersion.length() <= segmentIndex)
+        if (leftVersion.size() <= segmentIndex)
+            return rightVersion.size() > segmentIndex ? 1 : 0;
+        if (rightVersion.size() <= segmentIndex)
             return -1;
 
         bool leftOk = false;
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp
index da4ef10904..9447333700 100644
--- a/tools/qmlprofiler/qmlprofilerapplication.cpp
+++ b/tools/qmlprofiler/qmlprofilerapplication.cpp
@@ -384,7 +384,7 @@ void QmlProfilerApplication::userCommand(const QString &command)
         } else if (m_profilerData->isEmpty()) {
             prompt(tr("No data was recorded so far."));
         } else {
-            m_interactiveOutputFile = args.length() > 0 ? args.at(0).toString() : m_outputFile;
+            m_interactiveOutputFile = args.size() > 0 ? args.at(0).toString() : m_outputFile;
             if (checkOutputFile(REQUEST_OUTPUT_FILE))
                 output();
         }
@@ -401,7 +401,7 @@ void QmlProfilerApplication::userCommand(const QString &command)
         if (!m_recording && m_profilerData->isEmpty()) {
             prompt(tr("No data was recorded so far."));
         } else {
-            m_interactiveOutputFile = args.length() > 0 ? args.at(0).toString() : m_outputFile;
+            m_interactiveOutputFile = args.size() > 0 ? args.at(0).toString() : m_outputFile;
             if (checkOutputFile(REQUEST_FLUSH_FILE))
                 flush();
         }
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index 51ac32f2d5..cac1364b87 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -248,7 +248,7 @@ bool compareStartTimes(const QQmlProfilerEvent &t1, const QQmlProfilerEvent &t2)
 
 void QmlProfilerData::sortStartTimes()
 {
-    if (d->events.count() < 2)
+    if (d->events.size() < 2)
         return;
 
     // assuming startTimes is partially sorted
@@ -523,7 +523,7 @@ bool QmlProfilerData::save(const QString &filename)
             }
             case RangeEnd: {
                 QStack<qint64> &ends = rangeEnds[type.rangeType()];
-                if (starts.length() > ends.length()) {
+                if (starts.size() > ends.size()) {
                     ends.push(event.timestamp());
                     if (--level == 0)
                         sendPending();
@@ -542,7 +542,7 @@ bool QmlProfilerData::save(const QString &filename)
     }
 
     for (int i = 0; i < MaximumRangeType; ++i) {
-        while (rangeEnds[i].length() < rangeStarts[i].length()) {
+        while (rangeEnds[i].size() < rangeStarts[i].size()) {
             rangeEnds[i].push(d->traceEndTime);
             --level;
         }
@@ -597,7 +597,7 @@ void QmlProfilerData::setState(QmlProfilerData::State state)
 
 int QmlProfilerData::numLoadedEventTypes() const
 {
-    return d->eventTypes.length();
+    return d->eventTypes.size();
 }
 
 #include "moc_qmlprofilerdata.cpp"
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index f4d11caca4..0bff754e4c 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -86,7 +86,7 @@ void RenderStatistics::updateStats()
 
 void RenderStatistics::printTotalStats()
 {
-    int count = timePerFrame.count();
+    int count = timePerFrame.size();
     if (count == 0)
         return;
 
@@ -311,7 +311,7 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
 
         if (dummyData) {
             fprintf(stderr, "Loaded dummy data: %s\n", qPrintable(dir.filePath(qml)));
-            qml.truncate(qml.length()-4);
+            qml.truncate(qml.size()-4);
             engine.rootContext()->setContextProperty(qml, dummyData);
             dummyData->setParent(&engine);
         }
diff --git a/tools/qmltc/qmltccommandlineutils.cpp b/tools/qmltc/qmltccommandlineutils.cpp
index d6c6a9242c..e3f6b4d3b7 100644
--- a/tools/qmltc/qmltccommandlineutils.cpp
+++ b/tools/qmltc/qmltccommandlineutils.cpp
@@ -43,7 +43,7 @@ QString loadUrl(const QString &url)
     }
 
     QByteArray data(fi.size(), Qt::Uninitialized);
-    if (f.read(data.data(), data.length()) != data.length()) {
+    if (f.read(data.data(), data.size()) != data.size()) {
         fprintf(stderr, "Unable to read \"%s\": %s.\n",
                 qPrintable(QDir::toNativeSeparators(fi.absoluteFilePath())),
                 qPrintable(f.errorString()));