summaryrefslogtreecommitdiffstats
path: root/karbon
diff options
context:
space:
mode:
Diffstat (limited to 'karbon')
-rw-r--r--karbon/commands/valigncmd.cc2
-rw-r--r--karbon/commands/vbooleancmd.cc2
-rw-r--r--karbon/commands/vcleanupcmd.cc2
-rw-r--r--karbon/commands/vclosepathcmd.cc2
-rw-r--r--karbon/commands/vcommand.cc2
-rw-r--r--karbon/commands/vdeletecmd.cc2
-rw-r--r--karbon/commands/vdeletenodescmd.cc2
-rw-r--r--karbon/commands/vdistributecmd.cc2
-rw-r--r--karbon/commands/vfillcmd.cc2
-rw-r--r--karbon/commands/vflattencmd.cc2
-rw-r--r--karbon/commands/vgroupcmd.cc2
-rw-r--r--karbon/commands/vinsertcmd.cc2
-rw-r--r--karbon/commands/vstrokecmd.cc2
-rw-r--r--karbon/commands/vtextcmd.cc2
-rw-r--r--karbon/commands/vtransformcmd.cc2
-rw-r--r--karbon/commands/vungroupcmd.cc2
-rw-r--r--karbon/commands/vzordercmd.cc2
-rw-r--r--karbon/core/vglobal.h2
-rw-r--r--karbon/core/vlayer.cc2
-rw-r--r--karbon/dialogs/vcolordlg.cc2
-rw-r--r--karbon/dialogs/vcolortab.cc2
-rw-r--r--karbon/dialogs/vconfiguredlg.cc2
-rw-r--r--karbon/dialogs/vstrokedlg.cc2
-rw-r--r--karbon/dockers/vcolordocker.cc2
-rw-r--r--karbon/dockers/vdocumentdocker.cc4
-rw-r--r--karbon/dockers/vstrokedocker.cc2
-rw-r--r--karbon/dockers/vstyledocker.cc2
-rw-r--r--karbon/dockers/vtransformdocker.cc2
-rw-r--r--karbon/karbon_aboutdata.h2
-rw-r--r--karbon/karbon_factory.cc4
-rw-r--r--karbon/karbon_part.cc4
-rw-r--r--karbon/karbon_resourceserver.cc4
-rw-r--r--karbon/karbon_view.cc4
-rw-r--r--karbon/main.cc2
-rw-r--r--karbon/plugins/flattenpath/flattenpathplugin.cc2
-rw-r--r--karbon/plugins/imagetool/vimagetool.cc2
-rw-r--r--karbon/plugins/shadoweffect/shadoweffectplugin.cc2
-rw-r--r--karbon/plugins/zoomtool/vzoomtool.cc2
-rw-r--r--karbon/render/vkopainter.cc2
-rw-r--r--karbon/shapes/vellipse.cc2
-rw-r--r--karbon/shapes/vpolygon.cc2
-rw-r--r--karbon/shapes/vpolyline.cc2
-rw-r--r--karbon/shapes/vrectangle.cc2
-rw-r--r--karbon/shapes/vsinus.cc2
-rw-r--r--karbon/shapes/vspiral.cc2
-rw-r--r--karbon/shapes/vstar.cc2
-rw-r--r--karbon/tools/vellipsetool.cc2
-rw-r--r--karbon/tools/vgradienttool.cc2
-rw-r--r--karbon/tools/vpatterntool.cc2
-rw-r--r--karbon/tools/vpenciltool.cc2
-rw-r--r--karbon/tools/vpenciltool.h2
-rw-r--r--karbon/tools/vpolygontool.cc2
-rw-r--r--karbon/tools/vpolylinetool.cc2
-rw-r--r--karbon/tools/vrectangletool.cc2
-rw-r--r--karbon/tools/vrectangletool.h2
-rw-r--r--karbon/tools/vrotatetool.cc2
-rw-r--r--karbon/tools/vroundrecttool.h2
-rw-r--r--karbon/tools/vselectnodestool.cc2
-rw-r--r--karbon/tools/vselecttool.h2
-rw-r--r--karbon/tools/vsheartool.cc2
-rw-r--r--karbon/tools/vsinustool.cc2
-rw-r--r--karbon/tools/vspiraltool.cc2
-rw-r--r--karbon/tools/vspiraltool.h2
-rw-r--r--karbon/tools/vstartool.cc2
-rw-r--r--karbon/tools/vstartool.h2
-rw-r--r--karbon/tools/vtexttool.cc2
-rw-r--r--karbon/visitors/vselectiondesc.cc2
-rw-r--r--karbon/vtool.h2
-rw-r--r--karbon/widgets/vcanvas.cc2
-rw-r--r--karbon/widgets/vgradienttabwidget.cc2
-rw-r--r--karbon/widgets/vgradientwidget.cc2
-rw-r--r--karbon/widgets/vselecttoolbar.cc2
-rw-r--r--karbon/widgets/vsmallpreview.cc2
-rw-r--r--karbon/widgets/vtranslate.cc2
-rw-r--r--karbon/widgets/vtypebuttonbox.cc2
75 files changed, 80 insertions, 80 deletions
diff --git a/karbon/commands/valigncmd.cc b/karbon/commands/valigncmd.cc
index 47665eb5..d79c8485 100644
--- a/karbon/commands/valigncmd.cc
+++ b/karbon/commands/valigncmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "valigncmd.h"
#include "vtransformcmd.h"
diff --git a/karbon/commands/vbooleancmd.cc b/karbon/commands/vbooleancmd.cc
index e04676f7..dbfccffe 100644
--- a/karbon/commands/vbooleancmd.cc
+++ b/karbon/commands/vbooleancmd.cc
@@ -22,7 +22,7 @@
#include <tqptrlist.h>
#include <tqvaluelist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vbooleancmd.h"
#include "vpath.h"
diff --git a/karbon/commands/vcleanupcmd.cc b/karbon/commands/vcleanupcmd.cc
index 6df53601..2c9d4962 100644
--- a/karbon/commands/vcleanupcmd.cc
+++ b/karbon/commands/vcleanupcmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcleanupcmd.h"
#include "vlayer.h"
diff --git a/karbon/commands/vclosepathcmd.cc b/karbon/commands/vclosepathcmd.cc
index 3afe6195..652ed2df 100644
--- a/karbon/commands/vclosepathcmd.cc
+++ b/karbon/commands/vclosepathcmd.cc
@@ -18,7 +18,7 @@
*/
#include "vclosepathcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <core/vpath.h>
diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc
index 57826185..fe5e9ada 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cc
@@ -20,7 +20,7 @@
#include "tdeaction.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "vcommand.h"
#include "karbon_part.h"
diff --git a/karbon/commands/vdeletecmd.cc b/karbon/commands/vdeletecmd.cc
index d94723c0..997a7cc9 100644
--- a/karbon/commands/vdeletecmd.cc
+++ b/karbon/commands/vdeletecmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdeletecmd.h"
#include "vselection.h"
diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cc
index d1f7c979..e83c160a 100644
--- a/karbon/commands/vdeletenodescmd.cc
+++ b/karbon/commands/vdeletenodescmd.cc
@@ -19,7 +19,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdeletenodescmd.h"
#include "vselection.h"
diff --git a/karbon/commands/vdistributecmd.cc b/karbon/commands/vdistributecmd.cc
index d8e410b0..7a23072f 100644
--- a/karbon/commands/vdistributecmd.cc
+++ b/karbon/commands/vdistributecmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdistributecmd.h"
#include "vtransformcmd.h"
diff --git a/karbon/commands/vfillcmd.cc b/karbon/commands/vfillcmd.cc
index 18f17b85..75d5284c 100644
--- a/karbon/commands/vfillcmd.cc
+++ b/karbon/commands/vfillcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vfill.h"
#include "vfillcmd.h"
diff --git a/karbon/commands/vflattencmd.cc b/karbon/commands/vflattencmd.cc
index 0cab021a..21d5b50c 100644
--- a/karbon/commands/vflattencmd.cc
+++ b/karbon/commands/vflattencmd.cc
@@ -18,7 +18,7 @@
*/
#include "vflattencmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <core/vpath.h>
#include <core/vsegment.h>
diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cc
index bcad4d93..70bd2933 100644
--- a/karbon/commands/vgroupcmd.cc
+++ b/karbon/commands/vgroupcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vgroup.h"
#include "vgroupcmd.h"
diff --git a/karbon/commands/vinsertcmd.cc b/karbon/commands/vinsertcmd.cc
index 2db54907..fb544a0c 100644
--- a/karbon/commands/vinsertcmd.cc
+++ b/karbon/commands/vinsertcmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdocument.h"
#include "vlayer.h"
diff --git a/karbon/commands/vstrokecmd.cc b/karbon/commands/vstrokecmd.cc
index 2ea43668..7b99f2d7 100644
--- a/karbon/commands/vstrokecmd.cc
+++ b/karbon/commands/vstrokecmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vselection.h"
#include "vstroke.h"
diff --git a/karbon/commands/vtextcmd.cc b/karbon/commands/vtextcmd.cc
index 32e7b031..fd7424ba 100644
--- a/karbon/commands/vtextcmd.cc
+++ b/karbon/commands/vtextcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "karbon_view.h"
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index dc1038ab..ebcb443e 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcomposite.h"
#include "vpath.h"
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index 314a873e..947c4afe 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vgroup.h"
#include "vungroupcmd.h"
diff --git a/karbon/commands/vzordercmd.cc b/karbon/commands/vzordercmd.cc
index 2839120f..2a25edf9 100644
--- a/karbon/commands/vzordercmd.cc
+++ b/karbon/commands/vzordercmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vzordercmd.h"
#include "vselection.h"
diff --git a/karbon/core/vglobal.h b/karbon/core/vglobal.h
index c20d48b0..5c0d4706 100644
--- a/karbon/core/vglobal.h
+++ b/karbon/core/vglobal.h
@@ -21,7 +21,7 @@
#ifndef __VGLOBAL_H__
#define __VGLOBAL_H__
-#include <kglobal.h>
+#include <tdeglobal.h>
// define some often used mathematical constants et al:
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index 47fe919d..55602598 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -19,7 +19,7 @@
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include "vcomposite.h"
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc
index 90548045..ae8e399a 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcolor.h"
#include "vcolordlg.h"
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index 56fecc0b..0b2c3bab 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "vcolor.h"
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index 3e353484..bc4e5eb1 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <KoUnitWidgets.h>
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 2428de11..27009bf2 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -26,7 +26,7 @@
#include <tqvbuttongroup.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index c6453575..328f4f3f 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -27,7 +27,7 @@
#include <tqevent.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include "karbon_part.h"
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 6272cc2b..dc676a85 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -29,8 +29,8 @@
#include <tqlabel.h>
#include <tqcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <KoMainWindow.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index f30b3042..13fe44c1 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -26,7 +26,7 @@
#include <tqtooltip.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index 5bf60993..9f3d12e6 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -25,7 +25,7 @@
#include <tqhbuttongroup.h>
#include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <KoMainWindow.h>
#include <KoFilterManager.h>
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 7e93577b..69c9a87c 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -24,7 +24,7 @@
#include <tqwmatrix.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include <KoRect.h>
#include <KoUnitWidgets.h>
diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index aee04a23..8b9d9840 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -2,7 +2,7 @@
#define KARBON_ABOUTDATA_H
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
static const char* description=I18N_NOOP( "A Vector Graphics Drawing Application." );
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 32d5e2de..6dd94ed3 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -19,10 +19,10 @@
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 896b0450..a34a4da1 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -25,8 +25,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <KoTemplateChooseDia.h>
#include <KoStoreDevice.h>
#include <KoOasisStyles.h>
diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cc
index 92c94fdf..2b31e4d7 100644
--- a/karbon/karbon_resourceserver.cc
+++ b/karbon/karbon_resourceserver.cc
@@ -24,9 +24,9 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kogradientmanager.h>
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 432d243d..115bbf6f 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -29,9 +29,9 @@
#include <tdeaction.h>
#include <kcolordrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kprinter.h>
diff --git a/karbon/main.cc b/karbon/main.cc
index a02c04de..434134fe 100644
--- a/karbon/main.cc
+++ b/karbon/main.cc
@@ -22,7 +22,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoApplication.h>
#include "karbon_aboutdata.h"
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index 78c2a66e..6c4a33d8 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -18,7 +18,7 @@
*/
#include "flattenpathplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc
index 090561a8..749e07a1 100644
--- a/karbon/plugins/imagetool/vimagetool.cc
+++ b/karbon/plugins/imagetool/vimagetool.cc
@@ -19,7 +19,7 @@
*/
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index a837e51e..019b4024 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -18,7 +18,7 @@
*/
#include "shadoweffectplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cc
index beb19a68..1cecb94a 100644
--- a/karbon/plugins/zoomtool/vzoomtool.cc
+++ b/karbon/plugins/zoomtool/vzoomtool.cc
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vzoomtool.h"
#include <karbon_part.h>
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc
index 503b2e57..3f81f3c3 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cc
@@ -54,7 +54,7 @@
#include <gdk-pixbuf-xlibrgb.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <math.h>
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index ef5bb070..1a9462b8 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cc
@@ -20,7 +20,7 @@
#include "vellipse.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 1735471f..fdf0f745 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -23,7 +23,7 @@
#include "vglobal.h"
#include "vpolygon.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index cef5bda2..519422ed 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -22,7 +22,7 @@
#include <tqdom.h>
#include "vglobal.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <vdocument.h>
#include "vtransformcmd.h"
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index bbeef50f..3190c93c 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cc
@@ -19,7 +19,7 @@
#include "vrectangle.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc
index 362ed800..f27cee4b 100644
--- a/karbon/shapes/vsinus.cc
+++ b/karbon/shapes/vsinus.cc
@@ -23,7 +23,7 @@
#include "vglobal.h"
#include "vsinus.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <tqdom.h>
#include <vdocument.h>
diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc
index 0df88485..ff2f691e 100644
--- a/karbon/shapes/vspiral.cc
+++ b/karbon/shapes/vspiral.cc
@@ -26,7 +26,7 @@
#include "vglobal.h"
#include "vspiral.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <vdocument.h>
diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc
index 260c1664..a43413c9 100644
--- a/karbon/shapes/vstar.cc
+++ b/karbon/shapes/vstar.cc
@@ -26,7 +26,7 @@
#include "vglobal.h"
#include "vstar.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <vdocument.h>
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index b8855c50..170a51dd 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -21,7 +21,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KoUnitWidgets.h"
#include <KoUnit.h>
#include <kcombobox.h>
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc
index 68d7972e..e7d2db3c 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cc
@@ -20,7 +20,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <karbon_part.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 963f1a61..8c42d5e0 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <koIconChooser.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <karbon_factory.h>
#include <karbon_resourceserver.h>
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc
index a15dbf2d..1239923e 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cc
@@ -28,7 +28,7 @@
#include <tqvbox.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
//#include <KoUnitWidgets.h>
diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h
index 3667f294..8def1526 100644
--- a/karbon/tools/vpenciltool.h
+++ b/karbon/tools/vpenciltool.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "KoPoint.h"
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index 18895cea..de475691 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -22,7 +22,7 @@
#include <tqgroupbox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc
index e1689419..38ac9d25 100644
--- a/karbon/tools/vpolylinetool.cc
+++ b/karbon/tools/vpolylinetool.cc
@@ -22,7 +22,7 @@
#include <tqevent.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <karbon_part.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 5b0fcffe..4572cc23 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index 7da59745..1915b10a 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -21,7 +21,7 @@
#define __VRECTANGLETOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc
index f8d341dc..4230cac7 100644
--- a/karbon/tools/vrotatetool.cc
+++ b/karbon/tools/vrotatetool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include <karbon_part.h>
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 27e4ca3d..35ee9be1 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -20,7 +20,7 @@
#ifndef __VROUNDRECTTOOL_H__
#define __VROUNDRECTTOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <knuminput.h>
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc
index 7123b71a..2a3c38bb 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <KoRect.h>
diff --git a/karbon/tools/vselecttool.h b/karbon/tools/vselecttool.h
index e7791172..464dc6af 100644
--- a/karbon/tools/vselecttool.h
+++ b/karbon/tools/vselecttool.h
@@ -21,7 +21,7 @@
#define __VSELECTTOOL_H__
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vtool.h"
diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc
index d7fd40b9..4bc80810 100644
--- a/karbon/tools/vsheartool.cc
+++ b/karbon/tools/vsheartool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include <karbon_part.h>
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index d46c4180..12dbe128 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index e0b99c9e..c414be41 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <knuminput.h>
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 05694267..48842e9f 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -21,7 +21,7 @@
#define __VSPIRALTOOL_H__
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index e152ad31..9a92cd37 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcombobox.h>
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 1d35ad43..5c8936dc 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -20,7 +20,7 @@
#ifndef __VSTARTOOL_H__
#define __VSTARTOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 13e037a1..e7fa848d 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -35,7 +35,7 @@
#include <tdefontdialog.h>
#include <kiconloader.h>
#include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <karbon_view.h>
#include <karbon_part.h>
diff --git a/karbon/visitors/vselectiondesc.cc b/karbon/visitors/vselectiondesc.cc
index 0036f31c..8518b7b6 100644
--- a/karbon/visitors/vselectiondesc.cc
+++ b/karbon/visitors/vselectiondesc.cc
@@ -24,7 +24,7 @@
#include "vimage.h"
#include "vcomposite.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void
VSelectionDescription::visitVSelection( VSelection& selection )
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 4b085cba..87d7b1b3 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <koffice_export.h>
class TDERadioAction;
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 9fa5dcd6..d4cd6497 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -34,7 +34,7 @@
#include "vtool.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordrag.h>
int
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index d24e6956..5c57efab 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -27,7 +27,7 @@
#include <knuminput.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistbox.h>
#include <kiconloader.h>
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index d4ea8e75..64cbf373 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -24,7 +24,7 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
#include <kiconloader.h>
diff --git a/karbon/widgets/vselecttoolbar.cc b/karbon/widgets/vselecttoolbar.cc
index ff2d3585..ef731e92 100644
--- a/karbon/widgets/vselecttoolbar.cc
+++ b/karbon/widgets/vselecttoolbar.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index afd48d71..28a8dd27 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include "vcolor.h"
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index d6b288ba..35a25a71 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cc
index 84b3ed14..9a98a125 100644
--- a/karbon/widgets/vtypebuttonbox.cc
+++ b/karbon/widgets/vtypebuttonbox.cc
@@ -207,7 +207,7 @@ static const char* const buttonpattern[]={
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "karbon_part.h"
#include "vfillcmd.h"