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

6 files changed, 29 insertions, 29 deletions

diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp
index 2fd136e..3619f90 100644
--- a/ksim/library/ksimconfig.cpp
+++ b/ksim/library/ksimconfig.cpp
@@ -24,9 +24,9 @@
 #include "ksimconfig.h"
 #include "themeloader.h"
 
-KConfig *KSim::Config::mainConfig = 0;
+TDEConfig *KSim::Config::mainConfig = 0;
 
-KSim::Config::Config(KConfig *config)
+KSim::Config::Config(TDEConfig *config)
 {
   mainConfig = config;
 }
@@ -35,7 +35,7 @@ KSim::Config::~Config()
 {
 }
 
-KConfig *KSim::Config::config()
+TDEConfig *KSim::Config::config()
 {
   return mainConfig;
 }
diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h
index c831f35..8f7376d 100644
--- a/ksim/library/ksimconfig.h
+++ b/ksim/library/ksimconfig.h
@@ -26,7 +26,7 @@
 
 #include <kdemacros.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KSim
 {
@@ -36,10 +36,10 @@ namespace KSim
   class KDE_EXPORT Config
   {
     public:
-      Config(KConfig *config);
+      Config(TDEConfig *config);
       ~Config();
 
-      static KConfig *config();
+      static TDEConfig *config();
 
       int width(int defaultWidth) const;
       void setWidth(int width);
@@ -103,7 +103,7 @@ namespace KSim
       void setReColourThemes(bool);
 
     private:
-      static KConfig *mainConfig;
+      static TDEConfig *mainConfig;
   };
 }
 #endif
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index abe6609..74128d9 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -76,7 +76,7 @@ const TQString &KSim::PluginObject::configFileName() const
 class KSim::PluginPage::Private
 {
   public:
-    KConfig *config;
+    TDEConfig *config;
     KSim::PluginObject *parent;
 };
 
@@ -86,7 +86,7 @@ KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name)
   d = new PluginPage::Private;
   d->parent = parent;
   if (parent && !parent->configFileName().isEmpty())
-    d->config = new KConfig(parent->configFileName() + "rc");
+    d->config = new TDEConfig(parent->configFileName() + "rc");
   else {
     kdWarning() << className() << ": Can not create the config() "
        "pointer due to the parent being null" << endl;
@@ -100,7 +100,7 @@ KSim::PluginPage::~PluginPage()
   delete d;
 }
 
-KConfig *KSim::PluginPage::config() const
+TDEConfig *KSim::PluginPage::config() const
 {
   if (d)
     return d->config;
@@ -113,7 +113,7 @@ class KSim::PluginView::Private
   public:
     PluginObject *parent;
     TQPopupMenu *popupMenu;
-    KConfig *config;
+    TDEConfig *config;
 };
 
 KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name)
@@ -126,7 +126,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name)
      TQT_SLOT(showAbout()), 0, -1, 0);
 
   if (parent && !parent->configFileName().isEmpty())
-    d->config = new KConfig(parent->configFileName() + "rc");
+    d->config = new TDEConfig(parent->configFileName() + "rc");
   else {
     kdWarning() << className() << ": Can not create the config() "
        "pointer due to the parent being null" << endl;
@@ -142,7 +142,7 @@ KSim::PluginView::~PluginView()
   d = 0;
 }
 
-KConfig *KSim::PluginView::config() const
+TDEConfig *KSim::PluginView::config() const
 {
   return d->config;
 }
diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h
index 78cc21b..b93a98e 100644
--- a/ksim/library/pluginmodule.h
+++ b/ksim/library/pluginmodule.h
@@ -25,7 +25,7 @@
 #include <kdemacros.h>
 
 class TQPopupMenu;
-class KConfig;
+class TDEConfig;
 
 #define KSIM_INIT_PLUGIN(className) \
 extern "C" { \
@@ -139,7 +139,7 @@ namespace KSim
        * use this to get a config object unique to the plugin name,
        * eg: the plugin foo would have the config file foorc
        */
-      KConfig *config() const;
+      TDEConfig *config() const;
 
     signals:
       void pageChanged();
@@ -178,7 +178,7 @@ namespace KSim
        * use this to get a config object unique to the plugin name,
        * eg: the plugin foo would have the config file foorc
        */
-      KConfig *config() const;
+      TDEConfig *config() const;
       /**
        * the plugins popup menu
        */
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 60e2031..947ba73 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -47,7 +47,7 @@ class KSim::Theme::Private
 
     TQStringList file;
     TQStringList dFile;
-    KConfig *globalReader;
+    TDEConfig *globalReader;
     TQString altTheme;
     TQString location;
     const TQValueVector<TQString> &fileNames;
@@ -94,7 +94,7 @@ class KSim::ThemeLoader::Private
   public:
     TQValueVector<TQString> fileNames;
     TQStringList imageTypes;
-    KConfig *globalReader;
+    TDEConfig *globalReader;
     bool recolour;
     TQColor pixelColour;
 };
