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

14 files changed, 34 insertions, 34 deletions

diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c20c9443..a9fb11d0 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -229,7 +229,7 @@ KMixWindow::saveSettings()
 void
 KMixWindow::saveConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    // make sure we don't start without any UI
@@ -289,7 +289,7 @@ KMixWindow::saveConfig()
 void
 KMixWindow::loadConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(0);
 
    m_showDockWidget = config->readBoolEntry("AllowDocking", true);
@@ -468,7 +468,7 @@ KMixWindow::showAbout()
 void
 KMixWindow::loadVolumes()
 {
-	KConfig *cfg = new KConfig( "kmixctrlrc", true );
+	TDEConfig *cfg = new TDEConfig( "kmixctrlrc", true );
 	for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next())
 	{
 		mixer->volumeLoad( cfg );
@@ -484,7 +484,7 @@ KMixWindow::loadVolumes()
 void
 KMixWindow::saveVolumes()
 {
-    KConfig *cfg = new KConfig( "kmixctrlrc", false );
+    TDEConfig *cfg = new TDEConfig( "kmixctrlrc", false );
     for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) {
 	//kdDebug(67100) << "KMixWindow::saveConfig()" << endl;
 	if ( mixer->isOpen() ) { // protect from unplugged devices (better do *not* save them)
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 63b376e7..0af64588 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -235,7 +235,7 @@ void KMixApplet::saveConfig()
     kdDebug(67100) << "KMixApplet::saveConfig()" << endl;
     if ( m_mixerWidget != 0) {
 	//kdDebug(67100) << "KMixApplet::saveConfig() save" << endl;
-        KConfig *cfg = this->config();
+        TDEConfig *cfg = this->config();
 	//kdDebug(67100) << "KMixApplet::saveConfig() save cfg=" << cfg << endl;
         cfg->setGroup( 0 );
         cfg->writeEntry( "Mixer", _mixer->id() );
@@ -262,7 +262,7 @@ void KMixApplet::saveConfig()
 void KMixApplet::loadConfig()
 {
     kdDebug(67100) << "KMixApplet::loadConfig()" << endl;
-    KConfig *cfg = this->config();
+    TDEConfig *cfg = this->config();
     cfg->setGroup(0);
 	
     _mixerId = cfg->readEntry( "Mixer", "undef" );
@@ -282,7 +282,7 @@ void KMixApplet::loadConfig()
 }
 
 
-void KMixApplet::loadConfig( KConfig *config, const TQString &grp )
+void KMixApplet::loadConfig( TDEConfig *config, const TQString &grp )
 {
     if ( m_mixerWidget ) {
 	//config->setGroup( grp );
@@ -291,7 +291,7 @@ void KMixApplet::loadConfig( KConfig *config, const TQString &grp )
 }
 
 
-void KMixApplet::saveConfig( KConfig *config, const TQString &grp )
+void KMixApplet::saveConfig( TDEConfig *config, const TQString &grp )
 {
     if ( m_mixerWidget ) {
 	config->setGroup( grp );
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 5874a484..5b4a74a5 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -102,9 +102,9 @@ protected slots:
 protected:
    void resizeEvent( TQResizeEvent * );
    void saveConfig();
-   void saveConfig( KConfig *config, const TQString &grp );
+   void saveConfig( TDEConfig *config, const TQString &grp );
    void loadConfig();
-   void loadConfig( KConfig *config, const TQString &grp );
+   void loadConfig( TDEConfig *config, const TQString &grp );
 
 private:
    void positionChange(Position);
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 8cf04523..334dea71 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -61,7 +61,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
    TDEApplication app( false, false );
 
    // get maximum values
-   KConfig *config= new KConfig("kmixrc", true, false);
+   TDEConfig *config= new TDEConfig("kmixrc", true, false);
    config->setGroup("Misc");
    delete config;
 
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index adf1b88d..4d4ae7ee 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -219,7 +219,7 @@ void KMixerWidget::setValueStyle( int vs )
 /**
  *  @todo : Is the view list already filled, when loadConfig() is called?
  */
-void KMixerWidget::loadConfig( KConfig *config, const TQString &grp )
+void KMixerWidget::loadConfig( TDEConfig *config, const TQString &grp )
 {
 
 	for ( std::vector<ViewBase*>::iterator it = _views.begin(); it != _views.end();  it++) {
@@ -233,7 +233,7 @@ void KMixerWidget::loadConfig( KConfig *config, const TQString &grp )
 
 
 
-void KMixerWidget::saveConfig( KConfig *config, const TQString &grp )
+void KMixerWidget::saveConfig( TDEConfig *config, const TQString &grp )
 {
 	config->setGroup( grp );
 	// Write mixer name. It cannot be changed in the Mixer instance,
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 43f6574b..03e3195e 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -42,7 +42,7 @@ class TQSlider;
 // KDE
 class KActionCollection;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 class KTabWidget;
 
 // KMix
@@ -87,8 +87,8 @@ class KMixerWidget : public TQWidget
    void setValueStyle( int vs );
    void toggleMenuBarSlot();
 
-   void saveConfig( KConfig *config, const TQString &grp );
-   void loadConfig( KConfig *config, const TQString &grp );
+   void saveConfig( TDEConfig *config, const TQString &grp );
+   void loadConfig( TDEConfig *config, const TQString &grp );
 
   private slots:
       //void updateBalance();
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp
index 397aa320..2a472d6d 100644
--- a/kmix/kmixtoolbox.cpp
+++ b/kmix/kmixtoolbox.cpp
@@ -79,7 +79,7 @@ void KMixToolBox::setValueStyle(TQPtrList<TQWidget> &mdws, int vs ) {
     }
 }
 
-void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) {
+void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix) {
     int n = 0;
     config->setGroup( grp );
     int num = config->readNumEntry( viewPrefix + ".Devs", 0);
@@ -161,7 +161,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T
 }
 
 
-void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix) {
+void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix) {
     config->setGroup( grp  );
     config->writeEntry( viewPrefix + ".Devs", mdws.count() );
 
diff --git a/kmix/kmixtoolbox.h b/kmix/kmixtoolbox.h
index f39dd5a1..9b9d0c80 100644
--- a/kmix/kmixtoolbox.h
+++ b/kmix/kmixtoolbox.h
@@ -6,7 +6,7 @@
 
 class Mixer;
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This toolbox contains various static methods that are shared throughout KMix.
@@ -20,8 +20,8 @@ class KMixToolBox {
     static void setLabels (TQPtrList<TQWidget> &mdws, bool on );
     static void setTicks  (TQPtrList<TQWidget> &mdws, bool on );
     static void setValueStyle  (TQPtrList<TQWidget> &mdws, int vs );
-    static void loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix  );
-    static void saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const TQString &grp, const TQString &viewPrefix  );
+    static void loadConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix  );
+    static void saveConfig(TQPtrList<TQWidget> &mdws, TDEConfig *config, const TQString &grp, const TQString &viewPrefix  );
 };
     
 
diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp
index b29c485f..4b0649d0 100644
--- a/kmix/mixdevice.cpp
+++ b/kmix/mixdevice.cpp
@@ -133,7 +133,7 @@ void MixDevice::setPK(TQString &PK) {
  * because we need to read the minimum and maximum volume levels.
  * (Another solutien would be to "equip" volFromConfig with maxInt and minInt values).
  */
-void MixDevice::read( KConfig *config, const TQString& grp )
+void MixDevice::read( TDEConfig *config, const TQString& grp )
 {
    TQString devgrp;
    devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num );
@@ -193,7 +193,7 @@ void MixDevice::read( KConfig *config, const TQString& grp )
 /**
  *  called on "kmixctrl --save" and from the GUI's (currently only on exit)
  */
-void MixDevice::write( KConfig *config, const TQString& grp )
+void MixDevice::write( TDEConfig *config, const TQString& grp )
 {
    TQString devgrp;
    devgrp.sprintf( "%s.Dev%i", grp.ascii(), _num );
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 2009811e..33ef0d1b 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -75,8 +75,8 @@ SLIDER );
       unsigned int enumId();
       TQPtrList<TQString>& enumValues();
 
-      void read( KConfig *config, const TQString& grp );
-      void write( KConfig *config, const TQString& grp );
+      void read( TDEConfig *config, const TQString& grp );
+      void write( TDEConfig *config, const TQString& grp );
 
       void setType( ChannelType channeltype ) { _type = channeltype; };
       ChannelType type() { return _type; };
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 0e7c36fc..99fd84b0 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -110,7 +110,7 @@ Mixer::~Mixer() {
    delete _pollingTimer;
 }
 
-void Mixer::volumeSave( KConfig *config )
+void Mixer::volumeSave( TDEConfig *config )
 {
     //    kdDebug(67100) << "Mixer::volumeSave()" << endl;
     readSetFromHW();
@@ -119,7 +119,7 @@ void Mixer::volumeSave( KConfig *config )
     _mixerBackend->m_mixDevices.write( config, grp );
 }
 
-void Mixer::volumeLoad( KConfig *config )
+void Mixer::volumeLoad( TDEConfig *config )
 {
    TQString grp("Mixer");
    grp.append(mixerName());
diff --git a/kmix/mixer.h b/kmix/mixer.h
index 1269d609..d9566e81 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -39,7 +39,7 @@ class Mixer_Backend;
 #include "mixdevice.h"
 
 class Volume;
-class KConfig;
+class TDEConfig;
 
 class Mixer : public TQObject, virtual public MixerIface
 {
@@ -57,8 +57,8 @@ class Mixer : public TQObject, virtual public MixerIface
 
       MixDevice* find(TQString& devPK);
 
-      void volumeSave( KConfig *config );
-      void volumeLoad( KConfig *config );
+      void volumeSave( TDEConfig *config );
+      void volumeLoad( TDEConfig *config );
 
        /// Tells the number of the mixing devices
       unsigned int size() const;
diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp
index 63f87c84..8f4ba438 100644
--- a/kmix/mixset.cpp
+++ b/kmix/mixset.cpp
@@ -38,7 +38,7 @@ void MixSet::clone( MixSet &set )
     }
 }
 
-void MixSet::read( KConfig *config, const TQString& grp )
+void MixSet::read( TDEConfig *config, const TQString& grp )
 {
     kdDebug(67100) << "MixSet::read() of group " << grp << endl;
     config->setGroup(grp);
@@ -51,7 +51,7 @@ void MixSet::read( KConfig *config, const TQString& grp )
     }
 }
 
-void MixSet::write( KConfig *config, const TQString& grp )
+void MixSet::write( TDEConfig *config, const TQString& grp )
 {
     kdDebug(67100) << "MixSet::write() of group " << grp << endl;    
     config->setGroup(grp);
diff --git a/kmix/mixset.h b/kmix/mixset.h
index f66692b2..060f6944 100644
--- a/kmix/mixset.h
+++ b/kmix/mixset.h
@@ -6,8 +6,8 @@
 class MixSet : public TQPtrList<MixDevice>
 {
    public:
-      void read( KConfig *config, const TQString& grp );
-      void write( KConfig *config, const TQString& grp );
+      void read( TDEConfig *config, const TQString& grp );
+      void write( TDEConfig *config, const TQString& grp );
 
       void clone( MixSet &orig );