diff options
| author | Waldo Bastian <bastian@kde.org> | 2005-01-21 17:40:48 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:13 +0200 |
| commit | 5eb52e9f5a5cbe89b5569dcd2d5a9a8ee6133743 (patch) | |
| tree | e4f9b3b787cd52a817680ed20f39bc21a2e51eaf | |
| parent | 00835d2daec44f2ee6572f04c9afa31bf3add47d (diff) | |
| download | kconfig-5eb52e9f5a5cbe89b5569dcd2d5a9a8ee6133743.tar.gz kconfig-5eb52e9f5a5cbe89b5569dcd2d5a9a8ee6133743.tar.bz2 | |
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
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <key>", I18N_NOOP("Key to look for"), 0 }, { "default <default>", I18N_NOOP("Default value"), 0 }, { "type <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); |