Rename additional header files to avoid conflicts with KDE4

43 files changed, 86 insertions, 86 deletions

diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc
index c610b3a2..be0648ba 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 126352b8..453bbec2 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 ba0eff91..d956ee46 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 54ede8b9..8159ad73 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 cdc06ace..59019489 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 30339d6e..97c2c17e 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 62a2f5a1..97a0b8a7 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 12e1fe65..448a58cf 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 95a50a45..8252a98d 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 9c679507..25a7b9cf 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 12877006..85e4df40 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 0d9b3218..8a9a8c09 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 620ee85d..1d30db6a 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 ccd81002..c795924e 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 ea51ccf1..7cd1c335 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 684a1e9a..38c445b0 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 ebd33026..f0129e74 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 97e2f2ac..decf186e 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 b94bdedf..b2a72306 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 dfb0614c..f728043c 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 f381b3f9..84c11ffb 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 16a70764..5f2474a7 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 edb089d4..b07b4d3e 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 ffa101d1..96a5ec8c 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 65ae3c99..c243efa8 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 48ca9395..26b6634b 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 06a4d544..0fdf4a66 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 505f8de8..e1d18605 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 1486d415..be0b9307 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 9b5f5b6b..777a8aac 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 a3ce4dd6..fb6548b2 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 c8ef92c5..21ab7646 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 c7e1db5f..207bc0ce 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 57e32dce..61d85634 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 d1807384..6d2a59c3 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 b01d3e31..ba8c6b84 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 26650d73..db356a16 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 a2cc7773..e7a63180 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 43fdb18d..8e20b58d 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 781fe879..a0dbc5aa 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 d46a080a..ce13710b 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 b329151c..afa6a3d7 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 a3a084d7..5e2d65ba 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>