summaryrefslogtreecommitdiffstats
path: root/kdoctools
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 /kdoctools
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdoctools')
-rw-r--r--kdoctools/meinproc.cpp2
-rw-r--r--kdoctools/tdeio_help.cpp4
-rw-r--r--kdoctools/xslt.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index d0a1b732..51f0b913 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
#include <tqdir.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <stdlib.h>
#include <kdebug.h>
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index d9f306b4..7b9d2a36 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -25,8 +25,8 @@
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 2eb03cfb..498e6b2c 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -12,7 +12,7 @@
#include <xslt.h>
#include <kinstance.h>
#include "tdeio_help.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
#include <kfilterbase.h>
#include <kfilterdev.h>