Git commit cffca3da7eb4277c6db1edac2281b877d03a73d0 by David Edmundson.
Committed on 08/10/2014 at 20:25.
Pushed by davidedmundson into branch 'Plasma/5.1'.

Read/Write ColorScheme to configGroup General instead of KDE

commit d59d611731e293f06ce24361aff79fb02554987f changed one of the many
places this group is used. I think it was a correct change.

This fixes all the other places.

Cherry-pick: 758e602d8688df03ab2b20d0ba38da5a52a008ad

M  +4    -1    kcms/lookandfeel/autotests/kcmtest.cpp
M  +2    -0    kcms/lookandfeel/autotests/lookandfeel/contents/defaults
M  +5    -4    kcms/lookandfeel/kcm.cpp

http://commits.kde.org/plasma-desktop/cffca3da7eb4277c6db1edac2281b877d03a7=
3d0

diff --git a/kcms/lookandfeel/autotests/kcmtest.cpp b/kcms/lookandfeel/auto=
tests/kcmtest.cpp
index 83dcb40..e55b882 100644
--- a/kcms/lookandfeel/autotests/kcmtest.cpp
+++ b/kcms/lookandfeel/autotests/kcmtest.cpp
@@ -55,6 +55,7 @@ void KcmTest::initTestCase()
     QVERIFY(m_configDir.mkpath("."));
 =

     const QString packagePath =3D QFINDTESTDATA("lookandfeel");
+
     Plasma::Package p =3D Plasma::PluginLoader::self()->loadPackage("Plasm=
a/LookAndFeel");
     p.setPath(packagePath);
     QVERIFY(p.isValid());
@@ -89,7 +90,7 @@ void KcmTest::testColors()
     m_KCMLookandFeel->setColors("customTestValue", QString());
 =

     KConfig config("kdeglobals");
-    KConfigGroup cg(&config, "KDE");
+    KConfigGroup cg(&config, "General");
     QCOMPARE(cg.readEntry("ColorScheme", QString()), QString("customTestVa=
lue"));
 }
 =

@@ -147,6 +148,8 @@ void KcmTest::testKCMSave()
     KConfig config("kdeglobals");
     KConfigGroup cg(&config, "KDE");
     QCOMPARE(cg.readEntry("widgetStyle", QString()), QString("testValue"));
+
+    cg =3D KConfigGroup(&config, "General");
     //save() capitalizes the ColorScheme
     QCOMPARE(cg.readEntry("ColorScheme", QString()), QString("TestValue"));
 =

diff --git a/kcms/lookandfeel/autotests/lookandfeel/contents/defaults b/kcm=
s/lookandfeel/autotests/lookandfeel/contents/defaults
index ebafb42..d16963a 100644
--- a/kcms/lookandfeel/autotests/lookandfeel/contents/defaults
+++ b/kcms/lookandfeel/autotests/lookandfeel/contents/defaults
@@ -1,5 +1,7 @@
 [kdeglobals][KDE]
 widgetStyle=3DtestValue
+
+[kdeglobals][General]
 ColorScheme=3DtestValue
 =

 [kdeglobals][Icons]
diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
index 2b61412..3ede2e0 100644
--- a/kcms/lookandfeel/kcm.cpp
+++ b/kcms/lookandfeel/kcm.cpp
@@ -191,12 +191,13 @@ void KCMLookandFeel::load()
         if (!pkg.filePath("defaults").isEmpty()) {
             KSharedConfigPtr conf =3D KSharedConfig::openConfig(pkg.filePa=
th("defaults"));
             KConfigGroup cg(conf, "kdeglobals");
-            cg =3D KConfigGroup(&cg, "KDE");
+            cg =3D KConfigGroup(&cg, "General");
             bool hasColors =3D !cg.readEntry("ColorScheme", QString()).isE=
mpty();
             row->setData(hasColors, HasColorsRole);
             if (!hasColors) {
                 hasColors =3D !pkg.filePath("colors").isEmpty();
             }
+            cg =3D KConfigGroup(&cg, "KDE");
             row->setData(!cg.readEntry("widgetStyle", QString()).isEmpty()=
, HasWidgetStyleRole);
             cg =3D KConfigGroup(conf, "kdeglobals");
             cg =3D KConfigGroup(&cg, "Icons");
@@ -313,9 +314,9 @@ void KCMLookandFeel::setColors(const QString &scheme, c=
onst QString &colorFile)
     if (scheme.isEmpty() && colorFile.isEmpty()) {
         return;
     }
-
-    m_configGroup.writeEntry("ColorScheme", scheme);
-    m_configGroup.sync();
+    KConfigGroup configGroup(&m_config, "General");
+    configGroup.writeEntry("ColorScheme", scheme);
+    configGroup.sync();
 =

     KSharedConfigPtr conf =3D KSharedConfig::openConfig(colorFile);
     foreach (const QString &grp, conf->groupList()) {