modernize: Use C++ versions of system headers

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index b1e2f11..82e7fd4 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -52,8 +52,8 @@
 #include "util.h"
 #include "clientauthhandler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 Client::Client(std::unique_ptr<AbstractUi> ui, QObject *parent)
     : QObject(parent), Singleton<Client>(this),
@@ -61,26 +61,21 @@ Client::Client(std::unique_ptr<AbstractUi> ui, QObject *parent)
     _mainUi(std::move(ui)),
     _networkModel(new NetworkModel(this)),
     _bufferModel(new BufferModel(_networkModel)),
-    _bufferSyncer(0),
-    _aliasManager(0),
     _backlogManager(new ClientBacklogManager(this)),
-    _bufferViewManager(0),
     _bufferViewOverlay(new BufferViewOverlay(this)),
     _coreInfo(new CoreInfo(this)),
-    _dccConfig(0),
     _ircListHelper(new ClientIrcListHelper(this)),
     _inputHandler(new ClientUserInputHandler(this)),
-    _networkConfig(0),
-    _ignoreListManager(0),
-    _highlightRuleManager(0),
-    _transferManager(0),
     _transferModel(new TransferModel(this)),
     _messageModel(_mainUi->createMessageModel(this)),
     _messageProcessor(_mainUi->createMessageProcessor(this)),
     _coreAccountModel(new CoreAccountModel(this)),
-    _coreConnection(new CoreConnection(this)),
-    _connected(false)
+    _coreConnection(new CoreConnection(this))
 {
+#ifdef EMBED_DATA
+    Q_INIT_RESOURCE(data);
+#endif
+
     //connect(mainUi(), SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
     connect(mainUi(), SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
     connect(this, SIGNAL(connected()), mainUi(), SLOT(connectedToCore()));
@@ -183,7 +178,7 @@ QList<NetworkId> Client::networkIds()
 const Network *Client::network(NetworkId networkid)
 {
     if (instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
-    else return 0;
+    else return nullptr;
 }
 
 
@@ -227,7 +222,7 @@ void Client::coreNetworkCreated(NetworkId id)
         qWarning() << "Creation of already existing network requested!";
         return;
     }
-    Network *net = new Network(id, this);
+    auto *net = new Network(id, this);
     addNetwork(net);
 }
 
@@ -253,7 +248,7 @@ QList<IdentityId> Client::identityIds()
 const Identity *Client::identity(IdentityId id)
 {
     if (instance()->_identities.contains(id)) return instance()->_identities[id];
-    else return 0;
+    else return nullptr;
 }
 
 
@@ -288,7 +283,7 @@ void Client::removeIdentity(IdentityId id)
 void Client::coreIdentityCreated(const Identity &other)
 {
     if (!_identities.contains(other.id())) {
-        Identity *identity = new Identity(other, this);
+        auto *identity = new Identity(other, this);
         _identities[other.id()] = identity;
         identity->setInitialized();
         signalProxy()->synchronize(identity);
@@ -488,26 +483,26 @@ void Client::setDisconnectedFromCore()
 
     if (_bufferSyncer) {
         _bufferSyncer->deleteLater();
-        _bufferSyncer = 0;
+        _bufferSyncer = nullptr;
     }
 
     _coreInfo->reset();
 
     if (_bufferViewManager) {
         _bufferViewManager->deleteLater();
-        _bufferViewManager = 0;
+        _bufferViewManager = nullptr;
     }
 
     _bufferViewOverlay->reset();
 
     if (_aliasManager) {
         _aliasManager->deleteLater();
-        _aliasManager = 0;
+        _aliasManager = nullptr;
     }
 
     if (_ignoreListManager) {
         _ignoreListManager->deleteLater();
-        _ignoreListManager = 0;
+        _ignoreListManager = nullptr;
     }
 
     if (_highlightRuleManager) {
@@ -536,7 +531,7 @@ void Client::setDisconnectedFromCore()
     while (netIter != _networks.end()) {
         Network *net = netIter.value();
         emit networkRemoved(net->networkId());
-        disconnect(net, SIGNAL(destroyed()), this, 0);
+        disconnect(net, SIGNAL(destroyed()), this, nullptr);
         netIter = _networks.erase(netIter);
         net->deleteLater();
     }
@@ -553,7 +548,7 @@ void Client::setDisconnectedFromCore()
 
     if (_networkConfig) {
         _networkConfig->deleteLater();
-        _networkConfig = 0;
+        _networkConfig = nullptr;
     }
 }
 
@@ -562,7 +557,7 @@ void Client::setDisconnectedFromCore()
 
 void Client::networkDestroyed()
 {
-    Network *net = static_cast<Network *>(sender());
+    auto *net = static_cast<Network *>(sender());
     QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
     while (netIter != _networks.end()) {
         if (*netIter == net) {
@@ -608,7 +603,7 @@ MsgId Client::markerLine(BufferId id)
 {
     if (id.isValid() && networkModel())
         return networkModel()->markerLineMsgId(id);
-    return MsgId();
+    return {};
 }