summaryrefslogtreecommitdiffstats
path: root/kicker/menuext
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/menuext
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/menuext')
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cc2
4 files changed, 5 insertions, 5 deletions
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>
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 95f46dadc..c30ff04b4 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobalsettings.h>
#include <kapplication.h>
#include <kurldrag.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include "recentdocsmenu.h"
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index a02d88a6a..00a4b1a59 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -44,7 +44,7 @@ using namespace std;
#include <kmessagebox.h>
#include <kmimetype.h>
#include <kpixmap.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kservice.h>
#include <kservicegroup.h>
#include <kstandarddirs.h>