projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3c455ae
..
82e7fd4
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-52,8
+52,8
@@
#include "util.h"
#include "clientauthhandler.h"
#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),
Client::Client(std::unique_ptr<AbstractUi> ui, QObject *parent)
: QObject(parent), Singleton<Client>(this),
@@
-222,7
+222,7
@@
void Client::coreNetworkCreated(NetworkId id)
qWarning() << "Creation of already existing network requested!";
return;
}
qWarning() << "Creation of already existing network requested!";
return;
}
-
Network
*net = new Network(id, this);
+
auto
*net = new Network(id, this);
addNetwork(net);
}
addNetwork(net);
}
@@
-283,7
+283,7
@@
void Client::removeIdentity(IdentityId id)
void Client::coreIdentityCreated(const Identity &other)
{
if (!_identities.contains(other.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);
_identities[other.id()] = identity;
identity->setInitialized();
signalProxy()->synchronize(identity);
@@
-557,7
+557,7
@@
void Client::setDisconnectedFromCore()
void Client::networkDestroyed()
{
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) {
QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
while (netIter != _networks.end()) {
if (*netIter == net) {
@@
-603,7
+603,7
@@
MsgId Client::markerLine(BufferId id)
{
if (id.isValid() && networkModel())
return networkModel()->markerLineMsgId(id);
{
if (id.isValid() && networkModel())
return networkModel()->markerLineMsgId(id);
- return
MsgId()
;
+ return
{}
;
}
}