summaryrefslogtreecommitdiffstats
path: root/khexedit/parts/kpart
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
commit783715b853042d24841e3e888051f3a184e78a40 (patch)
tree33ce107e439bb622368ba17b8a2a6485ef28e3b5 /khexedit/parts/kpart
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/parts/kpart')
-rw-r--r--khexedit/parts/kpart/khepart.cpp4
-rw-r--r--khexedit/parts/kpart/khepartfactory.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index f7afb56..e23e26a 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -16,11 +16,11 @@
// kde specific
-#include <klocale.h>
+#include <tdelocale.h>
//#include <kinstance.h>
#include <tdeaction.h>
#include <kstdaction.h>
-//#include <kglobalsettings.h>
+//#include <tdeglobalsettings.h>
// app specific
#include "khexedit.h"
#include "kcharcodec.h"
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index b7116e6..7a9cce4 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -18,7 +18,7 @@
// kde specific
#include <kinstance.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app specific
#include "khepart.h"
#include "khepartfactory.h"