From 00835d2daec44f2ee6572f04c9afa31bf3add47d Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 19 Jan 2005 18:13:26 +0000 Subject: master david says: stay closer to what it actually does. Still keeping the deeper sense in the help svn path=/trunk/kdebase/src/kreadconfig/; revision=380175 --- src/kreadconfig/kreadconfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 9b5b0bd4..8474a372 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -39,7 +39,7 @@ static KCmdLineOptions options[] = { "key ", I18N_NOOP("Key to look for"), 0 }, { "default ", I18N_NOOP("Default value"), 0 }, { "type ", I18N_NOOP("Type of variable"), 0 }, - { "merged", I18N_NOOP("Ensure kiosk settings are honored (slow)"), "KDE" }, + { "usekdeglobals", I18N_NOOP("Read KDE global config. Also ensures kiosk settings are honored"), "KDE" }, KCmdLineLastOption }; int main(int argc, char **argv) @@ -73,7 +73,7 @@ int main(int argc, char **argv) konfig = KGlobal::config(); else { - konfig = new KConfig(file, true, args->isSet("merged")); + konfig = new KConfig(file, true, args->isSet("usekdeglobals")); configMustDeleted=true; } konfig->setGroup(group); -- cgit v1.2.1