X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=482039f26b1304e40f944cf0137b538b243f742e;hb=692a66647075e54be6d78e44ae5d7eb00d403d98;hp=a4c4ab6a000647a092a8fd8f2190202325f7f06a;hpb=dfbd0465f2a58eee4771472afd261869e5e5c400;p=quassel.git diff --git a/src/common/message.h b/src/common/message.h index a4c4ab6a..482039f2 100644 --- 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 #include @@ -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, @@ -73,6 +75,8 @@ public: void setFlags(Flags flags); + inline bool operator<(const Message &other) const { return _msgId < other._msgId; } + private: QDateTime _timestamp; MsgId _msgId; @@ -91,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