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

9 files changed, 25 insertions, 25 deletions

diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index da216aaf3..5eae86c62 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -88,7 +88,7 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
 
    if (m_multidesktop)
    {
-      KConfig cfg(desktopConfigname(), false, false);
+      TDEConfig cfg(desktopConfigname(), false, false);
       cfg.setGroup( "General" );
       if (!cfg.readBoolEntry( "Enabled", true ))
       {
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 2905d7ac7..448eda455 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -66,7 +66,7 @@
 
 #define NR_PREDEF_PATTERNS 6
 
-BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
+BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
   : BGDialog_UI(parent, "BGDialog")
 {
    m_pGlobals = new TDEGlobalBackgroundSettings(_config);
@@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
    //FIXME set this to a server when we get one
    //should really be in a .rc file but could be either
    //kcmshellrc or kcontrolrc
-   KConfig* config = TDEGlobal::config();
+   TDEConfig* config = TDEGlobal::config();
    config->setGroup("KNewStuff");
    config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
    config->writeEntry( "StandardResource", "wallpaper" );
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 86e10a039..2a76acd52 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI
 {
    Q_OBJECT
 public:
-   BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true);
+   BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
    ~BGDialog();
 
    void load( bool useDefaults );
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 2c3da199f..164616c14 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -47,7 +47,7 @@
 /**** KBackgroundRenderer ****/
 
 
-KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
+KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
     : KBackgroundSettings(desk, screen, drawBackgroundPerScreen, config)
 {
     m_State = 0;
@@ -1019,7 +1019,7 @@ void KBackgroundRenderer::saveCacheFile()
 }
 
 //BEGIN class KVirtualBGRenderer
-KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
+KVirtualBGRenderer::KVirtualBGRenderer( int desk, TDEConfig *config )
 {
     m_pPixmap = 0l;
     m_desk = desk;
@@ -1038,7 +1038,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
         else
             configname.sprintf("kdesktop-screen-%drc", screen_number);
 
-        m_pConfig = new KConfig(configname, false, false);
+        m_pConfig = new TDEConfig(configname, false, false);
         m_bDeleteConfig = true;
     } else {
         m_pConfig = config;
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index ee798894e..b10f4033c 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -23,7 +23,7 @@ class TQRect;
 class TQString;
 class TQTimer;
 
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KTempFile;
 class KShellProcess;
@@ -42,7 +42,7 @@ class KBackgroundRenderer:
     Q_OBJECT
 
 public:
-    KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0);
+    KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
     ~KBackgroundRenderer();
     
     void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true);
@@ -124,7 +124,7 @@ class KVirtualBGRenderer : public QObject
 {
     Q_OBJECT
 public:
-    KVirtualBGRenderer(int desk, KConfig *config=0l);
+    KVirtualBGRenderer(int desk, TDEConfig *config=0l);
     ~KVirtualBGRenderer();
     
     KBackgroundRenderer * renderer(unsigned screen);
@@ -162,7 +162,7 @@ private:
     TQSize renderSize(int screen); // the size the renderer should be
     void initRenderers();
     
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     float m_scaleX;
     float m_scaleY;
     int m_desk;
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index d51995299..7bc17a215 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -415,7 +415,7 @@ TQStringList KBackgroundProgram::list()
 /**** KBackgroundSettings ****/
 
 
-KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
+KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
     : KBackgroundPattern(),
       KBackgroundProgram()
 {
@@ -501,7 +501,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
         else
             configname.sprintf("kdesktop-screen-%drc", screen_number);
 
-        m_pConfig = new KConfig(configname, false, false);
+        m_pConfig = new TDEConfig(configname, false, false);
         m_bDeleteConfig = true;
     } else {
         m_pConfig = config;
@@ -1065,7 +1065,7 @@ void KBackgroundSettings::setEnabled(const bool enable)
 
 /**** TDEGlobalBackgroundSettings ****/
 
-TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
+TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(TDEConfig *_config)
 {
     m_pConfig = _config;
 
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index 03aa171e7..d007f5753 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -19,7 +19,7 @@
 template <class TQString, class T> class TQMap;
 class KStandardDirs;
 class KSimpleConfig;
-class KConfig;
+class TDEConfig;
 class TQString;
 class TQImage;
 
@@ -156,7 +156,7 @@ public:
      * mode) will be treated as one big display, and the "screen" paramater
      * will be ignored.
      */
-    KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config);
+    KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config);
     ~KBackgroundSettings();
 
     void copyConfig(const KBackgroundSettings*);
@@ -282,7 +282,7 @@ private:
     int m_CurrentWallpaper;
     TQString m_CurrentWallpaperName;
 
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     KStandardDirs *m_pDirs;
     bool m_bDeleteConfig;
     bool m_bEnabled;
@@ -305,7 +305,7 @@ public:
 class TDEGlobalBackgroundSettings
 {
 public:
-    TDEGlobalBackgroundSettings(KConfig *config);
+    TDEGlobalBackgroundSettings(TDEConfig *config);
 
     TQString deskName(int desk);
     //void setDeskName(int desk, TQString name);
@@ -347,7 +347,7 @@ public:
 
     void readSettings();
     void writeSettings();
-    KConfig* getConfig() { return m_pConfig; }
+    TDEConfig* getConfig() { return m_pConfig; }
 
 private:
     bool dirty;
@@ -363,7 +363,7 @@ private:
     bool m_shadowEnabled;
     int m_textLines;
     int m_textWidth;
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     bool m_bDeleteConfig;
     TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk]
 };
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index aab1f7bba..06d84ff86 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -42,7 +42,7 @@ KBackground::~KBackground( )
 }
 
 KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */)
-    : KCModule(KBackGndFactory::instance(), parent, name)
+    : TDECModule(KBackGndFactory::instance(), parent, name)
 {
     int screen_number = 0;
     if (tqt_xdisplay())
@@ -52,7 +52,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
 	configname = "kdesktoprc";
     else
 	configname.sprintf("kdesktop-screen-%drc", screen_number);
-    m_pConfig = new KConfig(configname, false, false);
+    m_pConfig = new TDEConfig(configname, false, false);
 
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_base = new BGDialog(this, m_pConfig);
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 100d9c2b9..a879becd8 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -12,13 +12,13 @@
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class BGDialog;
 
 /**
  * The Desktop/Background tab in kcontrol.
  */
-class KBackground: public KCModule
+class KBackground: public TDECModule
 {
     Q_OBJECT
 
@@ -33,7 +33,7 @@ public:
 
 private:
     BGDialog      *m_base;
-    KConfig       *m_pConfig;
+    TDEConfig       *m_pConfig;
 };