aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2019-12-04 13:10:04 +0100
committerLaurent Montel <montel@kde.org>2019-12-04 13:10:32 +0100
commit991d8de6ad84d19392b84c2c1c21b1da01b13569 (patch)
tree9343624ff5f62c60c1acb0ee7afbb3725063cdb0 /src
parent719920708b696ef5a5dbc3360672fb0c4cc282e4 (diff)
downloadkconfig-991d8de6ad84d19392b84c2c1c21b1da01b13569.tar.gz
kconfig-991d8de6ad84d19392b84c2c1c21b1da01b13569.tar.bz2
Don't use nullptr as flag. Make it compile against qt5.15
Diffstat (limited to 'src')
-rw-r--r--src/core/kconfig.cpp6
-rw-r--r--src/core/kconfigini.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index 140872b0..21f576b2 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -379,7 +379,7 @@ QMap<QString, QString> KConfig::entryMap(const QString &aGroup) const
const QByteArray theGroup(aGroup.isEmpty() ? "<default>" : aGroup.toUtf8());
const KEntryMapConstIterator theEnd = d->entryMap.constEnd();
- KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, nullptr, nullptr);
+ KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, {}, {});
if (it != theEnd) {
++it; // advance past the special group entry marker
@@ -858,7 +858,7 @@ bool KConfig::isImmutable() const
bool KConfig::isGroupImmutableImpl(const QByteArray &aGroup) const
{
Q_D(const KConfig);
- return isImmutable() || d->entryMap.getEntryOption(aGroup, nullptr, nullptr, KEntryMap::EntryImmutable);
+ return isImmutable() || d->entryMap.getEntryOption(aGroup, {},{}, KEntryMap::EntryImmutable);
}
#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(4, 0)
@@ -889,7 +889,7 @@ const KConfigGroup KConfig::groupImpl(const QByteArray &group) const
KEntryMap::EntryOptions convertToOptions(KConfig::WriteConfigFlags flags)
{
- KEntryMap::EntryOptions options = nullptr;
+ KEntryMap::EntryOptions options = {};
if (flags & KConfig::Persistent) {
options |= KEntryMap::EntryDirty;
diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp
index 798ce571..4b3123eb 100644
--- a/src/core/kconfigini.cpp
+++ b/src/core/kconfigini.cpp
@@ -167,7 +167,7 @@ KConfigIniBackend::parseConfig(const QByteArray &currentLocale, KEntryMap &entry
} while ((start = end + 2) <= line.length() && line.at(end + 1) == '[');
currentGroup = newGroup;
- groupSkip = entryMap.getEntryOption(currentGroup, nullptr, nullptr, KEntryMap::EntryImmutable);
+ groupSkip = entryMap.getEntryOption(currentGroup, {}, {}, KEntryMap::EntryImmutable);
if (groupSkip && !bDefault) {
continue;
@@ -201,7 +201,7 @@ KConfigIniBackend::parseConfig(const QByteArray &currentLocale, KEntryMap &entry
continue;
}
- KEntryMap::EntryOptions entryOptions = nullptr;
+ KEntryMap::EntryOptions entryOptions = {};
if (groupOptionImmutable) {
entryOptions |= KEntryMap::EntryImmutable;
}