[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdecore/config
From: Michael Jansen <kde () michael-jansen ! biz>
Date: 2009-02-25 22:01:20
Message-ID: 1235599280.349912.2988.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 931880 by mjansen:
Fix my last commit. Bring back the test for "<default>" and $Version group in \
groupList.
M +6 -6 kconfig.cpp
--- trunk/KDE/kdelibs/kdecore/config/kconfig.cpp #931879:931880
@@ -215,12 +215,13 @@
Q_D(const KConfig);
QSet<QString> groups;
- for (KEntryMap::ConstIterator entryMapIt( d->entryMap.constBegin() ); entryMapIt \
!= d->entryMap.constEnd(); ++entryMapIt)
- if (entryMapIt.key().mKey.isNull())
- {
- QString groupname = QString::fromUtf8(entryMapIt.key().mGroup);
+ for (KEntryMap::ConstIterator entryMapIt( d->entryMap.constBegin() ); entryMapIt \
!= d->entryMap.constEnd(); ++entryMapIt) { + const QByteArray group = \
entryMapIt.key().mGroup; + if (entryMapIt.key().mKey.isNull() && \
!group.isEmpty() && group != "<default>" && group != "$Version") { + \
QString groupname = QString::fromUtf8(group); groups << \
groupname.left(groupname.indexOf('\x1d')); }
+ }
return groups.toList();
}
@@ -231,8 +232,7 @@
QSet<QString> groups;
for (KEntryMap::ConstIterator entryMapIt( entryMap.constBegin() ); entryMapIt != \
entryMap.constEnd(); ++entryMapIt)
- if (entryMapIt.key().mKey.isNull() && \
entryMapIt.key().mGroup.startsWith(theGroup))
- {
+ if (entryMapIt.key().mKey.isNull() && \
entryMapIt.key().mGroup.startsWith(theGroup)) {
QString groupname = \
QString::fromUtf8(entryMapIt.key().mGroup.mid(theGroup.length())); groups << \
groupname.left(groupname.indexOf('\x1d')); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic