X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=cd50158523583d1bd2a11a5d2df3d9a1b161dba6;hp=2c0157664e3b4e36ebe92ae36354e9c8d56e3bd4;hb=dba66762993507168b1a3de25cfd2d7bff0ff969;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609 diff --git a/src/common/message.cpp b/src/common/message.cpp index 2c015766..cd501585 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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 * @@ -24,22 +24,24 @@ #include -Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags) +Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags) : _timestamp(QDateTime::currentDateTime().toUTC()), _bufferInfo(bufferInfo), _contents(contents), _sender(sender), + _senderPrefixes(senderPrefixes), _type(type), _flags(flags) { } -Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags) +Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags) : _timestamp(ts), _bufferInfo(bufferInfo), _contents(contents), _sender(sender), + _senderPrefixes(senderPrefixes), _type(type), _flags(flags) { @@ -67,6 +69,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg) msg._bufferInfo = buf; msg._timestamp = QDateTime::fromTime_t(ts); msg._sender = QString::fromUtf8(s); + msg._senderPrefixes = QString(""); msg._contents = QString::fromUtf8(m); return in; }