SVN commit 1008084 by coates: Add const overload version of isImmutable and findItem. See http://reviewboard.kde.org/r/1233/ M +10 -0 kcoreconfigskeleton.cpp M +14 -0 kcoreconfigskeleton.h --- trunk/KDE/kdelibs/kdecore/config/kcoreconfigskeleton.cpp #1008083:1008084 @@ -1295,12 +1295,22 @@ bool KCoreConfigSkeleton::isImmutable(const QString &name) { + return const_cast(this)->isImmutable(name); +} + +bool KCoreConfigSkeleton::isImmutable(const QString &name) const +{ KConfigSkeletonItem *item = findItem(name); return !item || item->isImmutable(); } KConfigSkeletonItem *KCoreConfigSkeleton::findItem(const QString &name) { + return const_cast(this)->findItem(name); +} + +KConfigSkeletonItem *KCoreConfigSkeleton::findItem(const QString &name) const +{ return d->mItemDict.value(name); } --- trunk/KDE/kdelibs/kdecore/config/kcoreconfigskeleton.h #1008083:1008084 @@ -1324,17 +1324,31 @@ */ KConfigSkeletonItem::List items() const; + // KDE5 TODO: Remove this non-const version. Kept only for BC. /** * Return whether a certain item is immutable */ bool isImmutable(const QString & name); /** + * Return whether a certain item is immutable + * @since 4.4 + */ + bool isImmutable(const QString & name) const; + + // KDE5 TODO: Remove this non-const version. Kept only for BC. + /** * Lookup item by name */ KConfigSkeletonItem * findItem(const QString & name); /** + * Lookup item by name + * @since 4.4 + */ + KConfigSkeletonItem * findItem(const QString & name) const; + + /** * Specify whether this object should reflect the actual values or the * default values. * This method is implemented by usrUseDefaults(), which can be overridden