diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:13 -0600 |
| commit | 4bb787f41f7cdefac2aac33ef59317b7157302c1 (patch) | |
| tree | c9726401d4eeb6fff8e78c4e35facb644c417e77 /kmilo/thinkpad | |
| parent | aef5eada7f51ee48f3d21448db290bd8f06953a8 (diff) | |
| download | tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.tar.gz tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmilo/thinkpad')
| -rw-r--r-- | kmilo/thinkpad/kcmthinkpad/main.cpp | 6 | ||||
| -rw-r--r-- | kmilo/thinkpad/kcmthinkpad/main.h | 2 | ||||
| -rw-r--r-- | kmilo/thinkpad/thinkpad.cpp | 4 | ||||
| -rw-r--r-- | kmilo/thinkpad/thinkpad.h | 2 |
4 files changed, 7 insertions, 7 deletions
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 diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 034c6bd..2a57daa 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -53,7 +53,7 @@ ThinkPadMonitor::~ThinkPadMonitor() { bool ThinkPadMonitor::init() { - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); reconfigure(&config); if (m_run) { @@ -436,7 +436,7 @@ void ThinkPadMonitor::showToggleMessage(TQString onMessage, TQString offMessage, _interface->displayText(message); } -void ThinkPadMonitor::reconfigure(KConfig* config) { +void ThinkPadMonitor::reconfigure(TDEConfig* config) { config->setGroup("thinkpad"); m_nvramFile = config->readEntry("nvram", "/dev/nvram"); diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h index dc843ca..fe2b364 100644 --- a/kmilo/thinkpad/thinkpad.h +++ b/kmilo/thinkpad/thinkpad.h @@ -115,7 +115,7 @@ class ThinkPadMonitor : public Monitor { * Reimplemented from KMilo::Monitor. * Loads configuration from kmilorc */ - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); private: /** * get the current state from the nvram |