From 71049a71c6648791e95cf421b19047415a2c4c84 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:54:06 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

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

(limited to 'noatun-plugins/alsaplayer')

diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp
index 0cd21a8..e7a5e6b 100644
--- a/noatun-plugins/alsaplayer/alsaplayerui.cpp
+++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index ec0b123..58a35f8 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 4ec4867..146f503 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -37,9 +37,9 @@
 #include <kstatusbar.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 #include <noatun/playlist.h>
-- 
cgit v1.2.1