From 8856e75c203aa69be210b2fee1095ab9761aca7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:08 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 6 +++--- kmilo/thinkpad/kcmthinkpad/main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kmilo') diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index c8c9225..d684d44 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KVaioModuleFactory::instance(), parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkvaio"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkvaio"), I18N_NOOP("TDE Control Module for Sony " "Vaio Laptop Hardware"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, "(c) 2003 Mirko Boehm"); about->addAuthor("Mirko Boehm", diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index e4db02b..c418313 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -56,11 +56,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { - KAboutData* about = - new KAboutData(I18N_NOOP("kcmthinkpad"), + TDEAboutData* about = + new TDEAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("TDE Control Module for IBM Thinkpad " "Laptop Hardware"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, "(c) 2004 Jonathan Riddell"); about->addAuthor("Jonathan Riddell", -- cgit v1.2.1