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

4 files changed, 7 insertions, 7 deletions

diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 79802e32..3544bb7a 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -43,7 +43,7 @@ typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") )
 
 KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
-    : KCModule (parent, name)
+    : TDECModule (parent, name)
 {
   tabs = new TQTabWidget (this, "tabs");
 
diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h
index 0596ebee..26de95a1 100644
--- a/wifi/kcmwifi/kcmwifi.h
+++ b/wifi/kcmwifi/kcmwifi.h
@@ -30,7 +30,7 @@ class MainConfig;
 class TQTabWidget;
 class KProcIO;
 
-class KCMWifi : public KCModule
+class KCMWifi : public TDECModule
 {
     Q_OBJECT
   
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 6941b80e..7a1cdac3 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -115,7 +115,7 @@ IfConfig::IfConfig()
   powerModeList << "All" << "UnicastOnly" << "MulticastOnly";
 }
 
-void IfConfig::load( KConfig *config, int i )
+void IfConfig::load( TDEConfig *config, int i )
 {
   TQString entry;
 
@@ -148,7 +148,7 @@ void IfConfig::load( KConfig *config, int i )
   m_wakeupPeriod = config->readNumEntry( "WakeupPeriod", 20 );
 }
 
-void IfConfig::save( KConfig *config, int i )
+void IfConfig::save( TDEConfig *config, int i )
 {
   TQString group = TQString( "Configuration %1" ).arg( i+1 );
   config->setGroup( group );
diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h
index 410756ed..2e153bcb 100644
--- a/wifi/kcmwifi/wificonfig.h
+++ b/wifi/kcmwifi/wificonfig.h
@@ -25,7 +25,7 @@
 
 #include "kcmwifi.h"
 
-class KConfig;
+class TDEConfig;
 class KSimpleConfig;
 
 enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5, STRING_128=6, STRING_256=7 };
@@ -58,8 +58,8 @@ class IfConfig
     enum PowerMode { AllPackets=0, UnicastOnly, MulticastOnly };
     enum CryptoMode { Open=0, Restricted };
 
-    void load( KConfig *config, int i );
-    void save( KConfig *config, int i );
+    void load( TDEConfig *config, int i );
+    void save( TDEConfig *config, int i );
 
     TQString speedAsString();
     TQString wifimodeAsString();