Introducing fast backlog replay! Thanks sph_ for the help!

[quassel.git] / src / common / message.h

diff --git a/src/common/message.h b/src/common/message.h
index 797e28b..482039f 100644 (file)
--- 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,7 +28,7 @@
 #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 */
@@ -48,14 +48,16 @@ public:
     Error  = 0x1000
   };
 
+  // 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,
+    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,
@@ -72,19 +74,8 @@ public:
   inline QDateTime timestamp() const { return _timestamp; }
 
   void setFlags(Flags flags);
-  
-#ifndef SPUTDEV
-  QString formattedTimestamp();
-  QString formattedSender();
-  QString formattedText();
-
-  //static QString formattedToHtml(const QString &);
 
-  /** 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;
@@ -104,7 +95,7 @@ private:
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 QDataStream &operator>>(QDataStream &in, Message &msg);
 
-Q_DECLARE_METATYPE(Message);
+Q_DECLARE_METATYPE(Message)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
 
 #endif