projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yay! After months, distributed client/core operation is working again!
[quassel.git]
/
src
/
common
/
message.cpp
diff --git
a/src/common/message.cpp
b/src/common/message.cpp
index
8b9f158
..
837dc35
100644
(file)
--- a/
src/common/message.cpp
+++ b/
src/common/message.cpp
@@
-22,10
+22,6
@@
#include <QDataStream>
QDataStream &operator<<(QDataStream &out, const Message &msg) {
#include <QDataStream>
QDataStream &operator<<(QDataStream &out, const Message &msg) {
- /*
- out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
- << msg.target.toUtf8() << msg.sender.toUtf8() << msg.text.toUtf8();
- */
out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
<< msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
return out;
out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
<< msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
return out;
@@
-34,13
+30,13
@@
QDataStream &operator<<(QDataStream &out, const Message &msg) {
QDataStream &operator>>(QDataStream &in, Message &msg) {
quint8 t, f;
quint32 ts;
QDataStream &operator>>(QDataStream &in, Message &msg) {
quint8 t, f;
quint32 ts;
- QByteArray s, m
, targ
;
+ QByteArray s, m;
BufferId buf;
in >> ts >> t >> f >> buf >> s >> m;
msg.type = (Message::Type)t;
msg.flags = (quint8)f;
BufferId buf;
in >> ts >> t >> f >> buf >> s >> m;
msg.type = (Message::Type)t;
msg.flags = (quint8)f;
+ msg.buffer = buf;
msg.timeStamp = QDateTime::fromTime_t(ts);
msg.timeStamp = QDateTime::fromTime_t(ts);
- //msg.target = QString::fromUtf8(targ);
msg.sender = QString::fromUtf8(s);
msg.text = QString::fromUtf8(m);
return in;
msg.sender = QString::fromUtf8(s);
msg.text = QString::fromUtf8(m);
return in;