diff options
| author | Andreas Pakulat <apaku@gmx.de> | 2007-10-05 22:21:25 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:15 +0200 |
| commit | 03f5568c55d73c6784ce43ff4ca32af967eac066 (patch) | |
| tree | 6565825bdbddb9414608734642621cf0fbe86f55 /src/kreadconfig/kwriteconfig.cpp | |
| parent | 0f1080566ef0c67c128a2bdb45f29afac7023133 (diff) | |
| download | kconfig-03f5568c55d73c6784ce43ff4ca32af967eac066.tar.gz kconfig-03f5568c55d73c6784ce43ff4ca32af967eac066.tar.bz2 | |
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
Diffstat (limited to 'src/kreadconfig/kwriteconfig.cpp')
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 <kconfig.h> +#include <kconfiggroup.h> #include <kglobal.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -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; |