projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPUTDEV compiles again, and the MessageModel now actually is filled with messages...
[quassel.git]
/
src
/
common
/
message.cpp
diff --git
a/src/common/message.cpp
b/src/common/message.cpp
index
91e1f49
..
15708b3
100644
(file)
--- a/
src/common/message.cpp
+++ b/
src/common/message.cpp
@@
-24,7
+24,7
@@
#include <QDataStream>
#include <QDataStream>
-Message::Message(BufferInfo bufferInfo, Type type, QString text, QString sender,
quint8
flags)
+Message::Message(BufferInfo bufferInfo, Type type, QString text, QString sender,
Flags
flags)
: _timestamp(QDateTime::currentDateTime().toUTC()),
_bufferInfo(bufferInfo),
_text(text),
: _timestamp(QDateTime::currentDateTime().toUTC()),
_bufferInfo(bufferInfo),
_text(text),
@@
-34,7
+34,7
@@
Message::Message(BufferInfo bufferInfo, Type type, QString text, QString sender,
{
}
{
}
-Message::Message(QDateTime ts,BufferInfo bufferInfo, Type type, QString text, QString sender,
quint8
flags)
+Message::Message(QDateTime ts,BufferInfo bufferInfo, Type type, QString text, QString sender,
Flags
flags)
: _timestamp(ts),
_bufferInfo(bufferInfo),
_text(text),
: _timestamp(ts),
_bufferInfo(bufferInfo),
_text(text),
@@
-44,7
+44,7
@@
Message::Message(QDateTime ts,BufferInfo bufferInfo, Type type, QString text, QS
{
}
{
}
-void Message::setFlags(
quint8
flags) {
+void Message::setFlags(
Flags
flags) {
_flags = flags;
}
_flags = flags;
}
@@
-107,6
+107,8
@@
void Message::format() {
switch(type()) {
case Message::Plain:
s = tr("%DS<%1>").arg(nick); t = tr("%D0%1").arg(txt); break;
switch(type()) {
case Message::Plain:
s = tr("%DS<%1>").arg(nick); t = tr("%D0%1").arg(txt); break;
+ case Message::Notice:
+ s = tr("%Dn[%1]").arg(nick); t = tr("%Dn%1").arg(txt); break;
case Message::Server:
s = tr("%Ds*"); t = tr("%Ds%1").arg(txt); break;
case Message::Error:
case Message::Server:
s = tr("%Ds*"); t = tr("%Ds%1").arg(txt); break;
case Message::Error:
@@
-176,7
+178,7
@@
QString Message::formattedToHtml(const QString &f) {
*/
QDataStream &operator<<(QDataStream &out, const Message &msg) {
*/
QDataStream &operator<<(QDataStream &out, const Message &msg) {
- out << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
+ out <<
msg.msgId() <<
(quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
<< msg.bufferInfo() << msg.sender().toUtf8() << msg.text().toUtf8();
return out;
}
<< msg.bufferInfo() << msg.sender().toUtf8() << msg.text().toUtf8();
return out;
}
@@
-187,9
+189,9
@@
QDataStream &operator>>(QDataStream &in, Message &msg) {
quint32 ts;
QByteArray s, m;
BufferInfo buf;
quint32 ts;
QByteArray s, m;
BufferInfo buf;
- in >> ts >> t >> f >> buf >> s >> m;
+ in >>
msg._msgId >>
ts >> t >> f >> buf >> s >> m;
msg._type = (Message::Type)t;
msg._type = (Message::Type)t;
- msg._flags = (
quint8
)f;
+ msg._flags = (
Message::Flags
)f;
msg._bufferInfo = buf;
msg._timestamp = QDateTime::fromTime_t(ts);
msg._sender = QString::fromUtf8(s);
msg._bufferInfo = buf;
msg._timestamp = QDateTime::fromTime_t(ts);
msg._sender = QString::fromUtf8(s);