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

3 files changed, 9 insertions, 9 deletions

diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 03a063f4d..474bc0416 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 void KRandRModule::performApplyOnStartup()
 {
-	KConfig config("kcmrandrrc", true);
+	TDEConfig config("kcmrandrrc", true);
 	if (RandRDisplay::applyOnStartup(config))
 	{
 		// Load settings and apply appropriate config
@@ -75,7 +75,7 @@ void KRandRModule::performApplyOnStartup()
 }
 
 KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 	, m_changed(false)
 {
 	if (!isValid()) {
@@ -146,7 +146,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 
 	slotScreenChanged(TQApplication::desktop()->primaryScreen());
 
-	setButtons(KCModule::Apply);
+	setButtons(TDECModule::Apply);
 }
 
 void KRandRModule::addRotationButton(int thisRotation, bool checkbox)
@@ -272,7 +272,7 @@ void KRandRModule::load( bool useDefaults )
 	// It will be correct already if they wanted to retain their settings over TDE restarts,
 	// and if it isn't correct they have changed a) their X configuration, b) the screen
 	// with another program, or c) their hardware.
-	KConfig config("kcmrandrrc", true);
+	TDEConfig config("kcmrandrrc", true);
 
    config.setReadDefaults( useDefaults );
 
@@ -294,7 +294,7 @@ void KRandRModule::save()
 
 	m_oldApply = m_applyOnStartup->isChecked();
 	m_oldSyncTrayApp = m_syncTrayApp->isChecked();
-	KConfig config("kcmrandrrc");
+	TDEConfig config("kcmrandrrc");
 	saveDisplay(config, m_oldApply, m_oldSyncTrayApp);
 
 	setChanged();
diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/krandrmodule.h
index 40a94566a..53d428fe1 100644
--- a/kcontrol/randr/krandrmodule.h
+++ b/kcontrol/randr/krandrmodule.h
@@ -25,7 +25,7 @@ class TQButtonGroup;
 class KComboBox;
 class TQCheckBox;
 
-class KRandRModule : public KCModule, public KRandrSimpleAPI
+class KRandRModule : public TDECModule, public KRandrSimpleAPI
 {
 	Q_OBJECT
 
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 85a5e3f60..f30e3102a 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -476,7 +476,7 @@ void KRandRSystemTray::slotResolutionChanged(int parameter)
 	currentScreen()->proposeRefreshRate(-1);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}
@@ -497,7 +497,7 @@ void KRandRSystemTray::slotOrientationChanged(int parameter)
 	currentScreen()->proposeRotation(propose);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}
@@ -511,7 +511,7 @@ void KRandRSystemTray::slotRefreshRateChanged(int parameter)
 	currentScreen()->proposeRefreshRate(parameter);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}