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

7 files changed, 15 insertions, 15 deletions

diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index 16d01a96..d0447397 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -51,7 +51,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
     analyserCache = NULL;
     winSkinVis = NULL;
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER));
@@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
 
 GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     config->writeEntry("visualizationMode", visualization_mode);
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index f19266b1..d18d9ead 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -20,7 +20,7 @@
 
 WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     reverse_time = config->readNumEntry("timeReversed", false);
@@ -29,7 +29,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
 
 WaDigit::~WaDigit()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
     config->writeEntry("timeReversed", reverse_time);
 }
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 2692a742..80375a90 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -69,7 +69,7 @@ void WaInfo::scrollerSetup()
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
-		KConfig *config=TDEGlobal::config();
+		TDEConfig *config=TDEGlobal::config();
 		config->setGroup("Winskin");
 		int s = config->readNumEntry("ScrollDelay", 15);
 		if (s!=0)
diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp
index f76cdabb..fdbad9af 100644
--- a/noatun/modules/winskin/waRegion.cpp
+++ b/noatun/modules/winskin/waRegion.cpp
@@ -27,7 +27,7 @@ const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointLis
 const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0};
 
 WaRegion::WaRegion(TQString filename) {
-    // Load the region file, which happens to be in KConfig format
+    // Load the region file, which happens to be in TDEConfig format
     KSimpleConfig regionFile(filename, true);
 
     // Clear our variables by default
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index d6d8fe58..4512d067 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -95,7 +95,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
 
     connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick()));
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
 
     config->setGroup("Winskin");
     TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin());
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index 4288119e..f7d9b777 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -72,8 +72,8 @@ bool WaSkinManager::installSkin(TQString _url) {
 
 	if (mimetype == "inode/directory")
 	{
-		KIO::Job *job = KIO::copy(url, location, !url.isLocalFile());
-		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile());
+		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 		return true;
 	}
 	else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip"))
@@ -83,8 +83,8 @@ bool WaSkinManager::installSkin(TQString _url) {
 
 		TQString base_path;
 		base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
-		KIO::Job *job = KIO::copy("zip:" + url.path(), base_path);
-		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path);
+		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 
 		return true;
 	}
@@ -98,8 +98,8 @@ bool WaSkinManager::removeSkin(TQString skinName) {
 
 	TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
 
-	KIO::Job *job = KIO::del(KURL(skins[0]), false, false);
-	connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+	TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false);
+	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 
 	return true;
 }
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 13e626fa..7d2c866d 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -78,7 +78,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
 
 void WinSkinConfig::save()
 {
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Winskin");
     config->writeEntry("CurrentSkin", skin_list->currentText());
     config->writeEntry("ScrollDelay", scrollSpeed->value());
@@ -123,7 +123,7 @@ void WinSkinConfig::reopen() {
         skin_list->setCurrentItem( 0 );
     }
 	
-    KConfig *config=TDEGlobal::config();
+    TDEConfig *config=TDEGlobal::config();
     config->setGroup("Winskin");
 	scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15));
 }