projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
funchelpers: Support traits for non-member functions
[quassel.git]
/
src
/
common
/
ctcpevent.cpp
diff --git
a/src/common/ctcpevent.cpp
b/src/common/ctcpevent.cpp
index
099627b
..
fab8c8b
100644
(file)
--- a/
src/common/ctcpevent.cpp
+++ b/
src/common/ctcpevent.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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,16
+20,15
@@
#include "ctcpevent.h"
#include "ctcpevent.h"
-Event
*CtcpEvent::create(EventManager::EventType type, QVariantMap &map, Network *
network)
+Event
* CtcpEvent::create(EventManager::EventType type, QVariantMap& map, Network*
network)
{
if (type == EventManager::CtcpEvent || type == EventManager::CtcpEventFlush)
return new CtcpEvent(type, map, network);
{
if (type == EventManager::CtcpEvent || type == EventManager::CtcpEventFlush)
return new CtcpEvent(type, map, network);
- return
0
;
+ return
nullptr
;
}
}
-
-CtcpEvent::CtcpEvent(EventManager::EventType type, QVariantMap &map, Network *network)
+CtcpEvent::CtcpEvent(EventManager::EventType type, QVariantMap& map, Network* network)
: IrcEvent(type, map, network)
{
_ctcpType = static_cast<CtcpType>(map.take("ctcpType").toInt());
: IrcEvent(type, map, network)
{
_ctcpType = static_cast<CtcpType>(map.take("ctcpType").toInt());
@@
-40,8
+39,7
@@
CtcpEvent::CtcpEvent(EventManager::EventType type, QVariantMap &map, Network *ne
_uuid = map.take("uuid").toString();
}
_uuid = map.take("uuid").toString();
}
-
-void CtcpEvent::toVariantMap(QVariantMap &map) const
+void CtcpEvent::toVariantMap(QVariantMap& map) const
{
IrcEvent::toVariantMap(map);
map["ctcpType"] = ctcpType();
{
IrcEvent::toVariantMap(map);
map["ctcpType"] = ctcpType();