summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_viewmgr.cc
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/konq_viewmgr.cc
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_viewmgr.cc')
-rw-r--r--konqueror/konq_viewmgr.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index a556ac529..136c34093 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -29,7 +29,7 @@
#include <tqfileinfo.h>
#include <tqptrlist.h>
-#include <kaccelgen.h>
+#include <tdeaccelgen.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -40,7 +40,7 @@
#include <kmessagebox.h>
#include <assert.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
// #define DEBUG_VIEWMGR