diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-01-16 09:44:17 +0100 | 
|---|---|---|
| committer | Kevin Funk <kfunk@kde.org> | 2017-01-16 09:44:17 +0100 | 
| commit | f83b4b191d627b010192e0715536cb57c25519fb (patch) | |
| tree | 411f9ae566f1a6ca7cd87e769d782842f29ff72e /src/core | |
| parent | f7ef172c32a7e17e5e3b24cafa5da1e95502b9e4 (diff) | |
| download | kconfig-f83b4b191d627b010192e0715536cb57c25519fb.tar.gz kconfig-f83b4b191d627b010192e0715536cb57c25519fb.tar.bz2 | |
Use nullptr everywhere
Differential Revision: https://phabricator.kde.org/D3987
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kconfig.cpp | 6 | ||||
| -rw-r--r-- | src/core/kconfiggroup.cpp | 2 | ||||
| -rw-r--r-- | src/core/kconfigini.cpp | 4 | 
3 files changed, 6 insertions, 6 deletions
| diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index ad52da9b..e0e73b8b 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -390,7 +390,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, 0, 0); +    KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, nullptr, nullptr);      if (it != theEnd) {          ++it; // advance past the special group entry marker @@ -833,7 +833,7 @@ bool KConfig::isImmutable() const  bool KConfig::isGroupImmutableImpl(const QByteArray &aGroup) const  {      Q_D(const KConfig); -    return isImmutable() || d->entryMap.getEntryOption(aGroup, 0, 0, KEntryMap::EntryImmutable); +    return isImmutable() || d->entryMap.getEntryOption(aGroup, nullptr, nullptr, KEntryMap::EntryImmutable);  }  #ifndef KDE_NO_DEPRECATED @@ -864,7 +864,7 @@ const KConfigGroup KConfig::groupImpl(const QByteArray &group) const  KEntryMap::EntryOptions convertToOptions(KConfig::WriteConfigFlags flags)  { -    KEntryMap::EntryOptions options = 0; +    KEntryMap::EntryOptions options = nullptr;      if (flags & KConfig::Persistent) {          options |= KEntryMap::EntryDirty; diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index 700e579c..8cee2474 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -653,7 +653,7 @@ QString KConfigGroup::readEntryUntranslated(const char *key, const QString &aDef  {      Q_ASSERT_X(isValid(), "KConfigGroup::readEntryUntranslated", "accessing an invalid group"); -    QString result = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchFlags(), 0); +    QString result = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchFlags(), nullptr);      if (result.isNull()) {          return aDefault;      } diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp index 3d0af962..d4262778 100644 --- a/src/core/kconfigini.cpp +++ b/src/core/kconfigini.cpp @@ -166,7 +166,7 @@ KConfigIniBackend::parseConfig(const QByteArray ¤tLocale, KEntryMap &entry              } while ((start = end + 2) <= line.length() && line.at(end + 1) == '[');              currentGroup = newGroup; -            groupSkip = entryMap.getEntryOption(currentGroup, 0, 0, KEntryMap::EntryImmutable); +            groupSkip = entryMap.getEntryOption(currentGroup, nullptr, nullptr, KEntryMap::EntryImmutable);              if (groupSkip && !bDefault) {                  continue; @@ -199,7 +199,7 @@ KConfigIniBackend::parseConfig(const QByteArray ¤tLocale, KEntryMap &entry                  continue;              } -            KEntryMap::EntryOptions entryOptions = 0; +            KEntryMap::EntryOptions entryOptions = nullptr;              if (groupOptionImmutable) {                  entryOptions |= KEntryMap::EntryImmutable;              } | 
