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

6 files changed, 21 insertions, 21 deletions

diff --git a/kxkb/TODO b/kxkb/TODO
index 349d580e4..f177e1656 100644
--- a/kxkb/TODO
+++ b/kxkb/TODO
@@ -14,7 +14,7 @@
 - prevent application/window list from growing endlessly
 
 - bug 59203: call kcontrol/keys/modifiers.cpp: 
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
 	if( bMacSwap )
 		ModifiersModule::setupMacModifierKeys();
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index 09b3ad204..c73fb620f 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -95,7 +95,7 @@ static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent)
 
 
 LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name), 
+  : TDECModule(parent, name), 
     m_rules(NULL)
 {
   TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -263,7 +263,7 @@ void LayoutConfig::initUI() {
 	}
 
 	updateOptionsCommand();
-	emit KCModule::changed( false );
+	emit TDECModule::changed( false );
 }
 
 
@@ -325,7 +325,7 @@ void LayoutConfig::save()
 	m_kxkbConfig.save();
 	
 	kapp->tdeinitExec("kxkb");
-	emit KCModule::changed( false );
+	emit TDECModule::changed( false );
 }
 
 
@@ -672,7 +672,7 @@ void LayoutConfig::updateLayoutCommand()
 void LayoutConfig::changed()
 {
   updateLayoutCommand();
-  emit KCModule::changed( true );
+  emit TDECModule::changed( true );
 }
 
 
@@ -762,7 +762,7 @@ void LayoutConfig::defaults()
 
 	initUI();
 
-	emit KCModule::changed( true );
+	emit TDECModule::changed( true );
 }
 
 
@@ -795,12 +795,12 @@ OptionListItem * OptionListItem::findChildItem( const TQString& optionName )
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_keyboard_layout(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *)
 	{
 		return new LayoutConfig(parent, "kcmlayout");
 	}
 	
-	KDE_EXPORT KCModule *create_keyboard(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *)
 	{
 		return new KeyboardConfig(parent, "kcmlayout");
 	}
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 6f61e9e06..14d9e734e 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -14,7 +14,7 @@ class OptionListItem;
 class LayoutConfigWidget;
 class XkbRules;
 
-class LayoutConfig : public KCModule
+class LayoutConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 63e4d25aa..e3f8f66c8 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -51,7 +51,7 @@
 #include <X11/Xlib.h>
 
 KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
-    : KCModule (parent, "kcmlayout")
+    : TDECModule (parent, "kcmlayout")
 {
   TQString wtstr;
   TQBoxLayout* lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -129,7 +129,7 @@ void KeyboardConfig::setNumLockState( int s )
 
 void KeyboardConfig::load()
 {
-  KConfig config("kcminputrc");
+  TDEConfig config("kcminputrc");
 
   XKeyboardState kbd;
 
@@ -150,7 +150,7 @@ void KeyboardConfig::load()
 
 void KeyboardConfig::save()
 {
-  KConfig config("kcminputrc");
+  TDEConfig config("kcminputrc");
 
   XKeyboardControl kbd;
 
@@ -201,7 +201,7 @@ void KeyboardConfig::delaySliderChanged (int value) {
 
 	ui->delay->setValue((int)floor(0.5 + linearValue));
 
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void KeyboardConfig::delaySpinboxChanged (int value) {
@@ -210,24 +210,24 @@ void KeyboardConfig::delaySpinboxChanged (int value) {
 
 	ui->delaySlider->setValue ((int)floor (0.5 + logVal));
 
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void KeyboardConfig::rateSliderChanged (int value) {
 	ui->rate->setValue(value/100.0);
 
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void KeyboardConfig::rateSpinboxChanged (double value) {
 	ui->rateSlider->setValue ((int)(value*100));
 
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void KeyboardConfig::changed()
 {
-  emit KCModule::changed(true);
+  emit TDECModule::changed(true);
 }
 
 /*
@@ -541,7 +541,7 @@ void set_repeatrate(int delay, double rate)
 
 void KeyboardConfig::init_keyboard()
 {
-	KConfig *config = new KConfig("kcminputrc", true); // Read-only, no globals
+	TDEConfig *config = new TDEConfig("kcminputrc", true); // Read-only, no globals
 	config->setGroup("Keyboard");
 
 	XKeyboardState   kbd;
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index 52b7a046f..b40f50a0d 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -30,7 +30,7 @@
 
 class KeyboardConfigWidget;
 
-class KeyboardConfig : public KCModule
+class KeyboardConfig : public TDECModule
 {
   Q_OBJECT
 public:
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 0e62fbc21..5ddfe8b9a 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -40,7 +40,7 @@ LayoutUnit KxkbConfig::getDefaultLayout()
 
 bool KxkbConfig::load(int loadMode) 
 {
-	KConfig *config = new KConfig("kxkbrc", true, false);
+	TDEConfig *config = new TDEConfig("kxkbrc", true, false);
 	config->setGroup("Layout");
 
 // Even if the layouts have been disabled we still want to set Xkb options
@@ -171,7 +171,7 @@ bool KxkbConfig::load(int loadMode)
 
 void KxkbConfig::save() 
 {
-	KConfig *config = new KConfig("kxkbrc", false, false);
+	TDEConfig *config = new TDEConfig("kxkbrc", false, false);
 	config->setGroup("Layout");
 
 	config->writeEntry("Model", m_model);