diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
| commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
| tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /src/plugins/generic/tuiotouch/qoscmessage.cpp | |
| parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
| parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/generic/tuiotouch/qoscmessage.cpp')
| -rw-r--r-- | src/plugins/generic/tuiotouch/qoscmessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/generic/tuiotouch/qoscmessage.cpp b/src/plugins/generic/tuiotouch/qoscmessage.cpp index 30cf117767..6f82cd784b 100644 --- a/src/plugins/generic/tuiotouch/qoscmessage.cpp +++ b/src/plugins/generic/tuiotouch/qoscmessage.cpp @@ -95,7 +95,7 @@ QOscMessage::QOscMessage(const QByteArray &data) if (parsedBytes > (quint32)data.size() || data.size() - parsedBytes < sizeof(quint32)) return; - quint32 anInt = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes); + quint32 anInt = qFromBigEndian<quint32>(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); // TODO: is int32 in OSC signed, or unsigned? @@ -109,7 +109,7 @@ QOscMessage::QOscMessage(const QByteArray &data) quint32 u; float f; } value; - value.u = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes); + value.u = qFromBigEndian<quint32>(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); arguments.append(value.f); } else { |