X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=c1b8e625491e2bd1128a8101f765d78860617dcf;hp=797e28b755f7ad78a61ba8222777a681c7ef945d;hb=946e79e0243dda74433016060f12abc65883f243;hpb=cc7f376eb105f7bf931fb7f96c9601a7b3f69511

diff --git a/src/common/message.h b/src/common/message.h
index 797e28b7..c1b8e625 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,39 +28,44 @@
 #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  = 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
+    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 = 0,
-    Self = 1,
-    Highlight = 2,
-    Redirected = 4
+    None = 0x00,
+    Self = 0x01,
+    Highlight = 0x02,
+    Redirected = 0x04,
+    ServerMsg = 0x08,
+    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; }
 
@@ -69,22 +74,12 @@ public:
   inline QString sender() const { return _sender; }
   inline Type type() const { return _type; }
   inline Flags flags() const { return _flags; }
+  inline void setFlags(Flags flags) { _flags = flags; }
   inline QDateTime timestamp() const { return _timestamp; }
 
-  void setFlags(Flags flags);
-  
-#ifndef SPUTDEV
-  QString formattedTimestamp();
-  QString formattedSender();
-  QString formattedText();
-
-  //static QString formattedToHtml(const QString &);
+  inline bool isValid() const { return _msgId.isValid(); }
 
-  /** Convert mIRC control codes to our own */
-  static QString mircToInternal(QString);
-
-  void format();
-#endif
+  inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
 
 private:
   QDateTime _timestamp;
@@ -95,16 +90,16 @@ 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);
 
-Q_DECLARE_METATYPE(Message);
+Q_DECLARE_METATYPE(Message)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif