X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmessage.cpp;h=e564b84f1baf92cca855a6fdb53621db5632f0f5;hp=160c8288df08de7bfaf0caec269a520e32105673;hb=8fc3a498f754f34b21d2a163e2a28323dae384cb;hpb=d6a96a47a3964b9c0b1ea2413601d70d0d327413

diff --git a/main/message.cpp b/main/message.cpp
index 160c8288..e564b84f 100644
--- a/main/message.cpp
+++ b/main/message.cpp
@@ -21,61 +21,67 @@
 #include "message.h"
 #include <QDataStream>
 
-Message Message::plain(QString _target, QString _text, QString _sender, Flags _flags) {
+/*
+Message Message::plain(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Plain, _text, _sender, _flags);
 }
 
-Message Message::notice(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::notice(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Notice, _text, _sender, _flags);
 }
 
-Message Message::action(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::action(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Action, _text, _sender, _flags);
 }
 
-Message Message::kick(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::kick(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Kick, _text, _sender, _flags);
 }
 
-Message Message::join(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::join(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Join, _text, _sender, _flags);
 }
 
-Message Message::part(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::part(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Part, _text, _sender, _flags);
 }
 
-Message Message::nick(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::nick(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Nick, _text, _sender, _flags);
 }
 
-Message Message::mode(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::mode(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Mode, _text, _sender, _flags);
 }
 
-Message Message::quit(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::quit(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Quit, _text, _sender, _flags);
 }
 
-Message Message::kill(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::kill(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Kill, _text, _sender, _flags);
 }
 
-Message Message::server(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::server(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Server, _text, _sender, _flags);
 }
 
-Message Message::info(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::info(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Info, _text, _sender, _flags);
 }
 
-Message Message::error(QString _target, QString _text, QString _sender, Flags _flags) {
+Message Message::error(QString _target, QString _text, QString _sender, quint8 _flags) {
   return Message(_target, Error, _text, _sender, _flags);
 }
+*/
 
 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;
 }
 
@@ -83,12 +89,14 @@ QDataStream &operator>>(QDataStream &in, Message &msg) {
   quint8 t, f;
   quint32 ts;
   QByteArray s, m, targ;
-  in >> ts >> t >> f >> targ >> s >> m;
+  BufferId buf;
+  in >> ts >> t >> f >> buf >> s >> m;
   msg.type = (Message::Type)t;
-  msg.flags = (Message::Flags)f;
+  msg.flags = (quint8)f;
   msg.timeStamp = QDateTime::fromTime_t(ts);
-  msg.target = QString::fromUtf8(targ);
+  //msg.target = QString::fromUtf8(targ);
   msg.sender = QString::fromUtf8(s);
   msg.text = QString::fromUtf8(m);
   return in;
 }
+