summaryrefslogtreecommitdiffstats
path: root/tdehtml/misc/decoder.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdehtml/misc/decoder.cpp
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/misc/decoder.cpp')
-rw-r--r--tdehtml/misc/decoder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index 6000aa9cf..28c8a5e9d 100644
--- a/tdehtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -39,12 +39,12 @@ using namespace tdehtml;
#include <tqregexp.h>
#include <tqtextcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <ctype.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>