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

3 files changed, 15 insertions, 15 deletions

diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index 312af343..31b34c5e 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-styles/glow/config/glowconfigdialog.cpp
@@ -45,16 +45,16 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new GlowConfigDialog(conf, parent));
 	}
 }
 
-GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
+GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 	: TQObject(parent)
 {
-	_glowConfig = new KConfig("twinglowrc");
+	_glowConfig = new TDEConfig("twinglowrc");
 	TDEGlobal::locale()->insertCatalogue("twin_glow_config");
 
 	_main_group_box = new TQWidget(parent);
@@ -138,8 +138,8 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	TQHBoxLayout *titlebarGradientTypeLayout = new TQHBoxLayout();
 	_titlebarGradientTypeComboBox = new TQComboBox(_main_group_box);
 
-    KConfig *c = TDEGlobal::config();
-    KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
+    TDEConfig *c = TDEGlobal::config();
+    TDEConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
     TQColor activeBackground = c->readColorEntry("activeBackground");
     TQColor activeBlend = c->readColorEntry("activeBlend");
 
@@ -183,7 +183,7 @@ GlowConfigDialog::~GlowConfigDialog()
 	delete[] _buttonConfigMap;
 }
 
-void GlowConfigDialog::load( KConfig* /* conf */ )
+void GlowConfigDialog::load( TDEConfig* /* conf */ )
 {
 	TQColor color;
 	const TQColor defaultCloseButtonColor(DEFAULT_CLOSE_BUTTON_COLOR);
@@ -229,7 +229,7 @@ void GlowConfigDialog::load( KConfig* /* conf */ )
         slotTitleButtonClicked(0);
 }
 
-void GlowConfigDialog::save( KConfig* /* conf */ )
+void GlowConfigDialog::save( TDEConfig* /* conf */ )
 {
 	_glowConfig->setGroup("General");
 
@@ -298,7 +298,7 @@ void GlowConfigDialog::slotLoadThemeList ()
 
 				if (! _theme_list_view->findItem (finfo->fileName(), 0))
 				{
-					KConfig conf (dir.path() + "/" + finfo->fileName() + "/" +
+					TDEConfig conf (dir.path() + "/" + finfo->fileName() + "/" +
 							finfo->fileName() + ".theme");
 					TQSize button_size = conf.readSizeEntry (
 						"buttonSize", new TQSize (-1, -1));
diff --git a/twin-styles/glow/config/glowconfigdialog.h b/twin-styles/glow/config/glowconfigdialog.h
index 81ab91b2..f86dfbc6 100644
--- a/twin-styles/glow/config/glowconfigdialog.h
+++ b/twin-styles/glow/config/glowconfigdialog.h
@@ -26,7 +26,7 @@ class TQPushButton;
 class TQSignalMapper;
 class TQCheckBox;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class KColorButton;
 
 class GlowConfigDialog : public TQObject
@@ -35,15 +35,15 @@ class GlowConfigDialog : public TQObject
   
 
 public:
-	GlowConfigDialog( KConfig* conf, TQWidget* parent );
+	GlowConfigDialog( TDEConfig* conf, TQWidget* parent );
 	~GlowConfigDialog();
 
 signals:
 	void changed();
 
 public slots:
-	void load( KConfig* conf );
-	void save( KConfig* conf );
+	void load( TDEConfig* conf );
+	void save( TDEConfig* conf );
 	void defaults();
 
 protected slots:
@@ -60,7 +60,7 @@ private:
 	enum ButtonType{stickyButton, helpButton, iconifyButton,
 		maximizeButton, closeButton };
 
-	KConfig *_glowConfig;
+	TDEConfig *_glowConfig;
 
 	bool _showResizeHandle;
 	KPixmapEffect::GradientType _titlebarGradientType;
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index 81be88d7..767363de 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-styles/glow/glowclient.cpp
@@ -51,7 +51,7 @@ GlowClientConfig::GlowClientConfig()
 
 void GlowClientConfig::load(KDecorationFactory *factory)
 {
-	KConfig conf("twinglowrc");
+	TDEConfig conf("twinglowrc");
 	conf.setGroup("General");
 
 	const TQColor defaultCloseButtonColor(DEFAULT_CLOSE_BUTTON_COLOR);
@@ -173,7 +173,7 @@ void GlowClientGlobals::readTheme()
 		return;
 	}
 
-	KConfig conf (theme_config_file);
+	TDEConfig conf (theme_config_file);
 	_theme = new GlowTheme(default_glow_theme);
 
 	_theme->buttonSize = conf.readSizeEntry ("buttonSize",