From aff1787ff9329bb2f4466cd13298a48e8ed57c18 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <ossi@kde.org>
Date: Wed, 24 Oct 2007 13:08:37 +0000
Subject: [PATCH] KConfig* API overhaul. only cosmetics, so don't panic.

KConfigBase:
- remove separator argument from list entry reading/writing functions
- introduce {read,write}XdgListEntry()
- kill readPathListEntry(), add readPathEntry() overload
  instead. the default value is not optional any more, as it defines the
  return type. this is consistent with the readEntry() functions.
- rename clean() => markAsClean(), remove rollback()
- rename ConfigState => AccessMode, getConfigState() => accessMode()
- rename {entry,group}IsImmutable() => is{Entry,Group}Immutable()
- remove NLS alias to Localized

KConfig:
- remove setGroup() & group()
- reshuffle OpenFlag enum, introduce NoCascade for symmetry
- remove setExtraConfigFiles() alias to addConfigSources()

KConfigGroup:
- inherit KConfigBase::deleteGroup() overloads
- make convertToQVariant() private, it will probably change somehow

- KConfig & KConfigGroup: deprecate entryMap()
- remove bogus declarations: KConfigGroup::setReadDefaults(),
  KConfig::readEntryUntranslated()
- apidox
- reshuffle the declarations in the headers


svn path=/trunk/KDE/kdebase/workspace/; revision=728852
---
 lib/kwineffects.cpp | 2 +-
 options.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/kwineffects.cpp b/lib/kwineffects.cpp
index 204c4044cf..a4a3de4a38 100644
--- a/lib/kwineffects.cpp
+++ b/lib/kwineffects.cpp
@@ -282,7 +282,7 @@ void EffectsHandler::sendReloadMessage( const QString& effectname )
 
 KConfigGroup EffectsHandler::effectConfig( const QString& effectname )
     {
-    KSharedConfig::Ptr kwinconfig = KSharedConfig::openConfig( "kwinrc", KConfig::CascadeConfig );
+    KSharedConfig::Ptr kwinconfig = KSharedConfig::openConfig( "kwinrc", KConfig::NoGlobals );
     return kwinconfig->group( "Effect-" + effectname );
     }
 
diff --git a/options.cpp b/options.cpp
index 37658ffab1..30da5325a0 100644
--- a/options.cpp
+++ b/options.cpp
@@ -85,7 +85,7 @@ unsigned long Options::updateSettings()
     if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
         focusStealingPreventionLevel = 0;
 
-    KConfig *gc = new KConfig("kdeglobals", KConfig::CascadeConfig);
+    KConfig *gc = new KConfig("kdeglobals", KConfig::NoGlobals);
     bool isVirtual = KApplication::desktop()->isVirtualDesktop();
     KConfigGroup gWindowsConfig(gc, "Windows");
     xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) &&