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

2 files changed, 7 insertions, 7 deletions

diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index fcc70a66d..acc66880e 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -44,11 +44,11 @@
 #include "smartcard.h"
 
 KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name),DCOPObject(name)
+  : TDECModule(parent, name),DCOPObject(name)
 {
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  config = new KConfig("ksmartcardrc", false, false);
+  config = new TDEConfig("ksmartcardrc", false, false);
 
   DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
 
@@ -372,14 +372,14 @@ TQString KSmartcardConfig::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_smartcard(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
   {
     return new KSmartcardConfig(parent, "kcmsmartcard");
   }
 
   KDE_EXPORT void init_smartcard()
   {
-    KConfig *config = new KConfig("ksmartcardrc", false, false);
+    TDEConfig *config = new TDEConfig("ksmartcardrc", false, false);
     bool start = config->readBoolEntry("Enable Support", false);
     delete config;
 
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 31fcea349..8a7367341 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -32,12 +32,12 @@
 #include "smartcardbase.h"
 #include "nosmartcardbase.h"
 
-class KConfig;
+class TDEConfig;
 class KCardDB;
 class KPopupMenu;
 class KListViewItem;
 
-class KSmartcardConfig : public KCModule, public DCOPObject
+class KSmartcardConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
     Q_OBJECT
@@ -74,7 +74,7 @@ public:
 
 private:
 
-  KConfig *config;
+  TDEConfig *config;
   bool _ok;
   KCardDB * _cardDB;
   KPopupMenu * _popUpKardChooser;