From 03f5568c55d73c6784ce43ff4ca32af967eac066 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Fri, 5 Oct 2007 22:21:25 +0000 Subject: Merge the KConfig branch. This are the 3 main modules (+kdeadmin), which are needed now because friday is the last BC day. The rest of the modules will follow as fast as my laptop allows. svn path=/trunk/KDE/kdebase/runtime/; revision=721704 --- src/kreadconfig/kwriteconfig.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/kreadconfig/kwriteconfig.cpp') diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 02a23120..23a4ffa4 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -7,6 +7,7 @@ * */ #include +#include #include #include #include @@ -51,9 +52,9 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(QString::fromLatin1( "kdeglobals"), KConfig::NoGlobals ); + konfig = new KConfig(QString::fromLatin1( "kdeglobals"), KConfig::CascadeConfig ); else - konfig = new KConfig( file, KConfig::NoGlobals ); + konfig = new KConfig( file, KConfig::CascadeConfig ); KConfigGroup cfgGroup = konfig->group(group); if ( konfig->getConfigState() != KConfig::ReadWrite || cfgGroup.entryIsImmutable( key ) ) return 2; -- cgit v1.2.1