X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;fp=src%2Fcommon%2Fmessage.h;h=4c700eff785acb7a732f824af0a8c36d72e99362;hp=8b16aa0d8569ff04dd71d00e6db042e5876f4030;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805

diff --git a/src/common/message.h b/src/common/message.h
index 8b16aa0d..4c700eff 100644
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -34,67 +34,80 @@ class COMMON_EXPORT Message
 
 public:
     /** The different types a message can have for display */
-    enum Type {
-        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,
+    enum Type
+    {
+        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,
-        Invite = 0x20000,
+        Invite       = 0x20000,
     };
     Q_DECLARE_FLAGS(Types, Type)
 
     // 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,
+    enum Flag
+    {
+        None       = 0x00,
+        Self       = 0x01,
+        Highlight  = 0x02,
         Redirected = 0x04,
-        ServerMsg = 0x08,
-        StatusMsg = 0x10,
-        Backlog = 0x80
+        ServerMsg  = 0x08,
+        StatusMsg  = 0x10,
+        Backlog    = 0x80
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
-    Message(BufferInfo bufferInfo = BufferInfo(), Type type = Plain, QString contents = {},
-            QString sender = {}, QString senderPrefixes = {}, QString realName = {},
-            QString avatarUrl = {}, Flags flags = None);
-    Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain,
-            QString contents = {}, QString sender = {}, QString senderPrefixes = {},
-            QString realName = {}, QString avatarUrl = {}, Flags flags = None);
-
-    inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); }
-    inline const MsgId &msgId() const { return _msgId; }
+    Message(BufferInfo bufferInfo = BufferInfo(),
+            Type type = Plain,
+            QString contents = {},
+            QString sender = {},
+            QString senderPrefixes = {},
+            QString realName = {},
+            QString avatarUrl = {},
+            Flags flags = None);
+    Message(QDateTime ts,
+            BufferInfo buffer = BufferInfo(),
+            Type type = Plain,
+            QString contents = {},
+            QString sender = {},
+            QString senderPrefixes = {},
+            QString realName = {},
+            QString avatarUrl = {},
+            Flags flags = None);
+
+    inline static Message ChangeOfDay(const QDateTime& day) { return Message(day, BufferInfo(), DayChange); }
+    inline const MsgId& msgId() const { return _msgId; }
     inline void setMsgId(MsgId id) { _msgId = id; }
 
-    inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
-    inline const BufferId &bufferId() const { return _bufferInfo.bufferId(); }
+    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 const QString &senderPrefixes() const { return _senderPrefixes; }
-    inline const QString &realName() const { return _realName; }
-    inline const QString &avatarUrl() const { return _avatarUrl; }
+    inline const QString& contents() const { return _contents; }
+    inline const QString& sender() const { return _sender; }
+    inline const QString& senderPrefixes() const { return _senderPrefixes; }
+    inline const QString& realName() const { return _realName; }
+    inline const QString& avatarUrl() const { return _avatarUrl; }
     inline Type type() const { return _type; }
     inline Flags flags() const { return _flags; }
     inline void setFlags(Flags flags) { _flags = flags; }
-    inline const QDateTime &timestamp() const { return _timestamp; }
+    inline const QDateTime& timestamp() const { return _timestamp; }
 
     inline bool isValid() const { return _msgId.isValid(); }
 
-    inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
+    inline bool operator<(const Message& other) const { return _msgId < other._msgId; }
 
 private:
     QDateTime _timestamp;
@@ -108,15 +121,14 @@ private:
     Type _type;
     Flags _flags;
 
-    friend QDataStream &operator>>(QDataStream &in, Message &msg);
+    friend QDataStream& operator>>(QDataStream& in, Message& msg);
 };
 
-
 using MessageList = QList<Message>;
 
-QDataStream &operator<<(QDataStream &out, const Message &msg);
-QDataStream &operator>>(QDataStream &in, Message &msg);
-QDebug operator<<(QDebug dbg, const 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_OPERATORS_FOR_FLAGS(Message::Types)