Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

56 files changed, 136 insertions, 136 deletions

diff --git a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
index 2377337..26f30fa 100644
--- a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.cpp
@@ -28,7 +28,7 @@ AlsaConfigMixerSetting::AlsaConfigMixerSetting()
 {
 }
 
-AlsaConfigMixerSetting::AlsaConfigMixerSetting(KConfig *c, const TQString &prefix)
+AlsaConfigMixerSetting::AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix)
 {
     m_card   = c->readNumEntry      (prefix+"card",   -1);
     m_name   = c->readEntry         (prefix+"name",   TQString());
@@ -55,7 +55,7 @@ TQString AlsaConfigMixerSetting::getIDString(int card, const TQString &name)
     return TQString::number(card) + "-" + name;
 }
 
-void AlsaConfigMixerSetting::saveState(KConfig *c, const TQString &prefix) const
+void AlsaConfigMixerSetting::saveState(TDEConfig *c, const TQString &prefix) const
 {
     c->writeEntry(prefix+"card",   m_card);
     c->writeEntry(prefix+"name",   m_name);
diff --git a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h
index 88140e8..94a995f 100644
--- a/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h
+++ b/kradio3/plugins/alsa-sound/alsa-config-mixer-setting.h
@@ -20,20 +20,20 @@
 
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 
 class AlsaConfigMixerSetting
 {
 public:
     AlsaConfigMixerSetting();
-    AlsaConfigMixerSetting(KConfig *c, const TQString &prefix);
+    AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix);
     AlsaConfigMixerSetting(int card, const TQString &name, bool use, bool active, float volume);
     ~AlsaConfigMixerSetting();
 
     TQString getIDString() const { return getIDString(m_card, m_name); }
     static TQString getIDString(int card, const TQString &m_name);
 
-    void saveState(KConfig *c, const TQString &prefix) const;
+    void saveState(TDEConfig *c, const TQString &prefix) const;
 
     int     m_card;
     TQString m_name;
diff --git a/kradio3/plugins/alsa-sound/alsa-sound.cpp b/kradio3/plugins/alsa-sound/alsa-sound.cpp
index 4ba8c2c..8da08fc 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound.cpp
@@ -132,7 +132,7 @@ void AlsaSoundDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali
 
 // PluginBase
 
-void AlsaSoundDevice::saveState (KConfig *c) const
+void AlsaSoundDevice::saveState (TDEConfig *c) const
 {
     c->setGroup(TQString("alsa-sound-") + PluginBase::name());
 
@@ -157,7 +157,7 @@ void AlsaSoundDevice::saveState (KConfig *c) const
 }
 
 
-void AlsaSoundDevice::restoreState (KConfig *c)
+void AlsaSoundDevice::restoreState (TDEConfig *c)
 {
     c->setGroup(TQString("alsa-sound-") + PluginBase::name());
 
diff --git a/kradio3/plugins/alsa-sound/alsa-sound.h b/kradio3/plugins/alsa-sound/alsa-sound.h
index 211c2be..4a79832 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound.h
+++ b/kradio3/plugins/alsa-sound/alsa-sound.h
@@ -101,8 +101,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual TQString pluginClassName() const { return "AlsaSoundDevice"; }
 
diff --git a/kradio3/plugins/gui-docking-menu/docking.cpp b/kradio3/plugins/gui-docking-menu/docking.cpp
index af89db0..8710fdf 100644
--- a/kradio3/plugins/gui-docking-menu/docking.cpp
+++ b/kradio3/plugins/gui-docking-menu/docking.cpp
@@ -118,7 +118,7 @@ bool RadioDocking::setStationSelection(const TQStringList &sl)
 
 // PluginBase
 
-void   RadioDocking::restoreState (KConfig *config)
+void   RadioDocking::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("radiodocking-") + name());
 
@@ -146,7 +146,7 @@ void   RadioDocking::restoreState (KConfig *config)
 }
 
 
-void RadioDocking::saveState (KConfig *config) const
+void RadioDocking::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("radiodocking-") + name());
 
diff --git a/kradio3/plugins/gui-docking-menu/docking.h b/kradio3/plugins/gui-docking-menu/docking.h
index c87833d..d2cfa13 100644
--- a/kradio3/plugins/gui-docking-menu/docking.h
+++ b/kradio3/plugins/gui-docking-menu/docking.h
@@ -61,8 +61,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp
index 7f711c2..ff8c5ea 100644
--- a/kradio3/plugins/gui-error-log/errorlog.cpp
+++ b/kradio3/plugins/gui-error-log/errorlog.cpp
@@ -134,14 +134,14 @@ bool ErrorLog::disconnectI (Interface *i)
     return a || b;
 }
 
-void ErrorLog::restoreState (KConfig *config)
+void ErrorLog::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("errorlog-") + WidgetPluginBase::name());
     WidgetPluginBase::restoreState(config, false);
 }
 
 
-void ErrorLog::saveState (KConfig *config) const
+void ErrorLog::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("errorlog-") + WidgetPluginBase::name());
     WidgetPluginBase::saveState(config);
@@ -251,7 +251,7 @@ void ErrorLog::slotUser1()
         // close hopefully flushes buffers ;)
         outf->close();
 
