projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix protocol spam on part/quit/disconnect
[quassel.git]
/
src
/
common
/
networkevent.cpp
diff --git
a/src/common/networkevent.cpp
b/src/common/networkevent.cpp
index
ec8947b
..
f3094de
100644
(file)
--- a/
src/common/networkevent.cpp
+++ b/
src/common/networkevent.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,7
+20,7
@@
#include "networkevent.h"
#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:
{
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 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)
: Event(type, map)
, _network(network)
-{
-}
+{}
-
-void NetworkEvent::toVariantMap(QVariantMap &map) const
+void NetworkEvent::toVariantMap(QVariantMap& map) const
{
Event::toVariantMap(map);
map["network"] = networkId().toInt();
}
{
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();
}
: 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();
}
{
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)
{
: 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
+void NetworkConnectionEvent::toVariantMap(QVariantMap& map) const
{
NetworkEvent::toVariantMap(map);
map["state"] = connectionState();
}
{
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();
: NetworkEvent(type, map, network)
{
_channel = map.take("channel").toString();
@@
-94,8
+86,7
@@
NetworkSplitEvent::NetworkSplitEvent(EventManager::EventType type, QVariantMap &
_quitMsg = map.take("quitMessage").toString();
}
_quitMsg = map.take("quitMessage").toString();
}
-
-void NetworkSplitEvent::toVariantMap(QVariantMap &map) const
+void NetworkSplitEvent::toVariantMap(QVariantMap& map) const
{
NetworkEvent::toVariantMap(map);
map["channel"] = channel();
{
NetworkEvent::toVariantMap(map);
map["channel"] = channel();