diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-10-12 18:45:43 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-10-13 12:05:51 +0000 |
| commit | 27fdabde2f1f7925b8e866520fb8a8b0eb5b84e4 (patch) | |
| tree | 3571ca1805176d16a7262528a390fa3b2ad6242c | |
| parent | a28b034aa3985571a8dc73f6a322e5b41a60992a (diff) | |
ModBus: Don't use QByteArray::operator[] on a temporaryv5.10.0-beta2
Found by clazy.
Change-Id: Ie1ff78bf4a2371a0650a9029bae256855916b17c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbuspdu.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp index 7f63afa..182a212 100644 --- a/src/serialbus/qmodbusclient.cpp +++ b/src/serialbus/qmodbusclient.cpp @@ -486,7 +486,7 @@ bool QModbusClientPrivate::collateBytes(const QModbusPdu &response, return false; // byte count needs to match available bytes - const quint8 byteCount = response.data()[0]; + const quint8 byteCount = quint8(response.data().at(0)); if ((response.dataSize() - 1) != byteCount) return false; diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp index e1ce0c6..6b1cee4 100644 --- a/src/serialbus/qmodbuspdu.cpp +++ b/src/serialbus/qmodbuspdu.cpp @@ -555,18 +555,18 @@ int QModbusRequest::calculateDataSize(const QModbusRequest &request) case QModbusPdu::WriteMultipleCoils: minimum -= 1; // first payload payload byte if (request.dataSize() >= minimum) - size = minimum + quint8(request.data()[minimum - 1]) /*byte count*/; + size = minimum + quint8(request.data().at(minimum - 1)) /*byte count*/; break; case QModbusPdu::WriteMultipleRegisters: case QModbusPdu::ReadWriteMultipleRegisters: minimum -= 2; // first 2 payload payload bytes if (request.dataSize() >= minimum) - size = minimum + quint8(request.data()[minimum - 1]) /*byte count*/; + size = minimum + quint8(request.data().at(minimum - 1)) /*byte count*/; break; case QModbusPdu::ReadFileRecord: case QModbusPdu::WriteFileRecord: if (request.dataSize() >= 1) - size = 1 /*byte count*/ + quint8(request.data()[0]) /*actual bytes*/; + size = 1 /*byte count*/ + quint8(request.data().at(0)) /*actual bytes*/; break; case QModbusPdu::EncapsulatedInterfaceTransport: { if (request.dataSize() < minimum) |