diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 10:09:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 10:09:11 +0200 |
| commit | ad54496cce03077073660c5c440b0f45b7e46496 (patch) | |
| tree | 5e06a153f3500572b41ec85ffb65f89297c1303b /src/serialbus/qmodbuspdu.cpp | |
| parent | 1675a0d726e5c07c275c0981cc3deb5ffbcc6afc (diff) | |
| parent | b8d5c1f1dff57da6927470543e5d004c237846ac (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I687907747e05cedbd3f9f1c20df95e5de2d5cd48
Diffstat (limited to 'src/serialbus/qmodbuspdu.cpp')
| -rw-r--r-- | src/serialbus/qmodbuspdu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp index ef8d93c..7e09743 100644 --- a/src/serialbus/qmodbuspdu.cpp +++ b/src/serialbus/qmodbuspdu.cpp @@ -106,7 +106,7 @@ static int minimumDataSize(const QModbusPdu &pdu, Type type) static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type type) { QModbusPdu::FunctionCode code = QModbusPdu::Invalid; - if (stream.readRawData((char*) (&code), sizeof(quint8)) != sizeof(quint8)) + if (stream.readRawData((char *) (&code), sizeof(quint8)) != sizeof(quint8)) return stream; pdu.setFunctionCode(code); @@ -298,7 +298,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ */ /*! - \fn QModbusPdu& QModbusPdu::operator=(const QModbusPdu& other) + \fn QModbusPdu &QModbusPdu::operator=(const QModbusPdu &other) Makes a copy of the \a other and assigns it to this QModbusPdu object. */ |