modernize: Reformat ALL the source... again!

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

diff --git a/src/common/messageevent.cpp b/src/common/messageevent.cpp
index 0efb85c..41485e2 100644 (file)
--- a/src/common/messageevent.cpp
+++ b/src/common/messageevent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,25 +20,26 @@
 
 #include "messageevent.h"
 
-Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Network *network)
+#include <utility>
+
+Event* MessageEvent::create(EventManager::EventType type, QVariantMap& map, Network* network)
 {
     if (type == EventManager::MessageEvent)
         return new MessageEvent(type, map, network);
 
-    return 0;
+    return nullptr;
 }
 
-
-MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &msg, const QString &sender, const QString &target,
-    Message::Flags flags, const QDateTime &timestamp)
-    : NetworkEvent(EventManager::MessageEvent, net),
-    _msgType(msgType),
-    _text(msg),
-    _sender(sender),
-    _target(target),
-    _msgFlags(flags)
+MessageEvent::MessageEvent(
+    Message::Type msgType, Network* net, QString msg, const QString& sender, QString target, Message::Flags flags, const QDateTime& timestamp)
+    : NetworkEvent(EventManager::MessageEvent, net)
+    , _msgType(msgType)
+    , _text(std::move(msg))
+    , _sender(sender)
+    , _target(std::move(target))
+    , _msgFlags(flags)
 {
-    IrcChannel *channel = network()->ircChannel(_target);
+    IrcChannel* channel = network()->ircChannel(_target);
     if (!channel) {
         if (!_target.isEmpty() && network()->prefixes().contains(_target.at(0)))
             _target = _target.mid(1);
@@ -55,8 +56,7 @@ MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &m
         setTimestamp(QDateTime::currentDateTime());
 }
 
-
-MessageEvent::MessageEvent(EventManager::EventType type, QVariantMap &map, Network *network)
+MessageEvent::MessageEvent(EventManager::EventType type, QVariantMap& map, Network* network)
     : NetworkEvent(type, map, network)
 {
     _msgType = static_cast<Message::Type>(map.take("messageType").toInt());
@@ -67,8 +67,7 @@ MessageEvent::MessageEvent(EventManager::EventType type, QVariantMap &map, Netwo
     _target = map.take("target").toString();
 }
 
-
-void MessageEvent::toVariantMap(QVariantMap &map) const
+void MessageEvent::toVariantMap(QVariantMap& map) const
 {
     NetworkEvent::toVariantMap(map);
     map["messageType"] = msgType();
@@ -79,8 +78,7 @@ void MessageEvent::toVariantMap(QVariantMap &map) const
     map["target"] = target();
 }
 
-
-BufferInfo::Type MessageEvent::bufferTypeByTarget(const QString &target) const
+BufferInfo::Type MessageEvent::bufferTypeByTarget(const QString& target) const
 {
     if (target.isEmpty())
         return BufferInfo::StatusBuffer;