diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /kimgio | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kimgio')
| -rw-r--r-- | kimgio/dds.cpp | 2 | ||||
| -rw-r--r-- | kimgio/eps.cpp | 2 | ||||
| -rw-r--r-- | kimgio/exr.cpp | 2 | ||||
| -rw-r--r-- | kimgio/gimp.h | 2 | ||||
| -rw-r--r-- | kimgio/hdr.cpp | 2 | ||||
| -rw-r--r-- | kimgio/jp2.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index d174bf893..22251002c 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 d839ffe30..bcf916836 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 c28cb799b..563c151a2 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 114ffdc0f..7da1a45f8 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 82cba5c12..5f1832f02 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 2200c948c..5de8fff8e 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> |