From 822c801d3926130bb2779406231486056ba67a12 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 19 Jan 2005 18:07:16 +0000 Subject: 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 --- src/kreadconfig/kreadconfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 ", 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" }, 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); -- cgit v1.2.1