@@ -764,7 +764,7 @@ KSim::Theme::Theme()
 
 KSim::Theme::Theme(const TQString &url, const TQString &fileName, int alt,
    const TQValueVector<TQString> &vector, const TQStringList &list,
-   KConfig *globalReader)
+   TDEConfig *globalReader)
 {
   create(vector, list, globalReader);
   init(url, fileName, alt);
@@ -774,7 +774,7 @@ KSim::Theme::Theme(const TQString &url, const TQString &fileName, int alt,
 }
 
 void KSim::Theme::create(const TQValueVector<TQString> &vector,
-   const TQStringList &list, KConfig *globalReader)
+   const TQStringList &list, TDEConfig *globalReader)
 {
   d = new Private(vector, list);
   d->globalReader = globalReader;
@@ -917,7 +917,7 @@ void KSim::ThemeLoader::reload()
 
   if (currentUrl() != defaultUrl()) {
     if (!d->globalReader)
-      d->globalReader = new KConfig(defaultUrl() + "gkrellmrc_ksim");
+      d->globalReader = new TDEConfig(defaultUrl() + "gkrellmrc_ksim");
   }
   else {
     delete d->globalReader;
@@ -998,24 +998,24 @@ TQString KSim::ThemeLoader::parseConfig(const TQString &url,
     TQString line(origStream.readLine().simplifyWhiteSpace());
 
     if (line.find(reg) == 0) // find the location of the * comments
-      // replace all * comments with # comments so KConfig doesn't complain
+      // replace all * comments with # comments so TDEConfig doesn't complain
       line.replace(reg, "#");
 
     if (line.find("#") == -1) { // find the location of the string 'gkrellmms'
       if (line.findRev("=") == -1) { // if found we check for the string '='
         int numLoc = line.findRev(numbers);
         if (numLoc != -1)
-          // if '=' doesn't exist we add one so KConfig doesn't complain
+          // if '=' doesn't exist we add one so TDEConfig doesn't complain
           line.insert(numLoc, " = ");
 
         numLoc = line.findRev(number);
         if (numLoc != -1)
-          // if '=' doesn't exist we add one so KConfig doesn't complain
+          // if '=' doesn't exist we add one so TDEConfig doesn't complain
           line.insert(numLoc, " = ");
 
         numLoc = line.findRev(minus);
         if (numLoc != -1)
-          // replace the '-' with an '=' so KConfig doesn't get confused
+          // replace the '-' with an '=' so TDEConfig doesn't get confused
           line.replace(TQRegExp("-"), "=");
       }
     }
@@ -1186,7 +1186,7 @@ KSim::ThemeLoader::ThemeLoader()
   d->imageTypes << "png" << "jpg" << "jpeg" << "xpm" << "gif";
 
   if (currentUrl() != defaultUrl())
-    d->globalReader = new KConfig(defaultUrl() + "gkrellmrc_ksim");
+    d->globalReader = new TDEConfig(defaultUrl() + "gkrellmrc_ksim");
   else
     d->globalReader = 0;
 
diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h
index 9206583..89ac67b 100644
--- a/ksim/library/themeloader.h
+++ b/ksim/library/themeloader.h
@@ -30,7 +30,7 @@
 
 class TQStringList;
 template<class> class TQValueVector;
-class KConfig;
+class TDEConfig;
 class TQWidget;
 
 namespace KSim
@@ -372,8 +372,8 @@ namespace KSim
       Theme();
       Theme(const TQString &url, const TQString &fileName, int alt,
          const TQValueVector<TQString> &vector, const TQStringList &list,
-         KConfig *globalReader);
-      void create(const TQValueVector<TQString> &, const TQStringList &, KConfig *);
+         TDEConfig *globalReader);
+      void create(const TQValueVector<TQString> &, const TQStringList &, TDEConfig *);
       void init(const TQString &url, const TQString &fileName, int alt);
       void reparse(const TQString &url, const TQString &fileName, int alt);
       TQString parseConfig(const TQString &, const TQString &);