Make Message a proper class rather than a struct (i.e. use setters/getters and

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

diff --git a/src/common/message.cpp b/src/common/message.cpp
index e564b84..9875473 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -21,82 +21,67 @@
 #include "message.h"
 #include <QDataStream>
 
-/*
-Message Message::plain(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Plain, _text, _sender, _flags);
+Message::Message(BufferId __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::notice(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Notice, _text, _sender, _flags);
-}
-
-Message Message::action(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Action, _text, _sender, _flags);
-}
+Message::Message(QDateTime __ts, BufferId __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
+  : _timeStamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
 
-Message Message::kick(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Kick, _text, _sender, _flags);
 }
 
-Message Message::join(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Join, _text, _sender, _flags);
+MsgId Message::msgId() const {
+  return _msgId;
 }
 
-Message Message::part(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Part, _text, _sender, _flags);
+void Message::setMsgId(MsgId _id) {
+  _msgId = _id;
 }
 
-Message Message::nick(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Nick, _text, _sender, _flags);
+BufferId Message::buffer() const {
+  return _buffer;
 }
 
-Message Message::mode(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Mode, _text, _sender, _flags);
+QString Message::text() const {
+  return _text;
 }
 
-Message Message::quit(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Quit, _text, _sender, _flags);
+QString Message::sender() const {
+  return _sender;
 }
 
-Message Message::kill(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Kill, _text, _sender, _flags);
+Message::Type Message::type() const {
+   return _type;
 }
 
-Message Message::server(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Server, _text, _sender, _flags);
+quint8 Message::flags() const {
+   return _flags;
 }
 
-Message Message::info(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Info, _text, _sender, _flags);
+QDateTime Message::timeStamp() const {
+  return _timeStamp;
 }
 
-Message Message::error(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Error, _text, _sender, _flags);
-}
-*/
 
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  /*
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.target.toUtf8() << msg.sender.toUtf8() << msg.text.toUtf8();
-  */
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
+  out << (quint32)msg.timeStamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
+      << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
   return out;
 }
 
 QDataStream &operator>>(QDataStream &in, Message &msg) {
   quint8 t, f;
   quint32 ts;
-  QByteArray s, m, targ;
+  QByteArray s, m;
   BufferId buf;
   in >> ts >> t >> f >> buf >> s >> m;
-  msg.type = (Message::Type)t;
-  msg.flags = (quint8)f;
-  msg.timeStamp = QDateTime::fromTime_t(ts);
-  //msg.target = QString::fromUtf8(targ);
-  msg.sender = QString::fromUtf8(s);
-  msg.text = QString::fromUtf8(m);
+  msg._type = (Message::Type)t;
+  msg._flags = (quint8)f;
+  msg._buffer = buf;
+  msg._timeStamp = QDateTime::fromTime_t(ts);
+  msg._sender = QString::fromUtf8(s);
+  msg._text = QString::fromUtf8(m);
   return in;
 }