-        if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) {
+        if (!TDEIO::NetAccess::upload(tmpFile.name(), url, this)) {
             logError("ErrorLogger: " +
                      i18n("error uploading preset file %1").arg(url.url()));
         }
diff --git a/kradio3/plugins/gui-error-log/errorlog.h b/kradio3/plugins/gui-error-log/errorlog.h
index d071788..26bd0c0 100644
--- a/kradio3/plugins/gui-error-log/errorlog.h
+++ b/kradio3/plugins/gui-error-log/errorlog.h
@@ -44,8 +44,8 @@ public:
 
 // WidgetPluginBase
 
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
 public slots:
     virtual void     showOnOrgDesktop();
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index ba5e922..3bff5dc 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -96,7 +96,7 @@ bool QuickBar::setStationSelection(const TQStringList &sl)
 // PluginBase methods
 
 
-void QuickBar::restoreState (KConfig *config)
+void QuickBar::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("quickBar-") + name());
 
@@ -115,7 +115,7 @@ void QuickBar::restoreState (KConfig *config)
 }
 
 
-void QuickBar::saveState (KConfig *config) const
+void QuickBar::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("quickBar-") + name());
 
diff --git a/kradio3/plugins/gui-quickbar/quickbar.h b/kradio3/plugins/gui-quickbar/quickbar.h
index 54a084e..2ec4f6b 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.h
+++ b/kradio3/plugins/gui-quickbar/quickbar.h
@@ -30,7 +30,7 @@
 
 class ButtonFlowLayout;
 class TQButtonGroup;
