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

6 files changed, 76 insertions, 76 deletions

diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 3c072996b..0743ca31f 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -36,46 +36,46 @@
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("twinrc", false, true);
+		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KFocusConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		return new KActionsOptions( parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("twinrc", false, true);
+		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KMovingConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("twinrc", false, true);
+		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KAdvancedConfig(true, c, parent, name);
 	}
         
-	KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("twinrc", false, true);
+		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KTranslucencyConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name)
+	KDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -84,9 +84,9 @@ extern "C"
 }
 
 KWinOptions::KWinOptions(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
-  mConfig = new KConfig("twinrc", false, true);
+  mConfig = new TDEConfig("twinrc", false, true);
 
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
@@ -153,7 +153,7 @@ void KWinOptions::load()
   mMoving->load();
   mAdvanced->load();
   mTranslucency->load();
-  emit KCModule::changed( false );
+  emit TDECModule::changed( false );
 }
 
 
@@ -166,7 +166,7 @@ void KWinOptions::save()
   mAdvanced->save();
   mTranslucency->save();
 
-  emit KCModule::changed( false );
+  emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
   if ( !kapp->dcopClient()->isAttached() )
@@ -197,14 +197,14 @@ TQString KWinOptions::quickHelp() const
 
 void KWinOptions::moduleChanged(bool state)
 {
-  emit KCModule::changed(state);
+  emit TDECModule::changed(state);
 }
 
 
 KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
-  mConfig = new KConfig("twinrc", false, true);
+  mConfig = new TDEConfig("twinrc", false, true);
 
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
@@ -230,7 +230,7 @@ void KActionsOptions::load()
 {
   mTitleBarActions->load();
   mWindowActions->load();
-  emit KCModule::changed( false );
+  emit TDECModule::changed( false );
 }
 
 
@@ -239,7 +239,7 @@ void KActionsOptions::save()
   mTitleBarActions->save();
   mWindowActions->save();
 
-  emit KCModule::changed( false );
+  emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
   if ( !kapp->dcopClient()->isAttached() )
@@ -256,7 +256,7 @@ void KActionsOptions::defaults()
 
 void KActionsOptions::moduleChanged(bool state)
 {
-  emit KCModule::changed(state);
+  emit TDECModule::changed(state);
 }
 
 #include "main.moc"
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index 2465c6766..4935cf39f 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -28,14 +28,14 @@
 #include <tqtabwidget.h>
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class KFocusConfig;
 class KTitleBarActionsConfig;
 class KWindowActionsConfig;
 class KAdvancedConfig;
 class KTranslucencyConfig;
 
-class KWinOptions : public KCModule
+class KWinOptions : public TDECModule
 {
   Q_OBJECT
 
@@ -66,10 +66,10 @@ private:
   KAdvancedConfig *mAdvanced;
   KTranslucencyConfig *mTranslucency;
 
-  KConfig *mConfig;
+  TDEConfig *mConfig;
 };
 
-class KActionsOptions : public KCModule
+class KActionsOptions : public TDECModule
 {
   Q_OBJECT
 
@@ -94,7 +94,7 @@ private:
   KTitleBarActionsConfig *mTitleBarActions;
   KWindowActionsConfig *mWindowActions;
 
-  KConfig *mConfig;
+  TDEConfig *mConfig;
 };
 
 #endif
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 76b4ba2f9..5c1e22d35 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -132,8 +132,8 @@ void KTitleBarActionsConfig::paletteChanged()
 
 }
 
-KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
-  : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+  : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
   TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -584,8 +584,8 @@ void KTitleBarActionsConfig::defaults()
 }
 
 
-KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
-  : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+  : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
   TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h
index 49591e5d8..70ff2bfca 100644
--- a/twin/kcmtwin/twinoptions/mouse.h
+++ b/twin/kcmtwin/twinoptions/mouse.h
@@ -22,7 +22,7 @@
 #ifndef __KKWMMOUSECONFIG_H__
 #define __KKWMMOUSECONFIG_H__
 
-class KConfig;
+class TDEConfig;
 
 #include <tqwidget.h>
 #include <kcmodule.h>
@@ -48,13 +48,13 @@ protected:
 
 
 
-class KTitleBarActionsConfig : public KCModule
+class KTitleBarActionsConfig : public TDECModule
 {
   Q_OBJECT
 
 public:
 
-  KTitleBarActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+  KTitleBarActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KTitleBarActionsConfig( );
 
   void load();
@@ -62,7 +62,7 @@ public:
   void defaults();
 
 public slots:
-	void changed() { emit KCModule::changed(true); }
+	void changed() { emit TDECModule::changed(true); }
 
 private:
   TQComboBox* coTiDbl;
@@ -77,7 +77,7 @@ private:
 
   ToolTipComboBox * coMax[3];
 
-  KConfig *config;
+  TDEConfig *config;
   bool standAlone;
 
   const char* functionTiDbl(int);
@@ -94,13 +94,13 @@ private slots:
 
 };
 
