X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=f76cd30e21f1efeb101a76aca523fadbd8db3351;hp=f2a8e1fa5cd0c44fc2c71ae6555fdb227269cc3d;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=ce221dcdce9f39596adf115b05057023c31bde4e

diff --git a/src/common/network.cpp b/src/common/network.cpp
index f2a8e1fa..f76cd30e 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -25,17 +25,17 @@
 #include "network.h"
 #include "peer.h"
 
-QTextCodec *Network::_defaultCodecForServer = 0;
-QTextCodec *Network::_defaultCodecForEncoding = 0;
-QTextCodec *Network::_defaultCodecForDecoding = 0;
+QTextCodec *Network::_defaultCodecForServer = nullptr;
+QTextCodec *Network::_defaultCodecForEncoding = nullptr;
+QTextCodec *Network::_defaultCodecForDecoding = nullptr;
 
 // ====================
 //  Public:
 // ====================
-INIT_SYNCABLE_OBJECT(Network)
+
 Network::Network(const NetworkId &networkid, QObject *parent)
     : SyncableObject(parent),
-    _proxy(0),
+    _proxy(nullptr),
     _networkId(networkid),
     _identity(0),
     _myNick(QString()),
@@ -57,9 +57,9 @@ Network::Network(const NetworkId &networkid, QObject *parent)
     _messageRateBurstSize(5),
     _messageRateDelay(2200),
     _unlimitedMessageRate(false),
-    _codecForServer(0),
-    _codecForEncoding(0),
-    _codecForDecoding(0),
+    _codecForServer(nullptr),
+    _codecForEncoding(nullptr),
+    _codecForDecoding(nullptr),
     _autoAwayActive(false)
 {
     setObjectName(QString::number(networkid.toInt()));
@@ -340,7 +340,7 @@ IrcUser *Network::ircUser(QString nickname) const
     if (_ircUsers.contains(nickname))
         return _ircUsers[nickname];
     else
-        return 0;
+        return nullptr;
 }
 
 
@@ -351,7 +351,7 @@ void Network::removeIrcUser(IrcUser *ircuser)
         return;
 
     _ircUsers.remove(nick);
-    disconnect(ircuser, 0, this, 0);
+    disconnect(ircuser, nullptr, this, nullptr);
     ircuser->deleteLater();
 }
 
@@ -363,7 +363,7 @@ void Network::removeIrcChannel(IrcChannel *channel)
         return;
 
     _ircChannels.remove(chanName);
-    disconnect(channel, 0, this, 0);
+    disconnect(channel, nullptr, this, nullptr);
     channel->deleteLater();
 }
 
@@ -410,7 +410,7 @@ IrcChannel *Network::ircChannel(QString channelname) const
     if (_ircChannels.contains(channelname))
         return _ircChannels[channelname];
     else
-        return 0;
+        return nullptr;
 }