projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing debug output
[quassel.git]
/
src
/
common
/
signalproxy.cpp
diff --git
a/src/common/signalproxy.cpp
b/src/common/signalproxy.cpp
index
f467b1b
..
9806acf
100644
(file)
--- 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);
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);
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);
rawItem = qCompress(rawItem);
- out <<
(quint32)rawItem.size() <<
rawItem;
+ out << rawItem;
} else {
} 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);
}
dev->write(block);
}
@@
-950,7
+952,7
@@
bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
QByteArray rawItem;
in >> rawItem;
rawItem = qUncompress(rawItem);
QByteArray rawItem;
in >> rawItem;
rawItem = qUncompress(rawItem);
-
+
QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
itemStream.setVersion(QDataStream::Qt_4_2);
itemStream >> item;
QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
itemStream.setVersion(QDataStream::Qt_4_2);
itemStream >> item;