From 5c2ff22ba117f295718c529198ab42ee4646d90c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 26 Apr 2016 16:40:37 -0700 Subject: Use void instead of uchar in the endian-swapping function parameters 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 Reviewed-by: Marc Mutz --- src/plugins/generic/tuiotouch/qoscbundle.cpp | 4 ++-- src/plugins/generic/tuiotouch/qoscmessage.cpp | 4 ++-- src/plugins/platforms/xcb/qxcbxsettings.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') 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((const uchar*)data.constData() + parsedBytes); + quint32 oscTimeEpoch = qFromBigEndian(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); - quint32 oscTimePico = qFromBigEndian((const uchar*)data.constData() + parsedBytes); + quint32 oscTimePico = qFromBigEndian(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((const uchar*)data.constData() + parsedBytes); + quint32 anInt = qFromBigEndian(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((const uchar*)data.constData() + parsedBytes); + value.u = qFromBigEndian(data.constData() + parsedBytes); parsedBytes += sizeof(quint32); arguments.append(value.f); } else { diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp index 899dc0158a..401eb8043c 100644 --- a/src/plugins/platforms/xcb/qxcbxsettings.cpp +++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp @@ -158,8 +158,8 @@ public: #define ADJUST_BO(b, t, x) \ ((b == LSBFirst) ? \ - qFromLittleEndian((const uchar *)(x)) : \ - qFromBigEndian((const uchar *)(x))) + qFromLittleEndian(x) : \ + qFromBigEndian(x)) #define VALIDATE_LENGTH(x) \ if ((size_t)xSettings.length() < (offset + local_offset + 12 + x)) { \ qWarning("Length %d runs past end of data", x); \ -- cgit v1.2.3