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

---
 kicker/applets/trash/trashapplet.cpp | 4 ++--
 kicker/applets/trash/trashbutton.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kicker/applets/trash')

diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 04fa20735..f431b8aed 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 526048c59..85c0eef62 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdepopupmenu.h>
 
-- 
cgit v1.2.1