From: Oswald Buddenhagen <ossi@kde.org>
Date: Wed, 24 Oct 2007 13:08:37 +0000 (+0000)
Subject: KConfig* API overhaul. only cosmetics, so don't panic.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/63392181794c306eb9bd245cb45322dbbc97bce1

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/apps/; revision=728852
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 4a852c9b7..60af9923f 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -102,7 +102,7 @@ void DolphinContextMenu::openTrashContextMenu()
     KMenu* popup = new KMenu(m_mainWindow);
 
     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), popup);
-    KConfig trashConfig("trashrc", KConfig::OnlyLocal);
+    KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);