diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /filters/chalk | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'filters/chalk')
| -rw-r--r-- | filters/chalk/gmagick/kis_image_magick_converter.cc | 2 | ||||
| -rw-r--r-- | filters/chalk/jpeg/kis_jpeg_converter.cc | 4 | ||||
| -rw-r--r-- | filters/chalk/magick/kis_image_magick_converter.cc | 2 | ||||
| -rw-r--r-- | filters/chalk/openexr/kis_openexr_export.cpp | 2 | ||||
| -rw-r--r-- | filters/chalk/png/kis_png_converter.cc | 4 | ||||
| -rw-r--r-- | filters/chalk/raw/kis_raw_import.cpp | 6 | ||||
| -rw-r--r-- | filters/chalk/tiff/kis_dlg_options_tiff.cpp | 2 | ||||
| -rw-r--r-- | filters/chalk/tiff/kis_tiff_writer_visitor.cpp | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index e8d4d0d6..ce8071c6 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -31,7 +31,7 @@ #include <tdeversion.h> #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/netaccess.h> diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc index efdb061a..fd0630ec 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.cc +++ b/filters/chalk/jpeg/kis_jpeg_converter.cc @@ -28,8 +28,8 @@ extern "C" { #include <tqfile.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <KoDocumentInfo.h> diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index 5b4b56a0..9a44ed97 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -30,7 +30,7 @@ #include <tdeversion.h> #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/netaccess.h> diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp index 33d9ec60..70e30a4a 100644 --- a/filters/chalk/openexr/kis_openexr_export.cpp +++ b/filters/chalk/openexr/kis_openexr_export.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <half.h> #include <ImfRgbaFile.h> diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index 795eb92e..3956b640 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -25,8 +25,8 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <KoDocumentInfo.h> diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index 1af33fd7..873fdf2b 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -40,14 +40,14 @@ #include <tqprogressdialog.h> #include <tqtimer.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <knuminput.h> #include <kgenericfactory.h> #include <kdialogbase.h> #include <kdialog.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kprocess.h> #include <KoDocument.h> diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index becda194..70e67938 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_wdg_options_tiff.h" diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp index da399a53..94f55824 100644 --- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp +++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp @@ -19,8 +19,8 @@ #include "kis_tiff_writer_visitor.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kis_annotation.h> #include <kis_colorspace.h> |