summaryrefslogtreecommitdiffstats
path: root/src/dolphincontextmenu.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:09:49 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:09:49 -0600
commit32932d14f9b794773c7eb4deb33777248065a37c (patch)
tree978eb031285dd470924948eec044da7714e90e02 /src/dolphincontextmenu.cpp
parent6b97d88a5acfa871e3a0d43728b09c79fd992564 (diff)
downloaddolphin-32932d14f9b794773c7eb4deb33777248065a37c.tar.gz
dolphin-32932d14f9b794773c7eb4deb33777248065a37c.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/dolphincontextmenu.cpp')
-rw-r--r--src/dolphincontextmenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 6589962..a47d1ed 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -20,7 +20,7 @@
#include "dolphincontextmenu.h"
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include <kbookmarkmanager.h>
#include <kbookmark.h>
#include <ktrader.h>
@@ -30,7 +30,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kpropertiesdialog.h>
#include <kdesktopfile.h>
#include <assert.h>