X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=837dc35a593922b7ae2dc3d43e00bccea8dbcc52;hp=8b9f15849669107a13c63c384eb7a42950d4a92e;hb=2039f5e28eeb431e394f1c2468a26218bd926538;hpb=f53a40aa9d3e0f2c1f15191b665780595d52348a

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 8b9f1584..837dc35a 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -22,10 +22,6 @@
 #include <QDataStream>
 
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  /*
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.target.toUtf8() << msg.sender.toUtf8() << msg.text.toUtf8();
-  */
   out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
       << msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
   return out;
@@ -34,13 +30,13 @@ QDataStream &operator<<(QDataStream &out, const Message &msg) {
 QDataStream &operator>>(QDataStream &in, Message &msg) {
   quint8 t, f;
   quint32 ts;
-  QByteArray s, m, targ;
+  QByteArray s, m;
   BufferId buf;
   in >> ts >> t >> f >> buf >> s >> m;
   msg.type = (Message::Type)t;
   msg.flags = (quint8)f;
+  msg.buffer = buf;
   msg.timeStamp = QDateTime::fromTime_t(ts);
-  //msg.target = QString::fromUtf8(targ);
   msg.sender = QString::fromUtf8(s);
   msg.text = QString::fromUtf8(m);
   return in;