/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Development Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * (at your option) version 3. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#include <QDataStream>
-Message::Message(BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
- : _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
- _timestamp = QDateTime::currentDateTime().toUTC();
+Message::Message(BufferInfo bufferInfo, Type type, QString text, QString sender, quint8 flags)
+ : _timestamp(QDateTime::currentDateTime().toUTC()),
+ _bufferInfo(bufferInfo),
+ _text(text),
+ _sender(sender),
+ _type(type),
+ _flags(flags)
+{
}
-Message::Message(QDateTime __ts, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
- : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
-
-}
-
-MsgId Message::msgId() const {
- return _msgId;
-}
-
-void Message::setMsgId(MsgId _id) {
- _msgId = _id;
-}
-
-BufferInfo Message::buffer() const {
- return _buffer;
-}
-
-QString Message::text() const {
- return _text;
-}
-
-QString Message::sender() const {
- return _sender;
-}
-
-Message::Type Message::type() const {
- return _type;
-}
-
-quint8 Message::flags() const {
- return _flags;
+Message::Message(QDateTime ts,BufferInfo bufferInfo, Type type, QString text, QString sender, quint8 flags)
+ : _timestamp(ts),
+ _bufferInfo(bufferInfo),
+ _text(text),
+ _sender(sender),
+ _type(type),
+ _flags(flags)
+{
}
-QDateTime Message::timestamp() const {
- return _timestamp;
+void Message::setFlags(quint8 flags) {
+ _flags = flags;
}
QString Message::mircToInternal(QString mirc) {
}
void Message::format() {
- if(!_formattedText.isNull()) return; // already done
+ if(!_formattedText.isNull())
+ return; // already done
+
QString user = userFromMask(sender());
QString host = hostFromMask(sender());
QString nick = nickFromMask(sender());
QString txt = mircToInternal(text());
- QString networkName = buffer().network();
- QString bufferName = buffer().buffer();
+ QString bufferName = bufferInfo().bufferName();
_formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
case Message::Error:
s = tr("%De*"); t = tr("%De%1").arg(txt); break;
case Message::Join:
- s = tr("%Dj-->"); t = tr("%Dj%DN%DU%1%DU%DN %DH(%2@%3)%DH has joined %DC%DU%4%DU%DC").arg(nick, user, host, bufferName); break;
+ s = tr("%Dj-->"); t = tr("%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break;
case Message::Part:
- s = tr("%Dp<--"); t = tr("%Dp%DN%DU%1%DU%DN %DH(%2@%3)%DH has left %DC%DU%4%DU%DC").arg(nick, user, host, bufferName);
+ s = tr("%Dp<--"); t = tr("%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName);
if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
break;
case Message::Quit:
QString victim = txt.section(" ", 0, 0);
//if(victim == ui.ownNick->currentText()) victim = tr("you");
QString kickmsg = txt.section(" ", 1);
- t = tr("%Dk%DN%DU%1%DU%DN has kicked %DN%DU%2%DU%DN from %DC%DU%3%DU%DC").arg(nick).arg(victim).arg(bufferName);
+ t = tr("%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName);
if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg);
}
break;
case Message::Nick:
s = tr("%Dr<->");
- if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(text());
- else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, text());
+ if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt);
+ else t = tr("%Dr%DN%1%DN is now known as %DN%2%DN").arg(nick, txt);
break;
case Message::Mode:
s = tr("%Dm***");
if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text());
- else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(text(), nick);
+ else t = tr("%DmMode %DM%1%DM by %DN%2%DN").arg(txt, nick);
break;
case Message::Action:
s = tr("%Da-*-");
- t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(text());
+ t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt);
break;
default:
s = tr("%De%1").arg(sender());
- t = tr("%De[%1]").arg(text());
+ t = tr("%De[%1]").arg(txt);
}
_formattedSender = s;
_formattedText = t;
*/
QDataStream &operator<<(QDataStream &out, const Message &msg) {
- out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
- << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
+ out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
+ << msg.bufferInfo() << msg.sender().toUtf8() << msg.text().toUtf8();
return out;
}
QDataStream &operator>>(QDataStream &in, Message &msg) {
- quint8 t, f;
+ quint8 f;
+ quint32 t;
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._flags = (quint8)f;
- msg._buffer = buf;
+ msg._bufferInfo = buf;
msg._timestamp = QDateTime::fromTime_t(ts);
msg._sender = QString::fromUtf8(s);
msg._text = QString::fromUtf8(m);
projects / quassel.git / blobdiff