X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkevent.cpp;h=d824042dc8b403501c24788e6fdde5c3be5ad3b7;hp=1752b58606541260f2f42136a4eae63df1e8e8a3;hb=HEAD;hpb=6f38b6fdeb73e726c24b26a97b98c9cfe0fc8a0e

diff --git a/src/common/networkevent.cpp b/src/common/networkevent.cpp
index 1752b586..d824042d 100644
--- a/src/common/networkevent.cpp
+++ b/src/common/networkevent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -15,87 +15,81 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "networkevent.h"
 
-Event *NetworkEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) {
-  switch(type) {
-  case EventManager::NetworkIncoming:
-    return new NetworkDataEvent(type, map, network);
-
-  case EventManager::NetworkConnecting:
-  case EventManager::NetworkInitializing:
-  case EventManager::NetworkInitialized:
-  case EventManager::NetworkReconnecting:
-  case EventManager::NetworkDisconnecting:
-  case EventManager::NetworkDisconnected:
-    return new NetworkConnectionEvent(type, map, network);
-
-  case EventManager::NetworkSplitJoin:
-  case EventManager::NetworkSplitQuit:
-    return new NetworkSplitEvent(type, map, network);
-
-  default:
-    return 0;
-  }
-}
-
-
-NetworkEvent::NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network)
-  : Event(type, map)
-  , _network(network)
+Event* NetworkEvent::create(EventManager::EventType type, QVariantMap& map, Network* network)
 {
-
+    switch (type) {
+    case EventManager::NetworkIncoming:
+        return new NetworkDataEvent(type, map, network);
+
+    case EventManager::NetworkConnecting:
+    case EventManager::NetworkInitializing:
+    case EventManager::NetworkInitialized:
+    case EventManager::NetworkReconnecting:
+    case EventManager::NetworkDisconnecting:
+    case EventManager::NetworkDisconnected:
+        return new NetworkConnectionEvent(type, map, network);
+
+    case EventManager::NetworkSplitJoin:
+    case EventManager::NetworkSplitQuit:
+        return new NetworkSplitEvent(type, map, network);
+
+    default:
+        return nullptr;
+    }
 }
 
+NetworkEvent::NetworkEvent(EventManager::EventType type, QVariantMap& map, Network* network)
+    : Event(type, map)
+    , _network(network)
+{}
 
-void NetworkEvent::toVariantMap(QVariantMap &map) const {
-  Event::toVariantMap(map);
-  map["network"] = networkId().toInt();
+void NetworkEvent::toVariantMap(QVariantMap& map) const
+{
+    Event::toVariantMap(map);
+    map["network"] = networkId().toInt();
 }
 
-
-NetworkDataEvent::NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network)
-  : NetworkEvent(type, map, network)
+NetworkDataEvent::NetworkDataEvent(EventManager::EventType type, QVariantMap& map, Network* network)
+    : NetworkEvent(type, map, network)
 {
-  _data = map.take("data").toByteArray();
+    _data = map.take("data").toByteArray();
 }
 
-
-void NetworkDataEvent::toVariantMap(QVariantMap &map) const {
-  NetworkEvent::toVariantMap(map);
-  map["data"] = data();
+void NetworkDataEvent::toVariantMap(QVariantMap& map) const
+{
+    NetworkEvent::toVariantMap(map);
+    map["data"] = data();
 }
 
-
-NetworkConnectionEvent::NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network)
-  : NetworkEvent(type, map, network)
+NetworkConnectionEvent::NetworkConnectionEvent(EventManager::EventType type, QVariantMap& map, Network* network)
+    : NetworkEvent(type, map, network)
 {
-  _state = static_cast<Network::ConnectionState>(map.take("state").toInt()); // FIXME: check enum plausibility
+    _state = static_cast<Network::ConnectionState>(map.take("state").toInt());  // FIXME: check enum plausibility
 }
 
-
-void NetworkConnectionEvent::toVariantMap(QVariantMap &map) const {
-  NetworkEvent::toVariantMap(map);
-  map["state"] = connectionState();
+void NetworkConnectionEvent::toVariantMap(QVariantMap& map) const
+{
+    NetworkEvent::toVariantMap(map);
+    map["state"] = connectionState();
 }
 
-
-NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network)
-  : NetworkEvent(type, map, network)
+NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap& map, Network* network)
+    : NetworkEvent(type, map, network)
 {
-  _channel = map.take("channel").toString();
-  _users = map.take("users").toStringList();
-  _quitMsg = map.take("quitMessage").toString();
+    _channel = map.take("channel").toString();
+    _users = map.take("users").toStringList();
+    _quitMsg = map.take("quitMessage").toString();
 }
 
-
-void NetworkSplitEvent::toVariantMap(QVariantMap &map) const
+void NetworkSplitEvent::toVariantMap(QVariantMap& map) const
 {
-  NetworkEvent::toVariantMap(map);
-  map["channel"] = channel();
-  map["users"] = users();
-  map["quitMessage"] = quitMessage();
+    NetworkEvent::toVariantMap(map);
+    map["channel"] = channel();
+    map["users"] = users();
+    map["quitMessage"] = quitMessage();
 }