X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircevent.cpp;h=dcff52a189e1317c3c957fcf3401a35252e963c5;hp=b9f7e45b97dba58ca985295e871e0f600f089fdb;hb=aec9c711900a443bfa7860fa86c6e9c86b81a3e7;hpb=6f38b6fdeb73e726c24b26a97b98c9cfe0fc8a0e

diff --git a/src/common/ircevent.cpp b/src/common/ircevent.cpp
index b9f7e45b..dcff52a1 100644
--- a/src/common/ircevent.cpp
+++ b/src/common/ircevent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -15,67 +15,71 @@
  *   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 "ircevent.h"
 
-Event *IrcEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) {
-  if((type & EventManager::IrcEventNumericMask) == EventManager::IrcEventNumeric)
-    return new IrcEventNumeric(type, map, network);
+Event *IrcEvent::create(EventManager::EventType type, QVariantMap &map, Network *network)
+{
+    if ((type & ~EventManager::IrcEventNumericMask) == EventManager::IrcEventNumeric)
+        return new IrcEventNumeric(type, map, network);
 
-  if((type & EventManager::EventGroupMask) != EventManager::IrcEvent)
-    return 0;
+    if ((type & EventManager::EventGroupMask) != EventManager::IrcEvent)
+        return 0;
 
-  switch(type) {
-  case EventManager::IrcEventRawPrivmsg:
-  case EventManager::IrcEventRawNotice:
-    return new IrcEventRawMessage(type, map, network);
+    switch (type) {
+    case EventManager::IrcEventRawPrivmsg:
+    case EventManager::IrcEventRawNotice:
+        return new IrcEventRawMessage(type, map, network);
 
-  default:
-    return new IrcEvent(type, map, network);
-  }
+    default:
+        return new IrcEvent(type, map, network);
+    }
 }
 
 
 IrcEvent::IrcEvent(EventManager::EventType type, QVariantMap &map, Network *network)
-  : NetworkEvent(type, map, network)
+    : NetworkEvent(type, map, network)
 {
-  _prefix = map.take("prefix").toString();
-  _params = map.take("params").toStringList();
+    _prefix = map.take("prefix").toString();
+    _params = map.take("params").toStringList();
 }
 
 
-void IrcEvent::toVariantMap(QVariantMap &map) const {
-  NetworkEvent::toVariantMap(map);
-  map["prefix"] = prefix();
-  map["params"] = params();
+void IrcEvent::toVariantMap(QVariantMap &map) const
+{
+    NetworkEvent::toVariantMap(map);
+    map["prefix"] = prefix();
+    map["params"] = params();
 }
 
 
 IrcEventNumeric::IrcEventNumeric(EventManager::EventType type, QVariantMap &map, Network *network)
-  : IrcEvent(type, map, network)
+    : IrcEvent(type, map, network)
 {
-  _number = map.take("number").toUInt();
-  _target = map.take("target").toString();
+    _number = map.take("number").toUInt();
+    _target = map.take("target").toString();
 }
 
 
-void IrcEventNumeric::toVariantMap(QVariantMap &map) const {
-  IrcEvent::toVariantMap(map);
-  map["number"] = number();
-  map["target"] = target();
+void IrcEventNumeric::toVariantMap(QVariantMap &map) const
+{
+    IrcEvent::toVariantMap(map);
+    map["number"] = number();
+    map["target"] = target();
 }
 
 
 IrcEventRawMessage::IrcEventRawMessage(EventManager::EventType type, QVariantMap &map, Network *network)
-  : IrcEvent(type, map, network)
+    : IrcEvent(type, map, network)
 {
-  _rawMessage = map.take("rawMessage").toByteArray();
+    _rawMessage = map.take("rawMessage").toByteArray();
 }
 
 
-void IrcEventRawMessage::toVariantMap(QVariantMap &map) const {
-  IrcEvent::toVariantMap(map);
-  map["rawMessage"] = rawMessage();
+void IrcEventRawMessage::toVariantMap(QVariantMap &map) const
+{
+    IrcEvent::toVariantMap(map);
+    map["rawMessage"] = rawMessage();
 }