3 files changed, 19 insertions, 13 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index ab6ac5c5..7f53847f 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -332,8 +332,8 @@ QStringList KConfigPrivate::keyListImpl(const QByteArray &theGroup) const
 {
     QStringList keys;
 
-    const KEntryMapConstIterator theEnd = entryMap.constEnd();
-    KEntryMapConstIterator it = entryMap.findEntry(theGroup);
+    const auto theEnd = entryMap.constEnd();
+    auto it = entryMap.constFindEntry(theGroup);
     if (it != theEnd) {
         ++it; // advance past the special group entry marker
 
@@ -363,8 +363,8 @@ QMap<QString, QString> KConfig::entryMap(const QString &aGroup) const
     QMap<QString, QString> theMap;
     const QByteArray theGroup(aGroup.isEmpty() ? "<default>" : aGroup.toUtf8());
 
-    const KEntryMapConstIterator theEnd = d->entryMap.constEnd();
-    KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, {}, {});
+    const auto theEnd = d->entryMap.constEnd();
+    auto it = d->entryMap.constFindEntry(theGroup, {}, {});
     if (it != theEnd) {
         ++it; // advance past the special group entry marker
 
@@ -981,7 +981,7 @@ QByteArray KConfigPrivate::lookupData(const QByteArray &group, const char *key,
     if (bReadDefaults) {
         flags |= KEntryMap::SearchDefaults;
     }
-    const KEntryMapConstIterator it = entryMap.findEntry(group, key, flags);
+    const auto it = entryMap.constFindEntry(group, key, flags);
     if (it == entryMap.constEnd()) {
         return QByteArray();
     }
diff --git a/src/core/kconfigdata.cpp b/src/core/kconfigdata.cpp
index accf869b..5a785c45 100644
--- a/src/core/kconfigdata.cpp
+++ b/src/core/kconfigdata.cpp
@@ -48,7 +48,7 @@ QMap<KEntryKey, KEntry>::Iterator KEntryMap::findEntry(const QByteArray &group,
     return find(theKey);
 }
 
-QMap<KEntryKey, KEntry>::ConstIterator KEntryMap::findEntry(const QByteArray &group, const QByteArray &key, KEntryMap::SearchFlags flags) const
+QMap<KEntryKey, KEntry>::ConstIterator KEntryMap::constFindEntry(const QByteArray &group, const QByteArray &key, SearchFlags flags) const
 {
     KEntryKey theKey(group, key, false, bool(flags & SearchDefaults));
 
@@ -56,14 +56,15 @@ QMap<KEntryKey, KEntry>::ConstIterator KEntryMap::findEntry(const QByteArray &gr
     if (flags & SearchLocalized) {
         theKey.bLocal = true;
 
-        ConstIterator it = find(theKey);
-        if (it != constEnd()) {
+        auto it = constFind(theKey);
+        if (it != cend()) {
             return it;
         }
 
         theKey.bLocal = false;
     }
-    return find(theKey);
+
+    return constFind(theKey);
 }
 
 bool KEntryMap::setEntry(const QByteArray &group, const QByteArray &key, const QByteArray &value, KEntryMap::EntryOptions options)
@@ -105,7 +106,7 @@ bool KEntryMap::setEntry(const QByteArray &group, const QByteArray &key, const Q
     } else {
         // make sure the group marker is in the map
         KEntryMap const *that = this;
-        ConstIterator cit = that->findEntry(group);
+        auto cit = that->constFindEntry(group);
         if (cit == constEnd()) {
             insert(KEntryKey(group), KEntry());
         } else if (cit->bImmutable) {
@@ -212,7 +213,7 @@ bool KEntryMap::setEntry(const QByteArray &group, const QByteArray &key, const Q
 
 QString KEntryMap::getEntry(const QByteArray &group, const QByteArray &key, const QString &defaultValue, KEntryMap::SearchFlags flags, bool *expand) const
 {
-    const ConstIterator it = findEntry(group, key, flags);
+    const auto it = constFindEntry(group, key, flags);
     QString theValue = defaultValue;
 
     if (it != constEnd() && !it->bDeleted) {
@@ -230,7 +231,7 @@ QString KEntryMap::getEntry(const QByteArray &group, const QByteArray &key, cons
 
 bool KEntryMap::hasEntry(const QByteArray &group, const QByteArray &key, KEntryMap::SearchFlags flags) const
 {
-    const ConstIterator it = findEntry(group, key, flags);
+    const auto it = constFindEntry(group, key, flags);
     if (it == constEnd()) {
         return false;
     }
diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h
index afa18877..dd396fc8 100644
--- a/src/core/kconfigdata.h
+++ b/src/core/kconfigdata.h
@@ -192,7 +192,12 @@ public:
 
     Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags());
 
-    ConstIterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const;
+    ConstIterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const
+    {
+        return constFindEntry(group, key, flags);
+    }
+
+    ConstIterator constFindEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const;
 
     /**
      * Returns true if the entry gets dirtied or false in other case