From 4bb787f41f7cdefac2aac33ef59317b7157302c1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:13 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmilo/thinkpad/kcmthinkpad/main.cpp | 6 +++--- kmilo/thinkpad/kcmthinkpad/main.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kmilo/thinkpad/kcmthinkpad') diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index c418313..66803ca 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" #define CONFIG_FILE "kmilodrc" KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) - : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { + : TDECModule(KCMThinkpadModuleFactory::instance(), parent, name) { TDEAboutData* about = new TDEAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("TDE Control Module for IBM Thinkpad " @@ -132,7 +132,7 @@ void KCMThinkpadModule::save() { } DCOPClient client; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setGroup("thinkpad"); config.writeEntry("run", m_KCMThinkpadGeneral->mCbRun->isChecked()); @@ -164,7 +164,7 @@ void KCMThinkpadModule::load() { } void KCMThinkpadModule::load(bool useDefaults) { - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setReadDefaults( useDefaults ); diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index 01c7a52..2621202 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -29,7 +29,7 @@ class KCMThinkPadGeneral; -class KCMThinkpadModule : public KCModule { +class KCMThinkpadModule : public TDECModule { Q_OBJECT -- cgit v1.2.1