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 | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
1043 files changed, 1556 insertions, 1556 deletions
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc index c76160c54..f7c1fbce3 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 e6b7f1511..c5c7ac5a0 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 77266dca7..88fb86f06 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 d81c1fe65..835ebfa1f 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 a67652f77..a37a1fb3f 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 83222765e..d175fb25d 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 8c579e326..d9b2591ca 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 ddce271b7..4cffd7668 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" diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc index 4799a92a2..96a6f1323 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 <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_debug_areas.h> #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 700d954cb..7b09ecca9 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 <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc index 359c22c5c..09c517df8 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc @@ -23,7 +23,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #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 34cf991ab..b24c48b3e 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 <tqimage.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #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 d6533c792..7d03d5f63 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 <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc index a913dc496..7968e311d 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc @@ -26,9 +26,9 @@ #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #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 3f5724794..138778be8 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 <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc index ab4642ff1..67ad17d0e 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 <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #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 1c7666211..8e698232d 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 <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc index 9e7f138ef..fd065637e 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 <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #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 a8fde30d6..4297498cc 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 <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc index 86494de73..d4eb9eaca 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 <tqimage.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #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 050c2ae5f..c6551a4ce 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 <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc index c3307aefe..75aa66499 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 <tqcolor.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #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 fde72fea2..77bc8c021 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 <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc index f15227982..0aaea6daa 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -26,7 +26,7 @@ #include <tqcolor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #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 8fdfb355c..820b58b53 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 f987e33f6..263101259 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc @@ -22,12 +22,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kis_debug_areas.h> diff --git a/chalk/colorspaces/wet/kis_texture_filter.h b/chalk/colorspaces/wet/kis_texture_filter.h index 75f12e88e..8dbaef595 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 <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_paint_device_action.h> /// 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 685e55594..b867e01ea 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -24,7 +24,7 @@ #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kis_debug_areas.h> #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 7c1153253..43cfd559a 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -32,7 +32,7 @@ #include <tqstyle.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <koFrameButton.h> diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc index 50ba12a51..f17f4e1c4 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc @@ -20,7 +20,7 @@ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_meta_registry.h" #include <kis_view.h> #include <kis_image.h> diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 6edc562eb..b919a2897 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -29,12 +29,12 @@ #include <tqwidget.h> #include <tdeactionclasses.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc index e72d63bf9..3a4394439 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.cc +++ b/chalk/colorspaces/wet/wetphysicsfilter.cc @@ -19,7 +19,7 @@ #include <stdlib.h> #include <vector> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kis_iterators_pixel.h> diff --git a/chalk/colorspaces/wet/wetphysicsfilter.h b/chalk/colorspaces/wet/wetphysicsfilter.h index eaae1a774..ef542f8eb 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 <klocale.h> +#include <tdelocale.h> #include <kis_filter.h> #include <kis_types.h> diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc index b3e1ffa60..1f141bb4f 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 <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index ad13eb91b..3e47114ae 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -24,7 +24,7 @@ #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #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 89a2f59ed..c53f6ea08 100644 --- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc +++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc @@ -24,12 +24,12 @@ #include <tqrect.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc index fd477dc7f..76dee20e6 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 <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h index d641f09e0..261783ca2 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 <kis_u16_base_colorspace.h> -#include <klocale.h> +#include <tdelocale.h> #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 7f22343d6..230e5a74b 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 <kis_u8_base_colorspace.h> -#include <klocale.h> +#include <tdelocale.h> #define LUMA_RED 0.2989 #define LUMA_GREEN 0.587 diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 71676e3a2..49ee8e581 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 ea0351dfc..f5ee5573f 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 0988a920f..9538a59f2 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 5fa319539..6b88759a4 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 534b4c695..599581bdd 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 abccf8bc4..f67e3ecc8 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 573d3840b..650a96812 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 55ef3d064..faabd7397 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 43c182d79..41541e80e 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 968bb67e9..7c2b00b18 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 0e2f90d25..290d19f5c 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 c6af64b66..1180bf4cf 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 1a66318e5..5c60b5174 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 99dc77a99..4bde87b22 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 654caedde..da25caecb 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 fc3e1d882..f3f5c9286 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 7fad40ba9..14a2e4c62 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 7d31b79f1..d549c3ad5 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 161a4ff8e..aa62b07a0 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 f757b0604..654449b80 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 2a8bfd45b..abb47a056 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 fb4c9f42f..a06d674d1 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 afe358ad0..75d58fa15 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 69b90fe3e..ea8f2be2b 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 3eef47d6f..d5102c8b2 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 dad56a3a1..128071922 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 5df21316f..55b68f194 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 77ea25f52..0d4a98b4c 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 d80646152..aa8a207c5 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 5d3881363..d0ae4f6ba 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; diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 32d0e6367..9d7712228 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -41,12 +41,12 @@ #include <tqlineedit.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kcombobox.h> diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index a2d9e1bd5..c8be0a6f6 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -27,12 +27,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cc index ae84bcaaa..754bbc2c0 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cc @@ -27,12 +27,12 @@ #include <tqpoint.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index 64bfb2055..cbca7a08c 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -21,7 +21,7 @@ #include <math.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpixmap.h> diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc index b3c73a924..4ce104f77 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc @@ -20,7 +20,7 @@ #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc index 39a395b40..08601d600 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "tqdom.h" -#include "klocale.h" +#include "tdelocale.h" #include "kdebug.h" #include "kis_painter.h" diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 2aa09219c..fcffb3def 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_filter.h" #include "kis_image.h" diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc index 68f560c41..1eb2984ef 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc @@ -28,12 +28,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc index 8619d8961..0d6974e0c 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc @@ -28,12 +28,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cc index e1e33ade7..a9ade7249 100644 --- a/chalk/plugins/filters/example/example.cc +++ b/chalk/plugins/filters/example/example.cc @@ -21,12 +21,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -37,7 +37,7 @@ #include <kis_global.h> #include <kis_types.h> -// #include <kmessagebox.h> +// #include <tdemessagebox.h> #include "example.h" diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp index 78398157f..cb7153c1d 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp @@ -22,12 +22,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc index 4fefb5970..6b26ab11a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc @@ -32,11 +32,11 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kis_image.h> #include <kis_iterators_pixel.h> diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index 43b8f9e6d..84dbc035c 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -20,7 +20,7 @@ #include <math.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpixmap.h> diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cc index cabda0b5b..891143783 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.cc +++ b/chalk/plugins/filters/levelfilter/levelfilter.cc @@ -27,12 +27,12 @@ #include <tqpoint.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cc index 0f634eb89..d8609ba2b 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.cc +++ b/chalk/plugins/filters/noisefilter/noisefilter.cc @@ -29,11 +29,11 @@ #include <kiconloader.h> #include <kinstance.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kis_image.h> #include <kis_iterators_pixel.h> diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index 2909e8a16..de869a424 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -28,12 +28,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc index 33886f2c1..a6b77df76 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc @@ -27,12 +27,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index 72c0675b0..acb8c2e17 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -28,12 +28,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cc index 54af3e7bd..74368802a 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cc @@ -29,11 +29,11 @@ #include <kiconloader.h> #include <kinstance.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kis_image.h> #include <kis_iterators_pixel.h> diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc index a823f8120..698961a82 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc @@ -28,12 +28,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc index f1f9f5dfa..a0cf20f17 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc @@ -28,12 +28,12 @@ #include <tqspinbox.h> #include <tqvaluevector.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc index db842ca2e..623fc690b 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc @@ -27,12 +27,12 @@ #include <tqpoint.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cc index 1274c55f9..8477c09c7 100644 --- a/chalk/plugins/filters/threadtest/threadtest.cc +++ b/chalk/plugins/filters/threadtest/threadtest.cc @@ -23,12 +23,12 @@ #include <tqrect.h> #include <tqthread.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -40,7 +40,7 @@ #include <kis_global.h> #include <kis_types.h> -// #include <kmessagebox.h> +// #include <tdemessagebox.h> #include "threadtest.h" diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index ad7f732a0..9f9777bf6 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -30,11 +30,11 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kis_image.h> #include <kis_iterators_pixel.h> diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc index 3b48e4396..25f12b87b 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc index 40e2b2e64..4a8da9a16 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc @@ -28,7 +28,7 @@ #include "kis_brush.h" #include "kis_global.h" #include "kis_paint_device.h" -#include "klocale.h" +#include "tdelocale.h" #include "kis_layer.h" #include "kis_painter.h" #include "kis_types.h" diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc index 0a9298dad..17e0feff0 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.cc +++ b/chalk/plugins/tools/defaulttools/default_tools.cc @@ -22,12 +22,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 8fa2c6475..864135870 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_config.h" #include "kis_brush.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 310d1660d..40a09a91f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -26,9 +26,9 @@ #include <tqspinbox.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kis_layer.h" #include "kis_cursor.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc index d93687df2..7bb4c54fd 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_cursor.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc index 72a8ed302..919454b26 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_painter.h" #include "kis_canvas_subject.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 8709e60d9..df8e4f7c5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -22,7 +22,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 555583954..a46fee808 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "kis_button_press_event.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 8b5bc2a87..4e118cccb 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_cursor.h" #include "kis_painter.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc index 2762e5a0b..be5065784 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc @@ -22,7 +22,7 @@ #include <stdlib.h> #include <tqpoint.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include "kis_canvas_subject.h" #include "kis_cursor.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc index f516d8998..c95b10000 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc @@ -17,7 +17,7 @@ */ #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_canvas_controller.h" #include "kis_canvas_subject.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc index fb36dcbde..852d2c0e0 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_button_press_event.h" #include "kis_button_release_event.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index 3897d78a1..1a2687f13 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -30,7 +30,7 @@ #include <tdeaction.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <ksqueezedtextlabel.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc index dca2b7c9a..fe449ee4f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc @@ -18,7 +18,7 @@ */ #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "kis_image.h" diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc index 2e939da06..a1f0902f4 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc @@ -22,7 +22,7 @@ #include <tqpoint.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include "kis_canvas_subject.h" #include "kis_cursor.h" diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index a353fb5b7..acc903620 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_button_press_event.h" diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index f8409f4e1..1a4932b75 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kcolorbutton.h> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 38806f0f4..def162ef4 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_autobrush_resource.h" #include "kis_canvas_controller.h" diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 5f687ca52..af7f8d84a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_brush.h" #include "kis_layer.h" diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index d5f1123f7..7f5267366 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_layer.h> #include <kis_selection_options.h> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index b871c825b..8d89eea2f 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_layer.h> #include <kis_selection_options.h> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index fdce6b73a..09d338663 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_canvas_controller.h" #include "kis_canvas_subject.h" diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc index fb0e61912..8407a076e 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.cc +++ b/chalk/plugins/tools/selectiontools/selection_tools.cc @@ -22,12 +22,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 4bb504526..11a47590c 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc index c624d62f8..97f6e0e85 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/tool_crop.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index b96fb7373..e4c1d05d0 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index 5c47cd20a..06f34f8cc 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -29,7 +29,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include "kis_cmb_composite.h" diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index 90205d8d7..724189208 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -29,7 +29,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include "kis_cmb_composite.h" diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index e4da1b371..7449e5817 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_global.h" diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index dd8a80765..75e3da2be 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 18aa06b0f..178ff278f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -30,7 +30,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc index d941c2dc0..b21f5aae3 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.cc +++ b/chalk/plugins/tools/tool_curves/tool_curves.cc @@ -23,10 +23,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index 84343b829..07133d3bb 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_filter_config_widget.h" #include "kis_tool_filter.h" diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc index b5d7c4b56..bda2357e3 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/tool_filter.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 38c859c66..2dbe56d3d 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_button_press_event.h> #include <kis_button_release_event.h> diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index 12615387f..f2800a594 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index 75e688d1e..ae334e627 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kis_global.h> diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index 24d716201..0c4023cce 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc index bb13e10e1..a7371e49f 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc index 5ace60794..626a773d3 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc index d16709f2d..c99513f47 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc index fe9eb0024..a5bfa27f2 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index e63fb48f6..65b05957a 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kis_cursor.h> diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc index 95c315d80..af8070171 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -24,12 +24,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 88bd0cfd7..cd4bb0b2e 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -27,7 +27,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <knuminput.h> diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc index dc40edf9f..9ac1b62f8 100644 --- a/chalk/plugins/tools/tool_star/tool_star.cc +++ b/chalk/plugins/tools/tool_star/tool_star.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc index b4c9c1bdc..de20ce7f6 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc @@ -31,7 +31,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kis_global.h> diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc index 328100205..82941e92c 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/tool_transform.cc @@ -22,10 +22,10 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc index c610b3a20..be0648bab 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 126352b85..453bbec27 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -29,7 +29,7 @@ #include <tqradiobutton.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index ba0eff91b..d956ee460 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -27,12 +27,12 @@ #include <tqapplication.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 54ede8b9c..8159ad73f 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -24,7 +24,7 @@ #include <tqcombobox.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index cdc06ace1..59019489c 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -31,7 +31,7 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "dlg_dropshadow.h" diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 30339d6e1..97c2c17ed 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -27,12 +27,12 @@ #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index 62a2f5a16..97a0b8a7a 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 12e1fe650..448a58cfc 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_types.h" diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc index 95a50a45b..8252a98db 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.cc +++ b/chalk/plugins/viewplugins/histogram/histogram.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc index 9c6795072..25a7b9cff 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc @@ -19,12 +19,12 @@ */ #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cc index 128770065..85e4df406 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.cc +++ b/chalk/plugins/viewplugins/history_docker/historydocker.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 0d9b32187..8a9a8c098 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -32,7 +32,7 @@ using namespace std; #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 620ee85dc..1d30db6a0 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -33,7 +33,7 @@ using namespace std; #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc index ccd810023..c795924e1 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc @@ -27,12 +27,12 @@ #include <tqrect.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kstdaction.h> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index ea51ccf17..7cd1c335d 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -32,7 +32,7 @@ using namespace std; #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 684a1e9a8..38c445b01 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -32,7 +32,7 @@ using namespace std; #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index ebd33026e..f0129e742 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -32,7 +32,7 @@ using namespace std; #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc index 97e2f2acf..decf186e0 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kstdaction.h> diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index b94bdedf2..b2a723069 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -31,7 +31,7 @@ using namespace std; #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index dfb0614ce..f728043cd 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -30,13 +30,13 @@ #include <tqtextedit.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index f381b3f9f..84c11ffb5 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -31,7 +31,7 @@ using namespace std; #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc index 16a70764d..5f2474a7c 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index edb089d45..b07b4d3e2 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -11,16 +11,16 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kimageio.h> #include <tdefiledialog.h> #include <kimagefilepreview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kprinter.h> #include <tdeio/netaccess.h> #include <ksavefile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqbitmap.h> #include <tqdragobject.h> @@ -33,7 +33,7 @@ #include <khelpmenu.h> #include <tdepopupmenu.h> #include <kpushbutton.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqcursor.h> #include <tqregexp.h> @@ -56,7 +56,7 @@ #include <X11/extensions/shape.h> #endif -#include <kglobal.h> +#include <tdeglobal.h> KSnapshot::KSnapshot(TQWidget *parent, const char *name) : super(parent, name, false, TQString(), Ok|Cancel) diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index ffa101d1b..96a5ec8cf 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -28,7 +28,7 @@ #include <tqtimer.h> #include <dcopclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> #include <kurl.h> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 65ae3c99f..c243efa87 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -301,7 +301,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">kglobalsettings.h</include> + <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> <Q_SIGNALS> diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp index 48ca93956..26b6634b7 100644 --- a/chalk/plugins/viewplugins/screenshot/main.cpp +++ b/chalk/plugins/viewplugins/screenshot/main.cpp @@ -1,7 +1,7 @@ #include <tdeapplication.h> #include "ksnapshot.h" #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 06a4d544a..0fdf4a663 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> SizeTip::SizeTip( TQWidget *parent, const char *name ) : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp index 505f8de85..e1d186054 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <KoView.h> #include <KoDocument.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include "ksnapshot.h" #include <kimageio.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp index 1486d4153..be0b9307a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp @@ -18,7 +18,7 @@ #include "krs_image.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_colorspace_factory_registry.h> #include <kis_image.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index 9b5f5b6b1..777a8aac1 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -24,7 +24,7 @@ //#include <api/proxy.h> //#include <api/variant.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_paint_layer.h> #include <kis_paint_device.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp index a3ce4dd6e..fb6548b24 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp @@ -18,7 +18,7 @@ #include "krs_paint_layer.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_colorspace_factory_registry.h> #include <kis_doc.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp index c8ef92c50..21ab76464 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp @@ -20,7 +20,7 @@ #include "krs_wavelet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_math_toolbox.h> diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index c7e1db5f2..207bc0ce3 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -29,10 +29,10 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #define KROSS_MAIN_EXPORT KDE_EXPORT #include <main/manager.h> diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index 57e32dcef..61d856344 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -26,12 +26,12 @@ #include <tqcursor.h> #include <tqapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index d1807384f..6d2a59c32 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -25,7 +25,7 @@ #include <tqcombobox.h> #include <tqbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc index b01d3e314..ba8c6b84a 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc @@ -25,12 +25,12 @@ #include <stdlib.h> #include <vector> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 26650d737..db356a164 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index a2cc77739..e7a63180b 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -31,7 +31,7 @@ using namespace std; #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdebug.h> diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc index 43fdb18d0..8e20b58d6 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc index 781fe8790..a0dbc5aa2 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "dlg_substrate.h" #include "wdgsubstrate.h" diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc index d46a080a0..ce13710be 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.cc +++ b/chalk/plugins/viewplugins/substrate/substrate.cc @@ -22,12 +22,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cc index b329151c1..afa6a3d74 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.cc +++ b/chalk/plugins/viewplugins/variations/dlg_variations.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "dlg_variations.h" #include "wdg_variations.h" diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc index a3a084d72..5e2d65ba8 100644 --- a/chalk/plugins/viewplugins/variations/variations.cc +++ b/chalk/plugins/viewplugins/variations/variations.cc @@ -26,12 +26,12 @@ #include <tqslider.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/sdk/kis_global.h b/chalk/sdk/kis_global.h index 19acb2162..93cfffdd8 100644 --- a/chalk/sdk/kis_global.h +++ b/chalk/sdk/kis_global.h @@ -23,7 +23,7 @@ #include LCMS_HEADER #include <limits.h> #include <tqglobal.h> -#include <kglobal.h> +#include <tdeglobal.h> #define KRITA_VERSION VERSION diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index 1d7932cb4..b6bd51629 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h index 059f3d3c7..60d106453 100644 --- a/chalk/ui/kis_aboutdata.h +++ b/chalk/ui/kis_aboutdata.h @@ -21,7 +21,7 @@ #define KIS_ABOUT_DATA_H_ #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> #include <config.h> diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 2ef11147d..2b816f9cb 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -24,7 +24,7 @@ #include "tqimage.h" #include "config.h" #include LCMS_HEADER -#include "klocale.h" +#include "tdelocale.h" #include "tqtooltip.h" #include "kis_view.h" diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 0e06a7818..db9aba981 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -18,7 +18,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <koIconChooser.h> #include "kis_double_widget.h" diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index 4dc0ed1b9..bb80e75e0 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -22,7 +22,7 @@ #include <tqmessagebox.h> #include <tqbuffer.h> #include <tdemultipledrag.h> -#include <klocale.h> +#include <tdelocale.h> #include "kdebug.h" diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc index 516813510..66e3a6b39 100644 --- a/chalk/ui/kis_cmb_composite.cc +++ b/chalk/ui/kis_cmb_composite.cc @@ -20,7 +20,7 @@ #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_cmb_composite.h" diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc index 2d7e80d9d..92dc608f6 100644 --- a/chalk/ui/kis_cmb_idlist.cc +++ b/chalk/ui/kis_cmb_idlist.cc @@ -20,7 +20,7 @@ #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_id.h" diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index fe2b93fd6..ae0ddfacb 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -35,7 +35,7 @@ #include <tqframe.h> #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <koFrameButton.h> diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc index 375b16ee0..64939c4a6 100644 --- a/chalk/ui/kis_config.cc +++ b/chalk/ui/kis_config.cc @@ -17,9 +17,9 @@ */ #include <limits.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <config.h> diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index f4af08a14..6c57a7e6a 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -31,10 +31,10 @@ #include <tdetoolbar.h> #include <tdemainwindow.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <tdeactioncollection.h> diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc index d235259f3..1802e6cfd 100644 --- a/chalk/ui/kis_custom_brush.cc +++ b/chalk/ui/kis_custom_brush.cc @@ -23,9 +23,9 @@ #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "kis_view.h" #include "kis_image.h" diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index 8bd36142d..631b9abed 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -24,13 +24,13 @@ #include <tqregexp.h> #include <tqvalidator.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kcolordialog.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kis_view.h" #include "kis_palette.h" diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc index 8c2f22e25..edf92be12 100644 --- a/chalk/ui/kis_custom_pattern.cc +++ b/chalk/ui/kis_custom_pattern.cc @@ -22,9 +22,9 @@ #include <tqimage.h> #include <tqpushbutton.h> #include <tqcombobox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "kis_view.h" #include "kis_image.h" diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index 159d966fa..f7d75310e 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -16,14 +16,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_filter_config_widget.h" #include "kis_transaction.h" diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 9819228e0..997887f00 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -16,14 +16,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_filter_config_widget.h" #include "kis_transaction.h" diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 2d5e8a909..fcdfbd099 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -17,7 +17,7 @@ */ #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include "kis_factory.h" diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index ac8e14a3a..00acde270 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -26,7 +26,7 @@ #include <tqtextedit.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorcombo.h> #include <KoUnitWidgets.h> diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 500d29a18..832102c6d 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -22,7 +22,7 @@ #include <tqslider.h> #include <tqstring.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <knuminput.h> #include "kis_global.h" diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index 4eb5a409f..91f53a751 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpushbutton.h> diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 7d1f5faa1..5fbe96d55 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -46,7 +46,7 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index dafb63dda..60dbbfdda 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -36,11 +36,11 @@ #include <kdebug.h> #include <kimageio.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kmimetype.h> #include <knotifyclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // KOffice #include <KoFilterManager.h> diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index 9048935bb..154213b49 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -25,8 +25,8 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index b7b84d881..848f99b73 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -22,7 +22,7 @@ #include <tqframe.h> #include <tqcursor.h> #include <tqapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kguiitem.h> #include <kis_cursor.h> diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index c6343f39f..e3674fc89 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -26,7 +26,7 @@ #include "tqpainter.h" #include "tqpixmap.h" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "kis_types.h" #include "kis_paint_device.h" diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 098efb554..5022a28b9 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 3325517a3..255d3847a 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_autogradient_resource.h" diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 04adc0c22..1852438d5 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -32,7 +32,7 @@ #include <tdeaction.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_config.h" diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 92573c9f1..cb1b69384 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -40,8 +40,8 @@ #include <tqvalidator.h> #include <knuminput.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <karrowbutton.h> diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc index 36513c32a..d33c38738 100644 --- a/chalk/ui/kis_itemchooser.cc +++ b/chalk/ui/kis_itemchooser.cc @@ -17,7 +17,7 @@ */ #include <tqvbox.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <koIconChooser.h> diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc index 492548ef7..bd1950183 100644 --- a/chalk/ui/kis_label_progress.cc +++ b/chalk/ui/kis_label_progress.cc @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 7e14dcf07..ba5fe219c 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -37,13 +37,13 @@ #include <tqcheckbox.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kiconloader.h> #include <kicontheme.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoPartSelectAction.h> diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 756ab60e1..7bb0b3321 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -18,9 +18,9 @@ */ #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <KoPartSelectAction.h> #include <tqimage.h> diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc index 806998bf7..e02695049 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cc +++ b/chalk/ui/kis_multi_bool_filter_widget.cc @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> KisBoolWidgetParam::KisBoolWidgetParam( bool ninitvalue, TQString nlabel, TQString nname) : initvalue(ninitvalue), diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc index 486bc7701..9491f2218 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cc +++ b/chalk/ui/kis_multi_double_filter_widget.cc @@ -24,7 +24,7 @@ #include <knuminput.h> #include <kis_filter_config_widget.h> -#include <klocale.h> +#include <tdelocale.h> KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name) : KDoubleNumInput(parent, name) diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc index 130a03d10..aef29d2cb 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cc +++ b/chalk/ui/kis_multi_integer_filter_widget.cc @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name) : KIntNumInput(parent, name) diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index b2fcc2124..6036ef74c 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -24,12 +24,12 @@ #include <tqlayout.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeactioncollection.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index 1a0de3db3..2e17f651a 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -39,12 +39,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kpalette.h> #include <kimageeffect.h> diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 5585a9a97..e04b04942 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -36,12 +36,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kpalette.h> #include <kimageeffect.h> diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index 5846a67b3..4c05360eb 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -21,7 +21,7 @@ #include "tqimage.h" #include "tqpainter.h" -#include <klocale.h> +#include <tdelocale.h> #include "KoDocument.h" #include "KoDocumentChild.h" diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index b05f62a0e..741cba653 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -17,7 +17,7 @@ */ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <koIconChooser.h> #include "kis_colorspace.h" diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index dae4bd464..d128f2209 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -21,8 +21,8 @@ #include "kis_perspective_grid_manager.h" #include <tdeaction.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kis_image.h" #include "kis_grid_drawer.h" diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc index 64cd11713..3076bc00d 100644 --- a/chalk/ui/kis_resourceserver.cc +++ b/chalk/ui/kis_resourceserver.cc @@ -25,7 +25,7 @@ #include <tqdir.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kinstance.h> diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index ca17d1adf..7d001586a 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <KoDocument.h> diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index 53b8fceeb..026747417 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -21,7 +21,7 @@ #include <tdeaction.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kis_tool.h" diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index eb961b33b..759136f44 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_canvas_controller.h" #include "kis_canvas_subject.h" diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h index bc5171a8a..afa6b9bc4 100644 --- a/chalk/ui/kis_tool_factory.h +++ b/chalk/ui/kis_tool_factory.h @@ -19,7 +19,7 @@ #ifndef KIS_TOOL_FACTORY_H_ #define KIS_TOOL_FACTORY_H_ -#include <klocale.h> +#include <tdelocale.h> #include "kis_id.h" #include "kis_types.h" diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index fe6ac1a21..787afee47 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeaction.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_canvas_subject.h" #include "kis_undo_adapter.h" diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index 995a3fe44..143bd6754 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -25,7 +25,7 @@ #include <tqcheckbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index fa9d0c947..68ce4c69e 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_tool_shape.h" #include "wdgshapeoptions.h" diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index dd406ac75..795753573 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -43,14 +43,14 @@ // KDE #include <kis_meta_registry.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopobject.h> #include <tdeaction.h> #include <kcolordialog.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kprinter.h> #include <kpushbutton.h> diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 5b1d4442f..f7a9842d5 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -28,11 +28,11 @@ #include <tqcursor.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaction.h> #include <tdetoolbar.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoDocument.h> diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 6b3ea4632..bb82396a2 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -32,11 +32,11 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> diff --git a/configure.in b/configure.in index 3a6899bd9..92ca35da5 100644 --- a/configure.in +++ b/configure.in @@ -2169,7 +2169,7 @@ AC_CONFIG_FILES([ kword/dtd/Makefile ]) AC_CONFIG_FILES([ kword/expression/Makefile ]) AC_CONFIG_FILES([ kword/horizontalline/Makefile ]) AC_CONFIG_FILES([ kword/mailmerge/Makefile ]) -AC_CONFIG_FILES([ kword/mailmerge/kabc/Makefile ]) +AC_CONFIG_FILES([ kword/mailmerge/tdeabc/Makefile ]) AC_CONFIG_FILES([ kword/mailmerge/kspread/Makefile ]) AC_CONFIG_FILES([ kword/mailmerge/sql/Makefile ]) AC_CONFIG_FILES([ kword/pics/Makefile ]) diff --git a/example/example_aboutdata.h b/example/example_aboutdata.h index a1f69b7fd..6c53d670c 100644 --- a/example/example_aboutdata.h +++ b/example/example_aboutdata.h @@ -21,7 +21,7 @@ #define EXAMPLE_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> static const char* description=I18N_NOOP("Example KOffice Program"); static const char* version="0.1"; diff --git a/example/example_factory.cc b/example/example_factory.cc index 307b7e939..9564e5fae 100644 --- a/example/example_factory.cc +++ b/example/example_factory.cc @@ -22,7 +22,7 @@ #include <example_aboutdata.h> #include <kinstance.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory ) diff --git a/example/example_view.cc b/example/example_view.cc index 57d26b07f..e681bdb32 100644 --- a/example/example_view.cc +++ b/example/example_view.cc @@ -25,7 +25,7 @@ #include <tqiconset.h> #include <tdeaction.h> #include <kstdaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name ) diff --git a/example/main.cc b/example/main.cc index dd4b01290..ecffb3736 100644 --- a/example/main.cc +++ b/example/main.cc @@ -21,7 +21,7 @@ #include <KoDocument.h> #include <KoMainWindow.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "example_aboutdata.h" #include <koffice_export.h> diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index e8d4d0d6b..ce8071c6a 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 efdb061a8..fd0630ecf 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 5b4b56a05..9a44ed975 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 33d9ec606..70e30a4a6 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 795eb92e0..3956b640b 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 1af33fd7c..873fdf2be 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 becda194c..70e679387 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 da399a53e..94f558240 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> diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc index e56646960..112c29d1c 100644 --- a/filters/generic_wrapper/generic_filter.cc +++ b/filters/generic_wrapper/generic_filter.cc @@ -25,11 +25,11 @@ #include <kdebug.h> #include <KoFilterChain.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ktrader.h> #include <kservice.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "generic_filter.h" diff --git a/filters/karbon/ai/ai88handler.cc b/filters/karbon/ai/ai88handler.cc index 7b5019be6..87a937ae9 100644 --- a/filters/karbon/ai/ai88handler.cc +++ b/filters/karbon/ai/ai88handler.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include "ai88handler.h" AI88Handler::AI88Handler(AIParserBase *delegate){ diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc index 220dbebaf..4bf4aec7e 100644 --- a/filters/karbon/eps/epsexportdlg.cc +++ b/filters/karbon/eps/epsexportdlg.cc @@ -23,7 +23,7 @@ #include <tqvbox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "epsexportdlg.h" diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc index e25889c0b..bd272271e 100644 --- a/filters/karbon/msod/msodimport.cc +++ b/filters/karbon/msod/msodimport.cc @@ -21,7 +21,7 @@ DESCRIPTION */ #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <kgenericfactory.h> #include <KoFilterChain.h> diff --git a/filters/kchart/bmp/bmpexport.cpp b/filters/kchart/bmp/bmpexport.cpp index 5f00bb5e2..e0c69c30e 100644 --- a/filters/kchart/bmp/bmpexport.cpp +++ b/filters/kchart/bmp/bmpexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/jpeg/jpegexport.cpp b/filters/kchart/jpeg/jpegexport.cpp index 7d2bcec01..46bc5900b 100644 --- a/filters/kchart/jpeg/jpegexport.cpp +++ b/filters/kchart/jpeg/jpegexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp index faff17ff2..f2143c498 100644 --- a/filters/kchart/libimageexport/imageexport.cpp +++ b/filters/kchart/libimageexport/imageexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/mng/mngexport.cpp b/filters/kchart/mng/mngexport.cpp index e23e870c9..f7dfbe7c0 100644 --- a/filters/kchart/mng/mngexport.cpp +++ b/filters/kchart/mng/mngexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/png/pngexport.cpp b/filters/kchart/png/pngexport.cpp index 456ca8870..380cc4631 100644 --- a/filters/kchart/png/pngexport.cpp +++ b/filters/kchart/png/pngexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc index 1507f5369..062ccd9b0 100644 --- a/filters/kchart/svg/svgexport.cc +++ b/filters/kchart/svg/svgexport.cc @@ -20,7 +20,7 @@ #include <tqpicture.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/xbm/xbmexport.cpp b/filters/kchart/xbm/xbmexport.cpp index a0acd6485..29a117437 100644 --- a/filters/kchart/xbm/xbmexport.cpp +++ b/filters/kchart/xbm/xbmexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kchart/xpm/xpmexport.cpp b/filters/kchart/xpm/xpmexport.cpp index da5832d08..bde51290d 100644 --- a/filters/kchart/xpm/xpmexport.cpp +++ b/filters/kchart/xpm/xpmexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc index 589c1168a..d47e36bd3 100644 --- a/filters/kformula/latex/latexexport.cc +++ b/filters/kformula/latex/latexexport.cc @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStoreDevice.h> diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc index 5f4735a11..37951d2de 100644 --- a/filters/kformula/mathml/mathmlexport.cc +++ b/filters/kformula/mathml/mathmlexport.cc @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStoreDevice.h> diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc index 42143fa5e..b8fa07ed4 100644 --- a/filters/kformula/mathml/mathmlimport.cc +++ b/filters/kformula/mathml/mathmlimport.cc @@ -20,9 +20,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <tqtextcodec.h> diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc index ec605aff6..47b0d316f 100644 --- a/filters/kformula/png/pngexport.cc +++ b/filters/kformula/png/pngexport.cc @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc index 490787a8a..938fed782 100644 --- a/filters/kformula/png/pngexportdia.cc +++ b/filters/kformula/png/pngexportdia.cc @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kformulacontainer.h> #include <kformuladocument.h> diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc index e63aca887..35896ac1b 100644 --- a/filters/kformula/svg/svgexport.cc +++ b/filters/kformula/svg/svgexport.cc @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp index 93e37f6eb..0c977398f 100644 --- a/filters/kivio/imageexport/kivio_imageexport.cpp +++ b/filters/kivio/imageexport/kivio_imageexport.cpp @@ -27,8 +27,8 @@ #include <tqsize.h> #include <tqstringlist.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp index 957bda633..1ed8fc0d2 100644 --- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp +++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "kivio_imageexportwidget.h" diff --git a/filters/kpresenter/bmp/bmpexport.cpp b/filters/kpresenter/bmp/bmpexport.cpp index f7351a104..40edc1005 100644 --- a/filters/kpresenter/bmp/bmpexport.cpp +++ b/filters/kpresenter/bmp/bmpexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/jpeg/jpegexport.cpp b/filters/kpresenter/jpeg/jpegexport.cpp index 527111881..720d8244d 100644 --- a/filters/kpresenter/jpeg/jpegexport.cpp +++ b/filters/kpresenter/jpeg/jpegexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index 8dd96c5fa..fc0f50cd0 100644 --- a/filters/kpresenter/kword/kprkword.cc +++ b/filters/kpresenter/kword/kprkword.cc @@ -24,7 +24,7 @@ #include <KoFilterChain.h> #include <KoGlobal.h> #include <kprkword.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqsortedlist.h> #include <tqcolor.h> diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp index c4ceb2438..e203ca990 100644 --- a/filters/kpresenter/libimageexport/imageexport.cpp +++ b/filters/kpresenter/libimageexport/imageexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/mng/mngexport.cpp b/filters/kpresenter/mng/mngexport.cpp index 67ff47d50..d5de30d3d 100644 --- a/filters/kpresenter/mng/mngexport.cpp +++ b/filters/kpresenter/mng/mngexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/png/pngexport.cpp b/filters/kpresenter/png/pngexport.cpp index 8bb6b0546..cbece8f1a 100644 --- a/filters/kpresenter/png/pngexport.cpp +++ b/filters/kpresenter/png/pngexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc index 9eae5cd8e..5b6ed8928 100644 --- a/filters/kpresenter/svg/svgexport.cc +++ b/filters/kpresenter/svg/svgexport.cc @@ -21,7 +21,7 @@ #include <tqpicture.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/xbm/xbmexport.cpp b/filters/kpresenter/xbm/xbmexport.cpp index 16a0818a8..782dac96b 100644 --- a/filters/kpresenter/xbm/xbmexport.cpp +++ b/filters/kpresenter/xbm/xbmexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kpresenter/xpm/xpmexport.cpp b/filters/kpresenter/xpm/xpmexport.cpp index 87097f5f0..013f94599 100644 --- a/filters/kpresenter/xpm/xpmexport.cpp +++ b/filters/kpresenter/xpm/xpmexport.cpp @@ -20,7 +20,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoStore.h> diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index d4173bd32..1e721d165 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -36,9 +36,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcharsets.h> CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/) diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index c7a3b6c04..ceeb8b5ec 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <KoFilterChain.h> #include <KoFilterManager.h> diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index c136fd91f..ebf1523ee 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -40,10 +40,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcharsets.h> using namespace KSpread; diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index f5c4262a1..72cadfa2b 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc index 6121baaff..001b35a20 100644 --- a/filters/kspread/dbase/dbaseimport.cc +++ b/filters/kspread/dbase/dbaseimport.cc @@ -37,7 +37,7 @@ #include <KoGlobal.h> #include <KoUnit.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> typedef KGenericFactory<DBaseImport, KoFilter> DBaseImportFactory; K_EXPORT_COMPONENT_FACTORY( libdbaseimport, DBaseImportFactory( "kofficefilters" ) ) diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index 05a57be69..28f5453e9 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -24,7 +24,7 @@ #include <gnumericexport.h> #include <kdebug.h> #include <kfilterdev.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <KoFilterChain.h> #include <tqapplication.h> diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index 665a61610..856a84911 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <gnumericimport.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kfilterdev.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc index cff62773f..8df7e0ce2 100644 --- a/filters/kspread/html/exportdialog.cc +++ b/filters/kspread/html/exportdialog.cc @@ -25,8 +25,8 @@ #include <tqtextcodec.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <exportdialog.h> diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index 0c0255252..6100dabe3 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -50,8 +50,8 @@ //KDE Includes #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <tqcolor.h> diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 090b4de1b..0e15acbe7 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -30,14 +30,14 @@ //KDE Includes #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kpushbutton.h> #include <tdelistview.h> #include <kcombobox.h> #include <tqradiobutton.h> #include <tqtextedit.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> //Kexi Includes #include <kexidb/global.h> diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 6a53ee95a..b088afe14 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -27,12 +27,12 @@ #include <tqcheckbox.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <tderecentdocument.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurlrequester.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc index c303a59ea..d9ebd7946 100644 --- a/filters/kspread/latex/export/latexexport.cc +++ b/filters/kspread/latex/export/latexexport.cc @@ -22,8 +22,8 @@ #include <kdebug.h> #include <KoFilterChain.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextcodec.h> #include "kspreadlatexexportdiaImpl.h" diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index f092d6b15..2db60420f 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -31,10 +31,10 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmdcodec.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoDocumentInfo.h> #include <KoFilterChain.h> diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 08ccaca7e..6dc3216ed 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -32,7 +32,7 @@ #include <kdebug.h> #include <KoDocumentInfo.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmdcodec.h> #include <KoFilterChain.h> #include <KoGlobal.h> diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index ec4793d06..e282a7698 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <KoFilterChain.h> diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc index 5e875ecd0..e9474364f 100644 --- a/filters/kword/abiword/ImportField.cc +++ b/filters/kword/abiword/ImportField.cc @@ -20,7 +20,7 @@ #include <tqstring.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include "ImportField.h" diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc index ac432855f..1a023c8e5 100644 --- a/filters/kword/abiword/ImportStyle.cc +++ b/filters/kword/abiword/ImportStyle.cc @@ -19,7 +19,7 @@ #include <tqfontinfo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <KoGlobal.h> diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index aec3373f8..bd6ea1e38 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -34,7 +34,7 @@ #include <kmdcodec.h> #include <kfilterdev.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoPageLayout.h> #include <KoStore.h> diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc index eb408d175..577fb72b9 100644 --- a/filters/kword/ascii/ExportDialog.cc +++ b/filters/kword/ascii/ExportDialog.cc @@ -23,12 +23,12 @@ #include <tqbuttongroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ExportDialogUI.h> #include <ExportDialog.h> diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc index 45eaf0bfb..09c81a090 100644 --- a/filters/kword/ascii/ImportDialog.cc +++ b/filters/kword/ascii/ImportDialog.cc @@ -22,13 +22,13 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ImportDialogUI.h> #include <ImportDialog.h> diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index c3d17203b..b7c4c0f5e 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -35,7 +35,7 @@ #include <tqfontinfo.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kgenericfactory.h> #include <KoGlobal.h> diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc index 8199f173d..d222d7df4 100644 --- a/filters/kword/html/export/ExportBasic.cc +++ b/filters/kword/html/export/ExportBasic.cc @@ -22,7 +22,7 @@ #include <tqtextcodec.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KWEFBaseWorker.h> diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index faacff642..2388477c3 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -22,7 +22,7 @@ #include <tqtextcodec.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KWEFUtil.h> diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc index e52f85c5a..5fc3fdc59 100644 --- a/filters/kword/html/export/ExportDialog.cc +++ b/filters/kword/html/export/ExportDialog.cc @@ -20,13 +20,13 @@ #include <tqtextcodec.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqradiobutton.h> diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc index 969ccd40b..eccdead1d 100644 --- a/filters/kword/html/export/ExportDocStruct.cc +++ b/filters/kword/html/export/ExportDocStruct.cc @@ -22,7 +22,7 @@ #include <tqtextcodec.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KWEFBaseWorker.h> diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index 05892740d..96f0b6c5b 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -25,7 +25,7 @@ #include <tqdir.h> #include <tqpicture.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KWEFUtil.h> diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp index db75a02f4..747d88a4c 100644 --- a/filters/kword/kword1.3/import/kword13document.cpp +++ b/filters/kword/kword1.3/import/kword13document.cpp @@ -21,7 +21,7 @@ #include <tqiodevice.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "kword13utils.h" #include "kword13layout.h" diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index 47eed1e7d..9e10ad9cc 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kimageio.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoFilterChain.h> #include <KoStoreDevice.h> diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp index 7f246cad8..cc28136ae 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp @@ -25,7 +25,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <kofficeversion.h> diff --git a/filters/kword/kword1.3/import/kword13picture.cpp b/filters/kword/kword1.3/import/kword13picture.cpp index c94d1e342..1fa6af723 100644 --- a/filters/kword/kword1.3/import/kword13picture.cpp +++ b/filters/kword/kword1.3/import/kword13picture.cpp @@ -21,7 +21,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoStore.h> #include <KoStoreDevice.h> diff --git a/filters/kword/latex/export/document.cc b/filters/kword/latex/export/document.cc index 410e7b7f9..13d40415f 100644 --- a/filters/kword/latex/export/document.cc +++ b/filters/kword/latex/export/document.cc @@ -22,7 +22,7 @@ #include <stdlib.h> /* for atoi function */ #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoStore.h> #include <tqdir.h> diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index a0da3ee46..3498bcdb9 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -27,12 +27,12 @@ #include <tqcheckbox.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <tderecentdocument.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurlrequester.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc index 083f23755..fed29704f 100644 --- a/filters/kword/latex/export/latexexport.cc +++ b/filters/kword/latex/export/latexexport.cc @@ -23,8 +23,8 @@ #include <kdebug.h> #include <KoFilterChain.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextcodec.h> #include "kwordlatexexportdia.h" diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc index b67a73855..17c00b7d9 100644 --- a/filters/kword/latex/export/texlauncher.cc +++ b/filters/kword/latex/export/texlauncher.cc @@ -2,8 +2,8 @@ #include "xml2latexparser.h" //#include "texgraphexport.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <KoFilter.h> #include <KoStore.h> #include<tqtextstream.h> diff --git a/filters/kword/latex/import/generator/kwordgenerator.cc b/filters/kword/latex/import/generator/kwordgenerator.cc index 0b0e7aa31..945c3869b 100644 --- a/filters/kword/latex/import/generator/kwordgenerator.cc +++ b/filters/kword/latex/import/generator/kwordgenerator.cc @@ -18,7 +18,7 @@ */ #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqdom.h> diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc index 00f069cf2..5bea13ccb 100644 --- a/filters/kword/latex/import/lateximport.cc +++ b/filters/kword/latex/import/lateximport.cc @@ -22,8 +22,8 @@ #include <kdebug.h> #include <KoFilterChain.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextcodec.h> #include "lateximportdia.h" diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc index 6a8d201b8..c69b7e901 100644 --- a/filters/kword/latex/import/lateximportdia.cc +++ b/filters/kword/latex/import/lateximportdia.cc @@ -36,7 +36,7 @@ #include <lateximportdia.h> #include <lateximportdia.moc> #include <dcopclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqptrlist.h> #include "latexparser.h" diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h index 360bfd8ce..1d8a3e57e 100644 --- a/filters/kword/latex/import/lateximportdia.h +++ b/filters/kword/latex/import/lateximportdia.h @@ -41,7 +41,7 @@ #include <tqradiobutton.h> #include <tqvbuttongroup.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopobject.h> #include <kdialogbase.h> diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index a3fca243f..b0a7913d8 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -37,8 +37,8 @@ #include <tqdom.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <KoGlobal.h> #include <KoStore.h> diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp index 595c026cb..01b4813de 100644 --- a/filters/kword/msword/conversion.cpp +++ b/filters/kword/msword/conversion.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tqregexp.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> TQColor Conversion::color(int number, int defaultcolor, bool defaultWhite) { diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp index ab70c79a4..043c1bc24 100644 --- a/filters/kword/msword/document.cpp +++ b/filters/kword/msword/document.cpp @@ -35,7 +35,7 @@ #include <wv2/parserfactory.h> #include <wv2/paragraphproperties.h> #include <wv2/associatedstrings.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoStore.h> #include <KoFilterChain.h> diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 242a6d392..775f8bce8 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -32,7 +32,7 @@ #include <tqfont.h> #include <tqfontinfo.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> wvWare::U8 KWordReplacementHandler::hardLineBreak() diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc index 004b5cc3c..cb9834913 100644 --- a/filters/kword/mswrite/ImportDialog.cc +++ b/filters/kword/mswrite/ImportDialog.cc @@ -20,9 +20,9 @@ #include <tqtextcodec.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index 73acf7414..216ace492 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -37,7 +37,7 @@ #include <tqdom.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kzip.h> #include <KoPageLayout.h> diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc index 22d9fed5d..259d97b5b 100644 --- a/filters/kword/oowriter/conversion.cc +++ b/filters/kword/oowriter/conversion.cc @@ -1,6 +1,6 @@ #include "conversion.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> TQString Conversion::importAlignment( const TQString& align ) { diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 6bd88ec9b..5e54ce06f 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -37,7 +37,7 @@ #include <KoDocument.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoFilterChain.h> #include <KoUnit.h> #include <KoPageLayout.h> diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp index 14d3d384a..0bd5a5a13 100644 --- a/filters/kword/pdf/FilterPage.cpp +++ b/filters/kword/pdf/FilterPage.cpp @@ -21,7 +21,7 @@ #include <math.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "data.h" diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp index 3236aa399..25a09f856 100644 --- a/filters/kword/pdf/data.cpp +++ b/filters/kword/pdf/data.cpp @@ -19,9 +19,9 @@ #include "data.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace PDFImport; diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp index 013d4cb3a..1513208d9 100644 --- a/filters/kword/pdf/dialog.cpp +++ b/filters/kword/pdf/dialog.cpp @@ -32,7 +32,7 @@ #include <tqwhatsthis.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp index c8ecabcbe..c681ff013 100644 --- a/filters/kword/pdf/fstring.cpp +++ b/filters/kword/pdf/fstring.cpp @@ -19,7 +19,7 @@ #include "fstring.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "data.h" diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp index 3cd0e1bfb..b2b2f1413 100644 --- a/filters/kword/pdf/misc.cpp +++ b/filters/kword/pdf/misc.cpp @@ -22,7 +22,7 @@ #include <math.h> #include <tqfontmetrics.h> #include <tqfontdatabase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "Link.h" diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp index 80ec92d08..b50e590ff 100644 --- a/filters/kword/pdf/pdfdocument.cpp +++ b/filters/kword/pdf/pdfdocument.cpp @@ -22,7 +22,7 @@ #include <math.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "GlobalParams.h" #include "PDFDoc.h" diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 14dce1e26..eba2b645d 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -32,8 +32,8 @@ #include <tqcolor.h> #include <tqdatetime.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <KWEFUtil.h> diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index eb8c467de..4b8d7e1bf 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -28,7 +28,7 @@ #include <tqvaluelist.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoPicture.h> #include <KoFilterManager.h> diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index 3cd6a01dc..a4a152175 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include "exportsizedia.h" diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index 99879f285..ae0395a94 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -26,7 +26,7 @@ DESCRIPTION #include <olefilter.h> #include <tqfile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kgenericfactory.h> #include <kmimetype.h> #include <KoFilterChain.h> diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index be32e432c..bf141f903 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -25,13 +25,13 @@ #include <tqcombobox.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> #include <tderecentdocument.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefiledialog.h> #include <kdebug.h> #include <KoFilterManager.h> diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc index ee3fdf705..24dfb5477 100644 --- a/filters/xsltfilter/import/xsltimport.cc +++ b/filters/xsltfilter/import/xsltimport.cc @@ -22,8 +22,8 @@ #include <kdebug.h> #include <KoFilterChain.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextcodec.h> #include "xsltimportdia.h" diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index a29638e6f..9052e4ecc 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -28,12 +28,12 @@ #include <tqdir.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tderecentdocument.h> #include <KoFilterManager.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <xsltproc.h> diff --git a/karbon/commands/valigncmd.cc b/karbon/commands/valigncmd.cc index 47665eb53..d79c8485c 100644 --- a/karbon/commands/valigncmd.cc +++ b/karbon/commands/valigncmd.cc @@ -18,7 +18,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "valigncmd.h" #include "vtransformcmd.h" diff --git a/karbon/commands/vbooleancmd.cc b/karbon/commands/vbooleancmd.cc index e04676f7d..dbfccffeb 100644 --- a/karbon/commands/vbooleancmd.cc +++ b/karbon/commands/vbooleancmd.cc @@ -22,7 +22,7 @@ #include <tqptrlist.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> #include "vbooleancmd.h" #include "vpath.h" diff --git a/karbon/commands/vcleanupcmd.cc b/karbon/commands/vcleanupcmd.cc index 6df536014..2c9d49627 100644 --- a/karbon/commands/vcleanupcmd.cc +++ b/karbon/commands/vcleanupcmd.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vcleanupcmd.h" #include "vlayer.h" diff --git a/karbon/commands/vclosepathcmd.cc b/karbon/commands/vclosepathcmd.cc index 3afe61953..652ed2df0 100644 --- a/karbon/commands/vclosepathcmd.cc +++ b/karbon/commands/vclosepathcmd.cc @@ -18,7 +18,7 @@ */ #include "vclosepathcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <core/vpath.h> diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc index 578261851..fe5e9adaf 100644 --- a/karbon/commands/vcommand.cc +++ b/karbon/commands/vcommand.cc @@ -20,7 +20,7 @@ #include "tdeaction.h" -#include "klocale.h" +#include "tdelocale.h" #include "vcommand.h" #include "karbon_part.h" diff --git a/karbon/commands/vdeletecmd.cc b/karbon/commands/vdeletecmd.cc index d94723c0c..997a7cc95 100644 --- a/karbon/commands/vdeletecmd.cc +++ b/karbon/commands/vdeletecmd.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vdeletecmd.h" #include "vselection.h" diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cc index d1f7c9794..e83c160a1 100644 --- a/karbon/commands/vdeletenodescmd.cc +++ b/karbon/commands/vdeletenodescmd.cc @@ -19,7 +19,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "vdeletenodescmd.h" #include "vselection.h" diff --git a/karbon/commands/vdistributecmd.cc b/karbon/commands/vdistributecmd.cc index d8e410b01..7a23072f8 100644 --- a/karbon/commands/vdistributecmd.cc +++ b/karbon/commands/vdistributecmd.cc @@ -18,7 +18,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "vdistributecmd.h" #include "vtransformcmd.h" diff --git a/karbon/commands/vfillcmd.cc b/karbon/commands/vfillcmd.cc index 18f17b857..75d5284cc 100644 --- a/karbon/commands/vfillcmd.cc +++ b/karbon/commands/vfillcmd.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vfill.h" #include "vfillcmd.h" diff --git a/karbon/commands/vflattencmd.cc b/karbon/commands/vflattencmd.cc index 0cab021a9..21d5b50c2 100644 --- a/karbon/commands/vflattencmd.cc +++ b/karbon/commands/vflattencmd.cc @@ -18,7 +18,7 @@ */ #include "vflattencmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <core/vpath.h> #include <core/vsegment.h> diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cc index bcad4d936..70bd2933f 100644 --- a/karbon/commands/vgroupcmd.cc +++ b/karbon/commands/vgroupcmd.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vgroup.h" #include "vgroupcmd.h" diff --git a/karbon/commands/vinsertcmd.cc b/karbon/commands/vinsertcmd.cc index 2db54907a..fb544a0c3 100644 --- a/karbon/commands/vinsertcmd.cc +++ b/karbon/commands/vinsertcmd.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vdocument.h" #include "vlayer.h" diff --git a/karbon/commands/vstrokecmd.cc b/karbon/commands/vstrokecmd.cc index 2ea436681..7b99f2d75 100644 --- a/karbon/commands/vstrokecmd.cc +++ b/karbon/commands/vstrokecmd.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vselection.h" #include "vstroke.h" diff --git a/karbon/commands/vtextcmd.cc b/karbon/commands/vtextcmd.cc index 32e7b0310..fd7424ba1 100644 --- a/karbon/commands/vtextcmd.cc +++ b/karbon/commands/vtextcmd.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "karbon_view.h" diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc index dc1038ab0..ebcb443ed 100644 --- a/karbon/commands/vtransformcmd.cc +++ b/karbon/commands/vtransformcmd.cc @@ -18,7 +18,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include "vcomposite.h" #include "vpath.h" diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc index 314a873e6..947c4afe3 100644 --- a/karbon/commands/vungroupcmd.cc +++ b/karbon/commands/vungroupcmd.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vgroup.h" #include "vungroupcmd.h" diff --git a/karbon/commands/vzordercmd.cc b/karbon/commands/vzordercmd.cc index 2839120f6..2a25edf95 100644 --- a/karbon/commands/vzordercmd.cc +++ b/karbon/commands/vzordercmd.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vzordercmd.h" #include "vselection.h" diff --git a/karbon/core/vglobal.h b/karbon/core/vglobal.h index c20d48b04..5c0d4706c 100644 --- a/karbon/core/vglobal.h +++ b/karbon/core/vglobal.h @@ -21,7 +21,7 @@ #ifndef __VGLOBAL_H__ #define __VGLOBAL_H__ -#include <kglobal.h> +#include <tdeglobal.h> // define some often used mathematical constants et al: diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc index 47fe919d8..55602598e 100644 --- a/karbon/core/vlayer.cc +++ b/karbon/core/vlayer.cc @@ -19,7 +19,7 @@ #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoRect.h> #include "vcomposite.h" diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc index 90548045a..ae8e399a5 100644 --- a/karbon/dialogs/vcolordlg.cc +++ b/karbon/dialogs/vcolordlg.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "vcolor.h" #include "vcolordlg.h" diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc index 56fecc0b9..0b2c3bab9 100644 --- a/karbon/dialogs/vcolortab.cc +++ b/karbon/dialogs/vcolortab.cc @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "vcolor.h" diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 3e3534846..bc4e5eb1d 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kcolorbutton.h> #include <KoUnitWidgets.h> diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc index 2428de118..27009bf21 100644 --- a/karbon/dialogs/vstrokedlg.cc +++ b/karbon/dialogs/vstrokedlg.cc @@ -26,7 +26,7 @@ #include <tqvbuttongroup.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "KoUnitWidgets.h" diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc index c6453575f..328f4f3ff 100644 --- a/karbon/dockers/vcolordocker.cc +++ b/karbon/dockers/vcolordocker.cc @@ -27,7 +27,7 @@ #include <tqevent.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoMainWindow.h> #include "karbon_part.h" diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 6272cc2b5..dc676a85c 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -29,8 +29,8 @@ #include <tqlabel.h> #include <tqcursor.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <KoMainWindow.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc index f30b30424..13fe44c16 100644 --- a/karbon/dockers/vstrokedocker.cc +++ b/karbon/dockers/vstrokedocker.cc @@ -26,7 +26,7 @@ #include <tqtooltip.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoMainWindow.h> #include "KoUnitWidgets.h" diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 5bf609932..9f3d12e6f 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -25,7 +25,7 @@ #include <tqhbuttongroup.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <KoMainWindow.h> #include <KoFilterManager.h> diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc index 7e93577b2..69c9a87cb 100644 --- a/karbon/dockers/vtransformdocker.cc +++ b/karbon/dockers/vtransformdocker.cc @@ -24,7 +24,7 @@ #include <tqwmatrix.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoMainWindow.h> #include <KoRect.h> #include <KoUnitWidgets.h> diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h index aee04a230..8b9d9840a 100644 --- a/karbon/karbon_aboutdata.h +++ b/karbon/karbon_aboutdata.h @@ -2,7 +2,7 @@ #define KARBON_ABOUTDATA_H #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> static const char* description=I18N_NOOP( "A Vector Graphics Drawing Application." ); diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 32d5e2de0..6dd94ed36 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -19,10 +19,10 @@ #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 896b04505..a34a4da11 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -25,8 +25,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <KoTemplateChooseDia.h> #include <KoStoreDevice.h> #include <KoOasisStyles.h> diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cc index 92c94fdf0..2b31e4d71 100644 --- a/karbon/karbon_resourceserver.cc +++ b/karbon/karbon_resourceserver.cc @@ -24,9 +24,9 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kogradientmanager.h> diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 432d243dc..115bbf6fc 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -29,9 +29,9 @@ #include <tdeaction.h> #include <kcolordrag.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeversion.h> #include <kprinter.h> diff --git a/karbon/main.cc b/karbon/main.cc index a02c04ded..434134fee 100644 --- a/karbon/main.cc +++ b/karbon/main.cc @@ -22,7 +22,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoApplication.h> #include "karbon_aboutdata.h" diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc index 78c2a66ee..6c4a33d8d 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cc +++ b/karbon/plugins/flattenpath/flattenpathplugin.cc @@ -18,7 +18,7 @@ */ #include "flattenpathplugin.h" -#include "klocale.h" +#include "tdelocale.h" #include <karbon_view.h> #include <karbon_part.h> #include <kgenericfactory.h> diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc index 090561a83..749e07a1f 100644 --- a/karbon/plugins/imagetool/vimagetool.cc +++ b/karbon/plugins/imagetool/vimagetool.cc @@ -19,7 +19,7 @@ */ #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc index a837e51ee..019b4024a 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc @@ -18,7 +18,7 @@ */ #include "shadoweffectplugin.h" -#include "klocale.h" +#include "tdelocale.h" #include <karbon_view.h> #include <karbon_part.h> #include <kgenericfactory.h> diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cc index beb19a688..1cecb94a8 100644 --- a/karbon/plugins/zoomtool/vzoomtool.cc +++ b/karbon/plugins/zoomtool/vzoomtool.cc @@ -21,7 +21,7 @@ #include <tqcursor.h> #include <tqevent.h> -#include <klocale.h> +#include <tdelocale.h> #include "vzoomtool.h" #include <karbon_part.h> diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc index 503b2e578..3f81f3c32 100644 --- a/karbon/render/vkopainter.cc +++ b/karbon/render/vkopainter.cc @@ -54,7 +54,7 @@ #include <gdk-pixbuf-xlibrgb.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <math.h> diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc index ef5bb0708..1a9462b81 100644 --- a/karbon/shapes/vellipse.cc +++ b/karbon/shapes/vellipse.cc @@ -20,7 +20,7 @@ #include "vellipse.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc index 1735471f7..fdf0f745d 100644 --- a/karbon/shapes/vpolygon.cc +++ b/karbon/shapes/vpolygon.cc @@ -23,7 +23,7 @@ #include "vglobal.h" #include "vpolygon.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc index cef5bda2e..519422ed9 100644 --- a/karbon/shapes/vpolyline.cc +++ b/karbon/shapes/vpolyline.cc @@ -22,7 +22,7 @@ #include <tqdom.h> #include "vglobal.h" -#include <klocale.h> +#include <tdelocale.h> #include <vdocument.h> #include "vtransformcmd.h" diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc index bbeef50f7..3190c93c9 100644 --- a/karbon/shapes/vrectangle.cc +++ b/karbon/shapes/vrectangle.cc @@ -19,7 +19,7 @@ #include "vrectangle.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc index 362ed800d..f27cee4b3 100644 --- a/karbon/shapes/vsinus.cc +++ b/karbon/shapes/vsinus.cc @@ -23,7 +23,7 @@ #include "vglobal.h" #include "vsinus.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <tqdom.h> #include <vdocument.h> diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc index 0df884856..ff2f691e0 100644 --- a/karbon/shapes/vspiral.cc +++ b/karbon/shapes/vspiral.cc @@ -26,7 +26,7 @@ #include "vglobal.h" #include "vspiral.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <vdocument.h> diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc index 260c1664a..a43413c99 100644 --- a/karbon/shapes/vstar.cc +++ b/karbon/shapes/vstar.cc @@ -26,7 +26,7 @@ #include "vglobal.h" #include "vstar.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <vdocument.h> diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc index b8855c50e..170a51dde 100644 --- a/karbon/tools/vellipsetool.cc +++ b/karbon/tools/vellipsetool.cc @@ -21,7 +21,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "KoUnitWidgets.h" #include <KoUnit.h> #include <kcombobox.h> diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc index 68d7972eb..e7d2db3ca 100644 --- a/karbon/tools/vgradienttool.cc +++ b/karbon/tools/vgradienttool.cc @@ -20,7 +20,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <karbon_part.h> #include <karbon_view.h> diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 963f1a610..8c42d5e00 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <koIconChooser.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <karbon_factory.h> #include <karbon_resourceserver.h> diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc index a15dbf2d0..1239923ea 100644 --- a/karbon/tools/vpenciltool.cc +++ b/karbon/tools/vpenciltool.cc @@ -28,7 +28,7 @@ #include <tqvbox.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> //#include <KoUnitWidgets.h> diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h index 3667f2942..8def15264 100644 --- a/karbon/tools/vpenciltool.h +++ b/karbon/tools/vpenciltool.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "KoPoint.h" diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc index 18895cea5..de4756919 100644 --- a/karbon/tools/vpolygontool.cc +++ b/karbon/tools/vpolygontool.cc @@ -22,7 +22,7 @@ #include <tqgroupbox.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> #include <karbon_view.h> diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc index e16894195..38ac9d256 100644 --- a/karbon/tools/vpolylinetool.cc +++ b/karbon/tools/vpolylinetool.cc @@ -22,7 +22,7 @@ #include <tqevent.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <karbon_part.h> #include <karbon_view.h> diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc index 5b0fcffe6..4572cc237 100644 --- a/karbon/tools/vrectangletool.cc +++ b/karbon/tools/vrectangletool.cc @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <karbon_view.h> diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h index 7da59745c..1915b10a8 100644 --- a/karbon/tools/vrectangletool.h +++ b/karbon/tools/vrectangletool.h @@ -21,7 +21,7 @@ #define __VRECTANGLETOOL_H__ -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "vshapetool.h" diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc index f8d341dcf..4230cac7f 100644 --- a/karbon/tools/vrotatetool.cc +++ b/karbon/tools/vrotatetool.cc @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoRect.h> #include <karbon_part.h> diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h index 27e4ca3db..35ee9be12 100644 --- a/karbon/tools/vroundrecttool.h +++ b/karbon/tools/vroundrecttool.h @@ -20,7 +20,7 @@ #ifndef __VROUNDRECTTOOL_H__ #define __VROUNDRECTTOOL_H__ -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <knuminput.h> diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc index 7123b71a1..2a3c38bba 100644 --- a/karbon/tools/vselectnodestool.cc +++ b/karbon/tools/vselectnodestool.cc @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoPoint.h> #include <KoRect.h> diff --git a/karbon/tools/vselecttool.h b/karbon/tools/vselecttool.h index e77911728..464dc6afc 100644 --- a/karbon/tools/vselecttool.h +++ b/karbon/tools/vselecttool.h @@ -21,7 +21,7 @@ #define __VSELECTTOOL_H__ #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "vtool.h" diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc index d7fd40b90..4bc80810e 100644 --- a/karbon/tools/vsheartool.cc +++ b/karbon/tools/vsheartool.cc @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoRect.h> #include <karbon_part.h> diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc index d46c4180c..12dbe1282 100644 --- a/karbon/tools/vsinustool.cc +++ b/karbon/tools/vsinustool.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <karbon_view.h> diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc index e0b99c9e6..c414be41f 100644 --- a/karbon/tools/vspiraltool.cc +++ b/karbon/tools/vspiraltool.cc @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <knuminput.h> diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h index 056942676..48842e9f5 100644 --- a/karbon/tools/vspiraltool.h +++ b/karbon/tools/vspiraltool.h @@ -21,7 +21,7 @@ #define __VSPIRALTOOL_H__ #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "vshapetool.h" diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc index e152ad31f..9a92cd376 100644 --- a/karbon/tools/vstartool.cc +++ b/karbon/tools/vstartool.cc @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kcombobox.h> diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h index 1d35ad43d..5c8936dcc 100644 --- a/karbon/tools/vstartool.h +++ b/karbon/tools/vstartool.h @@ -20,7 +20,7 @@ #ifndef __VSTARTOOL_H__ #define __VSTARTOOL_H__ -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "vshapetool.h" diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index 13e037a1b..e7fa848d2 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -35,7 +35,7 @@ #include <tdefontdialog.h> #include <kiconloader.h> #include <knuminput.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <karbon_view.h> #include <karbon_part.h> diff --git a/karbon/visitors/vselectiondesc.cc b/karbon/visitors/vselectiondesc.cc index 0036f31c2..8518b7b62 100644 --- a/karbon/visitors/vselectiondesc.cc +++ b/karbon/visitors/vselectiondesc.cc @@ -24,7 +24,7 @@ #include "vimage.h" #include "vcomposite.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void VSelectionDescription::visitVSelection( VSelection& selection ) diff --git a/karbon/vtool.h b/karbon/vtool.h index 4b085cba4..87d7b1b30 100644 --- a/karbon/vtool.h +++ b/karbon/vtool.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoPoint.h> #include <koffice_export.h> class TDERadioAction; diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc index 9fa5dcd65..d4cd64972 100644 --- a/karbon/widgets/vcanvas.cc +++ b/karbon/widgets/vcanvas.cc @@ -34,7 +34,7 @@ #include "vtool.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolordrag.h> int diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index d24e6956e..5c57efaba 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -27,7 +27,7 @@ #include <knuminput.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistbox.h> #include <kiconloader.h> diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc index d4ea8e75e..64cbf3731 100644 --- a/karbon/widgets/vgradientwidget.cc +++ b/karbon/widgets/vgradientwidget.cc @@ -24,7 +24,7 @@ #include <kcolorbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <kiconloader.h> diff --git a/karbon/widgets/vselecttoolbar.cc b/karbon/widgets/vselecttoolbar.cc index ff2d3585b..ef731e92f 100644 --- a/karbon/widgets/vselecttoolbar.cc +++ b/karbon/widgets/vselecttoolbar.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "KoUnitWidgets.h" diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc index afd48d716..28a8dd27d 100644 --- a/karbon/widgets/vsmallpreview.cc +++ b/karbon/widgets/vsmallpreview.cc @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoPoint.h> #include "vcolor.h" diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc index d6b288ba2..35a25a719 100644 --- a/karbon/widgets/vtranslate.cc +++ b/karbon/widgets/vtranslate.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cc index 84b3ed14b..9a98a125a 100644 --- a/karbon/widgets/vtypebuttonbox.cc +++ b/karbon/widgets/vtypebuttonbox.cc @@ -207,7 +207,7 @@ static const char* const buttonpattern[]={ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include "karbon_part.h" #include "vfillcmd.h" diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 5f404eb33..cf13c1b5e 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -35,9 +35,9 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcharsets.h> diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc index 798e27d57..d7716d311 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cc +++ b/kchart/kchartBackgroundPixmapConfigPage.cc @@ -20,11 +20,11 @@ #include "kchartBackgroundPixmapConfigPage.h" #include "kchartBackgroundPixmapConfigPage.moc" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdefilemetainfo.h> #include <kstringhandler.h> diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index faaa81d23..921b42c47 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 85313c0ed..dcf99e4ac 100644 --- a/kchart/kchartComboConfigPage.cc +++ b/kchart/kchartComboConfigPage.cc @@ -21,7 +21,7 @@ #include "kchartComboConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cc index e92d20f9b..f0f57d625 100644 --- a/kchart/kchartConfigDialog.cc +++ b/kchart/kchartConfigDialog.cc @@ -38,7 +38,7 @@ #include "kchartParameterPolarConfigPage.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqradiobutton.h> diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc index d31e47991..f9cc7e25d 100644 --- a/kchart/kchartDataConfigPage.cc +++ b/kchart/kchartDataConfigPage.cc @@ -22,7 +22,7 @@ #include "kchartDataConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <kdebug.h> diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc index 2bd0230d4..8f08dd78b 100644 --- a/kchart/kchartDataEditor.cc +++ b/kchart/kchartDataEditor.cc @@ -10,9 +10,9 @@ #include <tqpushbutton.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include "kdchart/KDChartAxisParams.h" diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index 2b23b22fc..27f91581d 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -23,7 +23,7 @@ #include "kchartFontConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <kdebug.h> diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc index 8730063f4..8e11184ed 100644 --- a/kchart/kchartHeaderFooterConfigPage.cc +++ b/kchart/kchartHeaderFooterConfigPage.cc @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index e0baf9431..dc18d7176 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -21,7 +21,7 @@ #include "kchartLegendConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <tdefontdialog.h> #include <kiconloader.h> diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc index 6308fe43d..f3750f739 100644 --- a/kchart/kchartLine3dConfigPage.cc +++ b/kchart/kchartLine3dConfigPage.cc @@ -21,7 +21,7 @@ #include "kchartLine3dConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc index 9292f1f94..e2587b9ff 100644 --- a/kchart/kchartPageLayout.cc +++ b/kchart/kchartPageLayout.cc @@ -23,7 +23,7 @@ #include <knumvalidator.h> #include <tqlineedit.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqgroupbox.h> diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc index a74878d25..1b37b8cca 100644 --- a/kchart/kchartParameter3dConfigPage.cc +++ b/kchart/kchartParameter3dConfigPage.cc @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc index 2025be3bb..da6c8017f 100644 --- a/kchart/kchartParameterConfigPage.cc +++ b/kchart/kchartParameterConfigPage.cc @@ -22,7 +22,7 @@ #include "kchartParameterConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc index 99bfb6ff0..d640333ee 100644 --- a/kchart/kchartParameterPieConfigPage.cc +++ b/kchart/kchartParameterPieConfigPage.cc @@ -22,7 +22,7 @@ #include "kchartParameterPieConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc index 32775fc01..b6e1fe59d 100644 --- a/kchart/kchartParameterPolarConfigPage.cc +++ b/kchart/kchartParameterPolarConfigPage.cc @@ -22,7 +22,7 @@ #include "kchartParameterPolarConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc index cf96654ad..31ec42a6b 100644 --- a/kchart/kchartPieConfigPage.cc +++ b/kchart/kchartPieConfigPage.cc @@ -21,7 +21,7 @@ #include "kchartPieConfigPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tdefontdialog.h> diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc index a7d0e88f9..a02592ded 100644 --- a/kchart/kchartPrinterDlg.cc +++ b/kchart/kchartPrinterDlg.cc @@ -26,7 +26,7 @@ // KDE includes #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "kchartPrinterDlg.h" diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc index e171da847..9ccad59eb 100644 --- a/kchart/kchartSubTypeChartPage.cc +++ b/kchart/kchartSubTypeChartPage.cc @@ -23,7 +23,7 @@ #include "kchartSubTypeChartPage.moc" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <tqvbuttongroup.h> diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cc index a2166f2eb..01e5bf456 100644 --- a/kchart/kchartWizard.cc +++ b/kchart/kchartWizard.cc @@ -12,7 +12,7 @@ #include <tqwidget.h> #include <tqpushbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kchart/kchartWizard.h b/kchart/kchartWizard.h index e3725bc1d..1e14840bc 100644 --- a/kchart/kchartWizard.h +++ b/kchart/kchartWizard.h @@ -1,7 +1,7 @@ #ifndef kchartWIZARD_H #define kchartWIZARD_H -#include <klocale.h> +#include <tdelocale.h> #include "kwizard.h" #include "kchart_part.h" diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc index c745a16a1..3899a2766 100644 --- a/kchart/kchartWizardLabelsLegendPage.cc +++ b/kchart/kchartWizardLabelsLegendPage.cc @@ -6,7 +6,7 @@ #include <tqlineedit.h> #include <tqradiobutton.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc index 2aa08afed..2c86549a8 100644 --- a/kchart/kchartWizardSelectChartSubTypePage.cc +++ b/kchart/kchartWizardSelectChartSubTypePage.cc @@ -15,8 +15,8 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include "kchart_params.h" diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc index b0365ddde..8ea02100b 100644 --- a/kchart/kchartWizardSelectChartTypePage.cc +++ b/kchart/kchartWizardSelectChartTypePage.cc @@ -10,8 +10,8 @@ #include <tqpushbutton.h> #include <tqlabel.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> namespace KChart diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc index e7ab0ba82..d40e95fe7 100644 --- a/kchart/kchartWizardSelectDataFormatPage.cc +++ b/kchart/kchartWizardSelectDataFormatPage.cc @@ -18,8 +18,8 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include "kchart_params.h" diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc index 5043313fc..5514e82b8 100644 --- a/kchart/kchartWizardSetupAxesPage.cc +++ b/kchart/kchartWizardSetupAxesPage.cc @@ -8,7 +8,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <knumvalidator.h> #include <math.h> diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h index abf8b2f77..5e53ed37d 100644 --- a/kchart/kchart_aboutdata.h +++ b/kchart/kchart_aboutdata.h @@ -21,7 +21,7 @@ #define KCHART_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> namespace KChart diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc index f45e6aedd..053627387 100644 --- a/kchart/kchart_factory.cc +++ b/kchart/kchart_factory.cc @@ -8,7 +8,7 @@ #include "kchart_factory.h" #include "kchart_aboutdata.h" #include "kchart_part.h" -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc index 55a158d75..2cd8da51d 100644 --- a/kchart/kchart_params.cc +++ b/kchart/kchart_params.cc @@ -26,7 +26,7 @@ using std::cerr; #include <dcopobject.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KoXmlNS.h> diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc index 67b0ab57b..fb6a64143 100644 --- a/kchart/kchart_part.cc +++ b/kchart/kchart_part.cc @@ -26,7 +26,7 @@ using std::cerr; #include <KoOasisLoadingContext.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqdom.h> diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index 1a40d1a95..ba2d1321e 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -12,17 +12,17 @@ #include <tqcstring.h> // For TQByteArray #include <tdeaction.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <kprinter.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <dcopobject.h> #include <kxmlguifactory.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoTemplateCreateDia.h> diff --git a/kchart/main.cc b/kchart/main.cc index a82f44dd9..97d046d1a 100644 --- a/kchart/main.cc +++ b/kchart/main.cc @@ -19,7 +19,7 @@ #include <KoApplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kchart_aboutdata.h" using namespace KChart; diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index c25d4e12e..d7b88e2cf 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -53,8 +53,8 @@ #include <tqptrlist.h> #include <tqpen.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kdebug.h> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 269607014..90adff174 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -22,9 +22,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 24aa75ed9..a375327fd 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -23,9 +23,9 @@ #include <kdebug.h> #include <tqfont.h> #include <tqfontinfo.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index b4640a302..6aa0ea66d 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -20,10 +20,10 @@ */ #include "KoPageLayout.h" #include <KoUnit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #ifndef SIMPLE_KOLIBS # include <kodom.h> # include <koxmlns.h> diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc index 99d5e01d1..2f0db91a3 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc @@ -29,9 +29,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index 38c8b1113..a2eb289a1 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -24,8 +24,8 @@ # include <KoXmlWriter.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 3f6fb09e6..097dfc250 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -20,8 +20,8 @@ #include "koUnitWidgets.moc" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 5ce1bc849..cf17da061 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -39,7 +39,7 @@ #include <ksharedptr.h> #include <kmimetype.h> #include <kstaticdeleter.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> using namespace Kexi; diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h index 921db42be..f90ec7674 100644 --- a/kexi/core/kexi.h +++ b/kexi/core/kexi.h @@ -31,8 +31,8 @@ #include <kexidb/drivermanager.h> #include <kexidb/driver.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> namespace Kexi { diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index e41cf0ff2..f35738878 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -23,7 +23,7 @@ #include <kexi_version.h> #include <tdeversion.h> #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING -#include <klocale.h> +#include <tdelocale.h> static const char *description = I18N_NOOP("Database creation for everyone") diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h index 5c31f63f9..62cbbe7fb 100644 --- a/kexi/core/kexicmdlineargs.h +++ b/kexi/core/kexicmdlineargs.h @@ -23,7 +23,7 @@ #define KEXICMDLINEARGS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions options[] = { diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index ac2ed1014..627bd7611 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -21,7 +21,7 @@ #include <KoContextCelp.h> #include <kxmlguiclient.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tqlayout.h> #include <kdebug.h> diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp index 5b2b2791b..eb5bdc241 100644 --- a/kexi/core/kexiguimsghandler.cpp +++ b/kexi/core/kexiguimsghandler.cpp @@ -23,7 +23,7 @@ #include <kexidb/utils.h> #include <kexiutils/utils.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialogbase.h> KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent) diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 0cfce53be..8635fa491 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> #include <kexidb/msghandler.h> diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index e1ed78fee..e907110a5 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -38,7 +38,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace KexiPart { //! @internal diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 1dbe4eefa..e5b1c2a4e 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kexiutils/identifier.h> diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp index 17ce3d890..525672882 100644 --- a/kexi/core/kexiprojectconnectiondata.cpp +++ b/kexi/core/kexiprojectconnectiondata.cpp @@ -25,13 +25,13 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeio/netaccess.h> #include <kurl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/connectiondata.h> #include <kexidb/drivermanager.h> diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp index dd8778734..53daea99d 100644 --- a/kexi/core/kexiprojectdata.cpp +++ b/kexi/core/kexiprojectdata.cpp @@ -26,13 +26,13 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeio/netaccess.h> #include <kurl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/drivermanager.h> #include "kexiprojectdata.h" diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index 7ced2d6f4..c68bd124d 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -20,8 +20,8 @@ #include "kexitemplateloader.h" #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index 3bc22a7a5..ad97123ed 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -1,4 +1,4 @@ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeshortcut.h> diff --git a/kexi/core/kexiuseractionmethod.cpp b/kexi/core/kexiuseractionmethod.cpp index 41b35782d..bef945e37 100644 --- a/kexi/core/kexiuseractionmethod.cpp +++ b/kexi/core/kexiuseractionmethod.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> #include "kexiuseraction.h" #include "kexiuseractionmethod.h" diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 29cbfcaa7..338cb08ca 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -25,9 +25,9 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccelmanager.h> #include "formIO.h" diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index 0e59a08f1..8376beb7e 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -27,9 +27,9 @@ #include <kpushbutton.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kexitableview.h" #include "kexitableviewdata.h" diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 3f7d201b9..a785893fa 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -27,7 +27,7 @@ #include <tqcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <cstdlib> // for abs() diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index eca070320..44bc80966 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -24,7 +24,7 @@ #include <tdelistbox.h> #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/editor.h> #include <koproperty/set.h> diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 813609278..18ce167c8 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -42,7 +42,7 @@ #include <kgenericfactory.h> #include <ktextedit.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index ebc9606fe..c5a4a5cb5 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -31,7 +31,7 @@ #include <kprogress.h> #include <kiconloader.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 1e185d6d9..b52c2087d 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -25,10 +25,10 @@ #include <tqptrdict.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "container.h" #include "objecttree.h" diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 264b3bad7..3d6fc8cab 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tdeaccelmanager.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 9ab98f4a4..25f13b97b 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -31,20 +31,20 @@ #include <tqvaluevector.h> #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kstdaction.h> #include <tdeaction.h> #include <kxmlguiclient.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdestyle.h> #include <tdeactionclasses.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> #include <ktextedit.h> #include <ktabwidget.h> diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index e668aa482..22434c87d 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "objecttree.h" #include "form.h" diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp index bdd0e3b07..1c3ad69d6 100644 --- a/kexi/formeditor/resizehandle.cpp +++ b/kexi/formeditor/resizehandle.cpp @@ -18,7 +18,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqcursor.h> diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 291b96dc3..9fde7052b 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -23,7 +23,7 @@ #include <kcolorcombo.h> #include <tdetoolbarradiogroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "richtextdialog.h" diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp index f28c8e2a9..bbc340988 100644 --- a/kexi/formeditor/tabstopdialog.cpp +++ b/kexi/formeditor/tabstopdialog.cpp @@ -23,7 +23,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "form.h" diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 4445e9ec7..15bb1a2fe 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -28,7 +28,7 @@ #include <tdeversion.h> #include <tdeaction.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> #include <kstdaction.h> @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "form.h" #include "formIO.h" diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp index d1a3edfd2..455fd311d 100644 --- a/kexi/formeditor/test/kfd_mainwindow.cpp +++ b/kexi/formeditor/test/kfd_mainwindow.cpp @@ -21,8 +21,8 @@ #include <kurl.h> #include <kdebug.h> #include <klibloader.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "kfd_mainwindow.h" diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 649c2fe97..401bfd20a 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -28,7 +28,7 @@ #include <tdeversion.h> #include <tdeaction.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> #include <kstdaction.h> @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "form.h" #include "formIO.h" diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp index 3f0727b7f..53aa57208 100644 --- a/kexi/formeditor/test/main.cpp +++ b/kexi/formeditor/test/main.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char *description = I18N_NOOP("KFormDesigner"); diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 9537085ed..b90193bca 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -27,7 +27,7 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> //#ifdef KEXI_KTEXTEDIT #include <ktextedit.h> //#else diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index fcb0ffe64..239917744 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -23,7 +23,7 @@ #include <tqstrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klibloader.h> #include <tdeparts/componentfactory.h> #include <ktrader.h> diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 73c79c30f..74b1a4f62 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -28,9 +28,9 @@ #include <tqapplication.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "objecttree.h" #include "form.h" diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 9037b0414..dd2eb76b4 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -44,7 +44,7 @@ #include <tqguardedptr.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #define KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION 1 diff --git a/kexi/kexidb/connectiondata.cpp b/kexi/kexidb/connectiondata.cpp index 4f45b0f48..14c23dfec 100644 --- a/kexi/kexidb/connectiondata.cpp +++ b/kexi/kexidb/connectiondata.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tqdir.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp index b5f095e23..41bf47351 100644 --- a/kexi/kexidb/cursor.cpp +++ b/kexi/kexidb/cursor.cpp @@ -26,7 +26,7 @@ #include <kexiutils/utils.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdlib.h> diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp index 490a7390f..ba9b1be0e 100644 --- a/kexi/kexidb/dbproperties.cpp +++ b/kexi/kexidb/dbproperties.cpp @@ -18,7 +18,7 @@ */ #include "dbproperties.h" -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 8e08b83f6..953243e4f 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -29,7 +29,7 @@ #include <tqfileinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <assert.h> diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 498c4610b..0ce563a91 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -30,7 +30,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <assert.h> diff --git a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp index abfdb44f2..590e7ceca 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp @@ -23,7 +23,7 @@ #include "mysqlconnection_p.h" #include <kexidb/error.h> #include <kexidb/utils.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <limits.h> diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp index d6262befc..76684483a 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kexidb/error.h> #include <kexidb/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <string> #include "pqxxpreparedstatement.h" #include "pqxxconnection_p.h" diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index b7219e71d..746a383ae 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp @@ -24,7 +24,7 @@ #include <kexidb/error.h> #include <kexidb/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <cstdlib> diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index fe6a78ea2..c8282963d 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -31,7 +31,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrvector.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index 71ba23216..afc861439 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -23,9 +23,9 @@ #include <kstandarddirs.h> #include <kprogress.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <tqfileinfo.h> diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index fabdf6034..f4e5ccfe8 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -28,7 +28,7 @@ #include <ctype.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 79b38aca7..41cce80be 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -27,7 +27,7 @@ // we use here i18n() but this depends on kde libs: TODO: add #ifdefs #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/object.cpp b/kexi/kexidb/object.cpp index 2e32274d8..bc3249fc6 100644 --- a/kexi/kexidb/object.cpp +++ b/kexi/kexidb/object.cpp @@ -21,7 +21,7 @@ #include <kexidb/error.h> #include <kexidb/msghandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KexiDB; diff --git a/kexi/kexidb/object.h b/kexi/kexidb/object.h index 232535d19..6fb183bac 100644 --- a/kexi/kexidb/object.h +++ b/kexi/kexidb/object.h @@ -21,7 +21,7 @@ #define KEXIDB_OBJECT_H #include <kexidb/error.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <tqstring.h> diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 1d2e52952..df4f3323d 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -21,7 +21,7 @@ #include "sqlparser.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index 097deb3bb..b7ddccd84 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -800,7 +800,7 @@ #include <tqobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqcstring.h> #include <tqvariant.h> diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index c2d8e8870..a33978065 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -466,7 +466,7 @@ #include <tqobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqcstring.h> #include <tqvariant.h> diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index 75ee2535e..3cd6bdf3a 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -507,7 +507,7 @@ char *yytext; #include "sqltypes.h" #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l index 5f74a0caf..b16a615da 100644 --- a/kexi/kexidb/parser/sqlscanner.l +++ b/kexi/kexidb/parser/sqlscanner.l @@ -26,7 +26,7 @@ #include "sqltypes.h" #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 31727bd55..1ee0d52df 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -34,7 +34,7 @@ #include <tqbitarray.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index d6652f6d0..edb472a07 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -29,10 +29,10 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kiconloader.h> #include "utils_p.h" diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h index 684a30fcd..88d76b066 100644 --- a/kexi/kexiutils/validator.h +++ b/kexi/kexiutils/validator.h @@ -26,7 +26,7 @@ #include <tqvariant.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> namespace KexiUtils { diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 255e18829..3365268a2 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -23,7 +23,7 @@ #include <kstdaction.h> #include <kpushbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <tdeaction.h> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index dd629780d..d6b2cc167 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -39,15 +39,15 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdestdaccel.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <tdeversion.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeparts/componentfactory.h> #include <ktip.h> #include <kstandarddirs.h> diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 8df772cee..e2493320e 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -21,7 +21,7 @@ #ifndef KEXIMAINWINDOWIMPL_H #define KEXIMAINWINDOWIMPL_H -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "core/keximainwindow.h" #include "core/kexiguimsghandler.h" diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index 8f5ee38a8..7176aa6d8 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <klineedit.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kexiutils/validator.h> #include <kexiutils/identifier.h> diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 1d81f9f8c..725c1047d 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include "kexinewstuff.h" diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 85468e1d8..6aaa6acee 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -29,8 +29,8 @@ #include <tqfontmetrics.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdeparts/part.h> #if KexitStatusBar_KTEXTEDITOR_USED diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 05c5f3ab5..8aed1c0aa 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <kurllabel.h> #include <kdebug.h> diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 4b15b16d8..35f8aa31b 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <kurllabel.h> #include <kdebug.h> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index acd0d709b..c19108bed 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -29,7 +29,7 @@ #include <kdialogbase.h> #include <tdetoolbarbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index f09f911f6..1c46a0463 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <kurlcombobox.h> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 2ce058707..e479d1bbf 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -35,12 +35,12 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdelistview.h> #include <kurlcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <tqobjectlist.h> diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index cdc770d96..76299637b 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 9bbe7a13d..6e2ecc800 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -40,9 +40,9 @@ #include <kexidbshortcutfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> #include <tdeversion.h> #include <kprogress.h> diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 4288ef781..f0b9a0e97 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -36,17 +36,17 @@ #include <tqtooltip.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <kinstance.h> #include <kdebug.h> #include <kpushbutton.h> #include <kjanuswidget.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ktextedit.h> #include <tdefileiconview.h> #include <tdefileitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kmimetype.h> #include <ktextbrowser.h> diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 1bccbf1e4..defa2e06e 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -28,8 +28,8 @@ #include <tqpushbutton.h> #include <tqapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmimetype.h> #include <tdefile.h> diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index 136ea3c66..f9b535c8b 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -23,7 +23,7 @@ #include <kprogress.h> #include <kprocess.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 474dc98ad..9f8bbce39 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kiconloader.h> diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index a62f90aa0..12b207a9c 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -30,7 +30,7 @@ #include <tqcheckbox.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 07245ba9e..1bc8945f5 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -27,7 +27,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <assert.h> diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 35e51dc16..637c94346 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -23,7 +23,7 @@ #include <tqobjectlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <widget/tableview/kexitableitem.h> #include <widget/tableview/kexitableviewdata.h> diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 6910bda95..54ecbb1d5 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbarbutton.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 9f63c09ca..1154e1107 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -25,7 +25,7 @@ #include <tqstyle.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <tdeactioncollection.h> diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 4d1f0ec76..aae999061 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -23,7 +23,7 @@ #include <tqobjectlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tableview/kexitableitem.h> #include <tableview/kexitableviewdata.h> diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 9437facae..f4056728c 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -28,7 +28,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kexidbcheckbox.h" #include "kexidbimagebox.h" diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index ed441d4fd..fb9636003 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> #include <kimageio.h> @@ -40,7 +40,7 @@ #include <kstaticdeleter.h> #include <kimageeffect.h> #include <tdestdaccel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kguiitem.h> #include <widget/utils/kexidropdownbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 2e49660d9..7b369c60e 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -34,7 +34,7 @@ #include <tqgroupbox.h> #include <tqclipboard.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kactivelabel.h> #include <kpushbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 070ea2349..104e43b39 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -34,7 +34,7 @@ #include <tqgroupbox.h> #include <tqclipboard.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kactivelabel.h> #include <kpushbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 2bbe979ca..941a7bd06 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -46,9 +46,9 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kcharsets.h> #include <knuminput.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 642c2b3a1..dce13f384 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -28,8 +28,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> KexiCSVImportOptions::KexiCSVImportOptions() diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index c0608072d..b1ee43668 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kdialogbase.h> #include <kactivelabel.h> diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index 4e211a53d..6fa700c4d 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -27,7 +27,7 @@ #include <core/keximainwindow.h> #include <core/kexiinternalpart.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index 7383b9a80..f34ca89cd 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp index f421abb58..bb588dee6 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.cpp +++ b/kexi/plugins/macros/kexiactions/messageaction.cpp @@ -22,8 +22,8 @@ #include <core/keximainwindow.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index 336039aea..5f10bd1ad 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -31,7 +31,7 @@ #include <widget/kexidataawareview.h> #include <widget/tableview/kexidataawareobjectiface.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 03545f695..da94c8c51 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -30,7 +30,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index 65def3aa3..0fb2dd4d1 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -31,7 +31,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index f5206ff5d..0a41b6444 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index 6a9d2964b..a953f0d9e 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -27,9 +27,9 @@ #include <tqpushbutton.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "../lib/context.h" diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 07c8f8e15..c87cb5b4d 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp index c1754ef34..f05f8290d 100644 --- a/kexi/plugins/macros/tests/komacrotest.cpp +++ b/kexi/plugins/macros/tests/komacrotest.cpp @@ -19,7 +19,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeunittest/runner.h> static const char description[] = diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp index f0bc50c18..ea4bbb9c7 100644 --- a/kexi/plugins/macros/tests/komacrotestgui.cpp +++ b/kexi/plugins/macros/tests/komacrotestgui.cpp @@ -19,7 +19,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdeunittest/runnergui.h" diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp index 4e7bb67b0..3e4d28162 100644 --- a/kexi/plugins/macros/tests/testaction.cpp +++ b/kexi/plugins/macros/tests/testaction.cpp @@ -25,7 +25,7 @@ #include "../lib/macroitem.h" #include "../lib/variable.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KoMacroTest; diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp index 9b7f5db94..0b117d845 100644 --- a/kexi/plugins/queries/kexiaddparamdialog.cpp +++ b/kexi/plugins/queries/kexiaddparamdialog.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <klineedit.h> #include <tqvbox.h> diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp index 555a84cff..82bd2fe25 100644 --- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp +++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp @@ -22,7 +22,7 @@ #include "kexidynamicqueryparameterdialog.moc" #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlineedit.h> #include <tqobjectlist.h> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 9a6f32057..45ea8e1d4 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -26,8 +26,8 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/field.h> #include <kexidb/queryschema.h> diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 0f39cb59e..39e36bbb7 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kexiutils/utils.h> diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 3328e42fc..c528540a7 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -23,10 +23,10 @@ #include <tqregexp.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> #include "kexiquerydesignersqlhistory.h" diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index affc1214a..4c77b6dde 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -19,7 +19,7 @@ #include "kexirelationmaindlg.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index cf54b2545..35036222e 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -20,7 +20,7 @@ #include <tqvaluevector.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 143a03921..f718efd0c 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbarbutton.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp index 4f6c9ff9b..843a9a133 100644 --- a/kexi/plugins/tables/kexitabledesignercommands.cpp +++ b/kexi/plugins/tables/kexitabledesignercommands.cpp @@ -24,9 +24,9 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccelmanager.h> #include <koproperty/property.h> diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 514be26a6..df715cbe1 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -28,10 +28,10 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconeffect.h> #include <koproperty/set.h> diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index 761107c24..7e5521e32 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -26,10 +26,10 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <koproperty/set.h> diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 07541f4d9..5b8538a7e 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktabwidget.h> #include <kiconloader.h> diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp index 72266fb29..5215a28f8 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.cpp +++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp @@ -22,7 +22,7 @@ #include <kstdguiitem.h> #include <kpushbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp index 8c86cfb52..936b3c774 100644 --- a/kexi/tests/gui/finddialog/main.cpp +++ b/kexi/tests/gui/finddialog/main.cpp @@ -18,7 +18,7 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp index 799294f6f..4f929f8c4 100644 --- a/kexi/tests/tableview/main.cpp +++ b/kexi/tests/tableview/main.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tableview/kexitableview.h> diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 4aa82bec2..2c86d4f75 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -32,10 +32,10 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kimageeffect.h> #include <tdeconfig.h> diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index ad368e698..76f19ba6e 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -22,8 +22,8 @@ #include <tqtextcodec.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index 797fa4406..18319585f 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index e11845535..6f722f0e0 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -21,9 +21,9 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstdguiitem.h> #include <tdeversion.h> diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 05115b699..5df84c96c 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //uncomment this to enable KTextEdit-based editor diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 1c1f929b9..ceb2aa41b 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kexidb/tableschema.h> #include <kexidb/queryschema.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index f688fa648..348e9ee04 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -33,8 +33,8 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kexidb/tableschema.h> #include <kexidb/queryschema.h> diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index bf5c64912..1612871b1 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -24,7 +24,7 @@ #include <koproperty/editor.h> #include <koproperty/property.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqlayout.h> diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp index 04257ec28..171df484c 100644 --- a/kexi/widget/kexiqueryparameters.cpp +++ b/kexi/widget/kexiqueryparameters.cpp @@ -20,7 +20,7 @@ #include "kexiqueryparameters.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <knumvalidator.h> diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index ba4c8f9e5..59fddb063 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kstaticdeleter.h> -#include <klocale.h> +#include <tdelocale.h> #include <utils/kexirecordnavigator.h> #include <core/kexi.h> diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 27f893959..bb3b0ec8f 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -24,7 +24,7 @@ #include <tqstyle.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <core/kexi.h> diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 1917e8f3f..8c4d95518 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -34,8 +34,8 @@ #include <kpixmapio.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "pixmapcollection.h" diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 5340691f3..7dcec4159 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -30,11 +30,11 @@ #include <tqlineedit.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <kexidb/tableschema.h> #include <kexidb/indexschema.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index b9420f67e..4bab34e40 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -34,7 +34,7 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kexidb/tableschema.h> #include <kexidb/utils.h> diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 47075bbb6..eef477a5a 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -27,7 +27,7 @@ #include <tqtimer.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 4982fffae..df2816fef 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -38,7 +38,7 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <kmimemagic.h> #include <kuserprofile.h> @@ -47,10 +47,10 @@ #include <kopenwith.h> #include <kurl.h> #include <karrowbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <tdeio/job.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <tdestdaccel.h> diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index c4067dfde..2bc14f4ac 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -25,10 +25,10 @@ #include <tqapplication.h> #include <tqclipboard.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent) diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index ce0b76958..68690ef95 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> #include <tqtooltip.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kexi.h> #include <kexiutils/validator.h> diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index 8bfc1c480..800c76e79 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -22,8 +22,8 @@ #include <tqtimer.h> #include <tqapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 6e538fd17..36a44566f 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -37,8 +37,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index aff64f582..b52aa2e65 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -37,8 +37,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 69c5c4efa..b68530379 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -29,10 +29,10 @@ #include <tqclipboard.h> #include <tqtooltip.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdecompletionbox.h> #include <knumvalidator.h> #include <kexiutils/longlongvalidator.h> diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index b082bd95e..3305fff18 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -26,8 +26,8 @@ #include <tqpalette.h> #include <tqpainter.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent) diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 9a36dfada..f054f0848 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -37,12 +37,12 @@ #include <tqlabel.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #ifndef KEXI_NO_PRINT # include <kprinter.h> diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp index 983378cb2..5ac720647 100644 --- a/kexi/widget/tableview/kexitableview_p.cpp +++ b/kexi/widget/tableview/kexitableview_p.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t) diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index a4e45daf8..c28ad5701 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -34,7 +34,7 @@ #include <kexi.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp index 9829f3476..5ff289206 100644 --- a/kexi/widget/tableview/kexitextformatter.cpp +++ b/kexi/widget/tableview/kexitextformatter.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kexitextformatter.h" #include <widget/utils/kexidatetimeformatter.h> diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index b6dc69d43..e6bec4b6d 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -35,8 +35,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index caae10b6e..6e5b5c9e6 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -20,12 +20,12 @@ #include "kexicontextmenuutils.h" #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> #include <kimageio.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfiledialog.h> #include <tqapplication.h> diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 21bb24ded..371425643 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -20,8 +20,8 @@ #include "kexidatetimeformatter.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp index 11b1d7428..8d626187b 100644 --- a/kexi/widget/utils/kexidisplayutils.cpp +++ b/kexi/widget/utils/kexidisplayutils.cpp @@ -24,7 +24,7 @@ #include <tqimage.h> #include <tqwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> // a color for displaying default values or autonumbers diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 9dd8cccce..18d1b09c0 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -25,7 +25,7 @@ #include <tqtooltip.h> #include <tqscrollview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <klineedit.h> #include <kguiitem.h> diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc index 5730975ff..f86b113a4 100644 --- a/kformula/formulastring.cc +++ b/kformula/formulastring.cc @@ -26,8 +26,8 @@ #include <tqwhatsthis.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc index 863cc9eba..b6bdd787c 100644 --- a/kformula/fsparser.cc +++ b/kformula/fsparser.cc @@ -20,7 +20,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kformuladefs.h> #include <kformuladocument.h> diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc index d6ee6d79d..82e3ae65f 100644 --- a/kformula/kfconfig.cc +++ b/kformula/kfconfig.cc @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfconfig.h" #include "kformula_factory.h" diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h index 70941c482..20d5d5e22 100644 --- a/kformula/kformula_aboutdata.h +++ b/kformula/kformula_aboutdata.h @@ -23,7 +23,7 @@ #define KFORMULA_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> static const char* description=I18N_NOOP("KOffice Formula Editor"); diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index fa2a9bd49..5eeb59f4b 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -42,13 +42,13 @@ #include <kdebug.h> #include <KoGlobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <kstandarddirs.h> #include <kurl.h> #include <KoXmlWriter.h> #include <KoStoreDevice.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoMainWindow.h> #include <kformulacontainer.h> diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index a23b7b64d..1aebcfbd7 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -6,9 +6,9 @@ #include <kiconloader.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index aebcd1c42..2d93ce5d8 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -28,10 +28,10 @@ class KPrinter; #include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <ktip.h> -//#include <kglobal.h> +//#include <tdeglobal.h> #include <kformulacontainer.h> #include <kformuladocument.h> diff --git a/kformula/main.cc b/kformula/main.cc index 5d137adda..a2337241d 100644 --- a/kformula/main.cc +++ b/kformula/main.cc @@ -20,7 +20,7 @@ #include <KoApplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "kformula_aboutdata.h" diff --git a/kivio/kiviopart/config/kivio.kcfg b/kivio/kiviopart/config/kivio.kcfg index ac23c8e31..deadfad40 100644 --- a/kivio/kiviopart/config/kivio.kcfg +++ b/kivio/kiviopart/config/kivio.kcfg @@ -6,8 +6,8 @@ <include>KoPageLayout.h</include> <include>kivioglobal.h</include> <include>KoGlobal.h</include> - <include>kglobal.h</include> - <include>klocale.h</include> + <include>tdeglobal.h</include> + <include>tdelocale.h</include> <include>tqfont.h</include> <include>tqcolor.h</include> <kcfgfile name="kiviorc"/> diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h index e80fa73cf..6348f7573 100644 --- a/kivio/kiviopart/kivio_aboutdata.h +++ b/kivio/kiviopart/kivio_aboutdata.h @@ -22,7 +22,7 @@ #define KIVIO_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> static const char* description = I18N_NOOP("KOffice Flowchart And Diagram Tool"); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index 181d34ae0..b8c010e93 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -34,8 +34,8 @@ #include "kivio_pluginmanager.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcursor.h> #include <KoGlobal.h> #include <KoZoomHandler.h> diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp index 6e761d062..f8cae8bd1 100644 --- a/kivio/kiviopart/kivio_dlg_pageshow.cpp +++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp @@ -24,7 +24,7 @@ #include "kivio_doc.h" #include "kivio_map.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include <tqlayout.h> #include <kbuttonbox.h> diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index 16b2f8aa3..c7196c1d8 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -44,8 +44,8 @@ #include "stencilbarbutton.h" #include <unistd.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> #include <kurl.h> @@ -69,7 +69,7 @@ #include <kstandarddirs.h> #include <tdepopupmenu.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kiconloader.h> #include <khelpmenu.h> #include <tdeconfig.h> @@ -80,7 +80,7 @@ #include <kcommand.h> #include <KoZoomHandler.h> #include <KoApplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <KoCommandHistory.h> #include <KoXmlWriter.h> #include <KoGenStyles.h> diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp index 3d4624bfc..9ad0b44bc 100644 --- a/kivio/kiviopart/kivio_factory.cpp +++ b/kivio/kiviopart/kivio_factory.cpp @@ -20,7 +20,7 @@ #include "kivio_doc.h" #include "kivio_aboutdata.h" -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp index 179b6a49a..41cabd59e 100644 --- a/kivio/kiviopart/kivio_icon_view.cpp +++ b/kivio/kiviopart/kivio_icon_view.cpp @@ -29,9 +29,9 @@ #include <tqbrush.h> #include <tqcursor.h> #include <tqpalette.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KivioStencilSpawner* KivioIconView::m_pCurDrag = 0L; TQPtrList<KivioIconView> KivioIconView::objList; diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 8e82a521a..6bf6a3aab 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -40,9 +40,9 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <KoUnit.h> #include <KoPoint.h> #include <KoRect.h> diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp index f7ea91211..82064c492 100644 --- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp +++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp @@ -5,7 +5,7 @@ #include <tqpixmap.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <KoPageLayout.h> diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 223fcd563..2d986414a 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -49,14 +49,14 @@ #include <tdeaction.h> #include <kcolorbutton.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdestdaccel.h> #include <kstdaction.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstatusbar.h> #include <kinputdialog.h> #include <knotifyclient.h> diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index 4b2757fa7..f3ce193c2 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -20,7 +20,7 @@ #include "tkcombobox.h" #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> using namespace Kivio; diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index 870d3190a..31c2c5b3b 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -30,7 +30,7 @@ #include <tdepopupmenu.h> #include <tdetoolbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> #include <tdetoolbarbutton.h> diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp index 669af9926..75db6ebd0 100644 --- a/kivio/kiviopart/kivioglobal.cpp +++ b/kivio/kiviopart/kivioglobal.cpp @@ -24,8 +24,8 @@ #include <tqprinter.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <KoGenStyles.h> #include <KoZoomHandler.h> diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp index 13ed44f55..6ff4d45ef 100644 --- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp @@ -33,7 +33,7 @@ #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KoZoomHandler.h> #include <KoPoint.h> diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h index 9fcfc81b0..632ea2a13 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h @@ -26,7 +26,7 @@ #include <tqptrlist.h> #include <tqbitarray.h> #include <KoPoint.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <KoRect.h> #include <koffice_export.h> diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp index 1c25f22f8..978eac319 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp @@ -19,8 +19,8 @@ #include "kivio_stencil_spawner_info.h" #include <tqdom.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> KivioStencilSpawnerInfo::KivioStencilSpawnerInfo() { diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp index e71b4cb14..67e49905d 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp @@ -28,8 +28,8 @@ #include <tqfile.h> #include <tqstring.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> KivioStencilSpawnerSet::KivioStencilSpawnerSet(const TQString& name) : m_pSpawners(NULL), diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index 37b342e61..d8d08d899 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -27,7 +27,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqdir.h> diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index a72dfbcaa..da9730a40 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -28,9 +28,9 @@ #include <tqcheckbox.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/kivio/kiviopart/main.cpp b/kivio/kiviopart/main.cpp index 708bd28b6..559870223 100644 --- a/kivio/kiviopart/main.cpp +++ b/kivio/kiviopart/main.cpp @@ -19,7 +19,7 @@ #include <koffice_export.h> #include <KoApplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp index 20f811eda..4cce5b20b 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -31,7 +31,7 @@ #include <tqframe.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* name ) diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp index b37c001f1..047cce094 100644 --- a/kivio/kiviopart/ui/addstencilsetdialog.cpp +++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp @@ -18,7 +18,7 @@ */ #include "addstencilsetdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include "kivioaddstencilsetpanel.h" diff --git a/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp index 61e8a56ed..b898541d4 100644 --- a/kivio/kiviopart/ui/export_page_dialog.cpp +++ b/kivio/kiviopart/ui/export_page_dialog.cpp @@ -4,7 +4,7 @@ #include <tqradiobutton.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "export_page_dialog_base.h" #include "kivio_config.h" diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 747618c1c..bb97e0c08 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -11,7 +11,7 @@ #include <tdetoolbar.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGlobal.h> #include <KoZoomHandler.h> #include <tdeversion.h> diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index ff0eb9ede..2a6fcf1e6 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <tdetoolbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kiconloader.h> #include <kinputdialog.h> diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp index 7eb9a75ce..2240a4a2d 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.cpp +++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp @@ -30,7 +30,7 @@ #include <tqcheckbox.h> #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *parent, const char *name ) : KivioProtectionPanelBase(parent, name), m_pView(view) diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 0e87398ae..a2bf2bc4c 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -28,7 +28,7 @@ #include <tqsplitter.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> #include "kivio_stencil_spawner_set.h" diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp index b208813a7..115fd2065 100644 --- a/kivio/kiviopart/ui/kivioaligndialog.cpp +++ b/kivio/kiviopart/ui/kivioaligndialog.cpp @@ -23,7 +23,7 @@ #include <tqradiobutton.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_page.h" #include "aligndialog.h" diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 9237333e8..30590ce29 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -28,7 +28,7 @@ #include <tqframe.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <KoUnitWidgets.h> diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 7c1bffd61..4f93a5176 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -27,7 +27,7 @@ #include "kivio_settings.h" #include "kivio_config.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoApplication.h> #include <kiconloader.h> #include <kpushbutton.h> @@ -35,7 +35,7 @@ #include <kurlrequester.h> #include <kcolorbutton.h> #include <KoUnitWidgets.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdefontdialog.h> diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 3361ad238..26a62671d 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 76f76c7d0..3bf67805a 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -26,7 +26,7 @@ #include <tdefontdialog.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_view.h" #include "kivio_doc.h" diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index 4a2d1fb5c..410fbdc0d 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -20,7 +20,7 @@ #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_layer_panel.h" #include "kivio_layer.h" diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 6c54077ed..95b1adfe8 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -24,7 +24,7 @@ #include <tdelistview.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_view.h" #include "kivio_stencil.h" diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index 26b8feb8d..f8b5d0151 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -25,7 +25,7 @@ #include <kstandarddirs.h> #include <KoPoint.h> #include <KoZoomHandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGuides.h> #include "kivio_view.h" diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index b8a529f7c..34e53196b 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <KoZoomHandler.h> #include <KoPoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGuides.h> #include "kivio_command.h" diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 4cb43bcca..966cb4c53 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -25,7 +25,7 @@ #include <KoPoint.h> #include <KoZoomHandler.h> #include <tdeactionclasses.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_view.h" #include "kivio_canvas.h" diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp index c25fb36bd..be6f60d8d 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp @@ -20,7 +20,7 @@ #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_stencil.h" #include "kivio_view.h" diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 0204132f6..1f2c7969d 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -28,7 +28,7 @@ #include <tdefontcombo.h> #include <kcolorbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <karrowbutton.h> #include "kivio_stenciltexteditorui.h" diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 5b1ee4fc6..bfc54a739 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <kdebug.h> #include <KoPoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoZoomHandler.h> #include <kinputdialog.h> diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index 9cf9b4437..e20b57e8b 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdetoolbar.h> #include <KoMainWindow.h> diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index dc43a8d9e..fc370370c 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kpushbutton.h> diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc index f405d81ad..e816cd9e1 100644 --- a/koshell/koshell_main.cc +++ b/koshell/koshell_main.cc @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> #include <twin.h> diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 46453c1c7..fc5ac0cf8 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -32,9 +32,9 @@ #include "koshellsettings.h" #include <tdeapplication.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kkeydialog.h> @@ -42,7 +42,7 @@ #include <klibloader.h> #include <tdepopupmenu.h> #include <kservice.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tderecentdocument.h> #include <tdeparts/partmanager.h> #include <tdeaction.h> diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc index a776cd3ee..47bfd5036 100644 --- a/kounavail/kounavail.cc +++ b/kounavail/kounavail.cc @@ -24,10 +24,10 @@ #include <tdeaction.h> #include <kinstance.h> #include <kstdaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqapplication.h> KoUnavailPart::KoUnavailPart( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name ) diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h index a8b7baf14..ccb6fb21c 100644 --- a/kplato/kptaboutdata.h +++ b/kplato/kptaboutdata.h @@ -22,7 +22,7 @@ #define KPLATO_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> namespace KPlato { diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cc index 4c4571936..f6016ff45 100644 --- a/kplato/kptaccount.cc +++ b/kplato/kptaccount.cc @@ -20,7 +20,7 @@ #include <tqdom.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kplato/kptaccountsdialog.cc b/kplato/kptaccountsdialog.cc index 9247aad7f..7ecc7bf1e 100644 --- a/kplato/kptaccountsdialog.cc +++ b/kplato/kptaccountsdialog.cc @@ -21,7 +21,7 @@ #include "kptaccountspanel.h" -#include <klocale.h> +#include <tdelocale.h> namespace KPlato { diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc index 00925a6e8..3a6015d8b 100644 --- a/kplato/kptaccountspanel.cc +++ b/kplato/kptaccountspanel.cc @@ -30,7 +30,7 @@ #include <tqstringlist.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index d466e1cc4..3352a87de 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -43,9 +43,9 @@ #include <tqpaintdevicemetrics.h> #include <kcalendarsystem.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> diff --git a/kplato/kptaccountsviewconfigdialog.cc b/kplato/kptaccountsviewconfigdialog.cc index 0d1a1015d..18e63fb66 100644 --- a/kplato/kptaccountsviewconfigdialog.cc +++ b/kplato/kptaccountsviewconfigdialog.cc @@ -26,7 +26,7 @@ #include <tqstring.h> #include <kdatewidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc index 56ba7380f..461950410 100644 --- a/kplato/kptcalendar.cc +++ b/kplato/kptcalendar.cc @@ -25,7 +25,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc index ab2df8bd0..a29eb8c09 100644 --- a/kplato/kptcalendaredit.cc +++ b/kplato/kptcalendaredit.cc @@ -37,10 +37,10 @@ #include <tqtabwidget.h> #include <tqtextbrowser.h> -#include <klocale.h> +#include <tdelocale.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <tqmap.h> diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc index 052928d3f..6349c273e 100644 --- a/kplato/kptcalendareditbase.cc +++ b/kplato/kptcalendareditbase.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kptcalendareditbase.h" diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc index 010e82bf5..496cc786b 100644 --- a/kplato/kptcalendarlistdialog.cc +++ b/kplato/kptcalendarlistdialog.cc @@ -34,10 +34,10 @@ #include <tqtabwidget.h> #include <tqtextbrowser.h> -#include <klocale.h> +#include <tdelocale.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kdebug.h> diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc index 764c7e983..bc59788ff 100644 --- a/kplato/kptcalendarlistdialogbase.cc +++ b/kplato/kptcalendarlistdialogbase.cc @@ -34,7 +34,7 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index 73c94c8b5..8717f187b 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -26,9 +26,9 @@ #include "kptcalendar.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kiconloader.h> #include <tqframe.h> diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index 837fb48ab..152fd837f 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -23,7 +23,7 @@ #include "kptpertcanvas.h" #include "kptganttview.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqpointarray.h> #include <tqptrlist.h> diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc index 992bfb5ca..11c920006 100644 --- a/kplato/kptcommand.cc +++ b/kplato/kptcommand.cc @@ -28,7 +28,7 @@ #include "kptresource.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqintdict.h> #include <tqmap.h> diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc index fe8d8e5d3..f721ae234 100644 --- a/kplato/kptconfigbehaviorpanel.cc +++ b/kplato/kptconfigbehaviorpanel.cc @@ -22,12 +22,12 @@ #include "kptdatetime.h" #include "kptfactory.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <ktextedit.h> #include <kcombobox.h> #include <kdatetimewidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc index 2062fda30..384c4abde 100644 --- a/kplato/kptconfigdialog.cc +++ b/kplato/kptconfigdialog.cc @@ -28,7 +28,7 @@ #include "kptcalendar.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tqvbox.h> diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index 36add001d..ea8e16afb 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -34,7 +34,7 @@ #include <assert.h> #include <tqlayout.h> #include <tqvaluelist.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h index b988e833e..25b78f521 100644 --- a/kplato/kptdatetable.h +++ b/kplato/kptdatetable.h @@ -24,8 +24,8 @@ #include "kptmap.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqgridview.h> #include <tqmemarray.h> diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 8a354d61a..d6bc73d4f 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -34,8 +34,8 @@ #include <tqpoint.h> #include <kcalendarsystem.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprinter.h> #include <tqrect.h> diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc index ec817195c..87e0e54a0 100644 --- a/kplato/kptduration.cc +++ b/kplato/kptduration.cc @@ -21,8 +21,8 @@ #include "kptduration.h" #include "kptdatetime.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/kplato/kptdurationwidget.ui.h b/kplato/kptdurationwidget.ui.h index 837114d82..087b539eb 100644 --- a/kplato/kptdurationwidget.ui.h +++ b/kplato/kptdurationwidget.ui.h @@ -27,8 +27,8 @@ */ #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <cmath> diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc index 6922ed2d6..7d66a7406 100644 --- a/kplato/kptfactory.cc +++ b/kplato/kptfactory.cc @@ -22,7 +22,7 @@ #include "kptaboutdata.h" #include <kinstance.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index ffed6ad23..b84bbbc49 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -60,10 +60,10 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprinter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace KPlato { diff --git a/kplato/kptintervaledit.cc b/kplato/kptintervaledit.cc index a76a15462..a37ec064c 100644 --- a/kplato/kptintervaledit.cc +++ b/kplato/kptintervaledit.cc @@ -31,7 +31,7 @@ #include <tqpair.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc index ee8ed8fc4..3d9065e20 100644 --- a/kplato/kptmainprojectdialog.cc +++ b/kplato/kptmainprojectdialog.cc @@ -19,7 +19,7 @@ #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc index 29f2195e6..24bf0891e 100644 --- a/kplato/kptmainprojectpanel.cc +++ b/kplato/kptmainprojectpanel.cc @@ -30,11 +30,11 @@ #include <klineedit.h> #include <ktextedit.h> #include <kdatewidget.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcommand.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kdebug.h> diff --git a/kplato/kptmilestoneprogressdialog.cc b/kplato/kptmilestoneprogressdialog.cc index e453d4734..f9bf729e9 100644 --- a/kplato/kptmilestoneprogressdialog.cc +++ b/kplato/kptmilestoneprogressdialog.cc @@ -21,7 +21,7 @@ #include "kptmilestoneprogresspanel.h" #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc index 67b884437..977878f10 100644 --- a/kplato/kptmilestoneprogresspanel.cc +++ b/kplato/kptmilestoneprogresspanel.cc @@ -22,8 +22,8 @@ #include <tqcheckbox.h> #include <kdatetimewidget.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index c95a1c9b2..b56146094 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -28,7 +28,7 @@ #include <tqptrlist.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc index 7b0dbd554..3f767e671 100644 --- a/kplato/kptpart.cc +++ b/kplato/kptpart.cc @@ -35,8 +35,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kcommand.h> #include <KoTemplateChooseDia.h> diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index ad8966dd1..9d12945cf 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -36,11 +36,11 @@ #include <tqptrlist.h> #include <KoStore.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <assert.h> #include <tdemultipledrag.h> #include <tdelistview.h> diff --git a/kplato/kptproject.h b/kplato/kptproject.h index 8ffbdb7d2..918d54bb0 100644 --- a/kplato/kptproject.h +++ b/kplato/kptproject.h @@ -34,7 +34,7 @@ #include <tqdict.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> namespace KPlato { diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc index c59a12e97..01a7e3f5d 100644 --- a/kplato/kptprojectdialog.cc +++ b/kplato/kptprojectdialog.cc @@ -28,10 +28,10 @@ #include <tqtextbrowser.h> #include <kdatepicker.h> -#include <klocale.h> +#include <tdelocale.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kdebug.h> diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc index c79adb6f4..4de50c110 100644 --- a/kplato/kptrelationdialog.cc +++ b/kplato/kptrelationdialog.cc @@ -31,8 +31,8 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index c93be14d5..dbbae9a17 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -34,10 +34,10 @@ #include <tdetoolbar.h> #include <kstandarddirs.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdesktopfile.h> #include <tdefiledialog.h> diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc index bca9a2089..790a61777 100644 --- a/kplato/kptrequestresourcespanel.cc +++ b/kplato/kptrequestresourcespanel.cc @@ -24,8 +24,8 @@ #include "kptcalendar.h" #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kptcommand.h> #include <tqlistbox.h> diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 00fe8aaaa..763c0c86c 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -28,8 +28,8 @@ #include "kptschedule.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> namespace KPlato { diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc index 5f6ac29b0..a251eddba 100644 --- a/kplato/kptresourceappointmentsview.cc +++ b/kplato/kptresourceappointmentsview.cc @@ -27,8 +27,8 @@ #include <tqapplication.h> #include <kcalendarsystem.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqdatetime.h> #include <tqheader.h> diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cc index 85af224ca..d48d892f3 100644 --- a/kplato/kptresourcedialog.cc +++ b/kplato/kptresourcedialog.cc @@ -36,14 +36,14 @@ #include <tqptrlist.h> #include <tqstringlist.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kcommand.h> #include <kdatetimewidget.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptresourcesdialog.cc b/kplato/kptresourcesdialog.cc index 032fcd0fb..37ce45298 100644 --- a/kplato/kptresourcesdialog.cc +++ b/kplato/kptresourcesdialog.cc @@ -19,7 +19,7 @@ #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc index eaadc808f..86275cd73 100644 --- a/kplato/kptresourcespanel.cc +++ b/kplato/kptresourcespanel.cc @@ -25,10 +25,10 @@ #include <kdebug.h> #include <tdelistview.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <tqgroupbox.h> #include <tqheader.h> diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index b0e433ebd..c20b9fd26 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -37,8 +37,8 @@ #include <tqstyle.h> #include <tdelistview.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprinter.h> #include <kdebug.h> diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cc index 6c478042b..7581312e0 100644 --- a/kplato/kptschedule.cc +++ b/kplato/kptschedule.cc @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index 1b5495b7c..31fcae494 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -39,8 +39,8 @@ #include <kdebug.h> #include <kcombobox.h> #include <kcalendarsystem.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <knuminput.h> #include <tdelistview.h> diff --git a/kplato/kptsummarytaskdialog.cc b/kplato/kptsummarytaskdialog.cc index 26a62cdf5..adf152a19 100644 --- a/kplato/kptsummarytaskdialog.cc +++ b/kplato/kptsummarytaskdialog.cc @@ -21,7 +21,7 @@ #include "kptsummarytaskdialog.h" #include "kptsummarytaskgeneralpanel.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tqvbox.h> diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cc index 73ba4f951..3db784d0b 100644 --- a/kplato/kptsummarytaskgeneralpanel.cc +++ b/kplato/kptsummarytaskgeneralpanel.cc @@ -24,15 +24,15 @@ #include "kptconfig.h" #include "kptpart.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <ktextedit.h> #include <kcombobox.h> #include <kdatetimewidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <tqpushbutton.h> #include <tqlayout.h> diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc index c38cc3ced..669bf0654 100644 --- a/kplato/kpttaskappointmentsview.cc +++ b/kplato/kpttaskappointmentsview.cc @@ -24,8 +24,8 @@ #include <tqapplication.h> #include <kcalendarsystem.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqheader.h> diff --git a/kplato/kpttaskcostpanel.cc b/kplato/kpttaskcostpanel.cc index a2447f6b8..d33e2c7cb 100644 --- a/kplato/kpttaskcostpanel.cc +++ b/kplato/kpttaskcostpanel.cc @@ -23,10 +23,10 @@ #include "kptcommand.h" #include "kptpart.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc index bcaac757b..8c1585a49 100644 --- a/kplato/kpttaskdefaultpanel.cc +++ b/kplato/kpttaskdefaultpanel.cc @@ -27,15 +27,15 @@ #include "kptconfig.h" #include "kptpart.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <ktextedit.h> #include <kcombobox.h> #include <kdatetimewidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kdatewidget.h> #include <tqlayout.h> diff --git a/kplato/kpttaskdialog.cc b/kplato/kpttaskdialog.cc index 1db88030a..65aa917f2 100644 --- a/kplato/kpttaskdialog.cc +++ b/kplato/kpttaskdialog.cc @@ -23,7 +23,7 @@ #include "kpttaskgeneralpanel.h" #include "kptrequestresourcespanel.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tqvbox.h> diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc index f89706756..7d064fccf 100644 --- a/kplato/kpttaskgeneralpanel.cc +++ b/kplato/kpttaskgeneralpanel.cc @@ -28,15 +28,15 @@ #include "kptconfig.h" #include "kptpart.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <ktextedit.h> #include <kcombobox.h> #include <kdatetimewidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> -#include <kabc/addressee.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseedialog.h> #include <kdatewidget.h> #include <tqlayout.h> diff --git a/kplato/kpttaskprogressdialog.cc b/kplato/kpttaskprogressdialog.cc index db34f3ee4..180d3a53d 100644 --- a/kplato/kpttaskprogressdialog.cc +++ b/kplato/kpttaskprogressdialog.cc @@ -21,7 +21,7 @@ #include "kpttaskprogresspanel.h" #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc index bed7a3c21..00de2b225 100644 --- a/kplato/kpttaskprogresspanel.cc +++ b/kplato/kpttaskprogresspanel.cc @@ -27,8 +27,8 @@ #include <ktextedit.h> #include <kdatetimewidget.h> #include <knuminput.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index 63a9a987b..c9f935534 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -19,7 +19,7 @@ */ #include <kprinter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <KoMainWindow.h> @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdeaction.h> #include <kstdaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdelistview.h> #include <tdestdaccel.h> diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc index e25f9fe60..fcf2d41f2 100644 --- a/kplato/kptwbsdefinition.cc +++ b/kplato/kptwbsdefinition.cc @@ -20,7 +20,7 @@ #include "kptwbsdefinition.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqstring.h> diff --git a/kplato/kptwbsdefinitiondialog.cc b/kplato/kptwbsdefinitiondialog.cc index 6dae8389a..181cbd43a 100644 --- a/kplato/kptwbsdefinitiondialog.cc +++ b/kplato/kptwbsdefinitiondialog.cc @@ -21,7 +21,7 @@ #include "kptwbsdefinitionpanel.h" #include "kptwbsdefinition.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <kdebug.h> diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc index 083c92167..3843a98c8 100644 --- a/kplato/kptwbsdefinitionpanel.cc +++ b/kplato/kptwbsdefinitionpanel.cc @@ -22,7 +22,7 @@ #include "kptcommand.h" #include "kptpart.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqcombobox.h> diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h index 53e8365e3..f85a74c6e 100644 --- a/kpresenter/KPrAboutData.h +++ b/kpresenter/KPrAboutData.h @@ -21,7 +21,7 @@ #define KPRESENTER_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> static const char* description=I18N_NOOP("KOffice Presentation Tool"); diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index a6985239a..dd4078e62 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -35,7 +35,7 @@ #include <tqdatetime.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kimageio.h> #include <kbuttonbox.h> diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 4b09382a4..177553d16 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -38,7 +38,7 @@ #include <stdlib.h> using namespace std; #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <KoStore.h> #include <KoStoreDevice.h> #include <KoGenStyles.h> diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp index 0493c64d6..11358ba5d 100644 --- a/kpresenter/KPrBgSpellCheck.cpp +++ b/kpresenter/KPrBgSpellCheck.cpp @@ -32,7 +32,7 @@ using namespace KSpell2; #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc) : KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc ) diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 7734835ad..7b7312d09 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -29,7 +29,7 @@ #include <tqwhatsthis.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <kcombobox.h> diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index f98ddb0f9..0c119b806 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -40,15 +40,15 @@ #include <tdeapplication.h> #include <kmimemagic.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kprinter.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kcursor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdemultipledrag.h> #include <tdeconfig.h> #include <kurl.h> diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 23b121a25..fde8efbf0 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdialogbase.h> #include <kiconloader.h> @@ -67,7 +67,7 @@ #include <tdefontdialog.h> #include <klineedit.h> #include <KoRect.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeversion.h> #include <kurlrequesterdlg.h> #include <tdelistview.h> diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 61eebe235..175dfc936 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -26,8 +26,8 @@ #include <tqapplication.h> #include <tqlayout.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "KPrPage.h" #include "KPrDocument.h" diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 098c7eb07..c914b094c 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -57,12 +57,12 @@ #include <KoGlobal.h> #include <tdeapplication.h> #include <kurldrag.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdeio/netaccess.h> @@ -99,7 +99,7 @@ #include "KPrBackground.h" #include "KPrNoteBar.h" #include "KPrBgSpellCheck.h" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <KoCommandHistory.h> #include "KoApplication.h" #include <KoOasisStyles.h> diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp index 0b0c7646f..fe2283b2b 100644 --- a/kpresenter/KPrDuplicateObjDia.cpp +++ b/kpresenter/KPrDuplicateObjDia.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index b65b724b5..955d249b7 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -39,8 +39,8 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kbuttonbox.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 75671e286..a0e9965a6 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -26,7 +26,7 @@ #include <tqlineedit.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> #include <KoGeneralPropertyUi.h> diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index c170f1597..0caacc289 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "KPrDocument.h" diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 078a39189..9f6985e76 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -26,7 +26,7 @@ #include <tqimage.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kcolorbutton.h> diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index 1cd4d9ff7..fec859672 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -18,14 +18,14 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "KPrDocument.h" #include <tqvbox.h> #include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "KPrImportStyleDia.h" #include <KoStore.h> #include <tqfile.h> diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index f362f03d2..3f9687682 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -31,7 +31,7 @@ #include "KPrPage.h" #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqdir.h> #include <tqframe.h> @@ -48,11 +48,11 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kcolorbutton.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 532fbb6e2..e4fe30e29 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "marginui.h" diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index ba07c8b69..35d8bcd0d 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index 80b935520..9548d259c 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -25,11 +25,11 @@ #include <tqsimplerichtext.h> #include <tqlabel.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kprinter.h> #include <kdebug.h> #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "KPrNoteBar.h" #include "KPrView.h" diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index 7b39be509..99d450099 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -29,7 +29,7 @@ #include "KPrGradient.h" #include "KoPointArray.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoPoint.h> #include <KoSize.h> #include <KoRect.h> diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 81c5a412f..fc57515d9 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -60,7 +60,7 @@ #include <KoVariable.h> #include <KoGenStyles.h> #include <KoXmlWriter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqbuffer.h> #include <tqregexp.h> #include <tqfile.h> diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index 753b184ad..37f4cab7d 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -29,7 +29,7 @@ #include <kcolorbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index fa51abf42..1a7b3079d 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -42,8 +42,8 @@ #include <tqwhatsthis.h> #include <kcolorbutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqslider.h> diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 7c7e788a1..dbb30557b 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "global.h" diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index 4d8cf1555..40cc785a5 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "polygonpropertyui.h" diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index aae5659ef..679362665 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <tdelistview.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, KPrDocument *_doc, TQStringList _durationListString, diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index cf496a153..284b2eede 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -26,7 +26,7 @@ // KDE includes #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtooltip.h> // local includes diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp index 80681763e..841b68412 100644 --- a/kpresenter/KPrPropertyEditor.cpp +++ b/kpresenter/KPrPropertyEditor.cpp @@ -33,7 +33,7 @@ #include "KPrTextProperty.h" #include "KPrObjectProperties.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc ) diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 3e28c7483..e6521ed77 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -26,7 +26,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "KPrRotationDialogImpl.h" diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index e46e80fdb..d27306659 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -5,7 +5,7 @@ #include <tqbuttongroup.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "KPrShadowDialogImpl.h" #include "KPrTextPreview.h" diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 00ee81395..96783d8d0 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -30,8 +30,8 @@ #include <tqtooltip.h> #include <kwordwrap.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <knotifyclient.h> #include <kiconview.h> diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index 88d1c9aca..8dd46db54 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -22,7 +22,7 @@ #include "KPrSlideTransitionDia.h" #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 35961bab9..2d02f6ccd 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -42,8 +42,8 @@ #include "KPrTextObjectIface.h" #include <KoOasisContext.h> #include <KoStyleStack.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> #include <tdemultipledrag.h> diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index a0610cec7..c69c39a16 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -25,7 +25,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "KPrMarginWidget.h" diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index b4f9d144c..aeee98bc8 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -47,7 +47,7 @@ #include <kdebug.h> #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kiconloader.h> #include <kurl.h> diff --git a/kpresenter/KPrVariableCollection.cpp b/kpresenter/KPrVariableCollection.cpp index d7312e756..50be1efad 100644 --- a/kpresenter/KPrVariableCollection.cpp +++ b/kpresenter/KPrVariableCollection.cpp @@ -22,7 +22,7 @@ #include <KoVariable.h> #include "KPrDocument.h" #include "KPrCommand.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KoXmlNS.h> #include <KoDom.h> diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 6f2e23588..583b7af74 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -20,7 +20,7 @@ #include <kprinter.h> #include <tdeaccel.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqpainter.h> #include <tqscrollbar.h> #include <tqpopupmenu.h> @@ -65,7 +65,7 @@ #include <dcopclient.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> @@ -76,15 +76,15 @@ #include "KPrMSPresentationSetup.h" #include "KPrTextObject.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <tdeconfig.h> #include <tdefontdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageio.h> #include <tdeparts/event.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kcolorbutton.h> #include <kprocess.h> diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 6f93acbab..90053b31c 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -30,7 +30,7 @@ #include <kstandarddirs.h> #include <unistd.h> #include <sys/types.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqtextstream.h> @@ -54,16 +54,16 @@ #include <tqcheckbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kbuttonbox.h> #include <ksimpleconfig.h> #include <tdeapplication.h> #include <kprogress.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kcharsets.h> #include <kurlrequester.h> #include <klineedit.h> diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 9c4e2e5e8..3e8543c94 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -26,7 +26,7 @@ #include <tqdir.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp index 4113d3411..b3ab9ec8c 100644 --- a/kpresenter/main.cpp +++ b/kpresenter/main.cpp @@ -23,7 +23,7 @@ #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const TDECmdLineOptions options[]= diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc index e326dd53c..763e47a59 100644 --- a/kspread/dialogs/kspread_dlg_angle.cc +++ b/kspread/dialogs/kspread_dlg_angle.cc @@ -26,7 +26,7 @@ #include <kbuttonbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kspread_cell.h> diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc index e4e130e80..108511ad0 100644 --- a/kspread/dialogs/kspread_dlg_area.cc +++ b/kspread/dialogs/kspread_dlg_area.cc @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kspread_doc.h" #include "kspread_locale.h" diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc index 9ed3c5512..2494959c2 100644 --- a/kspread/dialogs/kspread_dlg_comment.cc +++ b/kspread/dialogs/kspread_dlg_comment.cc @@ -25,7 +25,7 @@ #include <tqpushbutton.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include "kspread_canvas.h" diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index 9e9d47dea..a75bd5bd0 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -36,8 +36,8 @@ #include <kcombobox.h> #include <kdebug.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <KoGlobal.h> diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index f24e691a5..139113c79 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kspread_dlg_cons.h" diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index 653587fc5..c068810b0 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -36,8 +36,8 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kspread_cell.h> #include <kspread_doc.h> diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 5f9550741..34e680cdb 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -29,8 +29,8 @@ #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knumvalidator.h> #include <kpushbutton.h> diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index dceca6b1b..aa1c7f71e 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -21,7 +21,7 @@ #include "kspread_dlg_find.h" #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlabel.h> #include <tqcombobox.h> diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc index 6163710b2..501d8bf36 100644 --- a/kspread/dialogs/kspread_dlg_format.cc +++ b/kspread/dialogs/kspread_dlg_format.cc @@ -30,7 +30,7 @@ #include <tqpushbutton.h> #include <kbuttonbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index 49ec24611..b45525ad2 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -37,8 +37,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc index 6e217f24d..454a43ba4 100644 --- a/kspread/dialogs/kspread_dlg_insert.cc +++ b/kspread/dialogs/kspread_dlg_insert.cc @@ -31,8 +31,8 @@ #include <kbuttonbox.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kspread_doc.h" #include "kspread_sheet.h" diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index ce97542d4..ad876b3b4 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -48,7 +48,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knumvalidator.h> #include <KoUnitWidgets.h> diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc index 884963875..254470e19 100644 --- a/kspread/dialogs/kspread_dlg_list.cc +++ b/kspread/dialogs/kspread_dlg_list.cc @@ -29,7 +29,7 @@ #include <kbuttonbox.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kspread_autofill.h" #include "kspread_factory.h" diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index fcbbba78a..3305963e2 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -42,8 +42,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using namespace KSpread; diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc index cc49afad7..93d67b06a 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cc +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc @@ -21,7 +21,7 @@ */ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <tqbuttongroup.h> #include <kdebug.h> diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 0a15da25d..b47d55f8f 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -36,7 +36,7 @@ #include <kstatusbar.h> #include <knuminput.h> #include <tdespell.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeversion.h> #include <kcolorbutton.h> diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index c5ae14c72..9e747dfbb 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -43,7 +43,7 @@ #include <tqlayout.h> #include <kbuttonbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc index 0158dd2a5..9c003498f 100644 --- a/kspread/dialogs/kspread_dlg_series.cc +++ b/kspread/dialogs/kspread_dlg_series.cc @@ -31,12 +31,12 @@ #include "kspread_view.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqgroupbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knumvalidator.h> #include <tqradiobutton.h> diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc index c73f71ec8..11f55e6d0 100644 --- a/kspread/dialogs/kspread_dlg_show.cc +++ b/kspread/dialogs/kspread_dlg_show.cc @@ -23,7 +23,7 @@ */ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlistbox.h> #include <tqlabel.h> diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc index 0a32a44d9..32c4c631a 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cc +++ b/kspread/dialogs/kspread_dlg_showColRow.cc @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "kspread_doc.h" #include "kspread_sheet.h" diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 7292b25b4..52cda9b64 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -43,8 +43,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kspread_dlg_sort.h" #include "kspread_doc.h" diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc index 510e0ad8b..2fbeb7ebe 100644 --- a/kspread/dialogs/kspread_dlg_special.cc +++ b/kspread/dialogs/kspread_dlg_special.cc @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "kspread_canvas.h" #include "kspread_doc.h" diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index fdb8d6fe6..bf8f4de26 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -25,7 +25,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "kspread_canvas.h" #include "kspread_cell.h" diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc index f88f3a7fd..054cc1f76 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cc +++ b/kspread/dialogs/kspread_dlg_subtotal.cc @@ -25,8 +25,8 @@ #include <tqmemarray.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kspreadsubtotal.h" #include "kspread_sheet.h" diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index 2d0b56563..ea4625272 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -32,7 +32,7 @@ #include <tqbuttongroup.h> #include <knumvalidator.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqcombobox.h> #include <tqlineedit.h> diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index dfa7c3859..5d2217cb3 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -33,8 +33,8 @@ #include <kdialogbase.h> #include <kiconloader.h> #include <klineedit.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tderecentdocument.h> #include <kurlrequester.h> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index 7cdd64493..c4b79a9d4 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -22,7 +22,7 @@ #include <kcombobox.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "kspread_sheet.h" #include "sheet_properties_base.h" diff --git a/kspread/formula.cc b/kspread/formula.cc index b357151b8..3522f06b1 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -39,7 +39,7 @@ #include <tqvaluevector.h> #include <tqvaluestack.h> -#include <klocale.h> +#include <tdelocale.h> /* To understand how this formula engine works, please refer to the documentation diff --git a/kspread/functions.cc b/kspread/functions.cc index de55f7e55..f6bc16e2f 100644 --- a/kspread/functions.cc +++ b/kspread/functions.cc @@ -28,7 +28,7 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h index 85b9797e0..618fc132a 100644 --- a/kspread/kspread_aboutdata.h +++ b/kspread/kspread_aboutdata.h @@ -21,7 +21,7 @@ #define KSPREAD_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> namespace KSpread diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 780dd5af8..7ce1f63cb 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -58,7 +58,7 @@ #include <kcursor.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdemultipledrag.h> #include <krun.h> #include <kmimetype.h> diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index d8799d9f2..991f64331 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -79,7 +79,7 @@ #include <KoXmlWriter.h> #include <KoOasisStyles.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 3afcfaf15..7643b31d8 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -41,9 +41,9 @@ #include <kstandarddirs.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksconfig.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoApplication.h> #include <KoCommandHistory.h> diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index 2c0cf45a4..430e23869 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -25,7 +25,7 @@ #include <dcopobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoXmlNS.h> #include <KoGenStyles.h> diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc index 0136d298c..d322b6a49 100644 --- a/kspread/kspread_functions_datetime.cc +++ b/kspread/kspread_functions_datetime.cc @@ -27,7 +27,7 @@ #include "valueconverter.h" #include <kcalendarsystem.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KSpread; diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc index ddcda5617..bca81ec8d 100644 --- a/kspread/kspread_functions_engineering.cc +++ b/kspread/kspread_functions_engineering.cc @@ -29,8 +29,8 @@ #include <tqmap.h> // these are needed for complex functions, while we handle them in the old way -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <math.h> using namespace KSpread; diff --git a/kspread/kspread_functions_financial.cc b/kspread/kspread_functions_financial.cc index a9479efc4..daccb6408 100644 --- a/kspread/kspread_functions_financial.cc +++ b/kspread/kspread_functions_financial.cc @@ -28,7 +28,7 @@ #include "valuecalc.h" #include "valueconverter.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcalendarsystem.h> using namespace KSpread; diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc index 2a5775aae..30d64263c 100644 --- a/kspread/kspread_functions_information.cc +++ b/kspread/kspread_functions_information.cc @@ -27,7 +27,7 @@ #include <tqdir.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "functions.h" #include "valuecalc.h" diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc index b34996f65..06b6da2b5 100644 --- a/kspread/kspread_functions_math.cc +++ b/kspread/kspread_functions_math.cc @@ -22,7 +22,7 @@ // built-in math functions #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "functions.h" #include "valuecalc.h" diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc index 432bfc28d..5a8dccf69 100644 --- a/kspread/kspread_functions_text.cc +++ b/kspread/kspread_functions_text.cc @@ -25,7 +25,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <math.h> #include "functions.h" diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp index d15c79c88..f233576ad 100644 --- a/kspread/kspread_generalProperty.cpp +++ b/kspread/kspread_generalProperty.cpp @@ -26,7 +26,7 @@ #include <tqlineedit.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGeneralPropertyUi.h> #include <KoUnitWidgets.h> diff --git a/kspread/kspread_locale.h b/kspread/kspread_locale.h index 120817314..705d7b510 100644 --- a/kspread/kspread_locale.h +++ b/kspread/kspread_locale.h @@ -1,7 +1,7 @@ #ifndef KSPREAD_LOCALE_H #define KSPREAD_LOCALE_H -#include <klocale.h> +#include <tdelocale.h> class TQDomElement; class TQDomDocument; diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index d39f6c1fa..d54c340a1 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -23,7 +23,7 @@ #include <tqfile.h> #include <kmdcodec.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <KoDom.h> #include <KoGenStyles.h> diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cc index 769aa61a5..e0962b967 100644 --- a/kspread/kspread_numformat.cc +++ b/kspread/kspread_numformat.cc @@ -34,7 +34,7 @@ Tomas #include <tqstring.h> #include <kcalendarsystem.h> -#include <klocale.h> +#include <tdelocale.h> #include "kspread_util.h" #include "kspread_value.h" diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h index b66d67ac5..2aaab4008 100644 --- a/kspread/kspread_object.h +++ b/kspread/kspread_object.h @@ -22,7 +22,7 @@ #include "kspread_sheet.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoBrush.h> #include <KoChild.h> #include <KoDom.h> diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp index 3b84a3db3..1f2aa1e6c 100644 --- a/kspread/kspread_propertyEditor.cpp +++ b/kspread/kspread_propertyEditor.cpp @@ -33,7 +33,7 @@ // #include "KPrTextProperty.h" // #include "KPrObjectProperties.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> using namespace KSpread; diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 8d6cf77ba..a8965b9e7 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -42,7 +42,7 @@ #include <kmdcodec.h> #include <kfind.h> #include <kfinddialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kreplace.h> #include <kreplacedialog.h> #include <kprinter.h> diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index a70445eb7..3cc26bf3e 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -30,7 +30,7 @@ #include "commands.h" #include <KoDocumentInfo.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <kdebug.h> diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc index f8ac81589..bd58ac885 100644 --- a/kspread/kspread_style.cc +++ b/kspread/kspread_style.cc @@ -21,7 +21,7 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGlobal.h> #include <KoGenStyles.h> diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc index 47ca18ccd..8bfb8acf9 100644 --- a/kspread/kspread_style_manager.cc +++ b/kspread/kspread_style_manager.cc @@ -21,7 +21,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoOasisStyles.h> #include <KoXmlNS.h> diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index b43dac6c0..253a92671 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -56,7 +56,7 @@ #include <kfinddialog.h> #include <tdefontdialog.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kpassdlg.h> #include <kprocio.h> @@ -67,7 +67,7 @@ #include <kstatusbar.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeparts/partmanager.h> #include <tdelistview.h> #include <kpushbutton.h> diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index f1a5838b4..b095191c6 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -22,8 +22,8 @@ #include <tqcolor.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include "kspread_canvas.h" diff --git a/kspread/manipulator.h b/kspread/manipulator.h index 622362bc8..d7c039591 100644 --- a/kspread/manipulator.h +++ b/kspread/manipulator.h @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include <koffice_export.h> diff --git a/kspread/manipulator_data.cc b/kspread/manipulator_data.cc index 5b829de3b..af2317225 100644 --- a/kspread/manipulator_data.cc +++ b/kspread/manipulator_data.cc @@ -20,7 +20,7 @@ #include "manipulator_data.h" -#include <klocale.h> +#include <tdelocale.h> #include "kspread_cell.h" #include "kspread_sheet.h" diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 28ab2646d..56af25b4d 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -27,7 +27,7 @@ #include "configdlg.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index b6c71ca1c..d7c0ce767 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -24,17 +24,17 @@ #include "configdlg.h" #include "version.h" -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <tqlayout.h> #include <tqobjectlist.h> #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqstyle.h> #include <kdialog.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kcalc.h" extern last_input_type last_input; diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp index bdba8469f..881a05ebe 100644 --- a/kspread/plugins/calculator/kcalc_core.cpp +++ b/kspread/plugins/calculator/kcalc_core.cpp @@ -36,8 +36,8 @@ #include <limits.h> #include <math.h> #include <signal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include "kcalc.h" diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index dc4c169ed..ba6f23355 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -35,9 +35,9 @@ #include <kcalendarsystemfactory.h> #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqpoint.h> #include <tqrect.h> diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cc index 97993c825..2c7381e17 100644 --- a/kspread/tests/formula_tester.cc +++ b/kspread/tests/formula_tester.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "tester.h" diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc index 1eda41da0..94b6b57c2 100644 --- a/kspread/valueformatter.cc +++ b/kspread/valueformatter.cc @@ -27,7 +27,7 @@ #include <kcalendarsystem.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <float.h> #include <math.h> diff --git a/kugar/kudesigner/kudesigner_aboutdata.h b/kugar/kudesigner/kudesigner_aboutdata.h index 6a52781c6..8692a5a16 100644 --- a/kugar/kudesigner/kudesigner_aboutdata.h +++ b/kugar/kudesigner/kudesigner_aboutdata.h @@ -21,7 +21,7 @@ #define KUDESIGNER_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> static const char* description = I18N_NOOP( "GUI report template designer for Kugar report engine" ); diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 8e85bae62..bd4d1bef3 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -23,7 +23,7 @@ #include <KoTemplateChooseDia.h> #include <tdeparts/componentfactory.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kcommand.h> diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp index e9fec1f88..518eceb5d 100644 --- a/kugar/kudesigner/kudesigner_factory.cpp +++ b/kugar/kudesigner/kudesigner_factory.cpp @@ -22,7 +22,7 @@ #include <kudesigner_aboutdata.h> #include <kinstance.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 0b2509d6c..1f3eeafa3 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -37,7 +37,7 @@ #include <tdeaction.h> #include <kstdaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <KoMainWindow.h> diff --git a/kugar/kudesigner/main.cpp b/kugar/kudesigner/main.cpp index b78a88da1..d1b0d8886 100644 --- a/kugar/kudesigner/main.cpp +++ b/kugar/kudesigner/main.cpp @@ -21,7 +21,7 @@ #include <KoDocument.h> #include <KoMainWindow.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "kudesigner_aboutdata.h" diff --git a/kugar/kudesigner_lib/band.cpp b/kugar/kudesigner_lib/band.cpp index 21d0f7522..5732ff3a0 100644 --- a/kugar/kudesigner_lib/band.cpp +++ b/kugar/kudesigner_lib/band.cpp @@ -22,7 +22,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, #include <tqrect.h> #include <tqpainter.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "propertyserializer.h" #include "kugartemplate.h" diff --git a/kugar/kudesigner_lib/calcfield.cpp b/kugar/kudesigner_lib/calcfield.cpp index 16941b7b3..b47597fc6 100644 --- a/kugar/kudesigner_lib/calcfield.cpp +++ b/kugar/kudesigner_lib/calcfield.cpp @@ -18,7 +18,7 @@ */ #include "calcfield.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> diff --git a/kugar/kudesigner_lib/command.cpp b/kugar/kudesigner_lib/command.cpp index e65f9f71f..f9d2d26f0 100644 --- a/kugar/kudesigner_lib/command.cpp +++ b/kugar/kudesigner_lib/command.cpp @@ -18,7 +18,7 @@ */ #include "command.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //#include "kudesigner_doc.h" diff --git a/kugar/kudesigner_lib/commdefs.cpp b/kugar/kudesigner_lib/commdefs.cpp index 298c3ecc6..2be6e6d0c 100644 --- a/kugar/kudesigner_lib/commdefs.cpp +++ b/kugar/kudesigner_lib/commdefs.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqsettings.h> diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp index a9f2faa52..bb8ad3ef7 100644 --- a/kugar/kudesigner_lib/detail.cpp +++ b/kugar/kudesigner_lib/detail.cpp @@ -18,7 +18,7 @@ */ #include "detail.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/detailbase.cpp b/kugar/kudesigner_lib/detailbase.cpp index e338baa18..0b157b675 100644 --- a/kugar/kudesigner_lib/detailbase.cpp +++ b/kugar/kudesigner_lib/detailbase.cpp @@ -18,7 +18,7 @@ */ #include "detailbase.h" -#include "klocale.h" +#include "tdelocale.h" namespace Kudesigner { diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp index b1715920b..4544072cc 100644 --- a/kugar/kudesigner_lib/detailfooter.cpp +++ b/kugar/kudesigner_lib/detailfooter.cpp @@ -18,7 +18,7 @@ */ #include "detailfooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp index d43ce942f..5e9ad3b82 100644 --- a/kugar/kudesigner_lib/detailheader.cpp +++ b/kugar/kudesigner_lib/detailheader.cpp @@ -18,7 +18,7 @@ */ #include "detailheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/field.cpp b/kugar/kudesigner_lib/field.cpp index c9a5b480e..cdbd6253f 100644 --- a/kugar/kudesigner_lib/field.cpp +++ b/kugar/kudesigner_lib/field.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "field.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineeditdlg.h> #include <kdebug.h> diff --git a/kugar/kudesigner_lib/kugartemplate.cpp b/kugar/kudesigner_lib/kugartemplate.cpp index 1945b714a..41b7b0f18 100644 --- a/kugar/kudesigner_lib/kugartemplate.cpp +++ b/kugar/kudesigner_lib/kugartemplate.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "kugartemplate.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcanvas.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/label.cpp b/kugar/kudesigner_lib/label.cpp index 272267747..ec39b317d 100644 --- a/kugar/kudesigner_lib/label.cpp +++ b/kugar/kudesigner_lib/label.cpp @@ -18,14 +18,14 @@ */ #include "label.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineeditdlg.h> #include <tqmap.h> #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/property.h> diff --git a/kugar/kudesigner_lib/line.cpp b/kugar/kudesigner_lib/line.cpp index fb5a56d5d..2c7b48e64 100644 --- a/kugar/kudesigner_lib/line.cpp +++ b/kugar/kudesigner_lib/line.cpp @@ -18,7 +18,7 @@ */ #include "line.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/pagefooter.cpp b/kugar/kudesigner_lib/pagefooter.cpp index b4e30fedb..8e0b45473 100644 --- a/kugar/kudesigner_lib/pagefooter.cpp +++ b/kugar/kudesigner_lib/pagefooter.cpp @@ -18,7 +18,7 @@ */ #include "pagefooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/pageheader.cpp b/kugar/kudesigner_lib/pageheader.cpp index b2b76167d..33b133d6d 100644 --- a/kugar/kudesigner_lib/pageheader.cpp +++ b/kugar/kudesigner_lib/pageheader.cpp @@ -18,7 +18,7 @@ */ #include "pageheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportfooter.cpp b/kugar/kudesigner_lib/reportfooter.cpp index abed8a214..f6cccd5af 100644 --- a/kugar/kudesigner_lib/reportfooter.cpp +++ b/kugar/kudesigner_lib/reportfooter.cpp @@ -18,7 +18,7 @@ */ #include "reportfooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportheader.cpp b/kugar/kudesigner_lib/reportheader.cpp index aef6351b2..a64c9488a 100644 --- a/kugar/kudesigner_lib/reportheader.cpp +++ b/kugar/kudesigner_lib/reportheader.cpp @@ -18,7 +18,7 @@ */ #include "reportheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp index 60171583c..22234c053 100644 --- a/kugar/kudesigner_lib/reportitem.cpp +++ b/kugar/kudesigner_lib/reportitem.cpp @@ -18,8 +18,8 @@ */ #include "reportitem.h" -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tqrect.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/section.cpp b/kugar/kudesigner_lib/section.cpp index 7a7211335..630c8a669 100644 --- a/kugar/kudesigner_lib/section.cpp +++ b/kugar/kudesigner_lib/section.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "section.h" -#include "klocale.h" +#include "tdelocale.h" namespace Kudesigner { diff --git a/kugar/kudesigner_lib/specialfield.cpp b/kugar/kudesigner_lib/specialfield.cpp index d18c0e17f..7842e4ab0 100644 --- a/kugar/kudesigner_lib/specialfield.cpp +++ b/kugar/kudesigner_lib/specialfield.cpp @@ -18,7 +18,7 @@ */ #include "specialfield.h" -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/property.h> diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp index fecbd560e..bde41bcc7 100644 --- a/kugar/lib/mlabelobject.cpp +++ b/kugar/lib/mlabelobject.cpp @@ -8,7 +8,7 @@ email : cloudtemple@mksat.net ***************************************************************************/ -//#include <kglobalsettings.h> +//#include <tdeglobalsettings.h> #include <tqfont.h> #include "mlabelobject.h" diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index 4c34a7725..3619d1551 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -9,9 +9,9 @@ ***************************************************************************/ #include <tqapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprinter.h> -#include <klocale.h> +#include <tdelocale.h> #include "mreportviewer.h" diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h index 2a47f768c..965cd2826 100644 --- a/kugar/part/kugar_about.h +++ b/kugar/part/kugar_about.h @@ -24,7 +24,7 @@ #endif #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEAboutData *newKugarAboutData() { diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp index f32c1b956..9cd323c0f 100644 --- a/kugar/part/kugar_factory.cpp +++ b/kugar/part/kugar_factory.cpp @@ -3,11 +3,11 @@ // This file contains the implementation of the Kugar KPart. -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #if defined(HAVE_CONFIG_H) diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 14e8e059e..c00ba14d6 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -4,16 +4,16 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqwidget.h> #include <tdefiledialog.h> diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 55403d415..d1040574f 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -4,16 +4,16 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqlayout.h> diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h index d9b3b6f62..909fc6ef4 100644 --- a/kword/KWAboutData.h +++ b/kword/KWAboutData.h @@ -21,7 +21,7 @@ #define KWORD_ABOUTDATA #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kofficeversion.h> static const char* KWORD_DESCRIPTION=I18N_NOOP("KOffice Word Processor"); diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp index a1bd1f5c1..593800486 100644 --- a/kword/KWBgSpellCheck.cpp +++ b/kword/KWBgSpellCheck.cpp @@ -32,7 +32,7 @@ using namespace KSpell2; #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc) diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 27f1320f4..11e23e271 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -50,11 +50,11 @@ #include <KoStoreDrag.h> #include <KoPictureCollection.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <kcursor.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdemultipledrag.h> #include <kurl.h> #include <kurldrag.h> diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index d2adb65c6..fec98ab78 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -44,7 +44,7 @@ #include <KoStore.h> #include <KoOasisStore.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqxml.h> diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 6853f2c76..6d1a28b28 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> #include <knuminput.h> #include <knumvalidator.h> @@ -60,11 +60,11 @@ using namespace KSpell2; #include <float.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kurlrequesterdlg.h> #include <tdefiledialog.h> #include <tqtabwidget.h> diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index ee235c9b9..236c73579 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -27,7 +27,7 @@ #include <KoParagDia.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqradiobutton.h> diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 131192e9b..7f17f55f2 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -17,14 +17,14 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "KWDocument.h" #include <tqvbox.h> #include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "KWCommand.h" #include "KWCreateBookmarkDia.h" #include "KWCreateBookmarkDiaBase.h" diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index 2577e0f58..40f391d18 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -22,7 +22,7 @@ #include "KWDeleteDia.h" #include "KWView.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index e39947dce..f6595c00c 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -34,12 +34,12 @@ #include <KoSpeaker.h> // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <tdelistviewsearchline.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kpixmap.h> #include <tdetoolbar.h> #include <tdetoolbarbutton.h> diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index ece87a9a9..2c4462108 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -74,11 +74,11 @@ #include <kcursor.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <klibloader.h> #include <tdemultipledrag.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdespell.h> #include <kstandarddirs.h> diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 4a870af76..dd612b753 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -20,7 +20,7 @@ #include "KWEditPersonnalExpression.h" #include "KWView.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineeditdlg.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 24060cf23..4d9ec80b2 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -24,7 +24,7 @@ #include <tqvbox.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlineedit.h> #include "KWConfigFootNoteDia.h" diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp index f54942a45..a6a31f7c2 100644 --- a/kword/KWFormulaFrameSet.cpp +++ b/kword/KWFormulaFrameSet.cpp @@ -35,10 +35,10 @@ #include <KoXmlNS.h> #include <KoXmlWriter.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <dcopobject.h> #include "KWordFormulaFrameSetIface.h" #include "KWordFormulaFrameSetEditIface.h" diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 6c7fa4b28..66ef91b20 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -32,9 +32,9 @@ #include <KoParagDia_p.h> // for KoBorderPreview #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knumvalidator.h> #include <kcolorbutton.h> #include <kdebug.h> diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index 65ae6fbb0..a0cc5f815 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -28,7 +28,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> KWFrameStyleCollection::KWFrameStyleCollection() diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index b9ccbe16f..3a5fec874 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -27,7 +27,7 @@ #include <KoParagDia.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqtabwidget.h> diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index e3f6e98ca..4a76e4815 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -30,7 +30,7 @@ #include "KoZoomHandler.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeactionclasses.h> #include <tqapplication.h> diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index cb1f40b5a..b31f9789f 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "KWDocument.h" #include <tqvbox.h> @@ -25,7 +25,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "KWImportStyleDia.h" #include <KoStore.h> #include <tqfile.h> diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp index 097646084..6bcd52dba 100644 --- a/kword/KWInsertDia.cpp +++ b/kword/KWInsertDia.cpp @@ -22,7 +22,7 @@ #include "KWTableFrameSet.h" #include "KWView.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 42ca6b22f..1a818cb36 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -20,7 +20,7 @@ #include "KWInsertPageDia.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqradiobutton.h> #include <tqgroupbox.h> #include <tqlayout.h> diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 9aad5b5bf..55b8219ee 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -26,7 +26,7 @@ #include <tqscrollview.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kimageio.h> #include <tdeio/netaccess.h> diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp index 85b18a0a8..b9bd0ed77 100644 --- a/kword/KWInsertTOCCommand.cpp +++ b/kword/KWInsertTOCCommand.cpp @@ -25,7 +25,7 @@ #include "KWTextDocument.h" #include "KWTextParag.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> KWInsertTOCCommand::KWInsertTOCCommand( KWTextFrameSet * fs, KoTextParag *parag ) diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index 8ef08e912..b43e81c56 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -25,11 +25,11 @@ #include <KoCustomVariablesDia.h> #include "defs.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstdaction.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kservice.h> #include <tdemainwindow.h> diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp index daaa85020..108674637 100644 --- a/kword/KWOasisLoader.cpp +++ b/kword/KWOasisLoader.cpp @@ -38,7 +38,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvaluelist.h> #include <tqdom.h> diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp index 4ae071870..d347871a8 100644 --- a/kword/KWPartFrameSet.cpp +++ b/kword/KWPartFrameSet.cpp @@ -30,7 +30,7 @@ #include <KoXmlWriter.h> #include <KoXmlNS.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <assert.h> diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 2cc8443b1..62f8ce2cc 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -27,7 +27,7 @@ #include <KoDom.h> #include <KoXmlNS.h> #include <KoXmlWriter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //#define DEBUG_DRAW diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index 08c2ada25..c4f5ce015 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -24,7 +24,7 @@ #include "KWCommand.h" #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqvbox.h> diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index fe1f2c7f7..9fab03f98 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -21,7 +21,7 @@ #include "KWSortDia.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqradiobutton.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp index 5e988ea3f..fd141c293 100644 --- a/kword/KWSplitCellDia.cpp +++ b/kword/KWSplitCellDia.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int columns, unsigned int rows) : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, parent, name, true) diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index 9b1f462ab..82b15bf10 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -19,7 +19,7 @@ #include "KWStatisticsDialog.h" #include "KWDocument.h" #include "KWFrameSet.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqtabwidget.h> #include <tqvbox.h> #include <tqlabel.h> diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 013a2be61..6c68c32e6 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -38,7 +38,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 902d5a780..f86596ff2 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -46,9 +46,9 @@ DESCRIPTION #include <KoTextObject.h> // for customItemChar ! #include <KoTextParag.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopobject.h> #include <tqapplication.h> #include <tqpopupmenu.h> diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 20016d496..e6bd21165 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -27,7 +27,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> KWTableStyleCollection::KWTableStyleCollection() diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 4a9ad5efa..aff5a0082 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -30,7 +30,7 @@ #include "KWFrameStyleManager.h" #include "KWStyleManager.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kword/KWTableTemplate.cpp b/kword/KWTableTemplate.cpp index 7f4b46826..a54ae2598 100644 --- a/kword/KWTableTemplate.cpp +++ b/kword/KWTableTemplate.cpp @@ -24,7 +24,7 @@ #include "KoParagStyle.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index d161ccf75..476fb9b95 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -27,7 +27,7 @@ #include <KoRect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/netaccess.h> #include <kstandarddirs.h> diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp index 29252045f..33e1607cb 100644 --- a/kword/KWTextDocument.cpp +++ b/kword/KWTextDocument.cpp @@ -33,8 +33,8 @@ #include <KoDom.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> KWTextDocument::KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection *fc, KoTextFormatter *formatter ) : KoTextDocument( textfs->kWordDocument(), fc, formatter, false ), m_textfs( textfs ) diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 4df7bc1f6..756cf5764 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -54,9 +54,9 @@ #include <KoOasisContext.h> #include <KoStore.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqclipboard.h> diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index e870c7106..aae68085d 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -31,8 +31,8 @@ #include <KoXmlNS.h> #include <KoOasisStyles.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kdebug.h> #include <assert.h> diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp index 80666965b..285bac45f 100644 --- a/kword/KWVariable.cpp +++ b/kword/KWVariable.cpp @@ -32,7 +32,7 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> KWVariableSettings::KWVariableSettings() : KoVariableSettings() diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 4e3822a88..eb0022ce8 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -108,13 +108,13 @@ #include <kimageio.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/event.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <tdestdaccel.h> #include <kstdaction.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurldrag.h> #include <tdeversion.h> #include <kiconloader.h> diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index ef76bea08..c8bd6f3b3 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -29,7 +29,7 @@ #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqvalidator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtoolbutton.h> #include <tqtooltip.h> diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 96512f8bf..8453a5ec3 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -25,10 +25,10 @@ */ #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kabc/distributionlist.h> -#include <kabc/stdaddressbook.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeabc/distributionlist.h> +#include <tdeabc/stdaddressbook.h> #include "KWMailMergeKABC.h" #include "KWMailMergeKABCConfig.h" diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h index 32a078a6f..b5f0dfc37 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.h +++ b/kword/mailmerge/kabc/KWMailMergeKABC.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqguardedptr.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include "KWMailMergeDataSource.h" diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index c9c221dc1..a75a8417a 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -25,14 +25,14 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <krun.h> -#include <kabc/stdaddressbook.h> -#include <kabc/distributionlist.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/distributionlist.h> #include "addresspicker.h" #include "KWMailMergeKABC.h" diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h index 1024ecd0e..056cefc29 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <tdelistview.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include "KWMailMergeKABC.h" diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 63a028768..527d1e687 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -19,8 +19,8 @@ */ #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kspread_map.h> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index aa97d0b2b..441c3207e 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <kspread_map.h> diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index c45d75275..08def7cd8 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -2,7 +2,7 @@ #include "KWQtSqlEasyFilter.moc" #include <tqtable.h> #include <tqscrollview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 2f0c1a735..538e36a6d 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <tqsqldatabase.h> #include <tqguardedptr.h> -#include <klocale.h> +#include <tdelocale.h> /****************************************************************** * diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h index c9b24ac3a..29264c4e8 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h @@ -21,7 +21,7 @@ #define _SERIALLETTER_QtSql_POWER_PLUGIN_H_ #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialogbase.h> #include <tqsqldatabase.h> diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 2b3f711d9..655348023 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -21,7 +21,7 @@ #include "KWQtSqlSerialDataSource.moc" #include "KWQtSqlEasyFilter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqsqlcursor.h> #include <tqdatatable.h> diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index 41e971be0..22cde06d7 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -32,7 +32,7 @@ #include <tqsqlcursor.h> #include <tqdatatable.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc index c8169f240..feac37cea 100644 --- a/lib/kformula/MatrixDialog.cc +++ b/lib/kformula/MatrixDialog.cc @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KFORMULA_NAMESPACE_BEGIN diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc index a3714e60b..45aa54697 100644 --- a/lib/kformula/bracketelement.cc +++ b/lib/kformula/bracketelement.cc @@ -24,7 +24,7 @@ #include <tqpointarray.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "bracketelement.h" #include "elementvisitor.h" diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 8136965c4..32479b0f3 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -24,11 +24,11 @@ #include <tqapplication.h> #include <kstaticdeleter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "fontstyle.h" diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc index 77d930766..9f1125e12 100644 --- a/lib/kformula/fractionelement.cc +++ b/lib/kformula/fractionelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "formulaelement.h" diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cc index 41cd2600e..63275e1c6 100644 --- a/lib/kformula/identifierelement.cc +++ b/lib/kformula/identifierelement.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kformuladefs.h" #include "textelement.h" diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc index a540a7e1c..6f2f6d1d7 100644 --- a/lib/kformula/indexelement.cc +++ b/lib/kformula/indexelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "indexelement.h" diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc index 65bfa6c36..4aa311610 100644 --- a/lib/kformula/kformulacommand.cc +++ b/lib/kformula/kformulacommand.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> //This is for undo descriptions +#include <tdelocale.h> //This is for undo descriptions #include <tqvaluelist.h> diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index da930dba9..ce95c40c8 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -39,8 +39,8 @@ #include <kdialog.h> #include <tdefontdialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kpushbutton.h> diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index 4d4aa96c2..a6123154d 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include "KoGlobal.h" diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 251893d15..5a84a47d3 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -22,9 +22,9 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cc index fd3e43d25..ff941d6f3 100644 --- a/lib/kformula/kformulamathmlread.cc +++ b/lib/kformula/kformulamathmlread.cc @@ -22,8 +22,8 @@ #include <tqstring.h> #include <tqfontmetrics.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> //#include <KoUnit.h> diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index 39aff864a..68f941d98 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> -//#include <klocale.h> +//#include <tdelocale.h> //#include <kstdaction.h> #include "basicelement.h" diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 7371113f0..6b8783802 100644 --- a/lib/kformula/matrixelement.cc +++ b/lib/kformula/matrixelement.cc @@ -23,7 +23,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "MatrixDialog.h" #include "elementvisitor.h" diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cc index 41ddc1798..7705e3ab5 100644 --- a/lib/kformula/numberelement.cc +++ b/lib/kformula/numberelement.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "numberelement.h" #include "kformuladefs.h" diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc index 27dbbdd65..882eed01e 100644 --- a/lib/kformula/operatorelement.cc +++ b/lib/kformula/operatorelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementtype.h" #include "sequenceelement.h" diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc index 82a5870ce..5e511cbee 100644 --- a/lib/kformula/rootelement.cc +++ b/lib/kformula/rootelement.cc @@ -22,7 +22,7 @@ #include <tqpen.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "formulacursor.h" diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index f01636e7d..187bcd65b 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -27,7 +27,7 @@ #include <kcommand.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> //#include <boost/spirit.hpp> diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index aee6f6705..8fe3d8f8a 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kcombobox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <kdebug.h> diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index a9ca0641f..aca50b3ab 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -28,8 +28,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "symboltable.h" diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc index 6addc385c..9970ac450 100644 --- a/lib/kformula/tokenelement.cc +++ b/lib/kformula/tokenelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include "entities.h" #include "elementtype.h" diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index efa73850a..a2107452f 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -26,11 +26,11 @@ #include <KoQueryTrader.h> #include <KoDocument.h> #include <KoMainWindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <stdlib.h> diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc index 188a76d12..e8995ad66 100644 --- a/lib/kofficecore/KoApplicationIface.cc +++ b/lib/kofficecore/KoApplicationIface.cc @@ -20,8 +20,8 @@ #include <dcopclient.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "KoApplication.h" #include "KoApplicationIface.h" diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 9762f292d..5611e8737 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -31,7 +31,7 @@ #include <tqsplitter.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kpushbutton.h> #include <tdeconfig.h> diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 292e16e9d..e14228009 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -42,8 +42,8 @@ #include <kiconloader.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <tdeparts/partmanager.h> #include <kprinter.h> diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 882ccadfc..00d6038ba 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -31,8 +31,8 @@ #include <tdeparts/partmanager.h> #include <kmimetype.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqapplication.h> diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index 7bdc34e30..d50c256d6 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -29,8 +29,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqobjectlist.h> #include <tqdatetime.h> diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 61bbe0d48..44a79b144 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -40,14 +40,14 @@ #include <tqvbox.h> #include <tqdatetime.h> -#include <kabc/addressee.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/stdaddressbook.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktar.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <tqlayout.h> #include <tdelistview.h> @@ -58,7 +58,7 @@ #include <ktextedit.h> #include <kiconloader.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> class KoDocumentInfoDlg::KoDocumentInfoDlgPrivate { diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 1b1c98a88..84c5bde8b 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -21,8 +21,8 @@ #include "KoFileDialog.h" #include "KoDocument.h" #include <tdefilefiltercombo.h> -#include <klocale.h> -#include <kdiroperator.h> +#include <tdelocale.h> +#include <tdediroperator.h> #include <kdebug.h> KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index 1e5beb479..68953b40c 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kmimetype.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <KoFilterManager.h> diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 2000a5496..91123fd3c 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -17,7 +17,7 @@ */ #include <tqmetaobject.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <KoFilterChain.h> #include <KoQueryTrader.h> diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 2a894a0ef..06c7cf102 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -29,8 +29,8 @@ #include <tqptrlist.h> #include <tqapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <KoDocument.h> #include <klibloader.h> #include <tdelistbox.h> diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 78c395402..94e7e7d96 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -23,9 +23,9 @@ #include <kdebug.h> #include <tqfont.h> #include <tqfontinfo.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 97905af4b..18916b576 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -37,7 +37,7 @@ #include <tdeversion.h> #include <kstdaction.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kkeydialog.h> @@ -45,14 +45,14 @@ #include <kprogress.h> #include <kpushbutton.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tderecentdocument.h> #include <tdeparts/partmanager.h> #include <tdeparts/plugin.h> #include <tdeparts/event.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ksharedptr.h> #include <tqobjectlist.h> diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp index fa1642e74..62b6b0b15 100644 --- a/lib/kofficecore/KoOasisStore.cpp +++ b/lib/kofficecore/KoOasisStore.cpp @@ -25,9 +25,9 @@ #include <KoStoreDevice.h> #include <KoXmlWriter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqxml.h> diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index 0f1736585..9560a559e 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -24,8 +24,8 @@ #include "KoXmlNS.h" #include "KoGenStyles.h" #include <tqbuffer.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbrush.h> #include <KoStyleStack.h> diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 166084063..ed3086ab9 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -29,7 +29,7 @@ #include <tqpainter.h> #include <tqpen.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinstance.h> #include <kpushbutton.h> diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index 62d81b321..f21167cf2 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -20,10 +20,10 @@ */ #include "KoPageLayout.h" #include <KoUnit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <KoDom.h> #include <KoXmlNS.h> #include <tqdom.h> diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp index ff30802ea..101c946c5 100644 --- a/lib/kofficecore/KoPictureBase.cpp +++ b/lib/kofficecore/KoPictureBase.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kmdcodec.h> #include <tqpainter.h> diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index b6a05c8a4..5f0718e1b 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -32,13 +32,13 @@ #include <tqapplication.h> #include <tqdragobject.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeversion.h> #if ! KDE_IS_VERSION( 3,1,90 ) #include <kdebugclasses.h> #endif -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include "KoPictureKey.h" diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 0ed86896c..6bd950da3 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -44,8 +44,8 @@ // KDE includes. #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <dcopclient.h> #include <tdeconfig.h> #include <ktrader.h> diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index dd8410e3b..2d0ba5298 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -32,7 +32,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index 9068fc940..51d1cb2f7 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -22,8 +22,8 @@ #include "KoUnit.h" #include <KoXmlWriter.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 2964bcafd..1c8b88a45 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -24,8 +24,8 @@ #include <KoViewIface.h> #include <KoDocumentChild.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeparts/partmanager.h> #include <tdeparts/event.h> diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 57cd09e2a..8759ef664 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -28,8 +28,8 @@ #include <kiconloader.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index b5baad998..0e2160989 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -29,8 +29,8 @@ #include <tqtooltip.h> // KDE includes -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdemainwindow.h> #include <tdeaction.h> diff --git a/lib/kofficecore/tests/kopointtest.cpp b/lib/kofficecore/tests/kopointtest.cpp index bf2ff843f..c956466af 100644 --- a/lib/kofficecore/tests/kopointtest.cpp +++ b/lib/kofficecore/tests/kopointtest.cpp @@ -1,6 +1,6 @@ #include <KoPoint.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <stdlib.h> #include <math.h> diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp index 8a2455bfb..f9008b670 100644 --- a/lib/kofficecore/tests/korecttest.cpp +++ b/lib/kofficecore/tests/korecttest.cpp @@ -3,7 +3,7 @@ #include <tdeapplication.h> #include <stdlib.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> bool check(TQString txt, bool res, bool expected) { diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index 4095ae092..5a4a288df 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharselect.h> #include <kdebug.h> /******************************************************************/ diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 0bcf454b7..53eaba864 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kcommand.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeshortcutlist.h> #include <tdestdaccel.h> diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index f85e1937e..d9d222784 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -27,7 +27,7 @@ #include <tqsimplerichtext.h> #include <kpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kcursor.h> diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 1a2b2668e..bb937a7f0 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -18,7 +18,7 @@ */ #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpushbutton.h> #include <tqlistbox.h> diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 00664410d..bbc2e9cf6 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 84f31ee3e..a4e4ad129 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <KoDocument.h> diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index eda24051e..bb58686cd 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -18,7 +18,7 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 3150ab51e..69a6326ee 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -29,9 +29,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 736298628..c4e19fa87 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -22,9 +22,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 144b8a08d..897aba8d1 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -20,7 +20,7 @@ #include <KoPartSelectDia.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlistview.h> /**************************************************** diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp index 7baed8f9d..392309f34 100644 --- a/lib/kofficeui/KoPictureFilePreview.cpp +++ b/lib/kofficeui/KoPictureFilePreview.cpp @@ -21,7 +21,7 @@ #include "KoPictureFilePreview.h" #include "KoPictureFilePreview.moc" #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tqbitmap.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 74c617c59..fade3f714 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -22,8 +22,8 @@ /******************************************************************/ #include "KoRuler.h" -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <kiconloader.h> #include <tqcursor.h> diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 5960c2e6f..952387647 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -30,7 +30,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> class KoSelectAction::KoSelectActionPrivate { diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index c38d0e62c..325b9c00c 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -26,7 +26,7 @@ #include <tqpopupmenu.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> class KoTabChooserPrivate { diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 047a701a2..044df16ac 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -26,7 +26,7 @@ #include "KoTemplateChooseDia.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <tdefiledialog.h> #include <kinstance.h> @@ -38,11 +38,11 @@ #include <kdebug.h> #include <kpushbutton.h> #include <kjanuswidget.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ktextedit.h> #include <tdefileiconview.h> #include <tdefileitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index e3d6f9f76..0033ca2d9 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -32,14 +32,14 @@ #include <tqcheckbox.h> #include <tqtooltip.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoTemplates.h> #include <kicondialog.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kimageio.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 31c0dabf1..222b206d1 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdeparts/event.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbar.h> #include <kiconloader.h> #include <kseparator.h> diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f44adfb96..1cd5e1c61 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -25,11 +25,11 @@ #include <tqstyle.h> #include <tqpopupmenu.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <KoTooluButton.h> #include <kcolordrag.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <kdebug.h> diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 0b9f26e7c..4c4a5c45e 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -21,8 +21,8 @@ #include "KoUnitWidgets.h" #include "KoUnitWidgets.moc" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 09f7d3e45..78a4fc201 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, TQObject* parent, const char* name ): diff --git a/lib/kofficeui/KoZoomMode.cpp b/lib/kofficeui/KoZoomMode.cpp index ae49a3036..8c54d34ef 100644 --- a/lib/kofficeui/KoZoomMode.cpp +++ b/lib/kofficeui/KoZoomMode.cpp @@ -18,7 +18,7 @@ */ #include "KoZoomMode.h" -#include <klocale.h> +#include <tdelocale.h> const char* KoZoomMode::modes[] = { diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 41fcf7948..08176d1b3 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -25,7 +25,7 @@ #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> class KoLineStyleAction::KoLineStyleActionPrivate { diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index 50566d5a2..b9ff452ab 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -33,7 +33,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> #include <KoGlobal.h> diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 89574bcf8..d2476d62b 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -28,7 +28,7 @@ #include <tqpainter.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqapplication.h> diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 9befb976f..6fed1f486 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Delay in ms before delayed popup pops up #define POPUP_DELAY 500 diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h index 9f5d95409..706a8c03b 100644 --- a/lib/kofficeui/ttdetoolbarbutton.h +++ b/lib/kofficeui/ttdetoolbarbutton.h @@ -24,7 +24,7 @@ #include <tqpixmap.h> #include <tqtoolbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> class TDEToolBar; class TDEInstance; diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc index e2406a796..02439a8cb 100644 --- a/lib/kopainter/koColorChooser.cc +++ b/lib/kopainter/koColorChooser.cc @@ -25,7 +25,7 @@ #include <tqspinbox.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kcolordialog.h> #include <ktabctl.h> diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 9fd7f8774..e8647ffb3 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -20,7 +20,7 @@ #include <kdebug.h> #include <koIconChooser.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqpainter.h> #include <tqcursor.h> diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index e1230d802..af2136f97 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -30,8 +30,8 @@ #include <tqcolor.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <koColorSlider.h> diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index 942215d56..8d77bedc9 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -32,7 +32,7 @@ #include <kdualcolorbutton.h> #include <koColor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 7e8b69f99..7680d50ac 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -29,7 +29,7 @@ #include <tqcolor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <koColorSlider.h> diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 2202a86f4..cd3922055 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -29,9 +29,9 @@ #include <tqlayout.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeaccelmanager.h> #include <tdeconfig.h> diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 2bb6a0393..26f309925 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -29,8 +29,8 @@ #include <tdeaction.h> #include <tdeactionclasses.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <KoView.h> #include <KoMainWindow.h> diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp index c5a33ef6c..b51cc3172 100644 --- a/lib/koproperty/customproperty.cpp +++ b/lib/koproperty/customproperty.cpp @@ -25,7 +25,7 @@ #include <tqsizepolicy.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KoProperty; diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 22f81fe7c..6ba0e2955 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <tdeapplication.h> diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 839d6d52d..e34ee5d5b 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -23,7 +23,7 @@ #include "../property.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp index 5ff0bb34f..042256a07 100644 --- a/lib/koproperty/editors/cursoredit.cpp +++ b/lib/koproperty/editors/cursoredit.cpp @@ -24,7 +24,7 @@ #include <tqvariant.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "property.h" diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index d26dbb309..4b61d80ff 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -27,8 +27,8 @@ #include <tqvariant.h> #include <tqpainter.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 1ed2c9c65..74636c894 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -27,8 +27,8 @@ #include <tqpainter.h> #include <tqvariant.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 2de0468b2..80a3d5282 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -34,7 +34,7 @@ #include <tdeversion.h> #include <tdefontrequester.h> #include <tdeaccelmanager.h> -#include <klocale.h> +#include <tdelocale.h> //! @internal //! reimplemented to better button and label's positioning diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index a01248f2c..cf7645bf5 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -45,7 +45,7 @@ #ifndef PURE_QT #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #endif diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index 7badc4dec..c355c28be 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> //"[ %1, %2 ]" #define POINTEDIT_MASK "%1,%2" diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index 2422eec88..f9a77314d 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -26,7 +26,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> // "[ %1, %2, %3, %4 ]" #define RECTEDIT_MASK "%1,%2 %3x%4" diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 3e0213d95..e5a37f6d0 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> //"[ %1, %2 ]" #define SIZEEDIT_MASK "%1x%2" diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index ba65a92ff..c027d1dda 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 97a3177d9..4743f5702 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -28,8 +28,8 @@ #include <tqpainter.h> #include <tqlineedit.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index 54f986c55..dee5b335e 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -30,7 +30,7 @@ #include <keditlistbox.h> #include <kdialogbase.h> #include <kstdguiitem.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "property.h" diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index faaefdb93..98882e58b 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -25,7 +25,7 @@ #include <tqvariant.h> #include <kcharselect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "symbolcombo.h" diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 767ba83d4..94692a47a 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -28,8 +28,8 @@ #include <tqvariant.h> #include <tqdatetime.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index 5845365f9..16fdacc8d 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -28,7 +28,7 @@ //#include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> typedef TQMap<TQCString, TQValueList<TQCString> > StringListMap; typedef TQMapIterator<TQCString, TQStringList> StringListMapIterator; diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp index 4c21bff2c..e63039481 100644 --- a/lib/koproperty/test/main.cpp +++ b/lib/koproperty/test/main.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = "A test application for the KoProperty library"; diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 236936e2c..59fee2468 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -18,7 +18,7 @@ */ #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdecmdlineargs.h> #include <kiconloader.h> diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index 49749f91d..f72bbbd36 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index b6268a760..b3d0c7aa6 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -30,11 +30,11 @@ #include <tdeversion.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcommand.h> //#include <KoTextFormat.h> #include <kcompletion.h> @@ -169,7 +169,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti TDELocale klocale(m_doc->instance()->instanceName()); for (int i = 1; i <=7; i++) { - m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower()); + m_cacheNameOfDays.append(tdelocale.calendar()->weekDayName( i ).lower()); } } @@ -392,7 +392,7 @@ void KoAutoFormat::readAutoCorrectConfig() { Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once... TDELocale klocale(m_doc->instance()->instanceName()); - TQString kdelang = klocale.languageList().front(); + TQString kdelang = tdelocale.languageList().front(); kdelang.remove( TQRegExp( "@.*" ) ); kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl; TQString fname; @@ -620,7 +620,7 @@ void KoAutoFormat::saveConfig() TDEConfigGroupSaver cgs( config, "AutoFormat" ); config->writeEntry( "ConvertUpperCase", m_convertUpperCase ); - config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage); + config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? tdelocale.languageList().front() : m_autoFormatLanguage); config->writeEntry( "ConvertUpperUpper", m_convertUpperUpper ); config->writeEntry( "includeTwoLetterException", m_includeTwoUpperLetterException ); @@ -733,7 +733,7 @@ void KoAutoFormat::saveConfig() begin.appendChild(simpleQuote); TQFile f; if ( m_autoFormatLanguage.isEmpty()) - f.setName(locateLocal("data", "koffice/autocorrect/"+klocale.languageList().front() + ".xml",m_doc->instance())); + f.setName(locateLocal("data", "koffice/autocorrect/"+tdelocale.languageList().front() + ".xml",m_doc->instance())); else f.setName(locateLocal("data", "koffice/autocorrect/"+m_autoFormatLanguage + ".xml",m_doc->instance())); if(!f.open(IO_WriteOnly)) { diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 60b74bb00..c48236874 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -23,8 +23,8 @@ #include "KoCharSelectDia.h" #include <KoSearchDia.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <kstandarddirs.h> diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 3df928a13..6546c51cc 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -38,7 +38,7 @@ #include <tdespell2/filter.h> using namespace KSpell2; -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> #include <tqtimer.h> diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index cde58f0a7..a7cff7c22 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqwhatsthis.h> diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index e313d5b2c..727c6e5b9 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqmultilineedit.h> #include "KoCommentDia.h" #include <tqlayout.h> #include <tqpushbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqlabel.h> #include <kdebug.h> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 031a8122a..c500cca40 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -19,8 +19,8 @@ #include "KoCompletionDia.h" #include "KoAutoFormat.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kcompletion.h> #include <tdeconfig.h> diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index fb7d9b9d8..93c3dafd1 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlabel.h> #include <tqlineedit.h> #include "KoCreateStyleDia.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ) : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index dd32a80eb..a331596a3 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -20,7 +20,7 @@ #include "KoCustomVariablesDia.h" #include "KoCustomVariablesDia.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <tqcombobox.h> diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 73e0789e5..93b24a53d 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -23,7 +23,7 @@ #include <kcolorbutton.h> #include <kpushbutton.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 1d82214c9..fbde50285 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -25,7 +25,7 @@ #include "KoRichText.h" #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index f61306b07..adf7594dc 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -21,7 +21,7 @@ #include "KoGlobal.h" #include "KoTextFormat.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqfontmetrics.h> #include <tqrect.h> diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 6d9d57d65..1e048939e 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 200b1f327..b62a148fd 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -33,7 +33,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> #include <KoGlobal.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 7fd214be7..1978d88c1 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -27,8 +27,8 @@ #include <KoDom.h> #include <KoGenStyles.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqdom.h> #include <tqbuffer.h> diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index fcae882c3..2af7cecb0 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -25,7 +25,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index d9d6c1dfa..9121c59f4 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -45,8 +45,8 @@ #include "KoTextDocument.h" #include <kdebug.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextengine_p.h> //#define DEBUG_COLLECTION diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 52aba2370..55a4c56b0 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -30,7 +30,7 @@ #include <kcommand.h> #include <kdebug.h> #include <tdefontcombo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 2a9e5476c..8e96a44f5 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -29,8 +29,8 @@ #include <tdespell2/broker.h> #include <tdespell2/filter.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtimer.h> diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index fa0818d88..a29dbd84a 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -27,7 +27,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 0738f0e37..0a77bb42a 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -24,7 +24,7 @@ #include <KoFontDia.h> #include <KoGlobal.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index 875c1e71e..c624514cb 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -22,7 +22,7 @@ #include "KoTextParag.h" #include "KoVariable.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // This is automatically called by KCommandHistory's redo action when redo is activated void KoTextCommand::execute() diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 0f3d48d23..4648898d0 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -25,9 +25,9 @@ #include <KoGenStyles.h> #include <KoXmlNS.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include <tqregexp.h> diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 0b8d9ab59..cae6e9e40 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -31,7 +31,7 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index c9f0a8310..c4042779f 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -29,10 +29,10 @@ #include <KoGenStyles.h> #include <KoDom.h> #include <KoXmlNS.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <assert.h> //#define DEBUG_PAINT diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index a261d59f4..f6cdf4c46 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -26,14 +26,14 @@ #include "KoBgSpellCheck.h" #include "KoVariable.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdestdaccel.h> #include <kdebug.h> #include <kinstance.h> #include <kdatatool.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcommand.h> #include <kbookmarkmanager.h> #include <kbookmark.h> diff --git a/lib/kotext/KoUserStyle.cpp b/lib/kotext/KoUserStyle.cpp index 33de34216..4584735fd 100644 --- a/lib/kotext/KoUserStyle.cpp +++ b/lib/kotext/KoUserStyle.cpp @@ -17,7 +17,7 @@ */ #include "KoUserStyle.h" -#include <klocale.h> +#include <tdelocale.h> KoUserStyle::KoUserStyle( const TQString & name ) : m_name( name ), m_displayName( i18n( "Style name", name.utf8() ) ) diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 089b09d10..fb1b6c1c0 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -36,9 +36,9 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialogbase.h> #include <tdeconfig.h> #include <tdeversion.h> diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index fdf7c568d..a5db65230 100644 --- a/lib/kotext/TDEFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -45,11 +45,11 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tqlineedit.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 066039696..5bbd3d1fc 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlineedit.h> #include <knuminput.h> diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index bbb3ebb98..ddc09dc21 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 646bc7952..cddc47984 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -286,7 +286,7 @@ </connections> <includes> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="global" impldecl="in declaration">klocale.h</include> + <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <includehints> diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 72e5081ce..6a0360aa6 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -24,7 +24,7 @@ #include <KoUserStyleCollection.h> #include <KoUserStyle.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index a02866460..74014c2d5 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -2,8 +2,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "KoTextFormatter.h" #include "KoTextFormat.h" diff --git a/lib/kross/api/variant.cpp b/lib/kross/api/variant.cpp index 54e8ed7e1..a8823a41f 100644 --- a/lib/kross/api/variant.cpp +++ b/lib/kross/api/variant.cpp @@ -20,7 +20,7 @@ #include "variant.h" #include "list.h" -#include <klocale.h> +#include <tdelocale.h> using namespace Kross::Api; diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index 21ee1eca8..4ee5490d0 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -33,7 +33,7 @@ #include <tqregexp.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> extern "C" diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp index 7f7f980ed..809d3b830 100644 --- a/lib/kross/main/scriptcontainer.cpp +++ b/lib/kross/main/scriptcontainer.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> using namespace Kross::Api; diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index 7b8fe2af0..e96c4a900 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -26,9 +26,9 @@ #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <ktar.h> #include <kstandarddirs.h> diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index ea870f954..8347c7677 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -29,8 +29,8 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <tdetoolbar.h> diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp index 3b956fe05..4128a3011 100644 --- a/lib/kross/python/pythoninterpreter.cpp +++ b/lib/kross/python/pythoninterpreter.cpp @@ -24,7 +24,7 @@ //#include "pythonextension.h" #include "../api/variant.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #if defined(TQ_WS_WIN) diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 4175bc9ee..4d9c90e3e 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -31,7 +31,7 @@ #include <ktextedit.h> #include <kpushbutton.h> #include <tdepopupmenu.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstandarddirs.h> TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode) diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index 64b01a440..c45f3946b 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -35,8 +35,8 @@ #include <kurl.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> //#define DefaultFormat KoStore::Tar diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index 6c3459f41..05b242e17 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -19,7 +19,7 @@ #include "KoXmlWriter.h" -#include <kglobal.h> // kMin +#include <tdeglobal.h> // kMin #include <kdebug.h> #include <tqiodevice.h> #include <float.h> diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp index b8fd6c600..3401f3e4f 100644 --- a/plugins/scan/scan.cpp +++ b/plugins/scan/scan.cpp @@ -17,12 +17,12 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kscan.h> #include <KoView.h> diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 82779c445..9bad2fb57 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -23,8 +23,8 @@ #include <tdeaboutdata.h> #include <kimageio.h> #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kmimetype.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc index b802985d7..f94373f84 100644 --- a/tools/kthesaurus/main.cc +++ b/tools/kthesaurus/main.cc @@ -23,8 +23,8 @@ #include <tdecmdlineargs.h> #include <kdatatool.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <koffice_export.h> static TDECmdLineOptions options[] = { diff --git a/tools/spell/main.cc b/tools/spell/main.cc index 5686b06a1..f8baf9eb7 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -19,8 +19,8 @@ */ #include "main.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinstance.h> #include <tdeconfig.h> diff --git a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp index 59a645f75..eb76cdb4d 100644 --- a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_abiword.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kfilterdev.h> diff --git a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp index 296866630..4406a87b7 100644 --- a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_gnumeric.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kfilterdev.h> diff --git a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp index e4c897783..fb2028cf5 100644 --- a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_koffice.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <KoStore.h> #include <KoStoreDevice.h> diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp index 358bc8769..f73aa6d65 100644 --- a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp @@ -39,12 +39,12 @@ #include <config.h> #include "tdefile_ooo.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <KoStore.h> #include <KoStoreDevice.h> #include <kzip.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqptrstack.h> #include <tqdom.h> diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index 00fb732e3..aa2e19193 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -50,8 +50,8 @@ #include <kgenericfactory.h> #include <klibloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kpushbutton.h> #include <krun.h> |