summaryrefslogtreecommitdiffstats
path: root/src/dolphin.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/dolphin.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/dolphin.cpp')
-rw-r--r--src/dolphin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 98abe71..505e7ea 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -30,17 +30,17 @@
#include <kiconloader.h>
#include <tdeversion.h>
#include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <kurldrag.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
#include <kstdaction.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
#include <tdeio/renamedlg.h>
#include <kinputdialog.h>
#include <kshell.h>