X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkevent.cpp;h=cd8ef206c1e7f3ddbf8af4f701598cb4468025d1;hp=6ef957ae3553513f275f9c26d5f9e0479da2963f;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/common/networkevent.cpp b/src/common/networkevent.cpp index 6ef957ae..cd8ef206 100644 --- a/src/common/networkevent.cpp +++ b/src/common/networkevent.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,7 +20,7 @@ #include "networkevent.h" -Event *NetworkEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) +Event* NetworkEvent::create(EventManager::EventType type, QVariantMap& map, Network* network) { switch (type) { case EventManager::NetworkIncoming: @@ -39,54 +39,46 @@ Event *NetworkEvent::create(EventManager::EventType type, QVariantMap &map, Netw return new NetworkSplitEvent(type, map, network); default: - return 0; + return nullptr; } } - -NetworkEvent::NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network) +NetworkEvent::NetworkEvent(EventManager::EventType type, QVariantMap& map, Network* network) : Event(type, map) , _network(network) -{ -} +{} - -void NetworkEvent::toVariantMap(QVariantMap &map) const +void NetworkEvent::toVariantMap(QVariantMap& map) const { Event::toVariantMap(map); map["network"] = networkId().toInt(); } - -NetworkDataEvent::NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network) +NetworkDataEvent::NetworkDataEvent(EventManager::EventType type, QVariantMap& map, Network* network) : NetworkEvent(type, map, network) { _data = map.take("data").toByteArray(); } - -void NetworkDataEvent::toVariantMap(QVariantMap &map) const +void NetworkDataEvent::toVariantMap(QVariantMap& map) const { NetworkEvent::toVariantMap(map); map["data"] = data(); } - -NetworkConnectionEvent::NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network) +NetworkConnectionEvent::NetworkConnectionEvent(EventManager::EventType type, QVariantMap& map, Network* network) : NetworkEvent(type, map, network) { - _state = static_cast(map.take("state").toInt()); // FIXME: check enum plausibility + _state = static_cast(map.take("state").toInt()); // FIXME: check enum plausibility } - -void NetworkConnectionEvent::toVariantMap(QVariantMap &map) const +void NetworkConnectionEvent::toVariantMap(QVariantMap& map) const { NetworkEvent::toVariantMap(map); map["state"] = connectionState(); } - -NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network) +NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap& map, Network* network) : NetworkEvent(type, map, network) { _channel = map.take("channel").toString(); @@ -94,8 +86,7 @@ NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap & _quitMsg = map.take("quitMessage").toString(); } - -void NetworkSplitEvent::toVariantMap(QVariantMap &map) const +void NetworkSplitEvent::toVariantMap(QVariantMap& map) const { NetworkEvent::toVariantMap(map); map["channel"] = channel();