-class KConfig;
+class TDEConfig;
 class TQToolButton;
 
 /**
@@ -68,8 +68,8 @@ ANSWERS:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index aaf630c..da54c23 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -506,7 +506,7 @@ bool RadioView::noticeCountdownZero()
 
 // WidgetPluginBase
 
-void   RadioView::saveState (KConfig *config) const
+void   RadioView::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("radioview-") + name());
 
@@ -520,7 +520,7 @@ void   RadioView::saveState (KConfig *config) const
 }
 
 
-void   RadioView::restoreState (KConfig *config)
+void   RadioView::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("radioview-") + name());
 
diff --git a/kradio3/plugins/gui-standard-display/radioview.h b/kradio3/plugins/gui-standard-display/radioview.h
index 1ad686f..f90df1b 100644
--- a/kradio3/plugins/gui-standard-display/radioview.h
+++ b/kradio3/plugins/gui-standard-display/radioview.h
@@ -61,8 +61,8 @@ public:
     // WidgetPluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual bool   connectI(Interface *i);
     virtual bool   disconnectI(Interface *i);
diff --git a/kradio3/plugins/gui-standard-display/radioview_element.h b/kradio3/plugins/gui-standard-display/radioview_element.h
index 22fa1c5..cab2c89 100644
--- a/kradio3/plugins/gui-standard-display/radioview_element.h
+++ b/kradio3/plugins/gui-standard-display/radioview_element.h
@@ -54,8 +54,8 @@ public:
     // Configuration ??
     virtual ConfigPageInfo  createConfigurationPage() { return ConfigPageInfo(); }
 
-    virtual void   saveState (KConfig *) const {}
-    virtual void   restoreState (KConfig *)    {}
+    virtual void   saveState (TDEConfig *) const {}
+    virtual void   restoreState (TDEConfig *)    {}
 
 
 protected :
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index baa69e3..e320102 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -61,7 +61,7 @@ float RadioViewFrequencyRadio::getUsability (Interface *i) const
 }
 
 
-void   RadioViewFrequencyRadio::saveState (KConfig *config) const
+void   RadioViewFrequencyRadio::saveState (TDEConfig *config) const
 {
     config->writeEntry("frequency-view-colorActiveText",   m_colorActiveText);
     config->writeEntry("frequency-view-colorInactiveText", m_colorInactiveText);
@@ -70,7 +70,7 @@ void   RadioViewFrequencyRadio::saveState (KConfig *config) const
 }
 
 
-void   RadioViewFrequencyRadio::restoreState (KConfig *config)
+void   RadioViewFrequencyRadio::restoreState (TDEConfig *config)
 {
     TQColor defaultActive  (20, 244, 20),
            defaultInactive(TQColor(10, 117, 10).light(75)),
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
index a974ec5..b13db67 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.h
@@ -41,8 +41,8 @@ public:
 
     float getUsability (Interface *) const;
 
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     ConfigPageInfo createConfigurationPage();
 
diff --git a/kradio3/plugins/lirc/lircsupport.cpp b/kradio3/plugins/lirc/lircsupport.cpp
index 071ad6c..0116175 100644
--- a/kradio3/plugins/lirc/lircsupport.cpp
+++ b/kradio3/plugins/lirc/lircsupport.cpp
@@ -214,7 +214,7 @@ bool LircSupport::disconnectI (Interface *i)
 
 
 
-void   LircSupport::saveState (KConfig *c) const
+void   LircSupport::saveState (TDEConfig *c) const
 {
     c->writeEntry("LIRC_DIGIT_0",          m_Actions[LIRC_DIGIT_0]);
     c->writeEntry("LIRC_DIGIT_1",          m_Actions[LIRC_DIGIT_1]);
@@ -266,7 +266,7 @@ void   LircSupport::saveState (KConfig *c) const
     c->writeEntry("ALT_LIRC_APPLICATION_QUIT", m_AlternativeActions[LIRC_APPLICATION_QUIT]);
 }
 
-void   LircSupport::restoreState (KConfig *c)
+void   LircSupport::restoreState (TDEConfig *c)
 {
     m_Actions[LIRC_DIGIT_0]          = c->readEntry("LIRC_DIGIT_0", "0");
     m_Actions[LIRC_DIGIT_1]          = c->readEntry("LIRC_DIGIT_1", "1");
diff --git a/kradio3/plugins/lirc/lircsupport.h b/kradio3/plugins/lirc/lircsupport.h
index 47aeb9d..bd1ad8a 100644
--- a/kradio3/plugins/lirc/lircsupport.h
+++ b/kradio3/plugins/lirc/lircsupport.h
@@ -90,8 +90,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/oss-sound/oss-sound.cpp b/kradio3/plugins/oss-sound/oss-sound.cpp
index 61054f2..f37d011 100644
--- a/kradio3/plugins/oss-sound/oss-sound.cpp
+++ b/kradio3/plugins/oss-sound/oss-sound.cpp
@@ -117,7 +117,7 @@ void OSSSoundDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid
 
 // PluginBase
 
-void OSSSoundDevice::saveState (KConfig *c) const
+void OSSSoundDevice::saveState (TDEConfig *c) const
 {
     c->setGroup(TQString("oss-sound-") + PluginBase::name());
 
@@ -130,7 +130,7 @@ void OSSSoundDevice::saveState (KConfig *c) const
 }
 
 
-void OSSSoundDevice::restoreState (KConfig *c)
+void OSSSoundDevice::restoreState (TDEConfig *c)
 {
     c->setGroup(TQString("oss-sound-") + PluginBase::name());
 
diff --git a/kradio3/plugins/oss-sound/oss-sound.h b/kradio3/plugins/oss-sound/oss-sound.h
index 6d77ad4..68f7ce4 100644
--- a/kradio3/plugins/oss-sound/oss-sound.h
+++ b/kradio3/plugins/oss-sound/oss-sound.h
@@ -75,8 +75,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual TQString pluginClassName() const { return "OSSSoundDevice"; }
 
diff --git a/kradio3/plugins/radio/radio.cpp b/kradio3/plugins/radio/radio.cpp
index b7046e7..e485121 100644
--- a/kradio3/plugins/radio/radio.cpp
+++ b/kradio3/plugins/radio/radio.cpp
@@ -77,7 +77,7 @@ bool Radio::disconnectI (Interface *i)
 }
 
 
-void Radio::saveState (KConfig *config) const
+void Radio::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("radio-") + name());
 
@@ -87,7 +87,7 @@ void Radio::saveState (KConfig *config) const
 }
 
 
-void Radio::restoreState (KConfig *config)
+void Radio::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("radio-") + name());
 
diff --git a/kradio3/plugins/radio/radio.h b/kradio3/plugins/radio/radio.h
index 2ab5ebf..66798fb 100644
--- a/kradio3/plugins/radio/radio.h
+++ b/kradio3/plugins/radio/radio.h
@@ -63,8 +63,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual TQString pluginClassName() const { return "Radio"; }
 
diff --git a/kradio3/plugins/recording/recording-config.cpp b/kradio3/plugins/recording/recording-config.cpp
index 5b62fef..2395e28 100644
--- a/kradio3/plugins/recording/recording-config.cpp
+++ b/kradio3/plugins/recording/recording-config.cpp
@@ -65,7 +65,7 @@ RecordingConfig::RecordingConfig (const RecordingConfig &c)
 }
 
 
-void  RecordingConfig::restoreConfig(KConfig *c)
+void  RecordingConfig::restoreConfig(TDEConfig *c)
 {
     m_EncodeBufferSize  = c->readNumEntry("encodeBufferSize", 256*1024);
     m_EncodeBufferCount = c->readNumEntry("encodeBufferCount", 3);
@@ -104,7 +104,7 @@ void  RecordingConfig::restoreConfig(KConfig *c)
 }
 
 
-void  RecordingConfig::saveConfig(KConfig *c) const
+void  RecordingConfig::saveConfig(TDEConfig *c) const
 {
     c->writeEntry("encodeBufferSize", m_EncodeBufferSize);
     c->writeEntry("encodeBufferCount", m_EncodeBufferCount);
diff --git a/kradio3/plugins/recording/recording-config.h b/kradio3/plugins/recording/recording-config.h
index ef3d86f..ba7ba52 100644
--- a/kradio3/plugins/recording/recording-config.h
+++ b/kradio3/plugins/recording/recording-config.h
@@ -24,7 +24,7 @@
 
 #include "../../src/include/soundformat.h"
 
-class KConfig;
+class TDEConfig;
 struct SF_INFO;
 
 class RecordingConfig
@@ -46,8 +46,8 @@ public:
                      const SoundFormat &, int mp3_q, float ogg_q);
     RecordingConfig (const RecordingConfig &c);
 
-    void     restoreConfig(KConfig *c);
-    void     saveConfig(KConfig *c) const;
+    void     restoreConfig(TDEConfig *c);
+    void     saveConfig(TDEConfig *c) const;
 
     void     getSoundFileInfo(SF_INFO &info, bool input);
 
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index 48be95b..dac41f9 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -84,7 +84,7 @@ RecordingMonitor::~RecordingMonitor()
 
 // WidgetPluginBase
 
-void   RecordingMonitor::saveState (KConfig *config) const
+void   RecordingMonitor::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("recordingmonitor-") + name());
 
@@ -92,7 +92,7 @@ void   RecordingMonitor::saveState (KConfig *config) const
 }
 
 
-void   RecordingMonitor::restoreState (KConfig *config)
+void   RecordingMonitor::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("recordingmonitor-") + name());
 
diff --git a/kradio3/plugins/recording/recording-monitor.h b/kradio3/plugins/recording/recording-monitor.h
index 4bdd390..ecc38f2 100644
--- a/kradio3/plugins/recording/recording-monitor.h
+++ b/kradio3/plugins/recording/recording-monitor.h
@@ -55,8 +55,8 @@ public:
     // WidgetPluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual bool   connectI(Interface *i);
     virtual bool   disconnectI(Interface *i);
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index 1131fed..60899e6 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -106,14 +106,14 @@ void Recording::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid)
 
 // PluginBase
 
-void Recording::saveState (KConfig *c) const
+void Recording::saveState (TDEConfig *c) const
 {
     c->setGroup(TQString("recording-") + PluginBase::name());
     m_config.saveConfig(c);
 }
 
 
-void Recording::restoreState (KConfig *c)
+void Recording::restoreState (TDEConfig *c)
 {
     c->setGroup(TQString("recording-") + PluginBase::name());
     RecordingConfig cfg;
diff --git a/kradio3/plugins/recording/recording.h b/kradio3/plugins/recording/recording.h
index b8fc0da..7d48331 100644
--- a/kradio3/plugins/recording/recording.h
+++ b/kradio3/plugins/recording/recording.h
@@ -67,8 +67,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/soundserver/soundserver.cpp b/kradio3/plugins/soundserver/soundserver.cpp
index c1cd014..809cc02 100644
--- a/kradio3/plugins/soundserver/soundserver.cpp
+++ b/kradio3/plugins/soundserver/soundserver.cpp
@@ -55,11 +55,11 @@ bool SoundServer::disconnectI (Interface *i)
 
 
 
-void   SoundServer::saveState (KConfig *) const
+void   SoundServer::saveState (TDEConfig *) const
 {
 }
 
-void   SoundServer::restoreState (KConfig *)
+void   SoundServer::restoreState (TDEConfig *)
 {
 }
 
diff --git a/kradio3/plugins/soundserver/soundserver.h b/kradio3/plugins/soundserver/soundserver.h
index 23f5fb3..f01e863 100644
--- a/kradio3/plugins/soundserver/soundserver.h
+++ b/kradio3/plugins/soundserver/soundserver.h
@@ -44,8 +44,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/streaming/streaming-job.cpp b/kradio3/plugins/streaming/streaming-job.cpp
index 3266618..77e5a55 100644
--- a/kradio3/plugins/streaming/streaming-job.cpp
+++ b/kradio3/plugins/streaming/streaming-job.cpp
@@ -105,14 +105,14 @@ void StreamingJob::setBufferSize(size_t buffer_size)
 
 bool StreamingJob::startPutJob()
 {
-    m_KIO_Job = KIO::put(m_URL, -1, true, false, false);
+    m_KIO_Job = TDEIO::put(m_URL, -1, true, false, false);
     if (!m_KIO_Job)
         return false;
     m_KIO_Job->setAsyncDataEnabled(true);
-    connect (m_KIO_Job, TQT_SIGNAL(dataReq(KIO::Job *job, TQByteArray &data)),
-        this, TQT_SLOT(slotWriteData  (KIO::Job *job, TQByteArray &data)));
-    connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)),
-        this, TQT_SLOT(slotIOJobResult(KIO::Job *)));
+    connect (m_KIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
+        this, TQT_SLOT(slotWriteData  (TDEIO::Job *job, TQByteArray &data)));
+    connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
+        this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
     return true;
 }
 
@@ -150,14 +150,14 @@ bool StreamingJob::stopPlayback()
 
 bool StreamingJob::startGetJob()
 {
-    m_KIO_Job = KIO::get(m_URL, false, false);
+    m_KIO_Job = TDEIO::get(m_URL, false, false);
     if (!m_KIO_Job)
         return false;
     m_KIO_Job->setAsyncDataEnabled(true);
-    connect (m_KIO_Job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-                this, TQT_SLOT(slotReadData(KIO::Job *, const TQByteArray &)));
-    connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)),
-                this, TQT_SLOT(slotIOJobResult(KIO::Job *)));
+    connect (m_KIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                this, TQT_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &)));
+    connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
+                this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
     return true;
 }
 
@@ -196,7 +196,7 @@ bool StreamingJob::stopCapture()
 }
 
 
-void   StreamingJob::slotReadData  (KIO::Job */*job*/, const TQByteArray &data)
+void   StreamingJob::slotReadData  (TDEIO::Job */*job*/, const TQByteArray &data)
 {
     size_t free = m_Buffer.getFreeSize();
     if (free < data.size()) {
@@ -216,7 +216,7 @@ void   StreamingJob::slotReadData  (KIO::Job */*job*/, const TQByteArray &data)
 }
 
 
-void   StreamingJob::slotWriteData (KIO::Job */*job*/, TQByteArray &)
+void   StreamingJob::slotWriteData (TDEIO::Job */*job*/, TQByteArray &)
 {
     size_t size = m_Buffer.getFillSize();
     if (size) {
@@ -268,7 +268,7 @@ void StreamingJob::removeData(size_t size)
     }
 }
 
-void   StreamingJob::slotIOJobResult (KIO::Job *job)
+void   StreamingJob::slotIOJobResult (TDEIO::Job *job)
 {
     if (job && job->error()) {
         emit logStreamError(m_URL, job->errorString());
diff --git a/kradio3/plugins/streaming/streaming-job.h b/kradio3/plugins/streaming/streaming-job.h
index f7025d0..190b146 100644
--- a/kradio3/plugins/streaming/streaming-job.h
+++ b/kradio3/plugins/streaming/streaming-job.h
@@ -65,9 +65,9 @@ public:
 
 protected slots:
 
-    void   slotReadData  (KIO::Job *job, const TQByteArray &data);
-    void   slotWriteData (KIO::Job *job, TQByteArray &data);
-    void   slotIOJobResult (KIO::Job *job);
+    void   slotReadData  (TDEIO::Job *job, const TQByteArray &data);
+    void   slotWriteData (TDEIO::Job *job, TQByteArray &data);
+    void   slotIOJobResult (TDEIO::Job *job);
 
 signals:
 
@@ -92,7 +92,7 @@ protected:
 
     size_t            m_SkipCount;
 
-    KIO::TransferJob *m_KIO_Job;
+    TDEIO::TransferJob *m_KIO_Job;
     bool              m_capturing;
 };
 
diff --git a/kradio3/plugins/streaming/streaming.cpp b/kradio3/plugins/streaming/streaming.cpp
index be464e2..9586eb5 100644
--- a/kradio3/plugins/streaming/streaming.cpp
+++ b/kradio3/plugins/streaming/streaming.cpp
@@ -90,7 +90,7 @@ void StreamingDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali
 
 // PluginBase
 
-void StreamingDevice::saveState (KConfig *c) const
+void StreamingDevice::saveState (TDEConfig *c) const
 {
     c->setGroup(TQString("streaming-") + PluginBase::name());
     c->writeEntry("soundstreamclient-id", m_SoundStreamClientID);
@@ -124,7 +124,7 @@ void StreamingDevice::saveState (KConfig *c) const
     }
 }
 
-void StreamingDevice::restoreState (KConfig *c)
+void StreamingDevice::restoreState (TDEConfig *c)
 {
     c->setGroup(TQString("streaming-") + PluginBase::name());
     setSoundStreamClientID(c->readEntry("soundstreamclient-id", getSoundStreamClientID()));
diff --git a/kradio3/plugins/streaming/streaming.h b/kradio3/plugins/streaming/streaming.h
index 1c40528..df55ff8 100644
--- a/kradio3/plugins/streaming/streaming.h
+++ b/kradio3/plugins/streaming/streaming.h
@@ -56,8 +56,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual TQString pluginClassName() const { return "StreamingDevice"; }
 
diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp
index bf612e1..e7229e8 100644
--- a/kradio3/plugins/timecontrol/timecontrol.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol.cpp
@@ -208,7 +208,7 @@ void TimeControl::slotQTimerAlarmTimeout()
 }
 
 
-void    TimeControl::restoreState (KConfig *config)
+void    TimeControl::restoreState (TDEConfig *config)
 {
     AlarmVector al;
 
@@ -241,7 +241,7 @@ void    TimeControl::restoreState (KConfig *config)
 }
 
 
-void    TimeControl::saveState    (KConfig *config) const
+void    TimeControl::saveState    (TDEConfig *config) const
 {
     config->setGroup(TQString("timecontrol-") + name());
 
diff --git a/kradio3/plugins/timecontrol/timecontrol.h b/kradio3/plugins/timecontrol/timecontrol.h
index db94a22..933d8f2 100644
--- a/kradio3/plugins/timecontrol/timecontrol.h
+++ b/kradio3/plugins/timecontrol/timecontrol.h
@@ -61,8 +61,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/timeshifter/timeshifter.cpp b/kradio3/plugins/timeshifter/timeshifter.cpp
index fb8d653..f5b3d65 100644
--- a/kradio3/plugins/timeshifter/timeshifter.cpp
+++ b/kradio3/plugins/timeshifter/timeshifter.cpp
@@ -84,7 +84,7 @@ void TimeShifter::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid)
 }
 
 
