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/network/access | |
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/network/access')
-rw-r--r-- | src/network/access/qspdyprotocolhandler.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/network/access/qspdyprotocolhandler.cpp b/src/network/access/qspdyprotocolhandler.cpp index e4e058b772..413b03cc22 100644 --- a/src/network/access/qspdyprotocolhandler.cpp +++ b/src/network/access/qspdyprotocolhandler.cpp @@ -364,43 +364,43 @@ void QSpdyProtocolHandler::_q_readyRead() static qint16 twoBytesToInt(const char *bytes) { - return qFromBigEndian<qint16>(reinterpret_cast<const uchar *>(bytes)); + return qFromBigEndian<qint16>(bytes); } static qint32 threeBytesToInt(const char *bytes) { - return qFromBigEndian<qint32>(reinterpret_cast<const uchar *>(bytes)) >> 8; + return qFromBigEndian<qint32>(bytes) >> 8; } static qint32 fourBytesToInt(const char *bytes) { - return qFromBigEndian<qint32>(reinterpret_cast<const uchar *>(bytes)); + return qFromBigEndian<qint32>(bytes); } static void appendIntToThreeBytes(char *output, qint32 number) { - qToBigEndian<qint16>(number, reinterpret_cast<uchar *>(output + 1)); - qToBigEndian<qint8>(number >> 16, reinterpret_cast<uchar *>(output)); + qToBigEndian<qint16>(number, output + 1); + qToBigEndian<qint8>(number >> 16, output); } static void appendIntToFourBytes(char *output, qint32 number) { - qToBigEndian<qint32>(number, reinterpret_cast<uchar *>(output)); + qToBigEndian<qint32>(number, output); } static QByteArray intToFourBytes(qint32 number) // ### try to use appendIntToFourBytes where possible { - uchar data[4]; + char data[4]; qToBigEndian<qint32>(number, data); - QByteArray ret(reinterpret_cast<char *>(data), 4); + QByteArray ret(data, 4); return ret; } static QByteArray intToThreeBytes(qint32 number) { - uchar data[4]; + char data[4]; qToBigEndian<qint32>(number << 8, data); - QByteArray ret(reinterpret_cast<char *>(data), 3); + QByteArray ret(data, 3); return ret; } |