X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmessage.h;h=8ce0cfef14a47ba110fbd0d8f21c6e3974dbda83;hp=80b2b8b0d2ab73e639a729f2bb046a4f7c73fd63;hb=8fc3a498f754f34b21d2a163e2a28323dae384cb;hpb=23221be79f5a6c064061f425a156b27fd9802a09

diff --git a/main/message.h b/main/message.h
index 80b2b8b0..8ce0cfef 100644
--- a/main/message.h
+++ b/main/message.h
@@ -22,27 +22,52 @@
 #define _MESSAGE_H_
 
 #include <QtCore>
+#include "global.h"
 
 struct Message {
 
   /** The different types a message can have for display */
-  enum Type { Msg, Notice, Action, Nick, Mode, Join, Part, Quit, Kick, Kill, Server, Info, Error };
-  enum Flags { None = 0, Self = 1, Highlight = 2 };
+  enum Type { Plain, Notice, Action, Nick, Mode, Join, Part, Quit, Kick, Kill, Server, Info, Error };
+  enum Flags { None = 0, Self = 1, PrivMsg = 2, Highlight = 4 };
 
+  uint msgId;
   Type type;
-  Flags flags;
+  quint8 flags;
+  QString target;
   QString sender;
-  QString msg;
+  QString text;
   QDateTime timeStamp;
+  BufferId buffer;
 
-  Message(Type _type = Msg, QString _msg = "", QString _sender = "", Flags _flags = None)
-  : msg(_msg), sender(_sender), type(_type), flags(_flags) { timeStamp = QDateTime::currentDateTime().toUTC(); };
+  Message(QString _target, Type _type = Plain, QString _text = "", QString _sender = "", quint8 _flags = None)
+  : target(_target), text(_text), sender(_sender), type(_type), flags(_flags) { timeStamp = QDateTime::currentDateTime().toUTC(); }
 
+  Message(BufferId _buffer = BufferId(), Type _type = Plain, QString _text = "", QString _sender = "", quint8 _flags = None)
+  : buffer(_buffer), text(_text), sender(_sender), type(_type), flags(_flags) { timeStamp = QDateTime::currentDateTime().toUTC(); }
+
+  Message(QDateTime _ts, BufferId _buffer = BufferId(), Type _type = Plain, QString _text = "", QString _sender = "", quint8 _flags = None)
+  : timeStamp(_ts), buffer(_buffer), text(_text), sender(_sender), type(_type), flags(_flags) {}
+  
+/*
+  static Message plain(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message notice(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message action(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message nick(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message mode(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message join(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message part(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message quit(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message kick(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message kill(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message server(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message info(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+  static Message error(QString _target, QString _text, QString _sender = "", quint8 _flags = None);
+*/
 };
 
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
 
-Q_DECLARE_METATYPE(Message)
+Q_DECLARE_METATYPE(Message);
 
 #endif