modernize: Use raw string literals instead of escaped strings

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

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 061f16e..8cf74d2 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -25,32 +25,33 @@
 #include "signalproxy.h"
 
 #include <QDataStream>
+#include <utility>
 
-Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender,
-                 const QString &senderPrefixes, const QString &realName, const QString &avatarUrl, Flags flags)
+Message::Message(BufferInfo bufferInfo, Type type, QString contents, QString sender,
+                 QString senderPrefixes, QString realName, QString avatarUrl, Flags flags)
     : _timestamp(QDateTime::currentDateTime().toUTC()),
-    _bufferInfo(bufferInfo),
-    _contents(contents),
-    _sender(sender),
-    _senderPrefixes(senderPrefixes),
-    _realName(realName),
-    _avatarUrl(avatarUrl),
+    _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(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),
+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)
 {
@@ -65,8 +66,9 @@ QDataStream &operator<<(QDataStream &out, const Message &msg)
     // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
     out << msg.msgId();
 
-    if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongMessageTime)) {
-        out << (quint64) msg.timestamp().toMSecsSinceEpoch();
+    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();
     }
@@ -96,8 +98,9 @@ QDataStream &operator>>(QDataStream &in, Message &msg)
 
     in >> msg._msgId;
 
-    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongMessageTime)) {
-        quint64 timeStamp;
+    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongTime)) {
+        // timestamp is a qint64, signed rather than unsigned
+        qint64 timeStamp;
         in >> timeStamp;
         msg._timestamp = QDateTime::fromMSecsSinceEpoch(timeStamp);
     } else {