summaryrefslogtreecommitdiffstats
path: root/khexedit/parts/kpart
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /khexedit/parts/kpart
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/parts/kpart')
-rw-r--r--khexedit/parts/kpart/khebrowserextension.cpp2
-rw-r--r--khexedit/parts/kpart/khepart.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp
index 5c6a192..6adebaa 100644
--- a/khexedit/parts/kpart/khebrowserextension.cpp
+++ b/khexedit/parts/kpart/khebrowserextension.cpp
@@ -16,7 +16,7 @@
// qt specific
-#include <kaction.h>
+#include <tdeaction.h>
// app specific
#include "khexedit.h"
#include "khepart.h"
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 7fb6a33..f7afb56 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -18,7 +18,7 @@
// kde specific
#include <klocale.h>
//#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
//#include <kglobalsettings.h>
// app specific