From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:48:17 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc | 2 +- chalk/colorspaces/cmyk_u8/cmyk_plugin.cc | 6 +++--- chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc | 2 +- chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc | 4 ++-- chalk/colorspaces/gray_u8/gray_plugin.cc | 6 +++--- chalk/colorspaces/gray_u8/kis_gray_colorspace.cc | 4 ++-- chalk/colorspaces/gray_u8/kis_gray_colorspace.h | 2 +- chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc | 2 +- chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h | 2 +- chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc | 2 +- chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h | 2 +- chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc | 2 +- chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h | 2 +- chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc | 4 ++-- chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h | 2 +- chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc | 2 +- chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h | 2 +- chalk/colorspaces/rgb_u8/rgb_plugin.cc | 6 +++--- chalk/colorspaces/wet/kis_texture_filter.h | 2 +- chalk/colorspaces/wet/kis_wet_colorspace.cc | 2 +- chalk/colorspaces/wet/kis_wet_palette_widget.cc | 2 +- chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc | 2 +- chalk/colorspaces/wet/wet_plugin.cc | 6 +++--- chalk/colorspaces/wet/wetphysicsfilter.cc | 2 +- chalk/colorspaces/wet/wetphysicsfilter.h | 2 +- chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc | 6 +++--- chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc | 2 +- chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc | 6 +++--- chalk/colorspaces/wetsticky/wet_sticky_plugin.cc | 6 +++--- chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h | 2 +- chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h | 2 +- 31 files changed, 48 insertions(+), 48 deletions(-) (limited to 'chalk/colorspaces') diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc index 4799a92a..96a6f132 100644 --- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc +++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "kis_cmyk_u16_colorspace.h" diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc index 700d954c..7b09ecca 100644 --- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc +++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc index 359c22c5..09c517df 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kis_cmyk_colorspace.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc index 34cf991a..b24c48b3 100644 --- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc +++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include "kis_gray_u16_colorspace.h" #include "kis_u16_base_colorspace.h" diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cc index d6533c79..7d03d5f6 100644 --- a/chalk/colorspaces/gray_u8/gray_plugin.cc +++ b/chalk/colorspaces/gray_u8/gray_plugin.cc @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc index a913dc49..7968e311 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc @@ -26,9 +26,9 @@ #include -#include +#include #include -#include +#include #include "kis_abstract_colorspace.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h index 3f572479..138778be 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h @@ -19,7 +19,7 @@ #define KIS_STRATEGY_COLORSPACE_GRAYSCALE_H_ #include -#include +#include #include diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc index ab4642ff..67ad17d0 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include "kis_lms_f32_colorspace.h" #include "kis_color_conversions.h" diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h index 1c766621..8e698232 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc index 9e7f138e..fd065637 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include "kis_rgb_f16half_colorspace.h" #include "kis_f32_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h index a8fde30d..4297498c 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc index 86494de7..d4eb9eac 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include "kis_rgb_f32_colorspace.h" #include "kis_color_conversions.h" diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h index 050c2ae5..c6551a4c 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h @@ -22,7 +22,7 @@ #include -#include +#include #include diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc index c3307aef..75aa6649 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "kis_rgb_u16_colorspace.h" #include "kis_u16_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h index fde72fea..77bc8c02 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h @@ -19,7 +19,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_U16_H_ #define KIS_STRATEGY_COLORSPACE_RGB_U16_H_ -#include +#include #include diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc index f1522798..0aaea6da 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include "kis_rgb_colorspace.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h index 8fdfb355..820b58b5 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h @@ -18,7 +18,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_H_ #define KIS_STRATEGY_COLORSPACE_RGB_H_ -#include "klocale.h" +#include "tdelocale.h" #include "kis_global.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cc index f987e33f..26310125 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc @@ -22,12 +22,12 @@ #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/chalk/colorspaces/wet/kis_texture_filter.h b/chalk/colorspaces/wet/kis_texture_filter.h index 75f12e88..8dbaef59 100644 --- a/chalk/colorspaces/wet/kis_texture_filter.h +++ b/chalk/colorspaces/wet/kis_texture_filter.h @@ -22,7 +22,7 @@ #define _TEXTURE_FILTER_H #include -#include +#include #include /// Initializes a wet paint device with a texture diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc index 685e5559..b867e01e 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include "kis_abstract_colorspace.h" diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 7c115325..43cfd559 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc index 50ba12a5..f17f4e1c 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc @@ -20,7 +20,7 @@ #include -#include +#include #include "kis_meta_registry.h" #include #include diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 6edc562e..b919a289 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -29,12 +29,12 @@ #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc index e72d63bf..3a439443 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.cc +++ b/chalk/colorspaces/wet/wetphysicsfilter.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/colorspaces/wet/wetphysicsfilter.h b/chalk/colorspaces/wet/wetphysicsfilter.h index eaae1a77..ef542f8e 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.h +++ b/chalk/colorspaces/wet/wetphysicsfilter.h @@ -21,7 +21,7 @@ #ifndef WET_PHYSICS_FILTER_H #define WET_PHYSICS_FILTER_H -#include +#include #include #include diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc index b3e1ffa6..1f141bb4 100644 --- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc +++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index ad13eb91..3e47114a 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -24,7 +24,7 @@ #include -#include +#include #include #include "kis_color_conversions.h" diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc index 89a2f59e..c53f6ea0 100644 --- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc +++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc @@ -24,12 +24,12 @@ #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc index fd477dc7..76dee20e 100644 --- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc +++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h index d641f09e..261783ca 100644 --- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h +++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h @@ -22,7 +22,7 @@ #include -#include +#include #define LUMA_RED 0.2989 #define LUMA_GREEN 0.587 diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h index 7f22343d..230e5a74 100644 --- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h +++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h @@ -22,7 +22,7 @@ #include -#include +#include #define LUMA_RED 0.2989 #define LUMA_GREEN 0.587 -- cgit v1.2.1