#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)
{
// 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();
}
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 {