summaryrefslogtreecommitdiffstats
path: root/kimgio
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 /kimgio
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kimgio')
-rw-r--r--kimgio/dds.cpp2
-rw-r--r--kimgio/eps.cpp2
-rw-r--r--kimgio/exr.cpp2
-rw-r--r--kimgio/gimp.h2
-rw-r--r--kimgio/hdr.cpp2
-rw-r--r--kimgio/jp2.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index d174bf89..22251002 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqdatastream.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <math.h> // sqrtf
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index d839ffe3..bcf91683 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -6,7 +6,7 @@
#include <tqpainter.h>
#include <tqprinter.h>
#include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "eps.h"
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index c28cb799..563c151a 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -35,7 +35,7 @@
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kimgio/gimp.h b/kimgio/gimp.h
index 114ffdc0..7da1a45f 100644
--- a/kimgio/gimp.h
+++ b/kimgio/gimp.h
@@ -21,7 +21,7 @@
*
*/
-#include <kglobal.h>
+#include <tdeglobal.h>
/*
* These are the constants and functions I extracted from The GIMP source
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 82cba5c1..5f1832f0 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -14,7 +14,7 @@
#include <tqdatastream.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
typedef TQ_UINT8 uchar;
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 2200c948..5de8fff8 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -12,7 +12,7 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqcolor.h>
#include <tqcstring.h>
#include <tqfile.h>