Rename additional header files to avoid conflicts with KDE4

70 files changed, 84 insertions, 84 deletions

diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp
index 55cf59dc..2a464b72 100644
--- a/kolourpaint/kolourpaint.cpp
+++ b/kolourpaint/kolourpaint.cpp
@@ -34,7 +34,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // for srand
 #include <stdlib.h>
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index a192eac1..118f2280 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -39,7 +39,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index 060f19eb..018dbb9c 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -46,14 +46,14 @@
 #include <tqwmatrix.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kpcolor.h>
 #include <kpcolortoolbar.h>
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index b617c469..2113bffa 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kpdefs.h>
 
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index d3a6d422..21b8f11e 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -42,9 +42,9 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index ea00194d..24a45054 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -37,8 +37,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 
 #include <kpcolortoolbar.h>
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index 3b20417f..61cb7319 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -37,8 +37,8 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index ef602955..bc408f2c 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -44,8 +44,8 @@
 #include <kimagefilepreview.h>
 #include <kimageio.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index d60bf3dd..e8c9da7a 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcut.h>
 
 #include <kptool.h>
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 525f474d..cb3bca73 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -36,8 +36,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 
 #include <kpcolor.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 5c4c33db..b3a7448e 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_statusbar.cpp b/kolourpaint/kpmainwindow_statusbar.cpp
index bc1bc296..b46dd658 100644
--- a/kolourpaint/kpmainwindow_statusbar.cpp
+++ b/kolourpaint/kpmainwindow_statusbar.cpp
@@ -34,7 +34,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index a76ec58d..c96413be 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -33,7 +33,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolortoolbar.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp
index e8c25a30..50bd74ed 100644
--- a/kolourpaint/kpmainwindow_tools.cpp
+++ b/kolourpaint/kpmainwindow_tools.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolortoolbar.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index d700f427..f76b6183 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -38,7 +38,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index c5381d7d..2728f3cb 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -37,7 +37,7 @@
 #include <tqwmatrix.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolorsimilaritydialog.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index a1de8556..dbf6ff01 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index 7018c68f..fea1cf58 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -44,8 +44,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kpcolor.h>
 #include <kpcolortoolbar.h>
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 80e9d9e7..50d6ec9c 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -36,7 +36,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kppixmapfx.h>
diff --git a/kolourpaint/patches/color_eraser_speedup.diff b/kolourpaint/patches/color_eraser_speedup.diff
index 5e1ff7b7..d57ece28 100644
--- a/kolourpaint/patches/color_eraser_speedup.diff
+++ b/kolourpaint/patches/color_eraser_speedup.diff
@@ -34,7 +34,7 @@ diff -u -p -r1.9 kptoolpen.cpp
 +#include <qregion.h>
  
  #include <kdebug.h>
