From a02797ca0608a302f466897d5bb5cd5cf4b9d13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Mon, 7 May 2018 21:35:34 +0200 Subject: [PATCH] Use existing KSharedConfig in RuleBook::save Summary: Recently a KSharedConfig was introduced in RuleBook. It makes sense to also use it in save and not just in load. Reviewers: #kwin, #plasma Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D12747 --- rules.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rules.cpp b/rules.cpp index 32b389dd79..bb0b33df56 100644 --- a/rules.cpp +++ b/rules.cpp @@ -1080,20 +1080,23 @@ void RuleBook::load() void RuleBook::save() { m_updateTimer->stop(); - KConfig cfg(QStringLiteral(KWIN_NAME "rulesrc"), KConfig::NoGlobals); - QStringList groups = cfg.groupList(); + if (!m_config) { + qCWarning(KWIN_CORE) << "RuleBook::save invoked without prior invokation of RuleBook::load"; + return; + } + QStringList groups = m_config->groupList(); for (QStringList::ConstIterator it = groups.constBegin(); it != groups.constEnd(); ++it) - cfg.deleteGroup(*it); - cfg.group("General").writeEntry("count", m_rules.count()); + m_config->deleteGroup(*it); + m_config->group("General").writeEntry("count", m_rules.count()); int i = 1; for (QList< Rules* >::ConstIterator it = m_rules.constBegin(); it != m_rules.constEnd(); ++it) { if ((*it)->isTemporary()) continue; - KConfigGroup cg(&cfg, QString::number(i)); + KConfigGroup cg(m_config, QString::number(i)); (*it)->write(cg); ++i; }