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

2 files changed, 6 insertions, 6 deletions

diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 566e291d..62c959ac 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -94,7 +94,7 @@ void Marquis::restore(void)
 }
 
 // unload every window, and save the config as TQStringList of those loaded
-void Marquis::saveSessionConfig(KConfig *c)
+void Marquis::saveSessionConfig(TDEConfig *c)
 {
 	kdDebug(66666) << k_funcinfo << endl;
 
@@ -135,7 +135,7 @@ void Marquis::saveSessionConfig(KConfig *c)
 }
 
 // get the list of loaded plugins from the config, and load them
-void Marquis::readSessionConfig(KConfig *c)
+void Marquis::readSessionConfig(TDEConfig *c)
 {
 	Player *player = napp->player();
 
@@ -173,13 +173,13 @@ void Marquis::readSessionConfig(KConfig *c)
 
 void Marquis::dynamicSave()
 {
-	KConfig config( "marquisrc" );
+	TDEConfig config( "marquisrc" );
 	saveSessionConfig( &config );
 }
 
 void Marquis::dynamicRestore()
 {
-	KConfig config( "marquisrc" );
+	TDEConfig config( "marquisrc" );
 	readSessionConfig( &config );
 }
 
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index c96a6bd1..d07ed297 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -43,8 +43,8 @@ public:
 
 	virtual void restore(void);
 private:
-	void saveSessionConfig(KConfig *);
-	void readSessionConfig(KConfig *);
+	void saveSessionConfig(TDEConfig *);
+	void readSessionConfig(TDEConfig *);
 private slots:
 	void dynamicSave();
 	void dynamicRestore();