X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=90a6a168da4a6450b1358e6df2169cc9a349283c;hp=17f5493a6f559d342103bc77c2c0a92a35f9b7df;hb=46ddb293c61aeb90295fa1a14be71e8896f34ade;hpb=521a9e7155173db954ea5f32c93dd6933cd7aeda

diff --git a/src/common/message.h b/src/common/message.h
index 17f5493a..90a6a168 100644
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _MESSAGE_H_
-#define _MESSAGE_H_
+#ifndef MESSAGE_H_
+#define MESSAGE_H_
 
 #include <QString>
 #include <QDateTime>
@@ -28,71 +28,68 @@
 #include "types.h"
 
 class Message {
-  Q_DECLARE_TR_FUNCTIONS(Message);
+  Q_DECLARE_TR_FUNCTIONS(Message)
 
 public:
   /** The different types a message can have for display */
   enum Type {
-    Plain,
-    Notice,
-    Action,
-    Nick,
-    Mode,
-    Join,
-    Part,
-    Quit,
-    Kick,
-    Kill,
-    Server,
-    Info,
-    Error
+    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
   };
 
-  enum Flags {
-    None = 0,
-    Self = 1,
-    Highlight = 2
+  // DO NOT CHANGE without knowing what you do, some of these flags are stored in the database
+  enum Flag {
+    None = 0x00,
+    Self = 0x01,
+    Highlight = 0x02,
+    Redirected = 0x04,
+    Backlog = 0x80
   };
-  Q_DECLARE_FLAGS(MessageFlags, Flags)
-  
+  Q_DECLARE_FLAGS(Flags, Flag)
 
-  Message(BufferInfo bufferInfo = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
 
-  Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+  Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = "", const QString &sender = "", Flags flags = None);
+  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 void setMsgId(MsgId id) { _msgId = id; }
 
   inline BufferInfo bufferInfo() const { return _bufferInfo; }
-  inline QString text() const { return _text; }
+  inline QString contents() const { return _contents; }
   inline QString sender() const { return _sender; }
   inline Type type() const { return _type; }
-  inline quint8 flags() const { return _flags; }
+  inline Flags flags() const { return _flags; }
   inline QDateTime timestamp() const { return _timestamp; }
 
-  void setFlags(quint8 flags);
-  
-  QString formattedTimestamp();
-  QString formattedSender();
-  QString formattedText();
+  void setFlags(Flags flags);
 
-  //static QString formattedToHtml(const QString &);
-
-  void format();
+  inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
 
 private:
   QDateTime _timestamp;
   MsgId _msgId;
   BufferInfo _bufferInfo;
-  QString _text;
+  QString _contents;
   QString _sender;
   Type _type;
-  quint8 _flags;
+  Flags _flags;
 
   QString _formattedTimestamp, _formattedSender, _formattedText; // cache
 
-  /** Convert mIRC control codes to our own */
-  QString mircToInternal(QString);
 
   friend QDataStream &operator>>(QDataStream &in, Message &msg);
 };
@@ -100,7 +97,7 @@ private:
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
 
-Q_DECLARE_METATYPE(Message);
-Q_DECLARE_OPERATORS_FOR_FLAGS(Message::MessageFlags)
+Q_DECLARE_METATYPE(Message)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif