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 /tests/auto/qmldom | |
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 'tests/auto/qmldom')
-rw-r--r-- | tests/auto/qmldom/domitem/tst_qmldomitem.h | 24 | ||||
-rw-r--r-- | tests/auto/qmldom/path/tst_qmldompath.h | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/qmldom/domitem/tst_qmldomitem.h b/tests/auto/qmldom/domitem/tst_qmldomitem.h index 0286672f54..433a92a2b2 100644 --- a/tests/auto/qmldom/domitem/tst_qmldomitem.h +++ b/tests/auto/qmldom/domitem/tst_qmldomitem.h @@ -292,7 +292,7 @@ private slots: QVERIFY(didAdd2); RefCacheEntry e2 = RefCacheEntry::forPath(env, refPath); QCOMPARE(e2.cached, RefCacheEntry::Cached::First); - QCOMPARE(e2.canonicalPaths.length(), 1); + QCOMPARE(e2.canonicalPaths.size(), 1); QCOMPARE(e2.canonicalPaths.first().toString(), env.canonicalPath().toString()); bool didAdd3 = RefCacheEntry::addForPath( env, refPath, @@ -302,7 +302,7 @@ private slots: QVERIFY(didAdd3); RefCacheEntry e3 = RefCacheEntry::forPath(env, refPath); QCOMPARE(e3.cached, RefCacheEntry::Cached::All); - QCOMPARE(e3.canonicalPaths.length(), 2); + QCOMPARE(e3.canonicalPaths.size(), 2); QCOMPARE(e3.canonicalPaths.first().toString(), env.canonicalPath().toString()); QCOMPARE(e3.canonicalPaths.last().toString(), tOwner.canonicalPath().toString()); } @@ -457,18 +457,18 @@ private slots: const PropertyInfo *p1 = reinterpret_cast<const PropertyInfo *>(wrappedPInfoPtr->m_value.data()); PropertyInfo p2 = wrappedPInfoPtr->m_value.value<PropertyInfo>(); - QCOMPARE(mPInfo.bindings.length(), 1); - QCOMPARE(mPInfo.propertyDefs.length(), 1); + QCOMPARE(mPInfo.bindings.size(), 1); + QCOMPARE(mPInfo.propertyDefs.size(), 1); QCOMPARE(mPInfo.bindings.first().toString(), mPInfo.bindings.first().toString()); QCOMPARE(mPInfo.propertyDefs.first().toString(), mPInfo.propertyDefs.first().toString()); - QCOMPARE(p2.bindings.length(), 1); - QCOMPARE(p2.propertyDefs.length(), 1); + QCOMPARE(p2.bindings.size(), 1); + QCOMPARE(p2.propertyDefs.size(), 1); QCOMPARE(p2.bindings.first().toString(), mPInfo.bindings.first().toString()); QCOMPARE(p2.propertyDefs.first().toString(), mPInfo.propertyDefs.first().toString()); - QCOMPARE(p1->bindings.length(), 1); - QCOMPARE(p1->propertyDefs.length(), 1); + QCOMPARE(p1->bindings.size(), 1); + QCOMPARE(p1->propertyDefs.size(), 1); QCOMPARE(p1->bindings.first().toString(), mPInfo.bindings.first().toString()); QCOMPARE(p1->propertyDefs.first().toString(), mPInfo.propertyDefs.first().toString()); } @@ -520,9 +520,9 @@ private slots: QList<DomItem> rectAs = obj1.lookup(u"QQ.Rectangle"_s, LookupType::Symbol, LookupOption::Normal); - QVERIFY(rect.length() == 1); - QVERIFY(rect2.length() == 1); - QVERIFY(rectAs.length() == 1); + QVERIFY(rect.size() == 1); + QVERIFY(rect2.size() == 1); + QVERIFY(rectAs.size() == 1); QCOMPARE(rect.first().internalKind(), DomType::Export); QCOMPARE(rect.first(), rect2.first()); QCOMPARE(rect.first(), rectAs.first()); @@ -536,7 +536,7 @@ private slots: return true; }, {}); - QVERIFY(rects.length() == 1); + QVERIFY(rects.size() == 1); for (DomItem &el : rects) { QCOMPARE(rect.first(), el); } diff --git a/tests/auto/qmldom/path/tst_qmldompath.h b/tests/auto/qmldom/path/tst_qmldompath.h index 565bab713e..24d8c30bcf 100644 --- a/tests/auto/qmldom/path/tst_qmldompath.h +++ b/tests/auto/qmldom/path/tst_qmldompath.h @@ -28,9 +28,9 @@ public: QCOMPARE(p11, p2); QCOMPARE(p11, p3); QVERIFY(p11.m_data->strData.isEmpty()); - QCOMPARE(p2.m_data->strData.length(), 1); + QCOMPARE(p2.m_data->strData.size(), 1); QCOMPARE(p2.m_data->strData.first(), s); - QCOMPARE(p3.m_data->strData.length(), 1); + QCOMPARE(p3.m_data->strData.size(), 1); QCOMPARE(p3.m_data->strData.first(), s); } |