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
This commit is contained in:
parent
f70466ce74
commit
aff1787ff9
2 changed files with 2 additions and 2 deletions
|
@ -282,7 +282,7 @@ void EffectsHandler::sendReloadMessage( const QString& effectname )
|
||||||
|
|
||||||
KConfigGroup EffectsHandler::effectConfig( 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 );
|
return kwinconfig->group( "Effect-" + effectname );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ unsigned long Options::updateSettings()
|
||||||
if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
|
if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
|
||||||
focusStealingPreventionLevel = 0;
|
focusStealingPreventionLevel = 0;
|
||||||
|
|
||||||
KConfig *gc = new KConfig("kdeglobals", KConfig::CascadeConfig);
|
KConfig *gc = new KConfig("kdeglobals", KConfig::NoGlobals);
|
||||||
bool isVirtual = KApplication::desktop()->isVirtualDesktop();
|
bool isVirtual = KApplication::desktop()->isVirtualDesktop();
|
||||||
KConfigGroup gWindowsConfig(gc, "Windows");
|
KConfigGroup gWindowsConfig(gc, "Windows");
|
||||||
xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) &&
|
xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) &&
|
||||||
|
|
Loading…
Reference in a new issue