-class KWindowActionsConfig : public KCModule
+class KWindowActionsConfig : public TDECModule
 {
   Q_OBJECT
 
 public:
 
-  KWindowActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+  KWindowActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KWindowActionsConfig( );
 
   void load();
@@ -108,7 +108,7 @@ public:
   void defaults();
 
 public slots:
-	void changed() { emit KCModule::changed(true); }
+	void changed() { emit TDECModule::changed(true); }
 
 private:
   TQComboBox* coWin1;
@@ -121,7 +121,7 @@ private:
   TQComboBox* coAll3;
   TQComboBox* coAllW;
 
-  KConfig *config;
+  TDEConfig *config;
   bool standAlone;
 
   const char* functionWin(int);
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index fd2152db2..41a593388 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -101,8 +101,8 @@ KFocusConfig::~KFocusConfig ()
 }
 
 // removed the LCD display over the slider - this is not good GUI design :) RNolden 051701
-KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
-    : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
     TQString wtstr;
     TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -437,7 +437,7 @@ void KFocusConfig::setActiveMouseScreen(bool a) {
 void KFocusConfig::updateActiveMouseScreen()
 {
     // on by default for non click to focus policies
-    KConfigGroup cfg( config, "Windows" );
+    TDEConfigGroup cfg( config, "Windows" );
     if( !cfg.hasKey( KWIN_ACTIVE_MOUSE_SCREEN ))
         setActiveMouseScreen( focusCombo->currentItem() != 0 );
 }
@@ -514,7 +514,7 @@ void KFocusConfig::load( void )
     setTraverseAll( config->readBoolEntry(KWIN_TRAVERSE_ALL, false ));
 
     config->setGroup("Desktops");
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KFocusConfig::save( void )
@@ -583,7 +583,7 @@ void KFocusConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KFocusConfig::defaults()
@@ -604,7 +604,7 @@ void KFocusConfig::defaults()
     // setFocusStealing(2);
     // TODO default to low for now
     setFocusStealing(1);
-    emit KCModule::changed(true);
+    emit TDECModule::changed(true);
 }
 
 KAdvancedConfig::~KAdvancedConfig ()
@@ -613,8 +613,8 @@ KAdvancedConfig::~KAdvancedConfig ()
         delete config;
 }
 
-KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
-    : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
     TQString wtstr;
     TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -741,7 +741,7 @@ void KAdvancedConfig::load( void )
 
     setHideUtilityWindowsForInactive( config->readBoolEntry( KWIN_HIDE_UTILITY, true ));
 
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KAdvancedConfig::save( void )
@@ -771,7 +771,7 @@ void KAdvancedConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KAdvancedConfig::defaults()
@@ -782,7 +782,7 @@ void KAdvancedConfig::defaults()
     setElectricBorders(0);
     setElectricBorderDelay(150);
     setHideUtilityWindowsForInactive( true );
-    emit KCModule::changed(true);
+    emit TDECModule::changed(true);
 }
 
 void KAdvancedConfig::setEBorders()
@@ -826,8 +826,8 @@ KMovingConfig::~KMovingConfig ()
         delete config;
 }
 
-KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
-    : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
     TQString wtstr;
     TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
@@ -1163,7 +1163,7 @@ void KMovingConfig::load( void )
     else setWindowSnapZone(v);
 
     OverlapSnap->setChecked(config->readBoolEntry("SnapOnlyWhenOverlapping",false));
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KMovingConfig::save( void )
@@ -1225,7 +1225,7 @@ void KMovingConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
-    emit KCModule::changed(false);
+    emit TDECModule::changed(false);
 }
 
 void KMovingConfig::defaults()
@@ -1243,7 +1243,7 @@ void KMovingConfig::defaults()
 
     setMinimizeAnim( true );
     setMinimizeAnimSpeed( 5 );
-    emit KCModule::changed(true);
+    emit TDECModule::changed(true);
 }
 
 int KMovingConfig::getBorderSnapZone() {
@@ -1270,8 +1270,8 @@ KTranslucencyConfig::~KTranslucencyConfig ()
         kompmgr->detach();
 }
 
-KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
-    : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
+KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   kompmgr = 0L;
   resetKompmgr_ = FALSE;
