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/generic | |
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/generic')
-rw-r--r-- | kmilo/generic/generic_monitor.cpp | 6 | ||||
-rw-r--r-- | kmilo/generic/generic_monitor.h | 4 |
2 files changed, 5 insertions, 5 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; |