summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/charlatan
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
commit71049a71c6648791e95cf421b19047415a2c4c84 (patch)
tree4f75fdaee1cce5a44f58f1f54980099f50a82b10 /noatun-plugins/charlatan
parent6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff)
downloadtdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz
tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/charlatan')
-rw-r--r--noatun-plugins/charlatan/charlatanui.cpp2
-rw-r--r--noatun-plugins/charlatan/configmodule.cpp4
-rw-r--r--noatun-plugins/charlatan/userinterface.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index 36113ff..b4fa7f6 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -21,7 +21,7 @@
*/
#include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index f3ba458..97676f9 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/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/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 11c4988..85699bb 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -35,9 +35,9 @@
#include <tqframe.h>
#include <kurldrag.h>
#include <kstatusbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurldrag.h>
#include <kiconloader.h>
#include <noatun/playlist.h>