X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=6f7402825d4f508fba190c3421ec0ba1f7e0daa2;hp=9bb1c9c8851536ddf614e4cc349dc9ccd502093c;hb=dc0533961824e174efa6dae3ea4c2e25a5d5503a;hpb=b9a73f8181f4cee4b5b226b4a641796f04e85179 diff --git a/src/common/message.h b/src/common/message.h index 9bb1c9c8..6f740282 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,24 +28,25 @@ #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 @@ -63,6 +64,7 @@ public: 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; } @@ -75,6 +77,8 @@ public: void setFlags(Flags flags); + inline bool operator<(const Message &other) const { return _msgId < other._msgId; } + private: QDateTime _timestamp; MsgId _msgId; @@ -86,14 +90,14 @@ private: QString _formattedTimestamp, _formattedSender, _formattedText; // cache - friend QDataStream &operator>>(QDataStream &in, 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_METATYPE(Message) Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags) #endif