diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-08 19:56:03 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-10 21:04:07 +0200 |
| commit | dba8462702091bade6acbf988d931e8d0797802a (patch) | |
| tree | a958423c94c97f4e38855c6b61fe114fb4065656 | |
| parent | 4814ec0069a11a0e21cd3ac8c956c5a8ec7a0c5b (diff) | |
| download | qtconnectivity-dba8462702091bade6acbf988d931e8d0797802a.tar.gz | |
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: I58e1b41b91c34d2e860dbb5847b3752edbfc6fc9
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
| -rw-r--r-- | tests/auto/nfccommons/qtlv.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/nfccommons/qtlv.cpp b/tests/auto/nfccommons/qtlv.cpp index dcfe62c0..46c19553 100644 --- a/tests/auto/nfccommons/qtlv.cpp +++ b/tests/auto/nfccommons/qtlv.cpp @@ -353,7 +353,7 @@ bool QTlvWriter::process(bool all) if (m_tagMemorySize == -1) { if (m_rawData) - m_tagMemorySize = m_rawData->length(); + m_tagMemorySize = m_rawData->size(); else if (QNearFieldTagType1 *tag = qobject_cast<QNearFieldTagType1 *>(m_target)) { if (m_requestId.isValid()) { m_tagMemorySize = 8 * (tag->requestResponse(m_requestId).toUInt() + 1); |