Port from container::count() and length() to size() - V5

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");

except that the on() matcher has been replaced by one that doesn't
ignoreParens().

a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'.

Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().

Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
index a0e0173cbb..bdba20de3a 100644
--- a/src/corelib/text/qstringconverter.cpp
+++ b/src/corelib/text/qstringconverter.cpp
@@ -504,7 +504,7 @@ char *QUtf8::convertFromUnicode(char *out, QStringView in, QStringConverter::Sta
 {
     Q_ASSERT(state);
     const QChar *uc = in.data();
-    qsizetype len = in.length();
+    qsizetype len = in.size();
     if (!len)
         return out;
 
@@ -915,13 +915,13 @@ char *QUtf16::convertFromUnicode(char *out, QStringView in, QStringConverter::St
         out += 2;
     }
     if (endian == BigEndianness)
-        qToBigEndian<char16_t>(in.data(), in.length(), out);
+        qToBigEndian<char16_t>(in.data(), in.size(), out);
     else
-        qToLittleEndian<char16_t>(in.data(), in.length(), out);
+        qToLittleEndian<char16_t>(in.data(), in.size(), out);
 
     state->remainingChars = 0;
     state->internalState |= HeaderDone;
-    return out + 2*in.length();
+    return out + 2*in.size();
 }
 
 QString QUtf16::convertToUnicode(QByteArrayView in, QStringConverter::State *state, DataEndianness endian)
@@ -1051,7 +1051,7 @@ char *QUtf32::convertFromUnicode(char *out, QStringView in, QStringConverter::St
     }
 
     const QChar *uc = in.data();
-    const QChar *end = in.data() + in.length();
+    const QChar *end = in.data() + in.size();
     QChar ch;
     char32_t ucs4;
     if (state->remainingChars == 1) {
@@ -1489,7 +1489,7 @@ static char *toLatin1(char *out, QStringView in, QStringConverter::State *state)
 
     const char replacement = (state && state->flags & QStringConverter::Flag::ConvertInvalidToNull) ? 0 : '?';
     qsizetype invalid = 0;
-    for (qsizetype i = 0; i < in.length(); ++i) {
+    for (qsizetype i = 0; i < in.size(); ++i) {
         if (in[i] > QChar(0xff)) {
             *out = replacement;
             ++invalid;
@@ -1765,7 +1765,7 @@ struct QStringConverterICU : QStringConverter
         auto source = reinterpret_cast<const UChar *>(in.data());
         auto sourceLimit = reinterpret_cast<const UChar *>(in.data() + in.size());
 
-        qsizetype length = UCNV_GET_MAX_BYTES_FOR_STRING(in.length(), ucnv_getMaxCharSize(icu_conv));
+        qsizetype length = UCNV_GET_MAX_BYTES_FOR_STRING(in.size(), ucnv_getMaxCharSize(icu_conv));
 
         char *target = out;
         char *targetLimit = out + length;