projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dba6676
)
Add comment requested by @digitalcircuit
author
Janne Koschinski
<janne@kuschku.de>
Thu, 31 Aug 2017 23:14:05 +0000
(
01:14
+0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 4 Sep 2017 20:41:14 +0000
(22:41 +0200)
src/common/message.cpp
patch
|
blob
|
history
diff --git
a/src/common/message.cpp
b/src/common/message.cpp
index
cd50158
..
25ea45c
100644
(file)
--- a/
src/common/message.cpp
+++ b/
src/common/message.cpp
@@
-50,6
+50,7
@@
Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, c
QDataStream &operator<<(QDataStream &out, const Message &msg)
{
QDataStream &operator<<(QDataStream &out, const Message &msg)
{
+ // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
<< msg.bufferInfo() << msg.sender().toUtf8() << msg.contents().toUtf8();
return out;
out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
<< msg.bufferInfo() << msg.sender().toUtf8() << msg.contents().toUtf8();
return out;
@@
-69,6
+70,7
@@
QDataStream &operator>>(QDataStream &in, Message &msg)
msg._bufferInfo = buf;
msg._timestamp = QDateTime::fromTime_t(ts);
msg._sender = QString::fromUtf8(s);
msg._bufferInfo = buf;
msg._timestamp = QDateTime::fromTime_t(ts);
msg._sender = QString::fromUtf8(s);
+ // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
msg._senderPrefixes = QString("");
msg._contents = QString::fromUtf8(m);
return in;
msg._senderPrefixes = QString("");
msg._contents = QString::fromUtf8(m);
return in;