diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 08:20:36 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-10 20:28:01 +0200 |
commit | 7f0d702f4e568790dfdfd916fa3c2da5ec78c6df (patch) | |
tree | 617646d5471b9da4126c33ff95e6670406bf62d7 /src/shared | |
parent | f047e8b9786df0fbee307a0ec425eea385ab6657 (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: I574208abc90a8042b500b3f96e3862b0ff339eb6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/qwaylandinputmethodeventbuilder.cpp | 12 | ||||
-rw-r--r-- | src/shared/qwaylandmimehelper.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/qwaylandinputmethodeventbuilder.cpp b/src/shared/qwaylandinputmethodeventbuilder.cpp index 256a0c423..cfde26c76 100644 --- a/src/shared/qwaylandinputmethodeventbuilder.cpp +++ b/src/shared/qwaylandinputmethodeventbuilder.cpp @@ -106,7 +106,7 @@ QInputMethodEvent *QWaylandInputMethodEventBuilder::buildCommit(const QString &t const int absoluteOffset = absoluteCursor - cursor; - const int cursorAfterCommit = qMin(anchor, cursor) + replacement.first + text.length(); + const int cursorAfterCommit = qMin(anchor, cursor) + replacement.first + text.size(); surrounding.replace(qMin(anchor, cursor) + replacement.first, qAbs(anchor - cursor) + replacement.second, text); @@ -278,10 +278,10 @@ int QWaylandInputMethodEventBuilder::indexFromWayland(const QString &text, int l if (length < 0) { const QByteArray &utf8 = QStringView{text}.left(base).toUtf8(); - return QString::fromUtf8(utf8.left(qMax(utf8.length() + length, 0))).length(); + return QString::fromUtf8(utf8.left(qMax(utf8.size() + length, 0))).size(); } else { const QByteArray &utf8 = QStringView{text}.mid(base).toUtf8(); - return QString::fromUtf8(utf8.left(length)).length() + base; + return QString::fromUtf8(utf8.left(length)).size() + base; } } @@ -304,20 +304,20 @@ int QWaylandInputMethodEventBuilder::trimmedIndexFromWayland(const QString &text const unsigned char ch = utf8.at(start + i); // check if current character is a utf8's initial character. if (ch < 0x80 || ch > 0xbf) - return QString::fromUtf8(utf8.left(start + i)).length(); + return QString::fromUtf8(utf8.left(start + i)).size(); } } else { const QByteArray &utf8 = QStringView{text}.mid(base).toUtf8(); const int len = utf8.size(); const int start = length; if (start >= len) - return base + QString::fromUtf8(utf8).length(); + return base + QString::fromUtf8(utf8).size(); for (int i = 0; i < 4; i++) { const unsigned char ch = utf8.at(start - i); // check if current character is a utf8's initial character. if (ch < 0x80 || ch > 0xbf) - return base + QString::fromUtf8(utf8.left(start - i)).length(); + return base + QString::fromUtf8(utf8.left(start - i)).size(); } } return -1; diff --git a/src/shared/qwaylandmimehelper.cpp b/src/shared/qwaylandmimehelper.cpp index f589666c1..3bbbad97b 100644 --- a/src/shared/qwaylandmimehelper.cpp +++ b/src/shared/qwaylandmimehelper.cpp @@ -36,7 +36,7 @@ QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString & content = qvariant_cast<QColor>(mimeData->colorData()).name().toLatin1(); } else if (mimeType == QLatin1String("text/uri-list")) { QList<QUrl> urls = mimeData->urls(); - for (int i = 0; i < urls.count(); ++i) { + for (int i = 0; i < urls.size(); ++i) { content.append(urls.at(i).toEncoded()); content.append("\r\n"); } |