Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 14 insertions, 14 deletions

diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index cab5be35..16d01a96 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 = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     config->setGroup("Winskin");
 
     setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER));
@@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
 
 GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
 {
-    KConfig *config = KGlobal::config();
+    KConfig *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 b81a0da2..f19266b1 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 = KGlobal::config();
+    KConfig *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 = KGlobal::config();
+    KConfig *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 5f670953..2692a742 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=KGlobal::config();
+		KConfig *config=TDEGlobal::config();
 		config->setGroup("Winskin");
 		int s = config->readNumEntry("ScrollDelay", 15);
 		if (s!=0)
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index fdf2e768..d6d8fe58 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=KGlobal::config();
+    KConfig *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 08804885..4288119e 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -20,7 +20,7 @@ WaSkinManager::~WaSkinManager() {
 }
 
 TQStringList WaSkinManager::availableSkins() {
-	TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp");
+	TQStringList skinDirs = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp");
 	TQStringList skin_list;
 	
 	// This loop adds them all to our skin list
@@ -55,7 +55,7 @@ TQString WaSkinManager::defaultSkin() {
 }
 
 bool WaSkinManager::loadSkin(TQString skinName) {
-	TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
+	TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
 
 	if (!skins.count())
 		mCurrentSkin = defaultSkin();
@@ -66,7 +66,7 @@ bool WaSkinManager::loadSkin(TQString skinName) {
 }
 
 bool WaSkinManager::installSkin(TQString _url) {
-	TQString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp");
+	TQString location = TDEGlobal::dirs()->saveLocation("data", "noatun/skins/winamp");
 	KURL url(_url);
 	TQString mimetype = KMimeType::findByURL(_url)->name();
 
@@ -96,7 +96,7 @@ bool WaSkinManager::removeSkin(TQString skinName) {
 	if (!skinRemovable(skinName))
 		return false;
 
-	TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + 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()));
@@ -105,7 +105,7 @@ bool WaSkinManager::removeSkin(TQString skinName) {
 }
 
 bool WaSkinManager::skinRemovable(TQString skinName) {
-	TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
+	TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
 
 	if (!skins.count())
 		return false;
diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp
index e7562c04..88c1f460 100644
--- a/noatun/modules/winskin/waSkinModel.cpp
+++ b/noatun/modules/winskin/waSkinModel.cpp
@@ -82,7 +82,7 @@ bool WaSkinModel::load(TQString skinDir)
 
     if (findFile(dir, "main.bmp").isEmpty()) {
         // Ack, our skin dir doesn't exist, fall back to the default
-        dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]);
+        dir = TQDir(TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]);
         success = false;
     }
 
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 70a22ea5..13e626fa 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=KGlobal::config();
+    KConfig *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=KGlobal::config();
+    KConfig *config=TDEGlobal::config();
     config->setGroup("Winskin");
 	scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15));
 }