/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Development Team *
+ * Copyright (C) 2005-07 by the Quassel IRC Team *
* 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 *
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();
+ _timestamp = QDateTime::currentDateTime().toUTC();
}
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) {
+ : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
}
return _flags;
}
-QDateTime Message::timeStamp() const {
- return _timeStamp;
+QDateTime Message::timestamp() const {
+ return _timestamp;
}
QString Message::mircToInternal(QString mirc) {
QString networkName = buffer().network();
QString bufferName = buffer().buffer();
- _formattedTimeStamp = tr("%DT[%1]").arg(timeStamp().toLocalTime().toString("hh:mm:ss"));
+ _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
QString s, t;
switch(type()) {
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%DU%2%DU%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%DU%2%DU%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%DU%1%DU%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;
}
-QString Message::formattedTimeStamp() {
+QString Message::formattedTimestamp() {
format();
- return _formattedTimeStamp;
+ return _formattedTimestamp;
}
QString Message::formattedSender() {
*/
QDataStream &operator<<(QDataStream &out, const Message &msg) {
- out << (quint32)msg.timeStamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
+ out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
<< msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
return out;
}
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._sender = QString::fromUtf8(s);
msg._text = QString::fromUtf8(m);
return in;