X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=2aa3e302954b4538ef2954ba76b0356f83938173;hp=fc50d3766fb416c8c671d57aad11410481419536;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=6a63070246d89aa2a2474e3a9a1035fa889ad77e

diff --git a/src/common/message.cpp b/src/common/message.cpp
index fc50d376..2aa3e302 100644
--- 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  *
@@ -20,44 +20,48 @@
 
 #include "message.h"
 
-#include "util.h"
-#include "peer.h"
-#include "signalproxy.h"
+#include <utility>
 
 #include <QDataStream>
 
-Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender,
-                 const QString &senderPrefixes, const QString &realName, const QString &avatarUrl, Flags flags)
-    : _timestamp(QDateTime::currentDateTime().toUTC()),
-    _bufferInfo(bufferInfo),
-    _contents(contents),
-    _sender(sender),
-    _senderPrefixes(senderPrefixes),
-    _realName(realName),
-    _avatarUrl(avatarUrl),
-    _type(type),
-    _flags(flags)
-{
-}
-
-
-Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents,
-                 const QString &sender, const QString &senderPrefixes, const QString &realName,
-                 const QString &avatarUrl, Flags flags)
-    : _timestamp(ts),
-    _bufferInfo(bufferInfo),
-    _contents(contents),
-    _sender(sender),
-    _senderPrefixes(senderPrefixes),
-    _realName(realName),
-    _avatarUrl(avatarUrl),
-    _type(type),
-    _flags(flags)
-{
-}
-
+#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());
@@ -67,15 +71,13 @@ 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 {
-        out << (quint32) msg.timestamp().toTime_t();
+        out << (qint64)msg.timestamp().toMSecsSinceEpoch();
+    }
+    else {
+        out << (quint32)msg.timestamp().toTime_t();
     }
 
-    out << (quint32) msg.type()
-        << (quint8) msg.flags()
-        << msg.bufferInfo()
-        << msg.sender().toUtf8();
+    out << (quint32)msg.type() << (quint8)msg.flags() << msg.bufferInfo() << msg.sender().toUtf8();
 
     if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::SenderPrefixes))
         out << msg.senderPrefixes().toUtf8();
@@ -89,8 +91,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());
@@ -102,7 +103,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);
@@ -143,15 +145,11 @@ 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();
+    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();
     return dbg;
 }