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

6 files changed, 61 insertions, 61 deletions

diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index a085d032..dbe3ea91 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -98,7 +98,7 @@ bool KXSConfigDialog::create()
     layout->addWidget(controlLayout);
     ((TQBoxLayout*)controlLayout->layout())->addStrut(120);
 
-    KConfig config(mConfigFile);
+    TDEConfig config(mConfigFile);
 
     TQString xmlFile = "/doesntexist";
 #ifdef XSCREENSAVER_CONFIG_DIR
@@ -292,7 +292,7 @@ void KXSConfigDialog::slotChanged()
 void KXSConfigDialog::slotOk()
 {
   KXSConfigItem *item;
-  KConfig config(mConfigFile);
+  TDEConfig config(mConfigFile);
 
   for (item = mConfigItemList.first(); item != 0; item = mConfigItemList.next())
   {
diff --git a/kscreensaver/kxsconfig/kxscontrol.cpp b/kscreensaver/kxsconfig/kxscontrol.cpp
index aca1993c..08f9b55c 100644
--- a/kscreensaver/kxsconfig/kxscontrol.cpp
+++ b/kscreensaver/kxsconfig/kxscontrol.cpp
@@ -33,7 +33,7 @@
 
 //===========================================================================
 KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
-                                  KConfig &config)
+                                  TDEConfig &config)
   : TQWidget(parent), KXSRangeItem(name, config), mSlider(0), mSpinBox(0)
 {
   TQVBoxLayout *l = new TQVBoxLayout(this);
@@ -87,7 +87,7 @@ void KXSRangeControl::slotValueChanged(int value)
   emit changed();
 }
 
-void KXSRangeControl::read(KConfig &config)
+void KXSRangeControl::read(TDEConfig &config)
 {
     KXSRangeItem::read(config);
     if ( mSpinBox )
@@ -98,7 +98,7 @@ void KXSRangeControl::read(KConfig &config)
 
 //===========================================================================
 KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent,
-                                  const TQString &name, KConfig &config)
+                                  const TQString &name, TDEConfig &config)
   : TQWidget(parent), KXSDoubleRangeItem(name, config)
 {
   TQVBoxLayout *l = new TQVBoxLayout(this);
@@ -144,7 +144,7 @@ void KXSDoubleRangeControl::slotValueChanged(int value)
   emit changed();
 }
 
-void KXSDoubleRangeControl::read(KConfig &config)
+void KXSDoubleRangeControl::read(TDEConfig &config)
 {
     KXSDoubleRangeItem::read(config);
     mSlider->setValue((int)((mValue - mMinimum) * 100.0 /
@@ -153,7 +153,7 @@ void KXSDoubleRangeControl::read(KConfig &config)
 
 //===========================================================================
 KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
-                                      KConfig &config)
+                                      TDEConfig &config)
   : TQCheckBox(parent), KXSBoolItem(name, config)
 {
   setText(mLabel);
@@ -176,7 +176,7 @@ void KXSCheckBoxControl::slotToggled(bool state)
   emit changed();
 }
 
-void KXSCheckBoxControl::read(KConfig &config)
+void KXSCheckBoxControl::read(TDEConfig &config)
 {
     KXSBoolItem::read(config);
     setChecked(mValue);
@@ -184,7 +184,7 @@ void KXSCheckBoxControl::read(KConfig &config)
 
 //===========================================================================
 KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name,
-                                      KConfig &config)
+                                      TDEConfig &config)
   : TQWidget(parent), KXSSelectItem(name, config)
 {
   TQVBoxLayout *l = new TQVBoxLayout(this);
@@ -224,7 +224,7 @@ void KXSDropListControl::slotActivated(int indx)
   emit changed();
 }
 
-void KXSDropListControl::read(KConfig &config)
+void KXSDropListControl::read(TDEConfig &config)
 {
     KXSSelectItem::read(config);
     mCombo->setCurrentItem(mValue);
@@ -232,7 +232,7 @@ void KXSDropListControl::read(KConfig &config)
 
 //===========================================================================
 KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name,
-                                  KConfig &config)
+                                  TDEConfig &config)
   : TQWidget(parent), KXSStringItem(name, config)
 {
   TQVBoxLayout *l = new TQVBoxLayout(this);
@@ -261,7 +261,7 @@ void KXSLineEditControl::textChanged( const TQString &text )
   emit changed();
 }
 
