Cleanup allowing for tags to be available at later points, adds TAGMSG

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

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 8cf74d2..1367b40 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,47 +18,55 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "message.h"
-
-#include "util.h"
-#include "peer.h"
-#include "signalproxy.h"
-
-#include <QDataStream>
 #include <utility>
 
-Message::Message(BufferInfo bufferInfo, Type type, QString contents, QString sender,
-                 QString senderPrefixes, QString realName, QString avatarUrl, Flags flags)
-    : _timestamp(QDateTime::currentDateTime().toUTC()),
-    _bufferInfo(std::move(bufferInfo)),
-    _contents(std::move(contents)),
-    _sender(std::move(sender)),
-    _senderPrefixes(std::move(senderPrefixes)),
-    _realName(std::move(realName)),
-    _avatarUrl(std::move(avatarUrl)),
-    _type(type),
-    _flags(flags)
-{
-}
-
-
-Message::Message(QDateTime ts, BufferInfo bufferInfo, Type type, QString contents,
-                 QString sender, QString senderPrefixes, QString realName,
-                 QString avatarUrl, Flags flags)
-    : _timestamp(std::move(ts)),
-    _bufferInfo(std::move(bufferInfo)),
-    _contents(std::move(contents)),
-    _sender(std::move(sender)),
-    _senderPrefixes(std::move(senderPrefixes)),
-    _realName(std::move(realName)),
-    _avatarUrl(std::move(avatarUrl)),
-    _type(type),
-    _flags(flags)
-{
-}
+#include <QDataStream>
 
+#include "message.h"
+#include "peer.h"
+#include "signalproxy.h"
+#include "util.h"
 
-QDataStream &operator<<(QDataStream &out, const Message &msg)
+Message::Message(BufferInfo bufferInfo,
+                 Type type,
+                 QString contents,
+                 QString sender,
+                 QString senderPrefixes,
+                 QString realName,
+                 QString avatarUrl,
+                 Flags flags)
+    : _timestamp(QDateTime::currentDateTime().toUTC())
+    , _bufferInfo(std::move(bufferInfo))
+    , _contents(std::move(contents))
+    , _sender(std::move(sender))
+    , _senderPrefixes(std::move(senderPrefixes))
+    , _realName(std::move(realName))
+    , _avatarUrl(std::move(avatarUrl))
+    , _type(type)
+    , _flags(flags)
+{}
+
+Message::Message(QDateTime ts,
+                 BufferInfo bufferInfo,
+                 Type type,
+                 QString contents,
+                 QString sender,
+                 QString senderPrefixes,
+                 QString realName,
+                 QString avatarUrl,
+                 Flags flags)
+    : _timestamp(std::move(ts))
+    , _bufferInfo(std::move(bufferInfo))
+    , _contents(std::move(contents))
+    , _sender(std::move(sender))
+    , _senderPrefixes(std::move(senderPrefixes))
+    , _realName(std::move(realName))
+    , _avatarUrl(std::move(avatarUrl))
+    , _type(type)
+    , _flags(flags)
+{}
+
+QDataStream& operator<<(QDataStream& out, const Message& msg)
 {
     Q_ASSERT(SignalProxy::current());
     Q_ASSERT(SignalProxy::current()->targetPeer());
@@ -69,7 +77,8 @@ QDataStream &operator<<(QDataStream &out, const Message &msg)
     if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) {
         // toMSecs returns a qint64, signed rather than unsigned
         out << (qint64) msg.timestamp().toMSecsSinceEpoch();
-    } else {
+    }
+    else {
         out << (quint32) msg.timestamp().toTime_t();
     }
 
@@ -90,8 +99,7 @@ QDataStream &operator<<(QDataStream &out, const Message &msg)
     return out;
 }
 
-
-QDataStream &operator>>(QDataStream &in, Message &msg)
+QDataStream& operator>>(QDataStream& in, Message& msg)
 {
     Q_ASSERT(SignalProxy::current());
     Q_ASSERT(SignalProxy::current()->sourcePeer());
@@ -103,7 +111,8 @@ QDataStream &operator>>(QDataStream &in, Message &msg)
         qint64 timeStamp;
         in >> timeStamp;
         msg._timestamp = QDateTime::fromMSecsSinceEpoch(timeStamp);
-    } else {
+    }
+    else {
         quint32 timeStamp;
         in >> timeStamp;
         msg._timestamp = QDateTime::fromTime_t(timeStamp);
@@ -144,15 +153,16 @@ QDataStream &operator>>(QDataStream &in, Message &msg)
     return in;
 }
 
-
-QDebug operator<<(QDebug dbg, const Message &msg)
+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(", RealName:")) << msg.realName()
-    << qPrintable(QString(", AvatarURL:")) << msg.avatarUrl()
-    << qPrintable(QString(", Flags:")) << msg.flags() << qPrintable(QString(")"))
-    << msg.senderPrefixes() << msg.sender() << ":" << msg.contents();
+                  << qPrintable(QString(",")) << msg.timestamp()
+                  << qPrintable(QString(", Type:")) << msg.type()
+                  << qPrintable(QString(", RealName:")) << msg.realName()
+                  << qPrintable(QString(", AvatarURL:")) << msg.avatarUrl()
+                  << qPrintable(QString(", Flags:")) << msg.flags()
+                  << qPrintable(QString(")"))
+                  << msg.senderPrefixes() << msg.sender() << ":"
+                  << msg.contents();
     return dbg;
 }