Merge pull request #2 from sandsmark/wii

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

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 45517cf..f4016f5 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "message.h"
@@ -25,7 +25,7 @@
 #include <QDataStream>
 
 Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
-  : _timestamp(QDateTime::currentDateTime().toUTC()),
+    : _timestamp(QDateTime::currentDateTime().toUTC()),
     _bufferInfo(bufferInfo),
     _contents(contents),
     _sender(sender),
@@ -34,8 +34,9 @@ Message::Message(const BufferInfo &bufferInfo, Type type, const QString &content
 {
 }
 
+
 Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
-  : _timestamp(ts),
+    : _timestamp(ts),
     _bufferInfo(bufferInfo),
     _contents(contents),
     _sender(sender),
@@ -44,37 +45,39 @@ Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, c
 {
 }
 
-void Message::setFlags(Flags flags) {
-  _flags = flags;
-}
 
-QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  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 &out, const Message &msg)
+{
+    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 f;
-  quint32 t;
-  quint32 ts;
-  QByteArray s, m;
-  BufferInfo buf;
-  in >> msg._msgId >> ts >> t >> f >> buf >> s >> m;
-  msg._type = (Message::Type)t;
-  msg._flags = (Message::Flags)f;
-  msg._bufferInfo = buf;
-  msg._timestamp = QDateTime::fromTime_t(ts);
-  msg._sender = QString::fromUtf8(s);
-  msg._contents = QString::fromUtf8(m);
-  return in;
+
+QDataStream &operator>>(QDataStream &in, Message &msg)
+{
+    quint8 f;
+    quint32 t;
+    quint32 ts;
+    QByteArray s, m;
+    BufferInfo buf;
+    in >> msg._msgId >> ts >> t >> f >> buf >> s >> m;
+    msg._type = (Message::Type)t;
+    msg._flags = (Message::Flags)f;
+    msg._bufferInfo = buf;
+    msg._timestamp = QDateTime::fromTime_t(ts);
+    msg._sender = QString::fromUtf8(s);
+    msg._contents = QString::fromUtf8(m);
+    return in;
 }
 
-QDebug operator<<(QDebug dbg, const Message &msg) {
-  dbg.nospace() << qPrintable(QString("Message(MsgId:")) << msg.msgId()
-             << qPrintable(QString(",")) << msg.timestamp()
-             << qPrintable(QString(", Type:")) << msg.type()
-             << qPrintable(QString(", Flags:")) << msg.flags() << qPrintable(QString(")"))
-             << msg.sender() << ":" << msg.contents();
-  return dbg;
+
+QDebug operator<<(QDebug dbg, const Message &msg)
+{
+    dbg.nospace() << qPrintable(QString("Message(MsgId:")) << msg.msgId()
+    << qPrintable(QString(",")) << msg.timestamp()
+    << qPrintable(QString(", Type:")) << msg.type()
+    << qPrintable(QString(", Flags:")) << msg.flags() << qPrintable(QString(")"))
+    << msg.sender() << ":" << msg.contents();
+    return dbg;
 }