Prefer nullptr over Q_NULLPTR

11 files changed, 16 insertions, 16 deletions

diff --git a/src/core/bufferfragment_p.h b/src/core/bufferfragment_p.h
index a86e2922..bbc09a2b 100644
--- a/src/core/bufferfragment_p.h
+++ b/src/core/bufferfragment_p.h
@@ -40,7 +40,7 @@ class KConfigIniBackend::BufferFragment
 
 public:
 
-    BufferFragment() : d(Q_NULLPTR), len(0)
+    BufferFragment() : d(nullptr), len(0)
     {
     }
 
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index e0e73b8b..acc7a761 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -68,7 +68,7 @@ static const Qt::CaseSensitivity sPathCaseSensitivity = Qt::CaseInsensitive;
 
 KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
                                QStandardPaths::StandardLocation resourceType)
-    : openFlags(flags), resourceType(resourceType), mBackend(Q_NULLPTR),
+    : openFlags(flags), resourceType(resourceType), mBackend(nullptr),
       bDynamicBackend(true),  bDirty(false), bReadDefaults(false),
       bFileImmutable(false), bForceGlobal(false), bSuppressGlobal(false),
       configState(KConfigBase::NoAccess)
diff --git a/src/core/kconfig.h b/src/core/kconfig.h
index 6cc73235..ab148b3e 100644
--- a/src/core/kconfig.h
+++ b/src/core/kconfig.h
@@ -216,7 +216,7 @@ public:
      *
      * @return @p config if it was set, otherwise a new KConfig object
      */
-    KConfig *copyTo(const QString &file, KConfig *config = Q_NULLPTR) const;
+    KConfig *copyTo(const QString &file, KConfig *config = nullptr) const;
 
     /**
      * Ensures that the configuration file contains a certain update.
diff --git a/src/core/kconfigbackend.cpp b/src/core/kconfigbackend.cpp
index 9befdf36..32b43194 100644
--- a/src/core/kconfigbackend.cpp
+++ b/src/core/kconfigbackend.cpp
@@ -55,7 +55,7 @@ void KConfigBackend::registerMappings(const KEntryMap & /*entryMap*/)
 BackendPtr KConfigBackend::create(const QString &file, const QString &sys)
 {
     //qDebug() << "creating a backend for file" << file << "with system" << sys;
-    KConfigBackend *backend = Q_NULLPTR;
+    KConfigBackend *backend = nullptr;
 
 #if 0 // TODO port to Qt5 plugin loading
     const QString system = (sys.isEmpty() ? KConfigBackendPrivate::whatSystem(file) : sys);
@@ -65,7 +65,7 @@ BackendPtr KConfigBackend::create(const QString &file, const QString &sys)
 
         //qDebug() << "found" << offers.count() << "offers for KConfigBackend plugins with name" << system;
         foreach (const KService::Ptr &offer, offers) {
-            backend = offer->createInstance<KConfigBackend>(Q_NULLPTR);
+            backend = offer->createInstance<KConfigBackend>(nullptr);
             if (backend) {
                 //qDebug() << "successfully created a backend for" << system;
                 backend->setFilePath(file);
diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h
index 4dd2fa77..5839dfd4 100644
--- a/src/core/kconfigdata.h
+++ b/src/core/kconfigdata.h
@@ -203,7 +203,7 @@ public:
     QString getEntry(const QByteArray &group, const QByteArray &key,
                      const QString &defaultValue = QString(),
                      SearchFlags flags = SearchFlags(),
-                     bool *expand = Q_NULLPTR) const;
+                     bool *expand = nullptr) const;
 
     bool hasEntry(const QByteArray &group, const QByteArray &key = QByteArray(),
                   SearchFlags flags = SearchFlags()) const;
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);
 
diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h
index 57dd5ad9..ed350566 100644
--- a/src/core/kconfiggroup.h
+++ b/src/core/kconfiggroup.h
@@ -280,9 +280,9 @@ public:
     QString readEntry(const char *key, const QString &aDefault) const;
 
     /** Overload for readEntry(const QString&, const QString&) */
-    QString readEntry(const QString &key, const char *aDefault = Q_NULLPTR) const;
+    QString readEntry(const QString &key, const char *aDefault = nullptr) const;
     /** Overload for readEntry(const QString&, const QString&) */
-    QString readEntry(const char *key, const char *aDefault = Q_NULLPTR) const;
+    QString readEntry(const char *key, const char *aDefault = nullptr) const;
 
     /**
      * @copydoc readEntry(const char*, const QStringList&) const
diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp
index d4262778..6ae6345a 100644
--- a/src/core/kconfigini.cpp
+++ b/src/core/kconfigini.cpp
@@ -61,7 +61,7 @@ QString KConfigIniBackend::warningProlog(const QFile &file, int line)
 }
 
 KConfigIniBackend::KConfigIniBackend()
-    : KConfigBackend(), lockFile(Q_NULLPTR)
+    : KConfigBackend(), lockFile(nullptr)
 {
 }
 
@@ -640,7 +640,7 @@ void KConfigIniBackend::unlock()
 {
     lockFile->unlock();
     delete lockFile;
-    lockFile = Q_NULLPTR;
+    lockFile = nullptr;
 }
 
 bool KConfigIniBackend::isLocked() const
diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h
index ea17c7cc..b428708e 100644
--- a/src/core/kcoreconfigskeleton.h
+++ b/src/core/kcoreconfigskeleton.h
@@ -1006,7 +1006,7 @@ public:
      *                   config file as returned by KSharedConfig::openConfig() is used
      * @param parent the parent object (see QObject documentation)
      */
-    explicit KCoreConfigSkeleton(const QString &configname = QString(), QObject *parent = Q_NULLPTR);
+    explicit KCoreConfigSkeleton(const QString &configname = QString(), QObject *parent = nullptr);
 
     /**
      * Constructor.
@@ -1014,7 +1014,7 @@ public:
      * @param config configuration object to use
      * @param parent the parent object (see QObject documentation)
      */
-    explicit KCoreConfigSkeleton(KSharedConfig::Ptr config, QObject *parent = Q_NULLPTR);
+    explicit KCoreConfigSkeleton(KSharedConfig::Ptr config, QObject *parent = nullptr);
 
     /**
      * Destructor
diff --git a/src/core/kemailsettings.cpp b/src/core/kemailsettings.cpp
index 527ef16c..64a060c5 100644
--- a/src/core/kemailsettings.cpp
+++ b/src/core/kemailsettings.cpp
@@ -32,7 +32,7 @@
 class KEMailSettingsPrivate
 {
 public:
-    KEMailSettingsPrivate() : m_pConfig(Q_NULLPTR) {}
+    KEMailSettingsPrivate() : m_pConfig(nullptr) {}
     ~KEMailSettingsPrivate()
     {
         delete m_pConfig;
diff --git a/src/core/ksharedconfig.cpp b/src/core/ksharedconfig.cpp
index c2997e9d..8c9cad8d 100644
--- a/src/core/ksharedconfig.cpp
+++ b/src/core/ksharedconfig.cpp
@@ -87,7 +87,7 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString &_fileName,
     if (!list->wasTestModeEnabled && QStandardPaths::isTestModeEnabled()) {
         list->wasTestModeEnabled = true;
         list->clear();
-        list->mainConfig = Q_NULLPTR;
+        list->mainConfig = nullptr;
     }
 
     foreach (auto cfg, *static_cast<const GlobalSharedConfigList*>(list)) {