svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase .

I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts

svn path=/trunk/KDE/kdebase/kioslave/; revision=439627

src/kreadconfig/kreadconfig.cpp

@@ -31,6 +31,8 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <stdio.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 static KCmdLineOptions options[] =
 {
@@ -56,8 +58,8 @@ int main(int argc, char **argv)
 	QString group=QString::fromLocal8Bit(args->getOption("group"));
 	QString key=QString::fromLocal8Bit(args->getOption("key"));
 	QString file=QString::fromLocal8Bit(args->getOption("file"));
-	QCString dflt=args->getOption("default");
+	Q3CString dflt=args->getOption("default");
-	QCString type=args->getOption("type").lower();
+	Q3CString type=args->getOption("type").lower();
 
 	if (key.isNull()) {
 		KCmdLineArgs::usage();

src/kreadconfig/kwriteconfig.cpp

@@ -13,6 +13,8 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <stdio.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 static KCmdLineOptions options[] =
 {
@@ -39,14 +41,14 @@ int main(int argc, char **argv)
 	QString group=QString::fromLocal8Bit(args->getOption("group"));
 	QString key=QString::fromLocal8Bit(args->getOption("key"));
 	QString file=QString::fromLocal8Bit(args->getOption("file"));
-	QCString type=args->getOption("type").lower();
+	Q3CString type=args->getOption("type").lower();
 
 
 	if (key.isNull() || !args->count()) {
 		KCmdLineArgs::usage();
 		return 1;
 	}
-	QCString value = args->arg( 0 );
+	Q3CString value = args->arg( 0 );
 
 	KInstance inst(&aboutData);