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

9 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index fd31f7800..caa785605 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-ImportsView::ImportsView(TQWidget * parent, KConfig *config, const char * name )
+ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name )
    : TQWidget (parent, name)
    ,configFile(config)
    ,list(this)
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 51b83bd3c..bad8ab2fd 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -32,12 +32,12 @@ class ImportsView: public TQWidget
 {
    Q_OBJECT
    public:
-      ImportsView(TQWidget *parent, KConfig *config=0, const char * name=0);
+      ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0);
       virtual ~ImportsView() {};
       void saveSettings() {};
       void loadSettings() {};
 private:
-   KConfig *configFile;
+   TDEConfig *configFile;
    TQListView list;
    TQTimer timer;
 private slots:
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 59f44cc56..b6bceb31f 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -34,7 +34,7 @@
 
 #define LOG_SCREEN_XY_OFFSET 10
 
-LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
+LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
 : TQWidget (parent, name)
 ,configFile(config)
 ,filesCount(0)
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index ff2799ccc..05f6c3040 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -40,12 +40,12 @@ class LogView: public TQWidget
 {
    Q_OBJECT
    public:
-      LogView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
+      LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
       virtual ~LogView() {};
       void saveSettings();
       void loadSettings();
    private:
-      KConfig *configFile;
+      TDEConfig *configFile;
       int filesCount, connectionsCount;
       KURLRequester logFileName;
       TQLabel label;
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 1e3fa2175..b4b32611c 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *name)
+StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *name)
    :TQWidget (parent, name)
    ,configFile(config)
    ,dataList(0)
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 64c6026ad..4b6ad6211 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 class TQLineEdit;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 
 class SmallLogItem
 {
@@ -79,14 +79,14 @@ class StatisticsView: public TQWidget
 {
   Q_OBJECT
 public:
-  StatisticsView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
+  StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
   virtual ~StatisticsView() {};
   void saveSettings() {};
   void loadSettings() {};
   public slots:
 	void setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections);
 private:
-  KConfig *configFile;
+  TDEConfig *configFile;
   TQListView *dataList;
   TQListView* viewStatistics;
   TQLabel* connectionsL, *filesL;
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index effd67312..cd5457de1 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -34,7 +34,7 @@
 #define Before(ttf,in) in.left(in.find(ttf))
 #define After(ttf,in)  (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
 
-NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
+NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name )
    : TQWidget(parent, name)
    ,configFile(config)
    ,showmountProc(0)
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index e256de067..2d6c10fba 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -36,11 +36,11 @@ class NetMon : public TQWidget
 {
 Q_OBJECT
 public:
-   NetMon(TQWidget *parent, KConfig * config=0, const char * name=0);
+   NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0);
    void saveSettings() {};
    void loadSettings() {};
 private:
-   KConfig *configFile;
+   TDEConfig *configFile;
    TDEProcess *showmountProc;
    TQListView *list;
    TQLabel *version;
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 5c2856c32..2db372feb 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -29,7 +29,7 @@
 #include "kcmsambastatistics.h"
 #include "ksmbstatus.h"
 
-class SambaContainer:public KCModule
+class SambaContainer:public TDECModule
 {
    public:
       SambaContainer(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList() );
@@ -38,7 +38,7 @@ class SambaContainer:public KCModule
       virtual void save();
 
    private:
-      KConfig config;
+      TDEConfig config;
       TQTabWidget tabs;
       NetMon status;
       ImportsView imports;
@@ -50,7 +50,7 @@ typedef KGenericFactory<SambaContainer, TQWidget > SambaFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_samba, SambaFactory("kcmsamba") )
 
 SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStringList&)
-:KCModule(SambaFactory::instance(), parent,name)
+:TDECModule(SambaFactory::instance(), parent,name)
 ,config("kcmsambarc",false,true)
 ,tabs(this)
 ,status(&tabs,&config)