[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Use existing KSharedConfig in RuleBook::save
From:       Martin_Flöser <null () kde ! org>
Date:       2018-05-20 14:08:36
Message-ID: E1fKP0m-0004CR-2Q () code ! kde ! org
[Download RAW message or body]

Git commit a02797ca0608a302f466897d5bb5cd5cf4b9d13f by Martin Flöser.
Committed on 20/05/2018 at 13:45.
Pushed by graesslin into branch 'master'.

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

M  +8    -5    rules.cpp

https://commits.kde.org/kwin/a02797ca0608a302f466897d5bb5cd5cf4b9d13f

diff --git a/rules.cpp b/rules.cpp
index 32b389dd7..bb0b33df5 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;
     }
[prev in list] [next in list] [prev in thread] [next in thread]