diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 08:17:22 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 18:20:17 +0200 |
| commit | c338447261878111df7198fbd96051926464e865 (patch) | |
| tree | d21b5af1efae225f75d5c05dfe370daefb1ea1d1 /src/qdbus/qdbusviewer/qdbusviewer.cpp | |
| parent | 6495329e6de803025e6e4e8291b648f94893551c (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: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/qdbus/qdbusviewer/qdbusviewer.cpp')
| -rw-r--r-- | src/qdbus/qdbusviewer/qdbusviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index 4b9a2224f..f0c35df7d 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -281,7 +281,7 @@ void QDBusViewer::callMethod(const BusSignature &sig) QMetaMethod method; for (int i = 0; i < mo->methodCount(); ++i) { const QString signature = QString::fromLatin1(mo->method(i).methodSignature()); - if (signature.startsWith(sig.mName) && signature.at(sig.mName.length()) == QLatin1Char('(')) + if (signature.startsWith(sig.mName) && signature.at(sig.mName.size()) == QLatin1Char('(')) if (getDbusSignature(mo->method(i)) == sig.mTypeSig) method = mo->method(i); } @@ -298,7 +298,7 @@ void QDBusViewer::callMethod(const BusSignature &sig) const QList<QByteArray> paramTypes = method.parameterTypes(); const QList<QByteArray> paramNames = method.parameterNames(); QList<int> types; // remember the low-level D-Bus type - for (int i = 0; i < paramTypes.count(); ++i) { + for (int i = 0; i < paramTypes.size(); ++i) { const QByteArray paramType = paramTypes.at(i); if (paramType.endsWith('&')) continue; // ignore OUT parameters @@ -319,7 +319,7 @@ void QDBusViewer::callMethod(const BusSignature &sig) // Try to convert the values we got as closely as possible to the // dbus signature. This is especially important for those input as strings - for (int i = 0; i < args.count(); ++i) { + for (int i = 0; i < args.size(); ++i) { QVariant a = args.at(i); int desttype = types.at(i); if (desttype < int(QMetaType::User) && desttype != qMetaTypeId<QVariantMap>()) { |