X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=b5d52a4b5c1b31165b78350076f30b7657f31735;hp=77fde33fe765ba1061f45cd1f3aafa0277a6f136;hb=fd80315c076ede937f5d51ba6f8061a32d0107ec;hpb=cab361607b686847ee0df2e605f8f05598b65f99

diff --git a/src/common/message.h b/src/common/message.h
index 77fde33f..b5d52a4b 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  *
@@ -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,77 +28,83 @@
 #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     = 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,
   };
 
-  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,
+    ServerMsg = 0x08,
+    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 MsgId msgId() const { return _msgId; }
+  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 const 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 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 quint8 flags() const { return _flags; }
-  inline QDateTime timestamp() const { return _timestamp; }
+  inline Flags flags() const { return _flags; }
+  inline void setFlags(Flags flags) { _flags = flags; }
+  inline const QDateTime &timestamp() const { return _timestamp; }
 
-  QString formattedTimestamp();
-  QString formattedSender();
-  QString formattedText();
+  inline bool isValid() const { return _msgId.isValid(); }
 
-  //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;
-
-  QString _formattedTimestamp, _formattedSender, _formattedText; // cache
-
-  /** Convert mIRC control codes to our own */
-  QString mircToInternal(QString);
+  Flags _flags;
 
   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);
 
-Q_DECLARE_METATYPE(Message);
-Q_DECLARE_OPERATORS_FOR_FLAGS(Message::MessageFlags)
+Q_DECLARE_METATYPE(Message)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif