From 5eb52e9f5a5cbe89b5569dcd2d5a9a8ee6133743 Mon Sep 17 00:00:00 2001 From: Waldo Bastian Date: Fri, 21 Jan 2005 17:40:48 +0000 Subject: Always pick up kiosk restrictions. The hassle of a command line switch is not worth the 20ms that you save. BUG: 96512 svn path=/trunk/kdebase/src/kreadconfig/; revision=380871 --- 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 8474a372..8ad4d79f 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -39,7 +39,6 @@ static KCmdLineOptions options[] = { "key ", I18N_NOOP("Key to look for"), 0 }, { "default ", I18N_NOOP("Default value"), 0 }, { "type ", I18N_NOOP("Type of variable"), 0 }, - { "usekdeglobals", I18N_NOOP("Read KDE global config. Also ensures kiosk settings are honored"), "KDE" }, KCmdLineLastOption }; int main(int argc, char **argv) @@ -66,6 +65,7 @@ int main(int argc, char **argv) } KInstance inst(&aboutData); + KGlobal::config(); KConfig *konfig; bool configMustDeleted = false; @@ -73,7 +73,7 @@ int main(int argc, char **argv) konfig = KGlobal::config(); else { - konfig = new KConfig(file, true, args->isSet("usekdeglobals")); + konfig = new KConfig(file, true, false); configMustDeleted=true; } konfig->setGroup(group); -- cgit v1.2.1