- #include <klocale.h>
+ #include <tdelocale.h>
 @@ -416,31 +417,28 @@ void kpToolPen::draw (const QPoint &this
              rect = neededRect (rect, m_brushPixmap [m_mouseButton].width ());
  
diff --git a/kolourpaint/pixmapfx/kpcoloreffect.cpp b/kolourpaint/pixmapfx/kpcoloreffect.cpp
index 85ba5927..99ba5142 100644
--- a/kolourpaint/pixmapfx/kpcoloreffect.cpp
+++ b/kolourpaint/pixmapfx/kpcoloreffect.cpp
@@ -32,7 +32,7 @@
 #include <tqpixmap.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index c5aaa30e..a6b0a7ac 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -42,7 +42,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kppixmapfx.h>
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index e1feaaa3..000b2114 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -38,7 +38,7 @@
 
 #include <kdebug.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kpmainwindow.h>
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 0783021d..87cb7d14 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -39,7 +39,7 @@
 
 #include <kdebug.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kpmainwindow.h>
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index c870b5da..51d74381 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -40,9 +40,9 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kppixmapfx.h>
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index ad05d013..d6229aca 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -36,7 +36,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kppixmapfx.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 83dd997d..910e78ac 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -38,7 +38,7 @@
 #include <tqradiobutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kppixmapfx.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 27f66d08..c23c028f 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -40,7 +40,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index d037758f..ac5fca44 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -45,8 +45,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kpcolor.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp
index 0bf50b12..dc2b4a23 100644
--- a/kolourpaint/tools/kptoolairspray.cpp
+++ b/kolourpaint/tools/kptoolairspray.cpp
@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcommandhistory.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index c294b1d0..97e7ed15 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -52,8 +52,8 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kpcolortoolbar.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index a5122805..eb913fac 100644
--- a/kolourpaint/tools/kptoolbrush.cpp
+++ b/kolourpaint/tools/kptoolbrush.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kptoolbrush.h>
 
 kpToolBrush::kpToolBrush (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolclear.cpp b/kolourpaint/tools/kptoolclear.cpp
index 7b1a775b..96f1af1f 100644
--- a/kolourpaint/tools/kptoolclear.cpp
+++ b/kolourpaint/tools/kptoolclear.cpp
@@ -31,7 +31,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolcolorpicker.cpp b/kolourpaint/tools/kptoolcolorpicker.cpp
index d02a9572..b70cb0bc 100644
--- a/kolourpaint/tools/kptoolcolorpicker.cpp
+++ b/kolourpaint/tools/kptoolcolorpicker.cpp
@@ -36,7 +36,7 @@
 #include <tqpoint.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolortoolbar.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/tools/kptoolcolorwasher.cpp b/kolourpaint/tools/kptoolcolorwasher.cpp
index 27679276..9298b654 100644
--- a/kolourpaint/tools/kptoolcolorwasher.cpp
+++ b/kolourpaint/tools/kptoolcolorwasher.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kptoolcolorwasher.h>
 
 kpToolColorWasher::kpToolColorWasher (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolconverttograyscale.cpp b/kolourpaint/tools/kptoolconverttograyscale.cpp
index 7fe544f2..0bc94e44 100644
--- a/kolourpaint/tools/kptoolconverttograyscale.cpp
+++ b/kolourpaint/tools/kptoolconverttograyscale.cpp
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolcrop.cpp b/kolourpaint/tools/kptoolcrop.cpp
index ac1967e5..930ad888 100644
--- a/kolourpaint/tools/kptoolcrop.cpp
+++ b/kolourpaint/tools/kptoolcrop.cpp
@@ -33,7 +33,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/tools/kptoolcurve.cpp b/kolourpaint/tools/kptoolcurve.cpp
index 65424026..e8a9752e 100644
--- a/kolourpaint/tools/kptoolcurve.cpp
+++ b/kolourpaint/tools/kptoolcurve.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolcurve.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolCurve::kpToolCurve (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolellipse.cpp b/kolourpaint/tools/kptoolellipse.cpp
index 0f52a6ce..8aefd19f 100644
--- a/kolourpaint/tools/kptoolellipse.cpp
+++ b/kolourpaint/tools/kptoolellipse.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kptoolellipse.h>
 
 kpToolEllipse::kpToolEllipse (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolellipticalselection.cpp b/kolourpaint/tools/kptoolellipticalselection.cpp
index 353fea9f..dcb20f85 100644
--- a/kolourpaint/tools/kptoolellipticalselection.cpp
+++ b/kolourpaint/tools/kptoolellipticalselection.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolellipticalselection.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolEllipticalSelection::kpToolEllipticalSelection (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptooleraser.cpp b/kolourpaint/tools/kptooleraser.cpp
index 7349f01c..d74609b2 100644
--- a/kolourpaint/tools/kptooleraser.cpp
+++ b/kolourpaint/tools/kptooleraser.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kptooleraser.h>
 
 kpToolEraser::kpToolEraser (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp
index 88c81b8e..49aed85f 100644
--- a/kolourpaint/tools/kptoolflip.cpp
+++ b/kolourpaint/tools/kptoolflip.cpp
@@ -34,7 +34,7 @@
 #include <tqvbuttongroup.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolfloodfill.cpp b/kolourpaint/tools/kptoolfloodfill.cpp
index 51e35707..5a59cd5b 100644
--- a/kolourpaint/tools/kptoolfloodfill.cpp
+++ b/kolourpaint/tools/kptoolfloodfill.cpp
@@ -37,7 +37,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcommandhistory.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptoolfreeformselection.cpp b/kolourpaint/tools/kptoolfreeformselection.cpp
index 6beab422..af4983ce 100644
--- a/kolourpaint/tools/kptoolfreeformselection.cpp
+++ b/kolourpaint/tools/kptoolfreeformselection.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolfreeformselection.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolFreeFormSelection::kpToolFreeFormSelection (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolline.cpp b/kolourpaint/tools/kptoolline.cpp
index e9cf57dd..07787e59 100644
--- a/kolourpaint/tools/kptoolline.cpp
+++ b/kolourpaint/tools/kptoolline.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolline.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolLine::kpToolLine (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp
index 5a601a83..387f4bb7 100644
--- a/kolourpaint/tools/kptoolpen.cpp
+++ b/kolourpaint/tools/kptoolpen.cpp
@@ -38,7 +38,7 @@
 #endif
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index 634a8ea3..00a70b02 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -44,7 +44,7 @@
 #include <tqvbuttongroup.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcommandhistory.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolpolyline.cpp b/kolourpaint/tools/kptoolpolyline.cpp
index aa388ef4..ade5e67b 100644
--- a/kolourpaint/tools/kptoolpolyline.cpp
+++ b/kolourpaint/tools/kptoolpolyline.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolpolyline.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolPolyline::kpToolPolyline (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 30e223e3..65afb587 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index a0699d7b..9e5883ea 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpcommandhistory.h>
diff --git a/kolourpaint/tools/kptoolrectselection.cpp b/kolourpaint/tools/kptoolrectselection.cpp
index 4c5b2b78..44a4cb08 100644
--- a/kolourpaint/tools/kptoolrectselection.cpp
+++ b/kolourpaint/tools/kptoolrectselection.cpp
@@ -28,7 +28,7 @@
 
 #include <kptoolrectselection.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolRectSelection::kpToolRectSelection (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index d0bcf731..3ced0735 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -54,10 +54,10 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 5def33ca..28e05d3e 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/tools/kptoolroundedrectangle.cpp b/kolourpaint/tools/kptoolroundedrectangle.cpp
index 0c4c6b6d..d8a62fb8 100644
--- a/kolourpaint/tools/kptoolroundedrectangle.cpp
+++ b/kolourpaint/tools/kptoolroundedrectangle.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kptoolroundedrectangle.h>
 
 kpToolRoundedRectangle::kpToolRoundedRectangle (kpMainWindow *mainWindow)
diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp
index 5a4d7237..8fbdee55 100644
--- a/kolourpaint/tools/kptoolselection.cpp
+++ b/kolourpaint/tools/kptoolselection.cpp
@@ -39,7 +39,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcommandhistory.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index eec804d7..230db783 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -40,7 +40,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/tools/kptooltext.cpp b/kolourpaint/tools/kptooltext.cpp
index 352715ed..58955b3c 100644
--- a/kolourpaint/tools/kptooltext.cpp
+++ b/kolourpaint/tools/kptooltext.cpp
@@ -33,7 +33,7 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcommandhistory.h>
 #include <kpdocument.h>
diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp
index de7dfa0f..59b91f85 100644
--- a/kolourpaint/views/kpunzoomedthumbnailview.cpp
+++ b/kolourpaint/views/kpunzoomedthumbnailview.cpp
@@ -32,7 +32,7 @@
 #include <kpunzoomedthumbnailview.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdocument.h>
 #include <kpviewmanager.h>
diff --git a/kolourpaint/views/kpzoomedthumbnailview.cpp b/kolourpaint/views/kpzoomedthumbnailview.cpp
index b2315a9f..87f5bde8 100644
--- a/kolourpaint/views/kpzoomedthumbnailview.cpp
+++ b/kolourpaint/views/kpzoomedthumbnailview.cpp
@@ -32,7 +32,7 @@
 #include <kpzoomedthumbnailview.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdocument.h>
 #include <kpviewmanager.h>
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index 4d06d46e..60299475 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -37,7 +37,7 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpcolorsimilaritydialog.h>
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index d71ac501..f55f9d14 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -33,7 +33,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <kpcolorsimilaritycube.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index bdc4877b..d3bb51e1 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -46,7 +46,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolorsimilaritydialog.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index 0aaea034..eefda7f0 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -35,7 +35,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name)
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index b0d5e93b..6e559fa8 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -41,7 +41,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 57986b63..3d1f5999 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp
@@ -35,7 +35,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpdefs.h>
 
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index 90167fd2..ac469b6e 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kptool.h>
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index a87714c5..d13ae932 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -35,7 +35,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kpcolor.h>
 #include <kpdefs.h>
diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
index 2ac9e39c..18d8870c 100644
--- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
+++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
@@ -31,7 +31,7 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 static int lineWidths [] = {1, 2, 3, 5, 8};
diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
index 4cd5b6f6..1b3a4d1d 100644
--- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
+++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name)
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index 24569a21..d435c72b 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -37,7 +37,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kppixmapfx.h>