diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/thumbnail | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/thumbnail')
| -rw-r--r-- | tdeioslave/thumbnail/exrcreator.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/thumbnail/thumbnail.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp index 59c1fba76..5708b8996 100644 --- a/tdeioslave/thumbnail/exrcreator.cpp +++ b/tdeioslave/thumbnail/exrcreator.cpp @@ -22,7 +22,7 @@ #include <kimageio.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <ImfInputFile.h> diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 63d061d29..764f89937 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/tdeioslave/thumbnail/thumbnail.cpp @@ -37,7 +37,7 @@ #include <kdatastream.h> // Do not remove, needed for correct bool serialization #include <kurl.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kimageeffect.h> #include <kmimetype.h> @@ -47,7 +47,7 @@ #include <kservicetype.h> #include <kuserprofile.h> #include <tdefilemetainfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> // For HAVE_NICE #include "thumbnail.h" |