X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmessage.cpp;h=e19e74c593af85b1216584d6e6995c04dae82f85;hp=53b81702d17eb24df0310698fbb191148d1406d2;hb=117a8a4d7ced61a3e374f20c74bea1834386a1d7;hpb=11ee1cf78677b51d8fea2749e8501216a831dfd7 diff --git a/main/message.cpp b/main/message.cpp index 53b81702..e19e74c5 100644 --- a/main/message.cpp +++ b/main/message.cpp @@ -22,16 +22,19 @@ #include QDataStream &operator<<(QDataStream &out, const Message &msg) { - out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags << msg.sender << msg.msg; + out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags << msg.sender.toUtf8() << msg.msg.toUtf8(); return out; } QDataStream &operator>>(QDataStream &in, Message &msg) { quint8 t, f; quint32 ts; - in >> ts >> t >> f >> msg.sender >> msg.msg; + QByteArray s, m; + in >> ts >> t >> f >> s >> m; msg.type = (Message::Type)t; msg.flags = (Message::Flags)f; msg.timeStamp = QDateTime::fromTime_t(ts); + msg.sender = QString::fromUtf8(s); + msg.msg = QString::fromUtf8(m); return in; }