@@ -1558,7 +1558,7 @@ void KTranslucencyConfig::load( void )
   movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked());
   dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked());
 
-  KConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
+  TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
   conf_.setGroup("xcompmgr");
 
   disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE));
@@ -1589,7 +1589,7 @@ void KTranslucencyConfig::load( void )
   fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0));
   fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0));
 
-  emit KCModule::changed(false);
+  emit TDECModule::changed(false);
 }
 
 void KTranslucencyConfig::save( void )
@@ -1625,7 +1625,7 @@ void KTranslucencyConfig::save( void )
   config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked());
   config->writeEntry("ResetKompmgr",resetKompmgr_);
 
-  KConfig *conf_ = new KConfig(TQDir::homeDirPath() + "/.xcompmgrrc");
+  TDEConfig *conf_ = new TDEConfig(TQDir::homeDirPath() + "/.xcompmgrrc");
   conf_->setGroup("xcompmgr");
 
   conf_->writeEntry("Compmode",useShadows->isChecked()?"CompClientShadows":"");
@@ -1659,7 +1659,7 @@ void KTranslucencyConfig::save( void )
     startKompmgr();
   else
     stopKompmgr();
-  emit KCModule::changed(false);
+  emit TDECModule::changed(false);
 }
 
 void KTranslucencyConfig::defaults()
@@ -1701,7 +1701,7 @@ void KTranslucencyConfig::defaults()
   fadeOnOpacityChange->setChecked(FALSE);
   fadeInSpeed->setValue(70);
   fadeOutSpeed->setValue(70);
-  emit KCModule::changed(true);
+  emit TDECModule::changed(true);
 }
 
 
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index 4c6290a4e..f0b0bcd9f 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -68,11 +68,11 @@ class KIntNumInput;
 
 class TQSpinBox;
 
-class KFocusConfig : public KCModule
+class KFocusConfig : public TDECModule
 {
   Q_OBJECT
 public:
-  KFocusConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
+  KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KFocusConfig();
 
   void load();
@@ -87,7 +87,7 @@ private slots:
   void clickRaiseOnTog(bool);
   void updateAltTabMode();
   void updateActiveMouseScreen();
-	void changed() { emit KCModule::changed(true); }
+	void changed() { emit TDECModule::changed(true); }
 
 
 private:
@@ -127,15 +127,15 @@ private:
   TQCheckBox    *rollOverDesktops;
   TQCheckBox    *showPopupinfo;
 
-  KConfig *config;
+  TDEConfig *config;
   bool     standAlone;
 };
 
-class KMovingConfig : public KCModule
+class KMovingConfig : public TDECModule
 {
   Q_OBJECT
 public:
-  KMovingConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+  KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KMovingConfig();
 
   void load();
@@ -145,7 +145,7 @@ public:
 private slots:
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
-	void changed() { emit KCModule::changed(true); }
+	void changed() { emit TDECModule::changed(true); }
   void slotBrdrSnapChanged( int );
   void slotWndwSnapChanged( int );
 
@@ -174,7 +174,7 @@ private:
 
   TQComboBox *placementCombo;
 
-  KConfig *config;
+  TDEConfig *config;
   bool     standAlone;
 
   int getBorderSnapZone();
@@ -188,11 +188,11 @@ private:
 
 };
 
-class KAdvancedConfig : public KCModule
+class KAdvancedConfig : public TDECModule
 {
   Q_OBJECT
 public:
-  KAdvancedConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+  KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KAdvancedConfig();
 
   void load();
@@ -205,7 +205,7 @@ private slots:
   //copied from kcontrol/konq/twindesktop, aleXXX
   void setEBorders();
 
-  void changed() { emit KCModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 private:
 
@@ -219,7 +219,7 @@ private:
   TQCheckBox *shadeHoverOn;
   KIntNumInput *shadeHover;
 
-  KConfig *config;
+  TDEConfig *config;
   bool     standAlone;
 
   int getElectricBorders( void );
@@ -239,11 +239,11 @@ private:
 };
 
 class TDEProcess;
-class KTranslucencyConfig : public KCModule
+class KTranslucencyConfig : public TDECModule
 {
   Q_OBJECT
 public:
-  KTranslucencyConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
+  KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KTranslucencyConfig();
   
   void load();
@@ -281,7 +281,7 @@ private:
   KIntNumInput *fadeInSpeed;
   KIntNumInput *fadeOutSpeed;
   KColorButton *shadowColor;
-  KConfig *config;
+  TDEConfig *config;
   bool     standAlone;
   bool alphaActivated;
   bool resetKompmgr_;