X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkevent.cpp;h=a0b5b4ff08181ab265b6efd40d3697343e028e59;hp=394bfc9abc3f97efa18210fda4fe5b000b81e637;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf diff --git a/src/common/networkevent.cpp b/src/common/networkevent.cpp index 394bfc9a..a0b5b4ff 100644 --- a/src/common/networkevent.cpp +++ b/src/common/networkevent.cpp @@ -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();