X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=96ac10ea98f77c3d0a1a001e36265d4f3936b4e1;hp=6f7402825d4f508fba190c3421ec0ba1f7e0daa2;hb=326a0d0783c8ecffb6a7bae02fd74f66bd4242fa;hpb=dc0533961824e174efa6dae3ea4c2e25a5d5503a

diff --git a/src/common/message.h b/src/common/message.h
index 6f740282..96ac10ea 100644
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,20 +33,24 @@ class Message {
 public:
   /** The different types a message can have for display */
   enum Type {
-    Plain     = 0x0001,
-    Notice    = 0x0002,
-    Action    = 0x0004,
-    Nick      = 0x0008,
-    Mode      = 0x0010,
-    Join      = 0x0020,
-    Part      = 0x0040,
-    Quit      = 0x0080,
-    Kick      = 0x0100,
-    Kill      = 0x0200,
-    Server    = 0x0400,
-    Info      = 0x0800,
-    Error     = 0x1000,
-    DayChange = 0x2000
+    Plain     = 0x00001,
+    Notice    = 0x00002,
+    Action    = 0x00004,
+    Nick      = 0x00008,
+    Mode      = 0x00010,
+    Join      = 0x00020,
+    Part      = 0x00040,
+    Quit      = 0x00080,
+    Kick      = 0x00100,
+    Kill      = 0x00200,
+    Server    = 0x00400,
+    Info      = 0x00800,
+    Error     = 0x01000,
+    DayChange = 0x02000,
+    Topic     = 0x04000,
+    NetsplitJoin = 0x08000,
+    NetsplitQuit = 0x10000,
+    Invite = 0x20000,
   };
 
   // DO NOT CHANGE without knowing what you do, some of these flags are stored in the database
@@ -55,6 +59,7 @@ public:
     Self = 0x01,
     Highlight = 0x02,
     Redirected = 0x04,
+    ServerMsg = 0x08,
     Backlog = 0x80
   };
   Q_DECLARE_FLAGS(Flags, Flag)
@@ -64,18 +69,21 @@ public:
   Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain,
           const QString &contents = "", const QString &sender = "", Flags flags = None);
 
-  inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange, tr("Day changed to %1").arg(day.toString("dddd MMMM d yyyy"))); }
-  inline MsgId msgId() const { return _msgId; }
+  inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); }
+  inline const MsgId &msgId() const { return _msgId; }
   inline void setMsgId(MsgId id) { _msgId = id; }
 
-  inline BufferInfo bufferInfo() const { return _bufferInfo; }
-  inline QString contents() const { return _contents; }
-  inline QString sender() const { return _sender; }
+  inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
+  inline const BufferId &bufferId() const { return _bufferInfo.bufferId(); }
+  inline void setBufferId(BufferId id) { _bufferInfo.setBufferId(id); }
+  inline const QString &contents() const { return _contents; }
+  inline const QString &sender() const { return _sender; }
   inline Type type() const { return _type; }
   inline Flags flags() const { return _flags; }
-  inline QDateTime timestamp() const { return _timestamp; }
+  inline void setFlags(Flags flags) { _flags = flags; }
+  inline const QDateTime &timestamp() const { return _timestamp; }
 
-  void setFlags(Flags flags);
+  inline bool isValid() const { return _msgId.isValid(); }
 
   inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
 
@@ -88,11 +96,11 @@ private:
   Type _type;
   Flags _flags;
 
-  QString _formattedTimestamp, _formattedSender, _formattedText; // cache
-
   friend QDataStream &operator>>(QDataStream &in, Message &msg);
 };
 
+typedef QList<Message> MessageList;
+
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
 QDebug operator<<(QDebug dbg, const Message &msg);