diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk/chalkcolor | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/chalkcolor')
8 files changed, 9 insertions, 9 deletions
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc index c76160c5..f7c1fbce 100644 --- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc @@ -22,7 +22,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc index e6b7f151..c5c7ac5a 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc @@ -27,7 +27,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_lab_colorspace.h" #include "kis_color_conversions.h" diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h index 77266dca..88fb86f0 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h @@ -21,7 +21,7 @@ #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_global.h" #include "kis_integer_maths.h" diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc index d81c1fe6..835ebfa1 100644 --- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc @@ -25,7 +25,7 @@ #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_abstract_colorspace.h" diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc index a67652f7..a37a1fb3 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.cc +++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc @@ -17,7 +17,7 @@ */ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include "config.h" diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h index 83222765..d175fb25 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.h +++ b/chalk/chalkcolor/kis_basic_histogram_producers.h @@ -20,7 +20,7 @@ #define _KIS_BASIC_HISTOGRAM_PRODUCERS_ #include <tqvaluevector.h> -#include <klocale.h> +#include <tdelocale.h> #include "config.h" diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 8c579e32..d9b2591c 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -22,8 +22,8 @@ #include <kservice.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "kis_debug_areas.h" #include "kis_colorspace.h" #include "kis_profile.h" diff --git a/chalk/chalkcolor/kis_composite_op.cc b/chalk/chalkcolor/kis_composite_op.cc index ddce271b..4cffd766 100644 --- a/chalk/chalkcolor/kis_composite_op.cc +++ b/chalk/chalkcolor/kis_composite_op.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kis_composite_op.h" |