diff options
| author | Daniel Molkentin <molkentin@kde.org> | 2005-01-19 18:07:16 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:12 +0200 |
| commit | 822c801d3926130bb2779406231486056ba67a12 (patch) | |
| tree | d0337b98e9953e08f1ea87efedf21744a7f2e184 | |
| parent | 0ece0f4a7dfa02df6da629b1469060508418acb5 (diff) | |
| download | kconfig-822c801d3926130bb2779406231486056ba67a12.tar.gz kconfig-822c801d3926130bb2779406231486056ba67a12.tar.bz2 | |
merging (and therefore kiok functions) used to be disabled by default. This new switch "merged" will enable merging. This happens both in order to maintain the speed for the common case and in order to not break backward compatibility.
CCMAIL:tackat@kde.org
svn path=/trunk/kdebase/src/kreadconfig/; revision=380173
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index a74bcbe8..9b5b0bd4 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -39,6 +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" }, KCmdLineLastOption }; int main(int argc, char **argv) @@ -72,7 +73,7 @@ int main(int argc, char **argv) konfig = KGlobal::config(); else { - konfig = new KConfig(file, true, false); + konfig = new KConfig(file, true, args->isSet("merged")); configMustDeleted=true; } konfig->setGroup(group); |