diff options
| author | Stephan Kulow <coolo@kde.org> | 2007-02-20 07:00:30 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:14 +0200 |
| commit | ef32423608535b4ec6a300b012fbae768854a078 (patch) | |
| tree | 20a2a25a13f9ea44ac18e60bfcc0da423e06bb30 | |
| parent | 3188188fe7638b2db20ac309e3d4d37c7285990d (diff) | |
| download | kconfig-ef32423608535b4ec6a300b012fbae768854a078.tar.gz kconfig-ef32423608535b4ec6a300b012fbae768854a078.tar.bz2 | |
merged kconfiggroup_port branch
svn path=/trunk/KDE/kdebase/runtime/; revision=635490
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 2 | ||||
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 5bdb41ea..aeec64fe 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -73,7 +73,7 @@ int main(int argc, char **argv) konfig = KGlobal::config().data(); else { - konfig = new KConfig(file, true, false); + konfig = new KConfig( file, KConfig::NoGlobals ); configMustDeleted=true; } konfig->setGroup(group); diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 57c8d407..98b038f5 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -54,9 +54,9 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(QString::fromLatin1("kdeglobals"), false, false); + konfig = new KConfig(QString::fromLatin1( "kdeglobals"), KConfig::NoGlobals ); else - konfig = new KConfig(file, false, false); + konfig = new KConfig( file, KConfig::NoGlobals ); konfig->setGroup(group); if ( konfig->getConfigState() != KConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2; |