X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmessage.h;h=d61a8a72cc2c504fe4919e8d3cd47eb094a4bd64;hb=dba66762993507168b1a3de25cfd2d7bff0ff969;hp=c7000f9fdc2eca08a02f06a8e74ddecc3567d791;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/common/message.h b/src/common/message.h index c7000f9f..d61a8a72 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef MESSAGE_H_ @@ -61,13 +61,14 @@ public: Highlight = 0x02, Redirected = 0x04, ServerMsg = 0x08, + StatusMsg = 0x10, 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 BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain, - const QString &contents = "", const QString &sender = "", Flags flags = None); + const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); } inline const MsgId &msgId() const { return _msgId; } @@ -78,6 +79,7 @@ public: 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 Type type() const { return _type; } inline Flags flags() const { return _flags; } inline void setFlags(Flags flags) { _flags = flags; } @@ -93,6 +95,7 @@ private: BufferInfo _bufferInfo; QString _contents; QString _sender; + QString _senderPrefixes; Type _type; Flags _flags;