X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcorenetwork.cpp;h=143760f8f9be616dd990bff0183e8e719c655638;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hp=2b8f131abf6fe58693a98e03b334d77880c0cf4a;hpb=94461212440b2eaeccdbbbb8a734782e8301280c;p=quassel.git

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 2b8f131a..143760f8 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -33,7 +33,6 @@
 // IRCv3 capabilities
 #include "irccap.h"
 
-INIT_SYNCABLE_OBJECT(CoreNetwork)
 CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session)
     : Network(networkid, session),
     _coreSession(session),
@@ -439,10 +438,10 @@ void CoreNetwork::removeChannelKey(const QString &channel)
 Cipher *CoreNetwork::cipher(const QString &target)
 {
     if (target.isEmpty())
-        return 0;
+        return nullptr;
 
     if (!Cipher::neededFeaturesAvailable())
-        return 0;
+        return nullptr;
 
     CoreIrcChannel *channel = qobject_cast<CoreIrcChannel *>(ircChannel(target));
     if (channel) {
@@ -454,7 +453,7 @@ Cipher *CoreNetwork::cipher(const QString &target)
     } else if (!isChannelName(target)) {
         return qobject_cast<CoreIrcUser*>(newIrcUser(target))->cipher();
     }
-    return 0;
+    return nullptr;
 }