aboutsummaryrefslogtreecommitdiff
path: root/src/gui
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/gui
parentf83b4b191d627b010192e0715536cb57c25519fb (diff)
downloadkconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.gz
kconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.bz2
Prefer nullptr over Q_NULLPTR
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kconfiggui.cpp6
-rw-r--r--src/gui/kconfigloader.cpp2
-rw-r--r--src/gui/kconfigloader.h6
-rw-r--r--src/gui/kconfigskeleton.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp
index 67b6009a..6948b968 100644
--- a/src/gui/kconfiggui.cpp
+++ b/src/gui/kconfiggui.cpp
@@ -32,7 +32,7 @@ static QString configName(const QString &id, const QString &key)
QLatin1Char('_') + key);
}
-static KConfig *s_sessionConfig = Q_NULLPTR;
+static KConfig *s_sessionConfig = nullptr;
KConfig *KConfigGui::sessionConfig()
{
@@ -54,7 +54,7 @@ void KConfigGui::setSessionConfig(const QString &id, const QString &key)
{
if (hasSessionConfig()) {
delete s_sessionConfig;
- s_sessionConfig = Q_NULLPTR;
+ s_sessionConfig = nullptr;
}
// create a new instance specific config object from supplied id & key
@@ -64,7 +64,7 @@ void KConfigGui::setSessionConfig(const QString &id, const QString &key)
bool KConfigGui::hasSessionConfig()
{
- return s_sessionConfig != Q_NULLPTR;
+ return s_sessionConfig != nullptr;
}
#ifndef KDE_NO_DEPRECATED
diff --git a/src/gui/kconfigloader.cpp b/src/gui/kconfigloader.cpp
index 3121c3b7..e73b161b 100644
--- a/src/gui/kconfigloader.cpp
+++ b/src/gui/kconfigloader.cpp
@@ -196,7 +196,7 @@ void ConfigLoaderHandler::addItem()
m_name.remove(QLatin1Char(' '));
- KConfigSkeletonItem *item = Q_NULLPTR;
+ KConfigSkeletonItem *item = nullptr;
if (m_type == QStringLiteral("bool")) {
bool defaultValue = m_default.toLower() == QStringLiteral("true");
diff --git a/src/gui/kconfigloader.h b/src/gui/kconfigloader.h
index 341bdc4f..ffbd8e9b 100644
--- a/src/gui/kconfigloader.h
+++ b/src/gui/kconfigloader.h
@@ -109,7 +109,7 @@ public:
* @param xml the xml data; must be valid KConfigXT data
* @param parent optional QObject parent
**/
- KConfigLoader(const QString &configFile, QIODevice *xml, QObject *parent = Q_NULLPTR);
+ KConfigLoader(const QString &configFile, QIODevice *xml, QObject *parent = nullptr);
/**
* Creates a KConfigSkeleton populated using the definition found in
@@ -119,7 +119,7 @@ public:
* @param xml the xml data; must be valid KConfigXT data
* @param parent optional QObject parent
**/
- KConfigLoader(KSharedConfigPtr config, QIODevice *xml, QObject *parent = Q_NULLPTR);
+ KConfigLoader(KSharedConfigPtr config, QIODevice *xml, QObject *parent = nullptr);
/**
* Creates a KConfigSkeleton populated using the definition found in
@@ -129,7 +129,7 @@ public:
* @param xml the xml data; must be valid KConfigXT data
* @param parent optional QObject parent
**/
- KConfigLoader(const KConfigGroup &config, QIODevice *xml, QObject *parent = Q_NULLPTR);
+ KConfigLoader(const KConfigGroup &config, QIODevice *xml, QObject *parent = nullptr);
~KConfigLoader();
diff --git a/src/gui/kconfigskeleton.h b/src/gui/kconfigskeleton.h
index 6990a870..054f51f9 100644
--- a/src/gui/kconfigskeleton.h
+++ b/src/gui/kconfigskeleton.h
@@ -95,14 +95,14 @@ public:
* @param configname name of config file. If no name is given, the default
* config file as returned by KSharedConfig::openConfig() is used.
*/
- explicit KConfigSkeleton(const QString &configname = QString(), QObject *parent = Q_NULLPTR);
+ explicit KConfigSkeleton(const QString &configname = QString(), QObject *parent = nullptr);
/**
* Constructor.
*
* @param config configuration object to use.
*/
- explicit KConfigSkeleton(KSharedConfig::Ptr config, QObject *parent = Q_NULLPTR);
+ explicit KConfigSkeleton(KSharedConfig::Ptr config, QObject *parent = nullptr);
/**
* Register an item of type QColor.