X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmessage.cpp;fp=main%2Fmessage.cpp;h=6d1e7a8abce00d2cff819c59a36b4499c95eac32;hp=160c8288df08de7bfaf0caec269a520e32105673;hb=2a068c11e76c7b34afb64d443dbb1afd2e208aaa;hpb=12369966345e76e3bba92f64c84c940ef4d8d916 diff --git a/main/message.cpp b/main/message.cpp index 160c8288..6d1e7a8a 100644 --- a/main/message.cpp +++ b/main/message.cpp @@ -21,55 +21,55 @@ #include "message.h" #include -Message Message::plain(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::plain(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Plain, _text, _sender, _flags); } -Message Message::notice(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::notice(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Notice, _text, _sender, _flags); } -Message Message::action(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::action(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Action, _text, _sender, _flags); } -Message Message::kick(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::kick(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Kick, _text, _sender, _flags); } -Message Message::join(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::join(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Join, _text, _sender, _flags); } -Message Message::part(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::part(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Part, _text, _sender, _flags); } -Message Message::nick(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::nick(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Nick, _text, _sender, _flags); } -Message Message::mode(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::mode(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Mode, _text, _sender, _flags); } -Message Message::quit(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::quit(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Quit, _text, _sender, _flags); } -Message Message::kill(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::kill(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Kill, _text, _sender, _flags); } -Message Message::server(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::server(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Server, _text, _sender, _flags); } -Message Message::info(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::info(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Info, _text, _sender, _flags); } -Message Message::error(QString _target, QString _text, QString _sender, Flags _flags) { +Message Message::error(QString _target, QString _text, QString _sender, quint8 _flags) { return Message(_target, Error, _text, _sender, _flags); } @@ -85,10 +85,11 @@ QDataStream &operator>>(QDataStream &in, Message &msg) { QByteArray s, m, targ; in >> ts >> t >> f >> targ >> s >> m; msg.type = (Message::Type)t; - msg.flags = (Message::Flags)f; + msg.flags = (quint8)f; msg.timeStamp = QDateTime::fromTime_t(ts); msg.target = QString::fromUtf8(targ); msg.sender = QString::fromUtf8(s); msg.text = QString::fromUtf8(m); return in; } +