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

3 files changed, 10 insertions, 10 deletions

diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index 31ac3b83b..d3364af14 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new QuartzConfig(conf, parent));
 	}
@@ -30,10 +30,10 @@ extern "C"
  *			Configure tab in twindecoration
  */
 
-QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
+QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	quartzConfig = new KConfig("twinquartzrc");
+	quartzConfig = new TDEConfig("twinquartzrc");
 	TDEGlobal::locale()->insertCatalogue("twin_clients");
 	gb = new TQVBox( parent );
 	cbColorBorder = new TQCheckBox( 
@@ -72,7 +72,7 @@ void QuartzConfig::slotSelectionChanged()
 
 // Loads the configurable options from the twinrc config file
 // It is passed the open config from twindecoration to improve efficiency
-void QuartzConfig::load( KConfig* /*conf*/ )
+void QuartzConfig::load( TDEConfig* /*conf*/ )
 {
 	quartzConfig->setGroup("General");
 	bool override = quartzConfig->readBoolEntry( "UseTitleBarBorderColors", true );
@@ -83,7 +83,7 @@ void QuartzConfig::load( KConfig* /*conf*/ )
 
 
 // Saves the configurable options to the twinrc config file
-void QuartzConfig::save( KConfig* /*conf*/ )
+void QuartzConfig::save( TDEConfig* /*conf*/ )
 {
 	quartzConfig->setGroup("General");
 	quartzConfig->writeEntry( "UseTitleBarBorderColors", cbColorBorder->isChecked() );
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index 6bd1ba384..d334930c8 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -19,7 +19,7 @@ class QuartzConfig: public TQObject
 	Q_OBJECT
 
 	public:
-		QuartzConfig( KConfig* conf, TQWidget* parent );
+		QuartzConfig( TDEConfig* conf, TQWidget* parent );
 		~QuartzConfig();
 
 	// These public signals/slots work similar to KCM modules
@@ -27,15 +27,15 @@ class QuartzConfig: 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:
 		void slotSelectionChanged();	// Internal use
 
 	private:
-		KConfig*   quartzConfig;
+		TDEConfig*   quartzConfig;
 		TQCheckBox* cbColorBorder;
 		TQCheckBox* cbExtraSmall;
 		TQVBox* gb;
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 21b4c039c..09d3ccf52 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability )
 
 void QuartzHandler::readConfig()
 {
-	KConfig conf("twinquartzrc");
+	TDEConfig conf("twinquartzrc");
 	conf.setGroup("General");
 	coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true );
 	extraSlim    = conf.readBoolEntry( "UseQuartzExtraSlim", false );