summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-13 07:05:01 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:29 +0100
commitc9c85ad3597a59fece0a6267b036adeb048b8f33 (patch)
tree2da7be17308b283c89d0f1320201fdbf3c011d42
parentf0f01f645835a5d04508357439c0637a03472adf (diff)
USe some nullptr
-rw-r--r--libkopete/chatsessionmemberslistmodel.cpp2
-rw-r--r--libkopete/kopetecontactlist.cpp6
-rw-r--r--libkopete/kopeteidentitymanager.cpp2
-rw-r--r--libkopete/kopetemessagehandlerchain.cpp2
4 files changed, 5 insertions, 7 deletions
diff --git a/libkopete/chatsessionmemberslistmodel.cpp b/libkopete/chatsessionmemberslistmodel.cpp
index 178970f..8e8a89f 100644
--- a/libkopete/chatsessionmemberslistmodel.cpp
+++ b/libkopete/chatsessionmemberslistmodel.cpp
@@ -256,7 +256,7 @@ void ChatSessionMembersListModel::slotSessionClosed()
{
if (d->session) {
disconnect(d->session, 0, this, 0);
- d->session = 0;
+ d->session = nullptr;
reset();
}
}
diff --git a/libkopete/kopetecontactlist.cpp b/libkopete/kopetecontactlist.cpp
index 96fad3a..d1f2fae 100644
--- a/libkopete/kopetecontactlist.cpp
+++ b/libkopete/kopetecontactlist.cpp
@@ -191,11 +191,9 @@ Group *ContactList::findGroup(const QString &displayName, int type)
{
if (type == Group::Temporary) {
return Group::temporary();
- }
- if (type == Group::TopLevel) {
+ } else if (type == Group::TopLevel) {
return Group::topLevel();
- }
- if (type == Group::Offline) {
+ } else if (type == Group::Offline) {
return Group::offline();
}
diff --git a/libkopete/kopeteidentitymanager.cpp b/libkopete/kopeteidentitymanager.cpp
index e78b060..8f10105 100644
--- a/libkopete/kopeteidentitymanager.cpp
+++ b/libkopete/kopeteidentitymanager.cpp
@@ -186,7 +186,7 @@ void IdentityManager::removeIdentity(Identity *identity)
configgroup->deleteGroup();
configgroup->sync();
if (d->defaultIdentity == identity) {
- d->defaultIdentity = 0;
+ d->defaultIdentity = nullptr;
}
delete identity;
}
diff --git a/libkopete/kopetemessagehandlerchain.cpp b/libkopete/kopetemessagehandlerchain.cpp
index e0670e6..248d314 100644
--- a/libkopete/kopetemessagehandlerchain.cpp
+++ b/libkopete/kopetemessagehandlerchain.cpp
@@ -47,7 +47,7 @@ public:
class MessageHandlerChain::Private
{
public:
- Private() : first(0)
+ Private() : first(nullptr)
{
}