diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 08:12:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 14:58:05 +0200 |
| commit | a2f9cae04e4fadbc2147a7678dee1b5b09e5a5ec (patch) | |
| tree | 4a1b62c59ce086745f21ff7ba2a8a051c3597f6d /src | |
| parent | 263b19e4828d1502933da4dc7735b6890cb7e669 (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: I34051b8faf5f1c9f817a4f20cf4361646f4fdc08
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialbus/qcanbus.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qcanbusframe.h | 6 | ||||
| -rw-r--r-- | src/serialbus/qmodbuspdu.h | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusserver.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/serialbus/qcanbus.cpp b/src/serialbus/qcanbus.cpp index 851760a..7811762 100644 --- a/src/serialbus/qcanbus.cpp +++ b/src/serialbus/qcanbus.cpp @@ -38,7 +38,7 @@ static QCanBus *globalInstance = nullptr; static void loadPlugins() { const QList<QPluginParsedMetaData> meta = qFactoryLoader()->metaData(); - for (int i = 0; i < meta.count(); i++) { + for (int i = 0; i < meta.size(); i++) { const QCborMap obj = meta.at(i).value(QtPluginMetaDataKeys::MetaData).toMap(); if (obj.isEmpty()) continue; diff --git a/src/serialbus/qcanbusframe.h b/src/serialbus/qcanbusframe.h index 9a56f49..224c0b8 100644 --- a/src/serialbus/qcanbusframe.h +++ b/src/serialbus/qcanbusframe.h @@ -78,7 +78,7 @@ public: format(DataFrame), isExtendedFrame(0x0), version(Qt_5_10), - isFlexibleDataRate(data.length() > 8 ? 0x1 : 0x0), + isFlexibleDataRate(data.size() > 8 ? 0x1 : 0x0), isBitrateSwitch(0x0), isErrorStateIndicator(0x0), isLocalEcho(0x0), @@ -102,7 +102,7 @@ public: return false; // maximum permitted payload size in CAN or CAN FD - const qsizetype length = load.length(); + const qsizetype length = load.size(); if (isFlexibleDataRate) { if (format == RemoteRequestFrame) return false; @@ -170,7 +170,7 @@ public: void setPayload(const QByteArray &data) { load = data; - if (data.length() > 8) + if (data.size() > 8) isFlexibleDataRate = 0x1; } constexpr void setTimeStamp(TimeStamp ts) noexcept { stamp = ts; } diff --git a/src/serialbus/qmodbuspdu.h b/src/serialbus/qmodbuspdu.h index a54e05b..7a2e46c 100644 --- a/src/serialbus/qmodbuspdu.h +++ b/src/serialbus/qmodbuspdu.h @@ -127,7 +127,7 @@ private: { static_assert(is_pod<T>::value, "Only POD types supported."); static_assert(IsType<T, quint8, quint16>::value, "Only quint8 and quint16 supported."); - for (int i = 0; i < vector.count(); ++i) + for (int i = 0; i < vector.size(); ++i) (*stream) << vector[i]; } diff --git a/src/serialbus/qmodbusserver.cpp b/src/serialbus/qmodbusserver.cpp index 3f45345..a80ec2c 100644 --- a/src/serialbus/qmodbusserver.cpp +++ b/src/serialbus/qmodbusserver.cpp @@ -1253,7 +1253,7 @@ QModbusResponse QModbusServerPrivate::processEncapsulatedInterfaceTransportReque header[4] = quint8(0x00); // next object id header[5] = quint8(0x01); // number of objects header[6] = objectId; - header[7] = quint8(object.length()); + header[7] = quint8(object.size()); return QModbusResponse(request.functionCode(), QByteArray(header + object)); } default: |