summaryrefslogtreecommitdiffstats
path: root/khexedit/lib/codecs
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/lib/codecs
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/lib/codecs')
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index 6b27670..22c065d 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -18,8 +18,8 @@
// qt specific
#include "tqtextcodec.h"
// kde specific
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcharsets.h>
// lib specific
#include "ktextcharcodec.h"