Rename additional header files to avoid conflicts with KDE4

13 files changed, 16 insertions, 16 deletions

diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc
index 0a9298da..17e0feff 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 8fa2c647..86413587 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 310d1660..40a09a91 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 d93687df..7bb4c54f 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 72a8ed30..919454b2 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 8709e60d..df8e4f7c 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 55558395..a46fee80 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 8b5bc2a8..4e118ccc 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 2762e5a0..be506578 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 f516d899..c95b1000 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 fb36dcbd..852d2c0e 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 3897d78a..1a2687f1 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 dca2b7c9..fe449ee4 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"