aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/kreadconfig/kreadconfig.cpp2
-rw-r--r--src/kreadconfig/kwriteconfig.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp
index 329f7b05..915c0967 100644
--- a/src/kreadconfig/kreadconfig.cpp
+++ b/src/kreadconfig/kreadconfig.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
konfig = KGlobal::config().data();
else
{
- konfig = new KConfig( file, KConfig::CascadeConfig );
+ konfig = new KConfig( file, KConfig::NoGlobals );
configMustDeleted=true;
}
KConfigGroup cfgGroup = konfig->group(group);
diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp
index 23a4ffa4..2a3be11a 100644
--- a/src/kreadconfig/kwriteconfig.cpp
+++ b/src/kreadconfig/kwriteconfig.cpp
@@ -52,12 +52,12 @@ int main(int argc, char **argv)
KConfig *konfig;
if (file.isEmpty())
- konfig = new KConfig(QString::fromLatin1( "kdeglobals"), KConfig::CascadeConfig );
+ konfig = new KConfig(QString::fromLatin1( "kdeglobals"), KConfig::NoGlobals );
else
- konfig = new KConfig( file, KConfig::CascadeConfig );
+ konfig = new KConfig( file, KConfig::NoGlobals );
KConfigGroup cfgGroup = konfig->group(group);
- if ( konfig->getConfigState() != KConfig::ReadWrite || cfgGroup.entryIsImmutable( key ) ) return 2;
+ if ( konfig->accessMode() != KConfig::ReadWrite || cfgGroup.isEntryImmutable( key ) ) return 2;
if(type=="bool") {
// For symmetry with kreadconfig we accept a wider range of values as true than Qt