hero123457/qtmqtt
1
0
Fork 0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00
Code Issues Projects Releases Wiki Activity

Simplify readBufferTyped() routines

Browse Source 
get rid of dubious code by generalizing template specializations

Change-Id: Ib23f423f10e63985a11d18a9cfd37178ad18551e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Konstantin Ritt 2019-06-11 14:03:59 +03:00
parent dcf3bbb980
commit 954534fb55
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mqtt/qmqttconnection.cpp
View File

@ -47,49 +47,33 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcMqttConnection, "qt.mqtt.connection")
Q_LOGGING_CATEGORY(lcMqttConnectionVerbose, "qt.mqtt.connection.verbose");
template<>
quint32 QMqttConnection::readBufferTyped(qint64 *dataSize)
template <typename T>
T QMqttConnection::readBufferTyped(qint64 *dataSize)
{
if (dataSize)
*dataSize -= sizeof(quint32);
return qFromBigEndian<quint32>(reinterpret_cast<const quint32 *>(readBuffer(4).constData()));
}
Q_STATIC_ASSERT(std::is_integral<T>::value);
template<>
quint16 QMqttConnection::readBufferTyped(qint64 *dataSize)
{
if (dataSize)
*dataSize -= sizeof(quint16);
return qFromBigEndian<quint16>(reinterpret_cast<const quint16 *>(readBuffer(2).constData()));
}
template<>
quint8 QMqttConnection::readBufferTyped(qint64 *dataSize)
{
quint8 result;
readBuffer(reinterpret_cast<char *>(&result), 1);
if (dataSize)
*dataSize -= sizeof(quint8);
return result;
}
template<>
QString QMqttConnection::readBufferTyped(qint64 *dataSize)
{
const quint16 size = readBufferTyped<quint16>(dataSize);
if (dataSize)
*dataSize -= size;
const QByteArray ba = readBuffer(size);
return QString::fromUtf8(reinterpret_cast<const char *>(ba.constData()), ba.size());
T result;
readBuffer(reinterpret_cast<char *>(&result), sizeof(result));
if (dataSize != nullptr)
*dataSize -= sizeof(result);
return qFromBigEndian(result);
}
template<>
QByteArray QMqttConnection::readBufferTyped(qint64 *dataSize)
{
const quint16 size = readBufferTyped<quint16>(dataSize);
QByteArray ba(int(size), Qt::Uninitialized);
readBuffer(ba.data(), size);
if (dataSize)
*dataSize -= size;
return readBuffer(size);
return ba;
}
template<>
QString QMqttConnection::readBufferTyped(qint64 *dataSize)
{
return QString::fromUtf8(readBufferTyped<QByteArray>(dataSize));
}
QMqttConnection::QMqttConnection(QObject *parent) : QObject(parent)