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

3 files changed, 10 insertions, 10 deletions

diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index a11695dd2..6d4695da2 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return ( new KeramikConfig( conf, parent ) );
 	}
@@ -48,11 +48,11 @@ extern "C"
  *			Configure tab in twindecoration
  */
 
-KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
+KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
 	TDEGlobal::locale()->insertCatalogue("twin_clients");
-	c = new KConfig( "twinkeramikrc" );
+	c = new TDEConfig( "twinkeramikrc" );
 	
 	ui = new KeramikConfigUI( parent );
 	connect( ui->showAppIcons,    TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
@@ -74,7 +74,7 @@ KeramikConfig::~KeramikConfig()
 
 // Loads the configurable options from the twinrc config file
 // It is passed the open config from twindecoration to improve efficiency
-void KeramikConfig::load( KConfig* )
+void KeramikConfig::load( TDEConfig* )
 {
 	c->setGroup("General");
 	ui->showAppIcons->setChecked( c->readBoolEntry("ShowAppIcons", true) );
@@ -85,7 +85,7 @@ void KeramikConfig::load( KConfig* )
 
 
 // Saves the configurable options to the twinrc config file
-void KeramikConfig::save( KConfig* )
+void KeramikConfig::save( TDEConfig* )
 {
 	c->setGroup( "General" );
 	c->writeEntry( "ShowAppIcons", ui->showAppIcons->isChecked() );
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 911af89fb..4138fe958 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -35,7 +35,7 @@ class KeramikConfig: public TQObject
 	
 
 	public:
-		KeramikConfig( KConfig* conf, TQWidget* parent );
+		KeramikConfig( TDEConfig* conf, TQWidget* parent );
 		~KeramikConfig();
 
 	// These public signals/slots work similar to KCM modules
@@ -43,13 +43,13 @@ class KeramikConfig: public TQObject
 		void changed();
 
 	public slots:
-		void load( KConfig* conf );	
-		void save( KConfig* conf );
+		void load( TDEConfig* conf );	
+		void save( TDEConfig* conf );
 		void defaults();
 
 	private:
 		KeramikConfigUI *ui;
-		KConfig *c;
+		TDEConfig *c;
 };
 
 
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 2ffbbdfee..3825a851a 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
 
 void KeramikHandler::readConfig()
 {
-	KConfig *c = new KConfig( "twinkeramikrc" );
+	TDEConfig *c = new TDEConfig( "twinkeramikrc" );
 
 	c->setGroup( "General" );
 	showIcons = c->readBoolEntry( "ShowAppIcons", true );