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/core | |
parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core')
30 files changed, 31 insertions, 31 deletions
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 71676e3a..49ee8e58 100644 --- a/chalk/core/kis_brush.cc +++ b/chalk/core/kis_brush.cc @@ -39,7 +39,7 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_meta_registry.h> #include "kis_paint_device.h" diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc index ea0351df..f5ee5573 100644 --- a/chalk/core/kis_convolution_painter.cc +++ b/chalk/core/kis_convolution_painter.cc @@ -36,7 +36,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> diff --git a/chalk/core/kis_crop_visitor.h b/chalk/core/kis_crop_visitor.h index 0988a920..9538a59f 100644 --- a/chalk/core/kis_crop_visitor.h +++ b/chalk/core/kis_crop_visitor.h @@ -20,7 +20,7 @@ #include "tqrect.h" -#include "klocale.h" +#include "tdelocale.h" #include "kis_layer_visitor.h" #include "kis_types.h" diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc index 5fa31953..6b88759a 100644 --- a/chalk/core/kis_fill_painter.cc +++ b/chalk/core/kis_fill_painter.cc @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_debug_areas.h" diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h index 534b4c69..599581bd 100644 --- a/chalk/core/kis_filter.h +++ b/chalk/core/kis_filter.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <ksharedptr.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_types.h" #include "kis_filter_registry.h" diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index abccf8bc..f67e3ecc 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -21,7 +21,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/plugin.h> #include <kservice.h> #include <ktrader.h> diff --git a/chalk/core/kis_filter_strategy.cc b/chalk/core/kis_filter_strategy.cc index 573d3840..650a9681 100644 --- a/chalk/core/kis_filter_strategy.cc +++ b/chalk/core/kis_filter_strategy.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_debug_areas.h" #include "kis_filter_strategy.h" #include <math.h> diff --git a/chalk/core/kis_filter_strategy.h b/chalk/core/kis_filter_strategy.h index 55ef3d06..faabd739 100644 --- a/chalk/core/kis_filter_strategy.h +++ b/chalk/core/kis_filter_strategy.h @@ -20,7 +20,7 @@ #ifndef KIS_FILTER_STRATEGY_H_ #define KIS_FILTER_STRATEGY_H_ -#include <klocale.h> +#include <tdelocale.h> #include "kis_types.h" #include "kis_generic_registry.h" diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc index 43c182d7..41541e80 100644 --- a/chalk/core/kis_gradient.cc +++ b/chalk/core/kis_gradient.cc @@ -33,7 +33,7 @@ #include <kogradientmanager.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_gradient.h" diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc index 968bb67e..7c2b00b1 100644 --- a/chalk/core/kis_gradient_painter.cc +++ b/chalk/core/kis_gradient_painter.cc @@ -36,7 +36,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_debug_areas.h" diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc index 0e2f90d2..290d19f5 100644 --- a/chalk/core/kis_group_layer.cc +++ b/chalk/core/kis_group_layer.cc @@ -17,7 +17,7 @@ */ #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqimage.h> #include <tqdatetime.h> diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc index c6af64b6..1180bf4c 100644 --- a/chalk/core/kis_image.cc +++ b/chalk/core/kis_image.cc @@ -32,7 +32,7 @@ #include <kcommand.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_image_iface.h" diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc index 1a66318e..5c60b517 100644 --- a/chalk/core/kis_imagepipe_brush.cc +++ b/chalk/core/kis_imagepipe_brush.cc @@ -40,7 +40,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "kis_global.h" diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cc index 99dc77a9..4bde87b2 100644 --- a/chalk/core/kis_meta_registry.cc +++ b/chalk/core/kis_meta_registry.cc @@ -18,7 +18,7 @@ #include <tqstringlist.h> #include <tqdir.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <config.h> #include LCMS_HEADER diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc index 654caedd..da25caec 100644 --- a/chalk/core/kis_paint_device.cc +++ b/chalk/core/kis_paint_device.cc @@ -25,7 +25,7 @@ #include <tqtimer.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KoStore.h> diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc index fc3e1d88..f3f5c928 100644 --- a/chalk/core/kis_painter.cc +++ b/chalk/core/kis_painter.cc @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_debug_areas.h" diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h index 7fad40ba..14a2e4c6 100644 --- a/chalk/core/kis_paintop.h +++ b/chalk/core/kis_paintop.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <ksharedptr.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_global.h" #include "kis_types.h" diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 7d31b79f..d549c3ad 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -20,8 +20,8 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeparts/plugin.h> #include <kservice.h> diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc index 161a4ff8..aa62b07a 100644 --- a/chalk/core/kis_palette.cc +++ b/chalk/core/kis_palette.cc @@ -36,7 +36,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_debug_areas.h" #include "kis_palette.h" diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cc index f757b060..654449b8 100644 --- a/chalk/core/kis_pattern.cc +++ b/chalk/core/kis_pattern.cc @@ -35,7 +35,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_color.h" #include "kis_layer.h" diff --git a/chalk/core/kis_rotate_visitor.cc b/chalk/core/kis_rotate_visitor.cc index 2a8bfd45..abb47a05 100644 --- a/chalk/core/kis_rotate_visitor.cc +++ b/chalk/core/kis_rotate_visitor.cc @@ -21,7 +21,7 @@ #include <tqrect.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_paint_device.h" #include "kis_rotate_visitor.h" diff --git a/chalk/core/kis_scale_visitor.cc b/chalk/core/kis_scale_visitor.cc index fb4c9f42..a06d674d 100644 --- a/chalk/core/kis_scale_visitor.cc +++ b/chalk/core/kis_scale_visitor.cc @@ -18,7 +18,7 @@ #include <tqdatetime.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_paint_device.h" #include "kis_scale_visitor.h" diff --git a/chalk/core/kis_scale_visitor.h b/chalk/core/kis_scale_visitor.h index afe358ad..75d58fa1 100644 --- a/chalk/core/kis_scale_visitor.h +++ b/chalk/core/kis_scale_visitor.h @@ -19,7 +19,7 @@ #ifndef KIS_SCALE_VISITOR_H_ #define KIS_SCALE_VISITOR_H_ -#include "klocale.h" +#include "tdelocale.h" #include "kis_progress_subject.h" #include "kis_progress_display_interface.h" diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index 69b90fe3..ea8f2be2 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -19,7 +19,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include "kis_layer.h" diff --git a/chalk/core/kis_strategy_move.cc b/chalk/core/kis_strategy_move.cc index 3eef47d6..d5102c8b 100644 --- a/chalk/core/kis_strategy_move.cc +++ b/chalk/core/kis_strategy_move.cc @@ -21,7 +21,7 @@ #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_canvas_controller.h" diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index dad56a3a..12807192 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -17,7 +17,7 @@ */ #include "kis_thread_pool.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/chalk/core/kis_transform_visitor.h b/chalk/core/kis_transform_visitor.h index 5df21316..55b68f19 100644 --- a/chalk/core/kis_transform_visitor.h +++ b/chalk/core/kis_transform_visitor.h @@ -20,7 +20,7 @@ #include "tqrect.h" -#include "klocale.h" +#include "tdelocale.h" #include "kis_layer_visitor.h" #include "kis_types.h" diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cc index 77ea25f5..0d4a98b4 100644 --- a/chalk/core/kis_transform_worker.cc +++ b/chalk/core/kis_transform_worker.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_debug_areas.h" #include "kis_paint_device.h" diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index d8064615..aa8a207c 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -30,7 +30,7 @@ #include <tqfile.h> #include <kstaticdeleter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "kis_tileddatamanager.h" diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h index 5d388136..d0ae4f6b 100644 --- a/chalk/core/tiles/kis_tilemanager.h +++ b/chalk/core/tiles/kis_tilemanager.h @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tqmutex.h> -#include <ktempfile.h> +#include <tdetempfile.h> class KisTile; class KisTiledDataManager; |