merged kconfiggroup_port branch

svn path=/trunk/KDE/kdebase/runtime/; revision=635490

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);

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;