X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=2ce40f81064fc57edc6eb1529e89d8fff0809e35;hp=371867dd84fd77fda4dcbda8865a9e4a7899c02e;hb=bf01681e9e6108517bfa997422b84e04b801a40a;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016 diff --git a/src/common/message.cpp b/src/common/message.cpp index 371867dd..2ce40f81 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC 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 * @@ -24,48 +24,31 @@ #include -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(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags) + : _timestamp(QDateTime::currentDateTime().toUTC()), + _bufferInfo(bufferInfo), + _contents(contents), + _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; +Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags) + : _timestamp(ts), + _bufferInfo(bufferInfo), + _contents(contents), + _sender(sender), + _type(type), + _flags(flags) +{ } -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; -} - -QDateTime Message::timestamp() const { - return _timestamp; +void Message::setFlags(Flags flags) { + _flags = flags; } +#ifndef SPUTDEV QString Message::mircToInternal(QString mirc) { mirc.replace('%', "%%"); // escape % just to be sure mirc.replace('\x02', "%B"); @@ -110,13 +93,14 @@ 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 txt = mircToInternal(contents()); + QString bufferName = bufferInfo().bufferName(); _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss")); @@ -124,14 +108,16 @@ void Message::format() { 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: 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: @@ -143,27 +129,27 @@ void Message::format() { 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 == contents()) 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); + if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(contents()); + 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; @@ -183,33 +169,27 @@ QString Message::formattedText() { format(); return _formattedText; } - -/* -QString Message::formattedToHtml(const QString &f) { - - - return f; -} -*/ +#endif /* SPUTDEV */ 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.contents().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._flags = (Message::Flags)f; + msg._bufferInfo = buf; msg._timestamp = QDateTime::fromTime_t(ts); msg._sender = QString::fromUtf8(s); - msg._text = QString::fromUtf8(m); + msg._contents = QString::fromUtf8(m); return in; }