diff options
| author | Daniel Molkentin <molkentin@kde.org> | 2005-01-19 18:13:26 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:12 +0200 |
| commit | 00835d2daec44f2ee6572f04c9afa31bf3add47d (patch) | |
| tree | 6369d863fa01a5388d846aa27fca579d7e17c134 | |
| parent | 822c801d3926130bb2779406231486056ba67a12 (diff) | |
| download | kconfig-00835d2daec44f2ee6572f04c9afa31bf3add47d.tar.gz kconfig-00835d2daec44f2ee6572f04c9afa31bf3add47d.tar.bz2 | |
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
| -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 9b5b0bd4..8474a372 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -39,7 +39,7 @@ 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 }, - { "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); |