From 3eaf04e113e9edab0ed2a8b5a16dfa49717c8d3e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 28 Jul 2005 14:59:42 +0000 Subject: 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 | 6 ++++-- src/kreadconfig/kwriteconfig.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 8ad4d79f..0aad48f7 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -31,6 +31,8 @@ #include #include #include +//Added by qt3to4: +#include 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"); - QCString type=args->getOption("type").lower(); + Q3CString dflt=args->getOption("default"); + Q3CString type=args->getOption("type").lower(); if (key.isNull()) { KCmdLineArgs::usage(); diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 0246ec70..1284c40a 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -13,6 +13,8 @@ #include #include #include +//Added by qt3to4: +#include 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); -- cgit v1.2.1