aboutsummaryrefslogtreecommitdiff
path: root/src/core/kconfiggroup.cpp
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-01-16 18:17:34 +0100
committerKevin Funk <kfunk@kde.org>2017-01-16 18:17:34 +0100
commit2034e3ce7593f04d251b634bfe2d71b30f15ea3a (patch)
tree9f96f54eca16f8a552f09f130ac248c8e35557b7 /src/core/kconfiggroup.cpp
parentf83b4b191d627b010192e0715536cb57c25519fb (diff)
downloadkconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.gz
kconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.bz2
Prefer nullptr over Q_NULLPTR
Diffstat (limited to 'src/core/kconfiggroup.cpp')
-rw-r--r--src/core/kconfiggroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp
index 8cee2474..2959692e 100644
--- a/src/core/kconfiggroup.cpp
+++ b/src/core/kconfiggroup.cpp
@@ -1243,7 +1243,7 @@ bool KConfigGroup::isGroupImmutableImpl(const QByteArray &b) const
void KConfigGroup::copyTo(KConfigBase *other, WriteConfigFlags pFlags) const
{
Q_ASSERT_X(isValid(), "KConfigGroup::copyTo", "accessing an invalid group");
- Q_ASSERT(other != Q_NULLPTR);
+ Q_ASSERT(other != nullptr);
if (KConfigGroup *otherGroup = dynamic_cast<KConfigGroup *>(other)) {
config()->d_func()->copyGroup(d->fullName(), otherGroup->d->fullName(), otherGroup, pFlags);
@@ -1260,7 +1260,7 @@ void KConfigGroup::reparent(KConfigBase *parent, WriteConfigFlags pFlags)
Q_ASSERT_X(isValid(), "KConfigGroup::reparent", "accessing an invalid group");
Q_ASSERT_X(!d->bConst, "KConfigGroup::reparent", "reparenting a read-only group");
Q_ASSERT_X(!d->bImmutable, "KConfigGroup::reparent", "reparenting an immutable group");
- Q_ASSERT(parent != Q_NULLPTR);
+ Q_ASSERT(parent != nullptr);
KConfigGroup oldGroup(*this);