From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kicker/applets/trash/trashapplet.cpp | 2 +-
 kicker/applets/trash/trashbutton.cpp | 2 +-
 kicker/applets/trash/trashbutton.h   | 2 +-
 3 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 478ac01ec..3b7ae419a 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include "trashapplet.h"
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index fe8ad3200..526048c59 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tdeio/netaccess.h>
 
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 15c5d598f..bbf596a0c 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tdefileitem.h>
 #include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 class TrashButton : public PanelPopupButton
 {
-- 
cgit v1.2.1