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

diff --git a/src/common/message.h b/src/common/message.h
index e7e9f594..6f740282 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,55 +28,76 @@
 #include "types.h"
 
 class 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 };
-    enum Flags { None = 0, Self = 1, PrivMsg = 2, Highlight = 4 };
-
-    Message(BufferInfo buffer = 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);
-
-    MsgId msgId() const;
-    void setMsgId(MsgId id);
-
-    BufferInfo buffer() const;
-    QString text() const;
-    QString sender() const;
-    Type type() const;
-    quint8 flags() const;
-    QDateTime timestamp() const;
-
-    QString formattedTimestamp();
-    QString formattedSender();
-    QString formattedText();
-
-    //static QString formattedToHtml(const QString &);
-
-    void format();
-
-  private:
-    QDateTime _timestamp;
-    MsgId _msgId;
-    BufferInfo _buffer;
-    QString _text;
-    QString _sender;
-    Type _type;
-    quint8 _flags;
-
-    QString _formattedTimestamp, _formattedSender, _formattedText; // cache
-
-    /** Convert mIRC control codes to our own */
-    QString mircToInternal(QString);
-
-    friend QDataStream &operator>>(QDataStream &in, Message &msg);
+  Q_DECLARE_TR_FUNCTIONS(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
+  };
+
+  // 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(Flags, Flag)
+
+
+  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 contents() const { return _contents; }
+  inline QString sender() const { return _sender; }
+  inline Type type() const { return _type; }
+  inline Flags flags() const { return _flags; }
+  inline QDateTime timestamp() const { return _timestamp; }
+
+  void setFlags(Flags flags);
+
+  inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
+
+private:
+  QDateTime _timestamp;
+  MsgId _msgId;
+  BufferInfo _bufferInfo;
+  QString _contents;
+  QString _sender;
+  Type _type;
+  Flags _flags;
+
+  QString _formattedTimestamp, _formattedSender, _formattedText; // cache
+
+  friend QDataStream &operator>>(QDataStream &in, Message &msg);
 };
 
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
+QDebug operator<<(QDebug dbg, const Message &msg);
 
-Q_DECLARE_METATYPE(Message);
+Q_DECLARE_METATYPE(Message)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif