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

2 files changed, 7 insertions, 5 deletions

diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp
index 8e95aeb7..329f7b05 100644
--- a/src/kreadconfig/kreadconfig.cpp
+++ b/src/kreadconfig/kreadconfig.cpp
@@ -25,6 +25,7 @@
  *	fi
  */
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
@@ -70,19 +71,19 @@ int main(int argc, char **argv)
 	   konfig = KGlobal::config().data();
 	else
         {
-	   konfig = new KConfig( file, KConfig::NoGlobals );
+	   konfig = new KConfig( file, KConfig::CascadeConfig );
            configMustDeleted=true;
         }
         KConfigGroup cfgGroup = konfig->group(group);
 	if(type=="bool") {
 		dflt=dflt.toLower();
 		bool def=(dflt=="true" || dflt=="on" || dflt=="yes" || dflt=="1");
-                bool retValue = !cfgGroup.readEntry(key, QVariant(def)).toBool();
+                bool retValue = !cfgGroup.readEntry(key, def);
                 if ( configMustDeleted )
                     delete konfig;
 		return retValue;
 	} else if((type=="num") || (type=="int")) {
-            long retValue = cfgGroup.readEntry<qulonglong>(key, dflt.toLong());
+            int retValue = cfgGroup.readEntry(key, dflt.toInt());
             if ( configMustDeleted )
                 delete konfig;
             return retValue;
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;