diff options
| author | Nate Graham <nate@kde.org> | 2021-05-25 07:59:30 -0600 |
|---|---|---|
| committer | Nate Graham <nate@kde.org> | 2021-05-25 07:59:30 -0600 |
| commit | 4c590ede2cef74342aaf25eea9a32ee96c78b1aa (patch) | |
| tree | 2da15a4dabb77bfa6b1a1838a52a2a91a2ec8092 | |
| parent | b3dc879e8b108c26c929bfbe551bcdf77f140e94 (diff) | |
| download | kconfig-4c590ede2cef74342aaf25eea9a32ee96c78b1aa.tar.gz kconfig-4c590ede2cef74342aaf25eea9a32ee96c78b1aa.tar.bz2 | |
Revert "fix deleted group is in listGroups"
This reverts commit b3dc879e8b108c26c929bfbe551bcdf77f140e94.
This change breaks plasmashell startup and possible other apps as well.
Reverting so the root cause can be investigated without time pressure.
| -rw-r--r-- | autotests/kconfigtest.cpp | 2 | ||||
| -rw-r--r-- | src/core/kconfig.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index e6a3e645..bf7882f0 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -802,7 +802,7 @@ void KConfigTest::testDelete() delgr.deleteGroup(); QVERIFY(!delgr.exists()); QVERIFY(!ct.hasGroup("Nested Group 3")); - QVERIFY(!ct.groupList().contains(QStringLiteral("Nested Group 3"))); + QVERIFY(ct.groupList().contains(QStringLiteral("Nested Group 3"))); KConfigGroup ng(&ct, "Nested Group 2"); QVERIFY(sc.hasGroup("Complex Types")); diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 49a66d14..cc3700e1 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -269,7 +269,7 @@ QStringList KConfig::groupList() const for (auto entryMapIt = d->entryMap.cbegin(); entryMapIt != d->entryMap.cend(); ++entryMapIt) { const KEntryKey &key = entryMapIt.key(); const QByteArray group = key.mGroup; - if (key.mKey.isNull() && !group.isEmpty() && group != "<default>" && group != "$Version" && !d->hasNonDeletedEntries(group)) { + if (key.mKey.isNull() && !group.isEmpty() && group != "<default>" && group != "$Version") { const QString groupname = QString::fromUtf8(group); groups << groupname.left(groupname.indexOf(QLatin1Char('\x1d'))); } @@ -285,7 +285,7 @@ QStringList KConfigPrivate::groupList(const QByteArray &group) const for (auto entryMapIt = entryMap.cbegin(); entryMapIt != entryMap.cend(); ++entryMapIt) { const KEntryKey &key = entryMapIt.key(); - if (key.mKey.isNull() && key.mGroup.startsWith(theGroup) && !hasNonDeletedEntries(group)) { + if (key.mKey.isNull() && key.mGroup.startsWith(theGroup)) { const QString groupname = QString::fromUtf8(key.mGroup.mid(theGroup.length())); groups << groupname.left(groupname.indexOf(QLatin1Char('\x1d'))); } |