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

1 files changed, 19 insertions, 19 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 3b03971b..0e1ae639 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -68,7 +68,7 @@ NoatunApp::NoatunApp()
 
 	// set the default config data
 	// TODO: Maybe a first time wizard instead?
-	KConfig *config=TDEGlobal::config(); // +
+	TDEConfig *config=TDEGlobal::config(); // +
 	config->setGroup(TQString()); // 1
 	if (!config->readEntry("Modules").length())
 	{
@@ -146,7 +146,7 @@ NoatunApp::NoatunApp()
 NoatunApp::~NoatunApp()
 {
 	saveEngineState();
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("Volume", player()->volume());
 	config->writeEntry("LoopStyle", player()->loopStyle());
@@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B)
 #define READBOOLOPT_EX(name, string, def, group, reversal) \
 bool NoatunApp::name() const \
 { \
-	KConfig *config=TDEGlobal::config(); \
+	TDEConfig *config=TDEGlobal::config(); \
 	config->setGroup(group); \
 	return logicalXOR(config->readBoolEntry(string, def), reversal); \
 }
@@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const
 
 int NoatunApp::startupPlayMode() const
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore);
 }
 
 void NoatunApp::setStartupPlayMode(int mode)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("StartupPlayMode", mode);
 	config->sync();
@@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode)
 
 void NoatunApp::setHackUpPlaylist(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("HackUpPlaylist", b);
 	config->sync();
@@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b)
 	bool whatBefore=fastMixer();
 	if (whatBefore!=b)
 	{
-		KConfig *config=TDEGlobal::config();
+		TDEConfig *config=TDEGlobal::config();
 		config->setGroup(TQString());
 		config->writeEntry("FastMixer", b);
 		config->sync();
@@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b)
 
 void NoatunApp::setOneInstance(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("KDE");
 	config->writeEntry("MultipleInstances", !b);
 	config->sync();
@@ -255,7 +255,7 @@ void NoatunApp::setOneInstance(bool b)
 
 void NoatunApp::setLoopList(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("LoopList", b);
 	TDEGlobal::config()->sync();
@@ -263,7 +263,7 @@ void NoatunApp::setLoopList(bool b)
 
 void NoatunApp::setAutoPlay(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("AutoPlay", b);
 	TDEGlobal::config()->sync();
@@ -271,7 +271,7 @@ void NoatunApp::setAutoPlay(bool b)
 
 void NoatunApp::setRememberPositions(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("RememberPositions", b);
 	TDEGlobal::config()->sync();
@@ -279,7 +279,7 @@ void NoatunApp::setRememberPositions(bool b)
 
 void NoatunApp::setSaveDirectory(const TQString &s)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writePathEntry("SaveDirectory", s);
 	config->sync();
@@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s)
 
 TQString NoatunApp::saveDirectory() const
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readPathEntry("SaveDirectory", TQString(getenv("HOME")));
 }
 
 TQString NoatunApp::titleFormat() const
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")");
 }
 
 void NoatunApp::setTitleFormat(const TQString &format)
 {
-	KConfig *c=TDEGlobal::config();
+	TDEConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->writeEntry("TitleFormat", format);
 }
@@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b)
 
 void NoatunApp::setClearOnOpen(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("ClearOnOpen", b);
 	config->sync();
@@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b)
 
 void NoatunApp::setDisplayRemaining(bool b)
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("DisplayRemaining", b);
 	config->sync();
@@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename)
 
 void NoatunApp::restoreEngineState()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(TQString());
 	int state = config->readNumEntry("EngineState", Arts::posPlaying);
 	switch (state)
@@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState()
 
 void NoatunApp::saveEngineState()
 {
-	KConfig* config=TDEGlobal::config();
+	TDEConfig* config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("EngineState", player()->engine()->state());
 	// we don't sync here since it's done in the destructor afterwards anyway