From 2034e3ce7593f04d251b634bfe2d71b30f15ea3a Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 16 Jan 2017 18:17:34 +0100 Subject: Prefer nullptr over Q_NULLPTR --- src/core/kconfiggroup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/kconfiggroup.cpp') 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(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); -- cgit v1.2.1