-void KXSLineEditControl::read(KConfig &config)
+void KXSLineEditControl::read(TDEConfig &config)
 {
     KXSStringItem::read(config);
     mEdit->setText(mValue);
@@ -269,7 +269,7 @@ void KXSLineEditControl::read(KConfig &config)
 
 //===========================================================================
 KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name,
-                                  KConfig &config)
+                                  TDEConfig &config)
   : TQWidget(parent), KXSStringItem(name, config)
 {
   TQVBoxLayout *l = new TQVBoxLayout(this);
@@ -312,7 +312,7 @@ void KXSFileControl::selectFile()
     }
 }
 
-void KXSFileControl::read(KConfig &config)
+void KXSFileControl::read(TDEConfig &config)
 {
     KXSStringItem::read(config);
     mEdit->setText(mValue);
diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/kscreensaver/kxsconfig/kxscontrol.h
index 98594050..acd1a664 100644
--- a/kscreensaver/kxsconfig/kxscontrol.h
+++ b/kscreensaver/kxsconfig/kxscontrol.h
@@ -39,10 +39,10 @@ class KXSRangeControl : public TQWidget, public KXSRangeItem
   Q_OBJECT
   
 public:
-  KXSRangeControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSRangeControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
 signals:
   void changed();
@@ -61,10 +61,10 @@ class KXSDoubleRangeControl : public TQWidget, public KXSDoubleRangeItem
   Q_OBJECT
   
 public:
-  KXSDoubleRangeControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSDoubleRangeControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSDoubleRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
 signals:
   void changed();
@@ -83,10 +83,10 @@ class KXSCheckBoxControl : public TQCheckBox, public KXSBoolItem
   Q_OBJECT
   
 public:
-  KXSCheckBoxControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSCheckBoxControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSCheckBoxControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
 signals:
   void changed();
@@ -101,10 +101,10 @@ class KXSDropListControl : public TQWidget, public KXSSelectItem
   Q_OBJECT
   
 public:
-  KXSDropListControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSDropListControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSDropListControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
   virtual void addOption( const TQXmlAttributes &attr );
 
@@ -124,10 +124,10 @@ class KXSLineEditControl : public TQWidget, public KXSStringItem
   Q_OBJECT
   
 public:
-  KXSLineEditControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSLineEditControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSLineEditControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
 signals:
   void changed();
@@ -145,10 +145,10 @@ class KXSFileControl : public TQWidget, public KXSStringItem
   Q_OBJECT
   
 public:
-  KXSFileControl(TQWidget *parent, const TQString &name, KConfig &config);
+  KXSFileControl(TQWidget *parent, const TQString &name, TDEConfig &config);
   KXSFileControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr );
 
-  virtual void read(KConfig &config);
+  virtual void read(TDEConfig &config);
 
 signals:
   void changed();
diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp
index 7d9ab034..96e20758 100644
--- a/kscreensaver/kxsconfig/kxsitem.cpp
+++ b/kscreensaver/kxsconfig/kxsitem.cpp
@@ -24,7 +24,7 @@
 #include <tqxml.h>
 
 //===========================================================================
-KXSConfigItem::KXSConfigItem(const TQString &name, KConfig &config)
+KXSConfigItem::KXSConfigItem(const TQString &name, TDEConfig &config)
   : mName(name)
 {
   config.setGroup(name);
@@ -38,7 +38,7 @@ KXSConfigItem::KXSConfigItem(const TQString &name, const TQXmlAttributes &attr )
 }
 
 //===========================================================================
-KXSRangeItem::KXSRangeItem(const TQString &name, KConfig &config)
+KXSRangeItem::KXSRangeItem(const TQString &name, TDEConfig &config)
   : KXSConfigItem(name, config), mInvert(false)
 {
   mMinimum = config.readNumEntry("Minimum");
@@ -68,21 +68,21 @@ TQString KXSRangeItem::command()
   return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
 }
 
