Rename additional header files to avoid conflicts with KDE4

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-15 21:48:17 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-15 21:48:17 -0600
commit: 63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree: 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk
parent: 3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
download: koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
238 files changed, 388 insertions, 388 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 &lt;i&gt;no delay&lt;/i&gt; 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>
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-15 21:48:17 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-15 21:48:17 -0600
commit	63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree	89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk
parent	3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
download	koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip