summaryrefslogtreecommitdiffstats
path: root/tests/auto/core/origins/tst_origins.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-05 08:22:39 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-11 17:36:36 +0200
commit39ebe4abccdc4e059a0e310a331f3fc392c84009 (patch)
treeaeca91ed813d6675693fcb9e71d8336c3d303cab /tests/auto/core/origins/tst_origins.cpp
parent555beb85735f8ce92fdbff7358a6659820e4819c (diff)
Port from container::count() and length() to size() - V4
This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); a.k.a qt-port-to-std-compatible-api V4 with config Scope: 'Container'. Change-Id: I3e6fef8eca212da0c4f0b464545ba96183b4476f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/core/origins/tst_origins.cpp')
-rw-r--r--tests/auto/core/origins/tst_origins.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 6596b3fa0..cef9c31d5 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -1022,7 +1022,7 @@ void tst_Origins::mixedContent()
QTRY_COMPARE(eval(QSL("result !== undefined")), QVariant(true));
auto result = eval(QSL("result")).toString();
// Work-around some combinations missing JS loaded signals:
- if (m_page->messages.count() > 0) {
+ if (m_page->messages.size() > 0) {
if (m_page->messages[0] == QSL("Frame Loaded") && result == QSL("cannotLoad"))
result = QSL("canLoadButNotAccess");
m_page->messages.clear();