diff options
| author | Matthias Kretz <kretz@kde.org> | 2007-01-29 17:14:20 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:14 +0200 |
| commit | 3188188fe7638b2db20ac309e3d4d37c7285990d (patch) | |
| tree | 65d9cb7c22d6143d5a1956223051774c31bf1d92 | |
| parent | 469f114657464688aef7111da6713c80c343b297 (diff) | |
| download | kconfig-3188188fe7638b2db20ac309e3d4d37c7285990d.tar.gz kconfig-3188188fe7638b2db20ac309e3d4d37c7285990d.tar.bz2 | |
merge the kinstance-redesign branch back to trunk.
svn path=/trunk/KDE/kdebase/khelpcenter/; revision=628276
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 4 | ||||
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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()) |