-void   TimeShifter::saveState    (KConfig *config) const
+void   TimeShifter::saveState    (TDEConfig *config) const
 {
     config->setGroup(TQString("timeshifter-") + name());
 
@@ -96,7 +96,7 @@ void   TimeShifter::saveState    (KConfig *config) const
 }
 
 
-void   TimeShifter::restoreState (KConfig *config)
+void   TimeShifter::restoreState (TDEConfig *config)
 {
     config->setGroup(TQString("timeshifter-") + name());
 
diff --git a/kradio3/plugins/timeshifter/timeshifter.h b/kradio3/plugins/timeshifter/timeshifter.h
index 42f5869..cada015 100644
--- a/kradio3/plugins/timeshifter/timeshifter.h
+++ b/kradio3/plugins/timeshifter/timeshifter.h
@@ -58,8 +58,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState    (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState    (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index 0f37fe3..8cdeaa4 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -940,7 +940,7 @@ bool V4LRadio::setVolumeZeroOnPowerOff(bool a)
 
 // PluginBase methods
 
-void   V4LRadio::saveState (KConfig *config) const
+void   V4LRadio::saveState (TDEConfig *config) const
 {
     config->setGroup(TQString("v4lradio-") + name());
 
@@ -977,7 +977,7 @@ void   V4LRadio::saveState (KConfig *config) const
 }
 
 
-void   V4LRadio::restoreState (KConfig *config)
+void   V4LRadio::restoreState (TDEConfig *config)
 {
     BlockProfiler p("V4LRadio::restoreState");
 
diff --git a/kradio3/plugins/v4lradio/v4lradio.h b/kradio3/plugins/v4lradio/v4lradio.h
index 2e2d047..c8d7a58 100644
--- a/kradio3/plugins/v4lradio/v4lradio.h
+++ b/kradio3/plugins/v4lradio/v4lradio.h
@@ -64,8 +64,8 @@ public:
     // PluginBase
 
 public:
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
     virtual void   startPlugin();
 
     virtual ConfigPageInfo  createConfigurationPage();
diff --git a/kradio3/src/include/kradioapp.h b/kradio3/src/include/kradioapp.h
index facecae..fabe04f 100644
--- a/kradio3/src/include/kradioapp.h
+++ b/kradio3/src/include/kradioapp.h
@@ -41,8 +41,8 @@ public:
     virtual ConfigPageInfo createConfigurationPage () { return ConfigPageInfo(); }
     virtual AboutPageInfo  createAboutPage ();
 
-    virtual void   saveState    (KConfig *) const {}
-    virtual void   restoreState (KConfig *)       {}
+    virtual void   saveState    (TDEConfig *) const {}
+    virtual void   restoreState (TDEConfig *)       {}
 };
 
 
@@ -88,8 +88,8 @@ public:
     KRadioApp();
     virtual ~KRadioApp();
 
-    virtual void             saveState    (KConfig *c);
-    virtual void             restoreState (KConfig *c);
+    virtual void             saveState    (TDEConfig *c);
+    virtual void             restoreState (TDEConfig *c);
 
     virtual PluginManager   *createNewInstance(const TQString &name);
 
diff --git a/kradio3/src/include/plugin_configuration_dialog.h b/kradio3/src/include/plugin_configuration_dialog.h
index 4f3f6c0..b273207 100644
--- a/kradio3/src/include/plugin_configuration_dialog.h
+++ b/kradio3/src/include/plugin_configuration_dialog.h
@@ -42,8 +42,8 @@ public:
 
     virtual TQString pluginClassName() const { return "PluginConfigurationDialog"; }
 
-    virtual void   saveState (KConfig *) const;
-    virtual void   restoreState (KConfig *);
+    virtual void   saveState (TDEConfig *) const;
+    virtual void   restoreState (TDEConfig *);
 
 protected :
 
diff --git a/kradio3/src/include/pluginmanager.h b/kradio3/src/include/pluginmanager.h
index 635a50c..e450284 100644
--- a/kradio3/src/include/pluginmanager.h
+++ b/kradio3/src/include/pluginmanager.h
@@ -32,7 +32,7 @@ class WidgetPluginBase;
 class PluginConfigurationDialog;
 class PluginManagerConfiguration;
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class TQFrame;
 class KAboutDialog;
 class KDialogBase;
@@ -79,8 +79,8 @@ public :
 
     // operations on all plugins
 
-    virtual void         saveState    (KConfig *) const;
-    virtual void         restoreState (KConfig *);
+    virtual void         saveState    (TDEConfig *) const;
+    virtual void         restoreState (TDEConfig *);
     virtual void         startPlugins();
 
     // configuration dialog handling
diff --git a/kradio3/src/include/plugins.h b/kradio3/src/include/plugins.h
index 023e35d..808d0bb 100644
--- a/kradio3/src/include/plugins.h
+++ b/kradio3/src/include/plugins.h
@@ -34,7 +34,7 @@
 class PluginManager;
 class PluginBase;
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 typedef TQPtrList<PluginBase>           PluginList;
 typedef TQPtrListIterator<PluginBase>   PluginIterator;
@@ -115,8 +115,8 @@ public:
 
     // save/restore status, window position, etc...
 
-    virtual void   saveState (KConfig *) const = 0;
-    virtual void   restoreState (KConfig *) = 0;
+    virtual void   saveState (TDEConfig *) const = 0;
+    virtual void   restoreState (TDEConfig *) = 0;
     virtual void   startPlugin();
 
     virtual void   aboutToQuit();
diff --git a/kradio3/src/include/radiostation-listview.h b/kradio3/src/include/radiostation-listview.h
index 36ed7cf..d6210b9 100644
--- a/kradio3/src/include/radiostation-listview.h
+++ b/kradio3/src/include/radiostation-listview.h
@@ -52,8 +52,8 @@ public:
 
     int count() const { return childCount(); }
 
-    void   saveState    (KConfig *) const;
-    void   restoreState (KConfig *);
+    void   saveState    (TDEConfig *) const;
+    void   restoreState (TDEConfig *);
 
 
 protected:
diff --git a/kradio3/src/include/soundformat.h b/kradio3/src/include/soundformat.h
index ea11f09..0fcca24 100644
--- a/kradio3/src/include/soundformat.h
+++ b/kradio3/src/include/soundformat.h
@@ -60,8 +60,8 @@ struct SoundFormat {
     int      minValue() const;
     int      maxValue() const;
 
-    void     restoreConfig(const TQString &prefix, KConfig *c);
-    void     saveConfig(const TQString &prefix, KConfig *c) const;
+    void     restoreConfig(const TQString &prefix, TDEConfig *c);
+    void     saveConfig(const TQString &prefix, TDEConfig *c) const;
 
     int      convertSampleToInt(const char *sample, bool do_scale) const;
     void     convertIntToSample(int src, char *dst, bool is_scaled) const;
diff --git a/kradio3/src/include/stationselector.h b/kradio3/src/include/stationselector.h
index e18c87e..009293e 100644
--- a/kradio3/src/include/stationselector.h
+++ b/kradio3/src/include/stationselector.h
@@ -60,8 +60,8 @@ public :
 
     bool noticeCurrentSoundStreamIDChanged(SoundStreamID)         { return false; }
 
-    void   saveState    (KConfig *) const;
-    void   restoreState (KConfig *);
+    void   saveState    (TDEConfig *) const;
+    void   restoreState (TDEConfig *);
     
     bool   isDirty () const { return m_dirty; }
 
diff --git a/kradio3/src/include/widgetplugins.h b/kradio3/src/include/widgetplugins.h
index c3339c4..69bb0bf 100644
--- a/kradio3/src/include/widgetplugins.h
+++ b/kradio3/src/include/widgetplugins.h
@@ -31,9 +31,9 @@ class WidgetPluginBase : public PluginBase
 public :
     WidgetPluginBase(const TQString &name, const TQString &description);
 
-    virtual void     saveState    (KConfig *) const;
-    virtual void     restoreState (KConfig *);
-    virtual void     restoreState (KConfig *, bool showByDefault);
+    virtual void     saveState    (TDEConfig *) const;
+    virtual void     restoreState (TDEConfig *);
+    virtual void     restoreState (TDEConfig *, bool showByDefault);
     virtual void     startPlugin();
 
     virtual       TQWidget *getWidget() = 0;
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index c008a1d..d281285 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -144,7 +144,7 @@ void KRadioApp::saveState()
     saveState(TDEGlobal::config());
 }
 
-void KRadioApp::saveState (KConfig *c)
+void KRadioApp::saveState (TDEConfig *c)
 {
     c->setGroup("Global");
     c->writeEntry("instances", m_Instances.count());
@@ -169,7 +169,7 @@ void KRadioApp::saveState (KConfig *c)
 }
 
 
-void KRadioApp::restoreState (KConfig *c)
+void KRadioApp::restoreState (TDEConfig *c)
 {
     BlockProfiler profiler("KRadioApp::restoreState - loadLibraries");
 
diff --git a/kradio3/src/plugin_configuration_dialog.cpp b/kradio3/src/plugin_configuration_dialog.cpp
index 3482bf3..e2e4013 100644
--- a/kradio3/src/plugin_configuration_dialog.cpp
+++ b/kradio3/src/plugin_configuration_dialog.cpp
@@ -34,13 +34,13 @@ PluginConfigurationDialog::PluginConfigurationDialog(
 
 // PluginBase
 
-void   PluginConfigurationDialog::saveState (KConfig *c) const
+void   PluginConfigurationDialog::saveState (TDEConfig *c) const
 {
     c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name());
     WidgetPluginBase::saveState(c);
 }
 
-void   PluginConfigurationDialog::restoreState (KConfig *c)
+void   PluginConfigurationDialog::restoreState (TDEConfig *c)
 {
     c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name());
     WidgetPluginBase::restoreState(c, true);
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 5c7ea56..2ba5715 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -410,7 +410,7 @@ void PluginManager::createAboutDialog(const TQString &title)
 }
 
 
-void PluginManager::saveState (KConfig *c) const
+void PluginManager::saveState (TDEConfig *c) const
 {
     c->setGroup("PluginManager-" + m_Name);
     c->writeEntry("show-progress-bar", m_showProgressBar);
@@ -434,7 +434,7 @@ void PluginManager::saveState (KConfig *c) const
 }
 
 
-void PluginManager::restoreState (KConfig *c)
+void PluginManager::restoreState (TDEConfig *c)
 {
     BlockProfiler profile_all("PluginManager::restoreState");
     c->setGroup("PluginManager-" + m_Name);
diff --git a/kradio3/src/plugins.cpp b/kradio3/src/plugins.cpp
index f711bf0..3c386b3 100644
--- a/kradio3/src/plugins.cpp
+++ b/kradio3/src/plugins.cpp
@@ -62,13 +62,13 @@ bool PluginBase::isManagerSet () const
 }
 
 
-void   PluginBase::saveState (KConfig *) const
+void   PluginBase::saveState (TDEConfig *) const
 {
     // do nothing
 }
 
 
-void   PluginBase::restoreState (KConfig *)
+void   PluginBase::restoreState (TDEConfig *)
 {
     // do nothing
 }
diff --git a/kradio3/src/radiostation-listview.cpp b/kradio3/src/radiostation-listview.cpp
index 6502286..0a4148d 100644
--- a/kradio3/src/radiostation-listview.cpp
+++ b/kradio3/src/radiostation-listview.cpp
@@ -192,7 +192,7 @@ void RadioStationListView::slotCurrentStationChanged(TQListViewItem *item)
 }
 
 
-void RadioStationListView::saveState (KConfig *cfg) const
+void RadioStationListView::saveState (TDEConfig *cfg) const
 {
     if (!cfg)
         return;
@@ -201,7 +201,7 @@ void RadioStationListView::saveState (KConfig *cfg) const
 }
 
 
-void RadioStationListView::restoreState (KConfig *cfg)
+void RadioStationListView::restoreState (TDEConfig *cfg)
 {
     if (!cfg)
         return;
diff --git a/kradio3/src/soundformat.cpp b/kradio3/src/soundformat.cpp
index 50e0c75..57f9aa1 100644
--- a/kradio3/src/soundformat.cpp
+++ b/kradio3/src/soundformat.cpp
@@ -47,7 +47,7 @@ int SoundFormat::maxValue() const
 }
 
 
-void  SoundFormat::restoreConfig(const TQString &prefix, KConfig *c)
+void  SoundFormat::restoreConfig(const TQString &prefix, TDEConfig *c)
 {
     m_SampleBits      = c->readNumEntry (prefix + "bits", 16);
     m_IsSigned        = c->readBoolEntry(prefix + "sign", true);
@@ -59,7 +59,7 @@ void  SoundFormat::restoreConfig(const TQString &prefix, KConfig *c)
 }
 
 
-void  SoundFormat::saveConfig(const TQString &prefix, KConfig *c) const
+void  SoundFormat::saveConfig(const TQString &prefix, TDEConfig *c) const
 {
     c->writeEntry(prefix + "bits",         m_SampleBits);
     c->writeEntry(prefix + "sign",         m_IsSigned);
diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp
index 8c6bf80..6de71fb 100644
--- a/kradio3/src/stationlist.cpp
+++ b/kradio3/src/stationlist.cpp
@@ -337,7 +337,7 @@ bool StationList::readXML (const TQString &dat, const IErrorLogClient &logger, b
 bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool enableMessageBox)
 {
     TQString tmpfile;
-    if (!KIO::NetAccess::download(url, tmpfile, NULL)) {
+    if (!TDEIO::NetAccess::download(url, tmpfile, NULL)) {
         if (enableMessageBox) {
             logger.logError("StationList::readXML: " +
                             i18n("error downloading preset file %1").arg(url.url()));
@@ -393,7 +393,7 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
 
     presetFile.close();
 
-    KIO::NetAccess::removeTempFile(tmpfile);
+    TDEIO::NetAccess::removeTempFile(tmpfile);
 
     return readXML(xmlData, logger, enableMessageBox);
 }
@@ -477,7 +477,7 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool
                  i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count()));
     } else {
 
-        if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) {
+        if (!TDEIO::NetAccess::upload(tmpFile.name(), url, NULL)) {
             logger.logError("StationList::writeXML: " +
                     i18n("error uploading preset file %1").arg(url.url()));
 
diff --git a/kradio3/src/stationselector.cpp b/kradio3/src/stationselector.cpp
index 87a5d59..d604ea8 100644
--- a/kradio3/src/stationselector.cpp
+++ b/kradio3/src/stationselector.cpp
@@ -297,14 +297,14 @@ void StationSelector::slotCancel()
 }
 
 
-void StationSelector::saveState (KConfig *cfg) const
+void StationSelector::saveState (TDEConfig *cfg) const
 {
     listSelected->saveState(cfg);
     listAvailable->saveState(cfg);
 }
 
 
-void StationSelector::restoreState (KConfig *cfg)
+void StationSelector::restoreState (TDEConfig *cfg)
 {
     listSelected->restoreState(cfg);
     listAvailable->restoreState(cfg);
diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp
index c7e866d..21ddce1 100644
--- a/kradio3/src/widgetplugins.cpp
+++ b/kradio3/src/widgetplugins.cpp
@@ -186,7 +186,7 @@ void WidgetPluginBase::getKWinState(const TQWidget *_w) const
 }
 
 
-void   WidgetPluginBase::saveState (KConfig *config) const
+void   WidgetPluginBase::saveState (TDEConfig *config) const
 {
     const TQWidget *w = getWidget();
     getKWinState(w);
@@ -201,7 +201,7 @@ void   WidgetPluginBase::saveState (KConfig *config) const
 }
 
 
-void   WidgetPluginBase::restoreState (KConfig *config, bool showByDefault)
+void   WidgetPluginBase::restoreState (TDEConfig *config, bool showByDefault)
 {
     m_geoCacheValid = config->readBoolEntry("geoCacheValid", false);
     m_saveDesktop   = config->readNumEntry ("desktop",        1);
@@ -214,7 +214,7 @@ void   WidgetPluginBase::restoreState (KConfig *config, bool showByDefault)
 }
 
 
-void   WidgetPluginBase::restoreState (KConfig *config)
+void   WidgetPluginBase::restoreState (TDEConfig *config)
 {
     restoreState(config, true);
 }