summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar/trees/bookmark_module
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /konqueror/sidebar/trees/bookmark_module
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/trees/bookmark_module')
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 5b170b102..9194e8f0c 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -20,8 +20,8 @@
#include <tqcursor.h>
#include <tqpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
#include <kapplication.h>
#include <kbookmarkdrag.h>
#include <kiconloader.h>