X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fsignalproxy.cpp;h=9806acfcea9c029e171c00db445fdc60b5f1c2e6;hb=bc8d12b721ab61014fe7700982dbc408d98d54f1;hp=f467b1b5fbc66ed6681e428514db52a0653b5af6;hpb=018d1d001bf3c051b55525f523d933a8d694e071;p=quassel.git diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index f467b1b5..9806acfc 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -914,7 +914,8 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); out.setVersion(QDataStream::Qt_4_2); - + out << (quint32)0; + if(compressed) { QByteArray rawItem; QDataStream itemStream(&rawItem, QIODevice::WriteOnly); @@ -924,13 +925,14 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c rawItem = qCompress(rawItem); - out << (quint32)rawItem.size() << rawItem; + out << rawItem; } else { - out << (quint32)0 << item; - out.device()->seek(0); - out << (quint32)(block.size() - sizeof(quint32)); + out << item; } + out.device()->seek(0); + out << (quint32)(block.size() - sizeof(quint32)); + dev->write(block); } @@ -950,7 +952,7 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian QByteArray rawItem; in >> rawItem; rawItem = qUncompress(rawItem); - + QDataStream itemStream(&rawItem, QIODevice::ReadOnly); itemStream.setVersion(QDataStream::Qt_4_2); itemStream >> item;