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/menuext/konsole/konsolebookmarkhandler.cpp | 2 +-
 kicker/menuext/konsole/konsolebookmarkmenu.cpp    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kicker/menuext/konsole')

diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 314ceae10..9ace6483e 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -7,7 +7,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 3284c7a03..420a17c3b 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -5,7 +5,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 //#include <kbookmarkmenu.h>
@@ -16,7 +16,7 @@
 
 #include <tqfile.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 
-- 
cgit v1.2.1