X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessageevent.cpp;h=ee0331d8d233aade5f68acd89f681aeccbc296ac;hp=f58fa0b4ec31db21dd380170751b5c0912e46bf7;hb=HEAD;hpb=3a3e844f9fcfd12235a0086af75ecd503b621ef4 diff --git a/src/common/messageevent.cpp b/src/common/messageevent.cpp index f58fa0b4..a80a2b3e 100644 --- a/src/common/messageevent.cpp +++ b/src/common/messageevent.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,7 +22,7 @@ #include -Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) +Event* MessageEvent::create(EventManager::EventType type, QVariantMap& map, Network* network) { if (type == EventManager::MessageEvent) return new MessageEvent(type, map, network); @@ -30,23 +30,27 @@ Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Netw return nullptr; } - -MessageEvent::MessageEvent(Message::Type msgType, Network *net, QString msg, const QString &sender, QString target, - Message::Flags flags, const QDateTime ×tamp) - : NetworkEvent(EventManager::MessageEvent, net), - _msgType(msgType), - _text(std::move(msg)), - _sender(sender), - _target(std::move(target)), - _msgFlags(flags) +MessageEvent::MessageEvent(Message::Type msgType, + Network* net, + QString msg, + QString sender, + QString target, + Message::Flags flags, + const QDateTime& timestamp) + : NetworkEvent(EventManager::MessageEvent, net) + , _msgType(msgType) + , _text(std::move(msg)) + , _sender(std::move(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); if (_target.startsWith('$') || _target.startsWith('#')) - _target = nickFromMask(sender); + _target = nickFromMask(_sender); } _bufferType = bufferTypeByTarget(_target); @@ -57,8 +61,7 @@ MessageEvent::MessageEvent(Message::Type msgType, Network *net, QString msg, con 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(map.take("messageType").toInt()); @@ -69,20 +72,18 @@ 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(); - map["messageFlags"] = (int)msgFlags(); + map["messageFlags"] = (int) msgFlags(); map["bufferType"] = bufferType(); map["text"] = text(); map["sender"] = sender(); 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;