diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 07:29:16 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 23:38:48 +0200 |
commit | 958cd3ee1094a068b6d0ff27c73a4b3caff088ad (patch) | |
tree | 6d3816fedf5dab2307675fd6ef70d39758e246f5 /src/qml/qml/qqmlengine.cpp | |
parent | e8e03215654ca730243336a80453cf9396cbdf58 (diff) |
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>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 8f1a7b10b8..b62c2ecb31 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -306,12 +306,12 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in auto ev = std::make_unique<QMetaCallEvent>(m.methodIndex(), 0, nullptr, object, index, - parameterTypes.count() + 1); + parameterTypes.size() + 1); void **args = ev->args(); QMetaType *types = ev->types(); - for (int ii = 0; ii < parameterTypes.count(); ++ii) { + for (int ii = 0; ii < parameterTypes.size(); ++ii) { const QByteArray &typeName = parameterTypes.at(ii); if (typeName.endsWith('*')) types[ii + 1] = QMetaType(QMetaType::VoidStar); @@ -1385,7 +1385,7 @@ static void dumpwarning(const QQmlError &error) static void dumpwarning(const QList<QQmlError> &errors) { - for (int ii = 0; ii < errors.count(); ++ii) + for (int ii = 0; ii < errors.size(); ++ii) dumpwarning(errors.at(ii)); } @@ -1764,7 +1764,7 @@ void QQmlEnginePrivate::executeRuntimeFunction(const QV4::ExecutableCompilationU int argc, void **args, QMetaType *types) { Q_ASSERT(unit); - Q_ASSERT((functionIndex >= 0) && (functionIndex < unit->runtimeFunctions.length())); + Q_ASSERT((functionIndex >= 0) && (functionIndex < unit->runtimeFunctions.size())); Q_ASSERT(thisObject); QQmlData *ddata = QQmlData::get(thisObject); @@ -1831,15 +1831,15 @@ QQmlEnginePrivate::createInternalContext(const QQmlRefPointer<QV4::ExecutableCom context->setImports(unit->typeNameCache); context->initFromTypeCompilationUnit(unit, subComponentIndex); - if (isComponentRoot && unit->dependentScripts.count()) { + if (isComponentRoot && unit->dependentScripts.size()) { QV4::ExecutionEngine *v4 = v4engine(); Q_ASSERT(v4); QV4::Scope scope(v4); - QV4::ScopedObject scripts(scope, v4->newArrayObject(unit->dependentScripts.count())); + QV4::ScopedObject scripts(scope, v4->newArrayObject(unit->dependentScripts.size())); context->setImportedScripts(QV4::PersistentValue(v4, scripts.asReturnedValue())); QV4::ScopedValue v(scope); - for (int i = 0; i < unit->dependentScripts.count(); ++i) { + for (int i = 0; i < unit->dependentScripts.size(); ++i) { QQmlRefPointer<QQmlScriptData> s = unit->dependentScripts.at(i); scripts->put(i, (v = s->scriptValueForContext(context))); } |