X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=08c70c6fe5b34cdf0bdfd99867accbd55679a1e6;hb=d474ca8e41ebb9b4f057876560ec93a60d06d0da;hp=17f5493a6f559d342103bc77c2c0a92a35f9b7df;hpb=521a9e7155173db954ea5f32c93dd6933cd7aeda;p=quassel.git diff --git a/src/common/message.h b/src/common/message.h index 17f5493a..08c70c6f 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -33,25 +33,26 @@ class Message { public: /** The different types a message can have for display */ enum Type { - Plain, - Notice, - Action, - Nick, - Mode, - Join, - Part, - Quit, - Kick, - Kill, - Server, - Info, - Error + 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 }; enum Flags { None = 0, Self = 1, - Highlight = 2 + Highlight = 2, + Redirected = 4 }; Q_DECLARE_FLAGS(MessageFlags, Flags) @@ -78,6 +79,9 @@ public: //static QString formattedToHtml(const QString &); + /** Convert mIRC control codes to our own */ + static QString mircToInternal(QString); + void format(); private: @@ -91,8 +95,6 @@ private: QString _formattedTimestamp, _formattedSender, _formattedText; // cache - /** Convert mIRC control codes to our own */ - QString mircToInternal(QString); friend QDataStream &operator>>(QDataStream &in, Message &msg); };