From 958cd3ee1094a068b6d0ff27c73a4b3caff088ad Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 5 Oct 2022 07:29:16 +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: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale --- src/qmlcompiler/qqmljsfunctioninitializer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qmlcompiler/qqmljsfunctioninitializer.cpp') diff --git a/src/qmlcompiler/qqmljsfunctioninitializer.cpp b/src/qmlcompiler/qqmljsfunctioninitializer.cpp index 30aada368e..d64778af63 100644 --- a/src/qmlcompiler/qqmljsfunctioninitializer.cpp +++ b/src/qmlcompiler/qqmljsfunctioninitializer.cpp @@ -87,7 +87,7 @@ void QQmlJSFunctionInitializer::populateSignature( } } } else { - for (qsizetype i = 0, end = arguments.length(); i != end; ++i) { + for (qsizetype i = 0, end = arguments.size(); i != end; ++i) { const QQmlJS::AST::BoundName &argument = arguments[i]; if (argument.typeAnnotation) { if (const auto type = m_typeResolver->typeFromAST(argument.typeAnnotation->type)) { @@ -111,7 +111,7 @@ void QQmlJSFunctionInitializer::populateSignature( } } - for (int i = QQmlJSCompilePass::FirstArgument + function->argumentTypes.length(); + for (int i = QQmlJSCompilePass::FirstArgument + function->argumentTypes.size(); i < context->registerCountInFunction; ++i) { function->registerTypes.append(m_typeResolver->tracked( m_typeResolver->globalType(m_typeResolver->voidType()))); @@ -166,7 +166,7 @@ QQmlJSCompilePass::Function QQmlJSFunctionInitializer::run( if (method.methodType() == QQmlJSMetaMethod::Signal) { function.isSignalHandler = true; const auto argumentTypes = method.parameterTypes(); - for (qsizetype i = 0, end = argumentTypes.length(); i < end; ++i) { + for (qsizetype i = 0, end = argumentTypes.size(); i < end; ++i) { const auto &type = argumentTypes[i]; if (type.isNull()) { diagnose(u"Cannot resolve the argument type %1."_s -- cgit v1.2.3