X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.cpp;h=8bce68f4cc9ae1c71e7c6ea21a104c0bcd1b0d10;hp=c2745a8ea6e36b6561590266ef30c5fbe3f022cf;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=df48c9a36377de3c9e9deeaf539e1446ef7bd49b

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index c2745a8e..8bce68f4 100644
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -21,13 +21,12 @@
 #include "coreircchannel.h"
 #include "corenetwork.h"
 
-INIT_SYNCABLE_OBJECT(CoreIrcChannel)
 CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
     : IrcChannel(channelname, network),
     _receivedWelcomeMsg(false)
 {
 #ifdef HAVE_QCA2
-    _cipher = 0;
+    _cipher = nullptr;
 
     // Get the cipher key from CoreNetwork if present
     CoreNetwork *coreNetwork = qobject_cast<CoreNetwork *>(network);