merge the kinstance-redesign branch back to trunk.

svn path=/trunk/KDE/kdebase/khelpcenter/; revision=628276

src/kreadconfig/kreadconfig.cpp

@@ -64,13 +64,13 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	KInstance inst(&aboutData);
+	KComponentData inst(&aboutData);
 	KGlobal::config();
 
 	KConfig *konfig;
         bool configMustDeleted = false;
 	if (file.isEmpty())
-	   konfig = KGlobal::config();
+	   konfig = KGlobal::config().data();
 	else
         {
 	   konfig = new KConfig(file, true, false);

src/kreadconfig/kwriteconfig.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 	}
 	QByteArray value = args->arg( 0 );
 
-	KInstance inst(&aboutData);
+	KComponentData inst(&aboutData);
 
 	KConfig *konfig;
 	if (file.isEmpty())