From c338447261878111df7198fbd96051926464e865 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 5 Oct 2022 08:17:22 +0200 Subject: 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()))).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: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44 Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne Reviewed-by: Friedemann Kleint --- src/qdoc/cppcodeparser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qdoc/cppcodeparser.cpp') diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index a0519fc8f..7cca45ca6 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -700,7 +700,7 @@ FunctionNode *CppCodeParser::parseOtherFuncArg(const QString &topic, const Locat qsizetype firstBlank = funcName.indexOf(QChar(' ')); if (firstBlank > 0) { returnType = funcName.left(firstBlank); - funcName = funcName.right(funcName.length() - firstBlank - 1); + funcName = funcName.right(funcName.size() - firstBlank - 1); } QStringList colonSplit(funcName.split("::")); @@ -774,7 +774,7 @@ FunctionNode *CppCodeParser::parseMacroArg(const Location &location, const QStri params = afterParen.left(rightParen); } int i = 0; - while (i < macroName.length() && !macroName.at(i).isLetter()) + while (i < macroName.size() && !macroName.at(i).isLetter()) i++; if (i > 0) { returnType += QChar(' ') + macroName.left(i); @@ -978,7 +978,7 @@ void CppCodeParser::processMetaCommands(NodeList &nodes, DocList &docs) bool CppCodeParser::hasTooManyTopics(const Doc &doc) const { const QSet topicCommandsUsed = topicCommands() & doc.metaCommandsUsed(); - if (topicCommandsUsed.count() > 1) { + if (topicCommandsUsed.size() > 1) { bool ok = true; for (const auto &t : topicCommandsUsed) { if (!t.startsWith(QLatin1String("qml"))) -- cgit v1.2.1