From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kconf_update/kconf_update.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kconf_update') diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index b324e53f7..ac4fda768 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -940,10 +940,10 @@ void KonfUpdate::resetOptions() extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"), + TDEAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"), "1.0.2", I18N_NOOP("TDE Tool for updating user configuration files"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001, Waldo Bastian"); aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org"); @@ -951,7 +951,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KInstance instance(&aboutData); + TDEInstance instance(&aboutData); KonfUpdate konfUpdate; -- cgit v1.2.1