From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:40:51 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 noatun-plugins/alsaplayer/alsaplayerui.cpp | 2 +-
 noatun-plugins/alsaplayer/configmodule.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'noatun-plugins/alsaplayer')

diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp
index 1620b78..0cd21a8 100644
--- a/noatun-plugins/alsaplayer/alsaplayerui.cpp
+++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp
@@ -27,7 +27,7 @@ extern "C"
 {
 	Plugin * create_plugin()
 	{
-		KGlobal::locale()->insertCatalogue("alsaplayerui");
+		TDEGlobal::locale()->insertCatalogue("alsaplayerui");
 		return new AlsaPlayer;
 	}
 }
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 6fd02f8..9271616 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -53,7 +53,7 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
   void
 AlsaPlayerConfigModule::save()
 {
-  KConfig * c(KGlobal::config());
+  KConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ AlsaPlayerConfigModule::save()
   void
 AlsaPlayerConfigModule::reopen()
 {
-  KConfig * c(KGlobal::config());
+  KConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
-- 
cgit v1.2.1