-void KXSRangeItem::read(KConfig &config)
+void KXSRangeItem::read(TDEConfig &config)
 {
   config.setGroup(mName);
   if (config.hasKey("Value"))
       mValue = config.readNumEntry("Value");
 }
 
-void KXSRangeItem::save(KConfig &config)
+void KXSRangeItem::save(TDEConfig &config)
 {
   config.setGroup(mName);
   config.writeEntry("Value", mValue);
 }
 
 //===========================================================================
-KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, KConfig &config)
+KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, TDEConfig &config)
   : KXSConfigItem(name, config), mInvert(false)
 {
   mMinimum = config.readDoubleNumEntry("Minimum");
@@ -112,14 +112,14 @@ TQString KXSDoubleRangeItem::command()
   return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
 }
 
-void KXSDoubleRangeItem::read(KConfig &config)
+void KXSDoubleRangeItem::read(TDEConfig &config)
 {
   config.setGroup(mName);
   if (config.hasKey("Value"))
       mValue = config.readDoubleNumEntry("Value");
 }
 
-void KXSDoubleRangeItem::save(KConfig &config)
+void KXSDoubleRangeItem::save(TDEConfig &config)
 {
   config.setGroup(mName);
   config.writeEntry("Value", mValue);
@@ -127,7 +127,7 @@ void KXSDoubleRangeItem::save(KConfig &config)
 
 
 //===========================================================================
-KXSBoolItem::KXSBoolItem(const TQString &name, KConfig &config)
+KXSBoolItem::KXSBoolItem(const TQString &name, TDEConfig &config)
   : KXSConfigItem(name, config)
 {
   mValue = config.readBoolEntry("Value");
@@ -148,21 +148,21 @@ TQString KXSBoolItem::command()
   return mValue ? mSwitchOn : mSwitchOff;
 }
 
-void KXSBoolItem::read(KConfig &config)
+void KXSBoolItem::read(TDEConfig &config)
 {
   config.setGroup(mName);
   if (config.hasKey("Value"))
       mValue = config.readBoolEntry("Value");
 }
 
-void KXSBoolItem::save(KConfig &config)
+void KXSBoolItem::save(TDEConfig &config)
 {
   config.setGroup(mName);
   config.writeEntry("Value", mValue);
 }
 
 //===========================================================================
-KXSSelectItem::KXSSelectItem(const TQString &name, KConfig &config)
+KXSSelectItem::KXSSelectItem(const TQString &name, TDEConfig &config)
   : KXSConfigItem(name, config)
 {
   mOptions = config.readListEntry("Options");
@@ -191,14 +191,14 @@ TQString KXSSelectItem::command()
   return (*it);
 }
 
-void KXSSelectItem::read(KConfig &config)
+void KXSSelectItem::read(TDEConfig &config)
 {
   config.setGroup(mName);
   if (config.hasKey("Value"))
       mValue = config.readNumEntry("Value");
 }
 
-void KXSSelectItem::save(KConfig &config)
+void KXSSelectItem::save(TDEConfig &config)
 {
   config.setGroup(mName);
   config.writeEntry("Value", mValue);
@@ -206,7 +206,7 @@ void KXSSelectItem::save(KConfig &config)
 
 
 //===========================================================================
-KXSStringItem::KXSStringItem(const TQString &name, KConfig &config)
+KXSStringItem::KXSStringItem(const TQString &name, TDEConfig &config)
   : KXSConfigItem(name, config)
 {
   mValue = config.readEntry("Value");
@@ -236,14 +236,14 @@ TQString KXSStringItem::command()
   return "";
 }
 
-void KXSStringItem::read(KConfig &config)
+void KXSStringItem::read(TDEConfig &config)
 {
   config.setGroup(mName);
   if (config.hasKey("Value"))
       mValue = config.readEntry("Value");
 }
 
-void KXSStringItem::save(KConfig &config)
+void KXSStringItem::save(TDEConfig &config)
 {
   config.setGroup(mName);
   config.writeEntry("Value", mValue);
diff --git a/kscreensaver/kxsconfig/kxsitem.h b/kscreensaver/kxsconfig/kxsitem.h
index 74bdff24..9e4bed3e 100644
--- a/kscreensaver/kxsconfig/kxsitem.h
+++ b/kscreensaver/kxsconfig/kxsitem.h
@@ -29,13 +29,13 @@ class TQXmlAttributes;
 class KXSConfigItem
 {
 public:
-  KXSConfigItem(const TQString &name, KConfig &config);
+  KXSConfigItem(const TQString &name, TDEConfig &config);
   KXSConfigItem(const TQString &name, const TQXmlAttributes &attr);
   virtual ~KXSConfigItem() {}
 
   virtual TQString command() = 0;
-  virtual void save(KConfig &config) = 0;
-  virtual void read(KConfig &config) = 0;
+  virtual void save(TDEConfig &config) = 0;
+  virtual void read(TDEConfig &config) = 0;
 
 protected:
   TQString mName;
@@ -45,12 +45,12 @@ protected:
 class KXSRangeItem : public KXSConfigItem
 {
 public:
-  KXSRangeItem(const TQString &name, KConfig &config);
+  KXSRangeItem(const TQString &name, TDEConfig &config);
   KXSRangeItem(const TQString &name, const TQXmlAttributes &attr);
 
   virtual TQString command();
-  virtual void save(KConfig &config);
-  virtual void read(KConfig &config);
+  virtual void save(TDEConfig &config);
+  virtual void read(TDEConfig &config);
 
 protected:
   TQString mSwitch;
@@ -63,12 +63,12 @@ protected:
 class KXSDoubleRangeItem : public KXSConfigItem
 {
 public:
-  KXSDoubleRangeItem(const TQString &name, KConfig &config);
+  KXSDoubleRangeItem(const TQString &name, TDEConfig &config);
   KXSDoubleRangeItem(const TQString &name, const TQXmlAttributes &attr);
 
   virtual TQString command();
-  virtual void read(KConfig &config);
-  virtual void save(KConfig &config);
+  virtual void read(TDEConfig &config);
+  virtual void save(TDEConfig &config);
 
 protected:
   TQString mSwitch;
@@ -81,12 +81,12 @@ protected:
 class KXSBoolItem : public KXSConfigItem
 {
 public:
-  KXSBoolItem(const TQString &name, KConfig &config);
+  KXSBoolItem(const TQString &name, TDEConfig &config);
   KXSBoolItem(const TQString &name, const TQXmlAttributes &attr);
 
   virtual TQString command();
-  virtual void read(KConfig &config);
-  virtual void save(KConfig &config);
+  virtual void read(TDEConfig &config);
+  virtual void save(TDEConfig &config);
 
 protected:
   TQString mSwitchOn;
@@ -97,15 +97,15 @@ protected:
 class KXSSelectItem : public KXSConfigItem
 {
 public:
-  KXSSelectItem(const TQString &name, KConfig &config);
+  KXSSelectItem(const TQString &name, TDEConfig &config);
   KXSSelectItem(const TQString &name, const TQXmlAttributes &attr);
 
   virtual void addOption(const TQXmlAttributes &attr);
 
   virtual TQString command();
 
-  virtual void read(KConfig &config);
-  virtual void save(KConfig &config);
+  virtual void read(TDEConfig &config);
+  virtual void save(TDEConfig &config);
 
 protected:
   TQStringList mOptions;
@@ -116,12 +116,12 @@ protected:
 class KXSStringItem : public KXSConfigItem
 {
 public:
-  KXSStringItem(const TQString &name, KConfig &config);
+  KXSStringItem(const TQString &name, TDEConfig &config);
   KXSStringItem(const TQString &name, const TQXmlAttributes &attr);
 
   virtual TQString command();
-  virtual void save(KConfig &config);
-  virtual void read(KConfig &config);
+  virtual void save(TDEConfig &config);
+  virtual void read(TDEConfig &config);
 
 protected:
   TQString mSwitch;
diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp
index 6f4dbf5e..6ffa1b15 100644
--- a/kscreensaver/kxsconfig/kxsrun.cpp
+++ b/kscreensaver/kxsconfig/kxsrun.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     configFile += "rc";
 
     // read configuration args
-    KConfig config(configFile);
+    TDEConfig config(configFile);
 
     TQPtrList<KXSConfigItem> configItemList;