diff options
Diffstat (limited to 'kmilo')
-rw-r--r-- | kmilo/generic/generic_monitor.cpp | 6 | ||||
-rw-r--r-- | kmilo/generic/generic_monitor.h | 4 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 6 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/main.h | 2 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kmilo_kvaio.cpp | 2 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kmilo_kvaio.h | 2 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kvaio.cpp | 4 | ||||
-rw-r--r-- | kmilo/kmilo_kvaio/kvaio.h | 2 | ||||
-rw-r--r-- | kmilo/kmilod/defaultskin.cpp | 4 | ||||
-rw-r--r-- | kmilo/kmilod/defaultskin.h | 2 | ||||
-rw-r--r-- | kmilo/kmilod/kmilod.cpp | 2 | ||||
-rw-r--r-- | kmilo/kmilod/monitor.cpp | 2 | ||||
-rw-r--r-- | kmilo/kmilod/monitor.h | 4 | ||||
-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 |
17 files changed, 28 insertions, 28 deletions
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 658533a..bbc5f84 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -69,10 +69,10 @@ GenericMonitor::~GenericMonitor() bool GenericMonitor::init() { - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); reconfigure(&config); - //config = new KConfig("kmilodrc"); + //config = new TDEConfig("kmilodrc"); config.setGroup("kubuntu"); if(!m_enabled) @@ -120,7 +120,7 @@ bool GenericMonitor::init() return true; } -void GenericMonitor::reconfigure(KConfig *config) +void GenericMonitor::reconfigure(TDEConfig *config) { config->setGroup("generic monitor"); diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 3884627..18fd4eb 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -57,7 +57,7 @@ public: virtual bool init(); virtual int progress() const; virtual DisplayType poll(); - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); public slots: void slowVolumeUp(); @@ -86,7 +86,7 @@ private: void launch(TQString configKey, TQString defaultApplication); TDEGlobalAccel *ga; - KConfig* config; + TDEConfig* config; DCOPRef *kmixClient, *kmixWindow; diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index d684d44..ce01438 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KVaioModuleFactory::instance(), parent, name) + : TDECModule(KVaioModuleFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkvaio"), @@ -94,7 +94,7 @@ void KVaioModule::save() DCOPClient mClient; kdDebug() << "KVaioModule: saving." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setGroup("KVaio"); @@ -131,7 +131,7 @@ void KVaioModule::load() void KVaioModule::load(bool useDefaults) { kdDebug() << "KVaioModule: loading." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setReadDefaults( useDefaults ); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index 11e2d31..d40d07d 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -28,7 +28,7 @@ class TQTimer; class KCMKVaioGeneral; -class KVaioModule : public KCModule +class KVaioModule : public TDECModule { Q_OBJECT diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index 7ecf253..87de2da 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -59,7 +59,7 @@ int KMiloKVaio::progress() const { return m_kvaio->progress(); } -void KMiloKVaio::reconfigure(KConfig* k) +void KMiloKVaio::reconfigure(TDEConfig* k) { m_kvaio->loadConfiguration(k); } diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index 6fb2ce5..7104845 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -46,7 +46,7 @@ class KMiloKVaio : public KMilo::Monitor { virtual DisplayType poll(); virtual int progress() const; - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); bool showTextMsg(const TQString& msg) { diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 437d188..e8011e7 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -87,7 +87,7 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) kdDebug() << "KVaio ctor: cannot attach to DCOP server." << endl; } - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); loadConfiguration(&config); @@ -300,7 +300,7 @@ bool KVaio::isKMiloDAvailable() } } -void KVaio::loadConfiguration(KConfig *k) +void KVaio::loadConfiguration(TDEConfig *k) { k->setGroup("KVaio"); diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index bf5ad22..cafea4c 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -63,7 +63,7 @@ public: virtual ~KVaio(); const KVaioDriverInterface *driver(); - void loadConfiguration(KConfig *); + void loadConfiguration(TDEConfig *); const int progress() { return m_progress; } protected: diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 2793ee2..b9595e2 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -51,7 +51,7 @@ DefaultSkin::DefaultSkin() { _widget->hide(); - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); reconfigure( &config ); } @@ -61,7 +61,7 @@ DefaultSkin::~DefaultSkin() { _widget = 0; } -void DefaultSkin::reconfigure( KConfig *config ) { +void DefaultSkin::reconfigure( TDEConfig *config ) { config->setGroup("DefaultSkin"); diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h index 69e2e3f..2399d83 100644 --- a/kmilo/kmilod/defaultskin.h +++ b/kmilo/kmilod/defaultskin.h @@ -38,7 +38,7 @@ class DefaultSkin : public TQObject, public KMilo::DisplaySkin { virtual ~DefaultSkin(); virtual void clear(); - virtual void reconfigure( KConfig *config ); + virtual void reconfigure( TDEConfig *config ); virtual void displayText(const TQString& text, const TQPixmap& customPixmap=TQPixmap()); virtual void displayProgress(const TQString& text, diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index aa40b6d..1b777e2 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -213,7 +213,7 @@ void KMiloD::displayProgress(const TQString& text, int progress, const TQPixmap& void KMiloD::reconfigure() { // load the kmilo configuration file: - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); KMilo::Monitor *monitor; diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp index 7f37aaa..57caf59 100644 --- a/kmilo/kmilod/monitor.cpp +++ b/kmilo/kmilod/monitor.cpp @@ -30,7 +30,7 @@ KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&) KMilo::Monitor::~Monitor() { } -void KMilo::Monitor::reconfigure(KConfig*) +void KMilo::Monitor::reconfigure(TDEConfig*) { } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index d50045b..e646a7e 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -30,7 +30,7 @@ #include <kdemacros.h> -class KConfig; +class TDEConfig; namespace KMilo { class KMiloInterface; @@ -83,7 +83,7 @@ class KDE_EXPORT Monitor : public TQObject { bool shouldPoll() const { return _poll; } - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); protected: bool _poll; // set to false to disable polling. 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 |