X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=1cf0f678743f3ab55bfaf387f7e2e9a3cc8f0841;hp=d042c7b05ea46000db854dd9a68ddaa82d9afa0f;hb=342b6d8a5869e438362914f3848e639ac6c70bbc;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/common/message.h b/src/common/message.h
index d042c7b0..1cf0f678 100644
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -46,7 +46,8 @@ public:
     Server    = 0x0400,
     Info      = 0x0800,
     Error     = 0x1000,
-    DayChange = 0x2000
+    DayChange = 0x2000,
+    Topic     = 0x4000
   };
 
   // DO NOT CHANGE without knowing what you do, some of these flags are stored in the database
@@ -66,17 +67,20 @@ public:
           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 const 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 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 Flags flags() const { return _flags; }
-  inline QDateTime timestamp() const { return _timestamp; }
+  inline void setFlags(Flags flags) { _flags = flags; }
+  inline const QDateTime &timestamp() const { return _timestamp; }
 
-  void setFlags(Flags flags);
+  inline bool isValid() const { return _msgId.isValid(); }
 
   inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
 
@@ -89,8 +93,6 @@ private:
   Type _type;
   Flags _flags;
 
-  QString _formattedTimestamp, _formattedSender, _formattedText; // cache
-
   friend QDataStream &operator>>(QDataStream &in, Message &msg);
 };