diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-26 16:40:37 -0700 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-26 18:02:49 +0000 |
| commit | 5c2ff22ba117f295718c529198ab42ee4646d90c (patch) | |
| tree | bc1a9625b580dde5dd961203b944a18531d306bf /src/plugins/generic | |
| parent | 2fb026d58b45f50ed7d5666de58c9184e81bbc60 (diff) | |
Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1
This allows us to pass pointers to storage that is not an array of
uchar, which it hardly ever is.
Change-Id: Ifea6e497f11a461db432ffff14490d2c2df21906
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/plugins/generic')
| -rw-r--r-- | src/plugins/generic/tuiotouch/qoscbundle.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/generic/tuiotouch/qoscmessage.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/generic/tuiotouch/qoscbundle.cpp b/src/plugins/generic/tuiotouch/qoscbundle.cpp index 26dabebd23..6ddca9b09d 100644 --- a/src/plugins/generic/tuiotouch/qoscbundle.cpp +++ b/src/plugins/generic/tuiotouch/qoscbundle.cpp @@ -89,9 +89,9 @@ QOscBundle::QOscBundle(const QByteArray &data) // (editor's note: one may wonder how a 64bit big-endian number can also be // two 32bit numbers, without specifying in which order they occur or // anything, and one may indeed continue to wonder.) - quint32 oscTimeEpoch = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes); + quint32 oscTimeEpoch = qFromBigEndian<quint32>(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); - quint32 oscTimePico = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes); + quint32 oscTimePico = qFromBigEndian<quint32>(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); bool isImmediate = false; 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 { |