- Highlights are now determined in Client::checkForHighlight(Message &).

[quassel.git] / src / common / message.cpp

diff --git a/src/common/message.cpp b/src/common/message.cpp
index e51cc6b..97cee42 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -24,46 +24,28 @@
 
 #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) {
@@ -110,13 +92,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 bufferName = bufferInfo().bufferName();
 
   _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 
@@ -194,7 +177,7 @@ QString Message::formattedToHtml(const QString &f) {
 
 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();
+      << msg.bufferInfo() << msg.sender().toUtf8() << msg.text().toUtf8();
   return out;
 }
 
@@ -206,7 +189,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg) {
   in >> 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);