From 3188188fe7638b2db20ac309e3d4d37c7285990d Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 29 Jan 2007 17:14:20 +0000 Subject: merge the kinstance-redesign branch back to trunk. svn path=/trunk/KDE/kdebase/khelpcenter/; revision=628276 --- src/kreadconfig/kreadconfig.cpp | 4 ++-- src/kreadconfig/kwriteconfig.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 0d9c830d..5bdb41ea 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/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); diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 4e934a7b..57c8d407 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/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()) -- cgit v1.2.1