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

3 files changed, 11 insertions, 11 deletions

diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index 8942467f..dc99a05a 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/twin-styles/icewm/config/config.cpp
@@ -39,7 +39,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new IceWMConfig(conf, parent));
 	}
@@ -55,10 +55,10 @@ extern "C"
 //				Configure tab in twindecoration
 // ==========================================================================
 
-IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
+IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	icewmConfig = new KConfig("twinicewmrc");
+	icewmConfig = new TDEConfig("twinicewmrc");
 	TDEGlobal::locale()->insertCatalogue("twin_art_clients");
 
 	mainWidget = new TQVBox( parent );
@@ -224,7 +224,7 @@ void IceWMConfig::slotSelectionChanged()
 
 
 // Loads the configurable options from the twinicewmrc config file
-void IceWMConfig::load( KConfig* )
+void IceWMConfig::load( TDEConfig* )
 {
 	icewmConfig->setGroup("General");
 
@@ -242,7 +242,7 @@ void IceWMConfig::load( KConfig* )
 
 
 // Saves the configurable options to the twinicewmrc config file
-void IceWMConfig::save( KConfig* )
+void IceWMConfig::save( TDEConfig* )
 {
 	icewmConfig->setGroup("General");
 	icewmConfig->writeEntry( "ThemeTitleTextColors", cbThemeTitleTextColors->isChecked() );
diff --git a/twin-styles/icewm/config/config.h b/twin-styles/icewm/config/config.h
index d8865971..89f98e0d 100644
--- a/twin-styles/icewm/config/config.h
+++ b/twin-styles/icewm/config/config.h
@@ -43,7 +43,7 @@ class IceWMConfig: public TQObject
   
 
 	public:
-		IceWMConfig( KConfig* conf, TQWidget* parent );
+		IceWMConfig( TDEConfig* conf, TQWidget* parent );
 		~IceWMConfig();
 
 	// These public signals/slots work similar to KCM modules
@@ -51,8 +51,8 @@ class IceWMConfig: public TQObject
 		void changed();
 
 	public slots:
-		void load( KConfig* conf );
-		void save( KConfig* conf );
+		void load( TDEConfig* conf );
+		void save( TDEConfig* conf );
 		void defaults();
 
 	protected slots:
@@ -61,7 +61,7 @@ class IceWMConfig: public TQObject
 		void findIceWMThemes();
 
 	private:
-		KConfig*   icewmConfig;
+		TDEConfig*   icewmConfig;
 		TQCheckBox* cbThemeTitleTextColors;
 		TQCheckBox* cbTitleBarOnTop;
 		TQCheckBox* cbShowMenuButtonIcon;
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 1e79ceb0..003ec3d5 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -237,7 +237,7 @@ TQString ThemeHandler::reverseString( TQString s )
 // This function reads the twinicewmrc config file
 void ThemeHandler::readConfig()
 {
-	KConfig conf("twinicewmrc");
+	TDEConfig conf("twinicewmrc");
 	conf.setGroup("General");
 	themeName = conf.readEntry("CurrentTheme");
 	themeTitleTextColors = conf.readBoolEntry("ThemeTitleTextColors", true);
@@ -271,7 +271,7 @@ void ThemeHandler::initTheme()
 
 	// We use kconfig to read icewm config files...
 	// this is easy since icewm uses key=value pairs!
-	KConfig config( locate("data", TQString("twin/icewm-themes/") +
+	TDEConfig config( locate("data", TQString("twin/icewm-themes/") +
 					themeName + TQString("default.theme")) );
 
 	// Load specifics, or use IceWM defaults instead.