Rename additional header files to avoid conflicts with KDE4

24 files changed, 64 insertions, 64 deletions

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>