Rename many classes and header files to avoid conflicts with KDE4

76 files changed, 137 insertions, 137 deletions

diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index b440e3f58..8fa2c6475 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 9f6b52aec..310d1660d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -25,7 +25,7 @@
 #include <tqlistview.h>
 #include <tqspinbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tqcolor.h>
 #include <kmessagebox.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
index 0718f116b..d93687df2 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqlabel.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <klocale.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
index 4cc7d2f63..72a8ed302 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 93976d6a4..8709e60d9 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcommand.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 6801cf402..555583954 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
index 5a024bf02..8b5bc2a87 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
index d7a2bbb60..2762e5a0b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 #include <tqpoint.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tqcolor.h>
 #include "kis_canvas_subject.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
index 287ba2f47..f516d8998 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include "kis_canvas_controller.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
index abfd13622..fb36dcbde 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index 02626efeb..3897d78a1 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -28,10 +28,10 @@
 #include <tqfontmetrics.h>
 #include <tqhbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <ksqueezedtextlabel.h>
 
 #include <tqcolor.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index fda422c5b..276ff3dba 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kapplication.h>
 
diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index 49d3f5711..5bb879836 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalkselectiontools.desktop
+kde_services_DATA = chaltdeselectiontools.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,13 +9,13 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \
+chaltdeselectiontools_la_SOURCES = kis_tool_move_selection.cc \
 	kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \
 	kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \
 	kis_tool_select_rectangular.cc selection_tools.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalkselectiontools.la
+kde_module_LTLIBRARIES = chaltdeselectiontools.la
 
 noinst_HEADERS = \
 	selection_tools.h \
@@ -28,13 +28,13 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 
 
 
-chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdeselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdeselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalkselectiontools_la_METASOURCES = AUTO
+chaltdeselectiontools_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop b/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop
index f005126bb..b18a857a3 100644
--- a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop
+++ b/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=选择工具
 Name[zh_TW]=選取區工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalkselectiontools
+X-TDE-Library=chaltdeselectiontools
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
index 139d99b9e..2e939da06 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <tqpoint.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 #include <tqcolor.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index 478e5904a..a353fb5b7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -25,7 +25,7 @@
 #include <tqrect.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index 397e56c75..f8409f4e1 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqcheckbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index 2be4046c8..38806f0f4 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index 87dc038aa..5f687ca52 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index ee869304f..d5f1123f7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcommand.h>
 #include <klocale.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index 58fc19c6d..b871c825b 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcommand.h>
 #include <klocale.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index f469ce319..fdce6b73a 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc
index fb0e61912..2fdedc0c7 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cc
@@ -48,7 +48,7 @@
 #include "kis_tool_move_selection.h"
 
 typedef KGenericFactory<SelectionTools> SelectionToolsFactory;
-K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdeselectiontools, SelectionToolsFactory( "chalk" ) )
 
 
 SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index 9f46072e7..fb7bcca7b 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolcrop.desktop
+kde_services_DATA = chaltdetoolcrop.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolcrop_la_SOURCES = \
+chaltdetoolcrop_la_SOURCES = \
 	wdg_tool_crop.ui \
 	tool_crop.cc \
 	kis_tool_crop.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolcrop.la
+kde_module_LTLIBRARIES = chaltdetoolcrop.la
 
 noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 
 
-chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolcrop_la_METASOURCES = AUTO
+chaltdetoolcrop_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop b/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop
index 325fbf78e..c93b427e6 100644
--- a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop
+++ b/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop
@@ -43,5 +43,5 @@ Name[zh_CN]=裁剪工具
 Name[zh_TW]=剪裁工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolcrop
+X-TDE-Library=chaltdetoolcrop
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index ff5d98a70..4bb504526 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -30,7 +30,7 @@
 #include <tqrect.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc
index c624d62f8..9a836ec6a 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolCrop> ToolCropFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolcrop, ToolCropFactory( "chalk" ) )
 
 
 ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index d2ddbf07c..704a975df 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolcurves.desktop
+kde_services_DATA = chaltdetoolcurves.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,7 +9,7 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolcurves_la_SOURCES = \
+chaltdetoolcurves_la_SOURCES = \
 	kis_curve_framework.cc \
 	kis_tool_curve.cc \
 		tool_curves.cc \
@@ -21,7 +21,7 @@ chalktoolcurves_la_SOURCES = \
 	kis_tool_moutline.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolcurves.la
+kde_module_LTLIBRARIES = chaltdetoolcurves.la
 
 noinst_HEADERS = \
 	kis_curve_framework.h \
@@ -33,13 +33,13 @@ noinst_HEADERS = \
 	kis_tool_bezier_select.h \
 	kis_tool_moutline.h
 
-chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolcurves_la_METASOURCES = AUTO
+chaltdetoolcurves_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop b/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop
index 76ea7b29e..218abbf4f 100644
--- a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop
+++ b/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop
@@ -32,5 +32,5 @@ Name[uk]=Криві
 Name[zh_TW]=曲線工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolcurves
+X-TDE-Library=chaltdetoolcurves
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index e18b096c2..b96fb7373 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqrect.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
index bfa016ae9..5c47cd20a 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
index 4cc872911..90205d8d7 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index f70d23af5..e4da1b371 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqrect.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
index 91ae71b87..dd8a80765 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqrect.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index cf770196d..18aa06b0f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -28,7 +28,7 @@
 #include <tqpushbutton.h>
 #include <tqslider.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index d941c2dc0..8e32617e2 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -42,7 +42,7 @@
 
 
 typedef KGenericFactory<ToolCurves> ToolCurvesFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolcurves, ToolCurvesFactory( "chalk" ) )
 
 
 ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index f775c4357..f8d699523 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolfilter.desktop
+kde_services_DATA = chaltdetoolfilter.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,26 +9,26 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolfilter_la_SOURCES = \
+chaltdetoolfilter_la_SOURCES = \
 	kis_filterop.cc \
 	kis_tool_filter.cc \
 	tool_filter.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolfilter.la
+kde_module_LTLIBRARIES = chaltdetoolfilter.la
 
 noinst_HEADERS = \
 	kis_filterop.h \
 	kis_tool_filter.h \
 	tool_filter.h
 
-chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolfilter_la_METASOURCES = AUTO
+chaltdetoolfilter_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop b/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop
index 991709b9f..f20c3ccae 100644
--- a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop
+++ b/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop
@@ -88,5 +88,5 @@ Comment[zh_CN]=过滤器工具和绘图集成
 Comment[zh_TW]=濾鏡工具與繪圖操作
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolfilter
+X-TDE-Library=chaltdetoolfilter
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
index 3364bfce4..84343b829 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc
index b5d7c4b56..912686c19 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cc
@@ -41,7 +41,7 @@
 
 
 typedef KGenericFactory<ToolFilter> ToolFilterFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolfilter, ToolFilterFactory( "chalk" ) )
 
 
 ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index 534759916..df7491528 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolperspectivegrid.desktop
+kde_services_DATA = chaltdetoolperspectivegrid.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,19 +9,19 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolperspectivegrid_la_SOURCES = \
+chaltdetoolperspectivegrid_la_SOURCES = \
 	tool_perspectivegrid.cc \
 	kis_tool_perspectivegrid.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolperspectivegrid.la
+kde_module_LTLIBRARIES = chaltdetoolperspectivegrid.la
 
 noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 
 
-chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
diff --git a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop
index 9899e2841..1538be0bf 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop
+++ b/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop
@@ -31,5 +31,5 @@ Name[uk]=Засіб ґратки перспективи
 Name[zh_TW]=透視格工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolperspectivegrid
+X-TDE-Library=chaltdetoolperspectivegrid
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 97660392d..38c859c66 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcommand.h>
 #include <klocale.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
index 12615387f..f9f4a5aa2 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) )
 
 
 ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index c34b906c3..48c1fe7a9 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolperspectivetransform.desktop
+kde_services_DATA = chaltdetoolperspectivetransform.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolperspectivetransform_la_SOURCES = \
+chaltdetoolperspectivetransform_la_SOURCES = \
 	tool_perspectivetransform.cc \
 	kis_tool_perspectivetransform.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolperspectivetransform.la
+kde_module_LTLIBRARIES = chaltdetoolperspectivetransform.la
 
 noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 
 
-chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolperspectivetransform_la_METASOURCES = AUTO
+chaltdetoolperspectivetransform_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop
index 9f1a9b9c4..0717f235e 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop
+++ b/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop
@@ -33,5 +33,5 @@ Name[uk]=Засіб перспективи
 Name[zh_TW]=透視轉換工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolperspectivetransform
+X-TDE-Library=chaltdetoolperspectivetransform
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index ddd703643..75e688d1e 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -33,7 +33,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
index 24d716201..be96be71f 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) )
 
 
 ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index ad69e2cc2..c72db7007 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolpolygon.desktop
+kde_services_DATA = chaltdetoolpolygon.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolpolygon_la_SOURCES = \
+chaltdetoolpolygon_la_SOURCES = \
         tool_polygon.cc \
 	kis_tool_polygon.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolpolygon.la
+kde_module_LTLIBRARIES = chaltdetoolpolygon.la
 
 noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 
 
-chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolpolygon_la_METASOURCES = AUTO
+chaltdetoolpolygon_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop
index 2b10ed9dd..f58ddc8ae 100644
--- a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop
+++ b/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=多边形工具
 Name[zh_TW]=多邊形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolpolygon
+X-TDE-Library=chaltdetoolpolygon
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
index 1cf41f9a8..bb13e10e1 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqspinbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
index 5ace60794..c5783cba0 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPolygon> ToolPolygonFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolygon, ToolPolygonFactory( "chalk" ) )
 
 
 ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index a058dc589..bd7786162 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolpolyline.desktop
+kde_services_DATA = chaltdetoolpolyline.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolpolyline_la_SOURCES = \
+chaltdetoolpolyline_la_SOURCES = \
         tool_polyline.cc \
 	kis_tool_polyline.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolpolyline.la
+kde_module_LTLIBRARIES = chaltdetoolpolyline.la
 
 noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 
 
-chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolpolyline_la_METASOURCES = AUTO
+chaltdetoolpolyline_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop
index b68aa879c..37846b0ee 100644
--- a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop
+++ b/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop
@@ -45,5 +45,5 @@ Name[zh_CN]=折线工具
 Name[zh_TW]=任意線工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolpolyline
+X-TDE-Library=chaltdetoolpolyline
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
index 6eb7817da..d16709f2d 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqspinbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
index fe9eb0024..34592d5ca 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
@@ -40,7 +40,7 @@
 
 
 typedef KGenericFactory<ToolPolyline> ToolPolylineFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolyline, ToolPolylineFactory( "chalk" ) )
 
 
 ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 84bb341e1..c7ac5a2ed 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolselectsimilar.desktop
+kde_services_DATA = chaltdetoolselectsimilar.desktop
 
 INCLUDES  =  -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../core \
@@ -9,18 +9,18 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 
-chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
+chaltdetoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
 noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
-kde_module_LTLIBRARIES = chalktoolselectsimilar.la
+kde_module_LTLIBRARIES = chaltdetoolselectsimilar.la
 
-chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolselectsimilar_la_METASOURCES = AUTO
+chaltdetoolselectsimilar_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop
index cc83dccc8..32d28701a 100644
--- a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop
+++ b/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop
@@ -39,5 +39,5 @@ Name[zh_CN]=选择相似颜色工具
 Name[zh_TW]=選取近似色彩工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolselectsimilar
+X-TDE-Library=chaltdetoolselectsimilar
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 4827af085..acaddb7c5 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <knuminput.h>
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
index 95c315d80..85cf98bed 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
@@ -39,7 +39,7 @@
 #include "kis_tool_selectsimilar.h"
 
 typedef KGenericFactory<SelectSimilar> SelectSimilarFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolselectsimilar, SelectSimilarFactory( "chalk" ) )
 
 SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index c8f65857c..c3de3a0d0 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktoolstar.desktop
+kde_services_DATA = chaltdetoolstar.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktoolstar_la_SOURCES = \
+chaltdetoolstar_la_SOURCES = \
 	wdg_tool_star.ui \
         tool_star.cc \
 	kis_tool_star.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktoolstar.la
+kde_module_LTLIBRARIES = chaltdetoolstar.la
 
 noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 
 
-chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetoolstar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktoolstar_la_METASOURCES = AUTO
+chaltdetoolstar_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop b/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop
index f2b68b7a8..0f6bc2eb8 100644
--- a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop
+++ b/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=星形工具
 Name[zh_TW]=星形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktoolstar
+X-TDE-Library=chaltdetoolstar
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc
index 8ba6a1722..88bd0cfd7 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc
index dc40edf9f..040eaf99c 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolStar> ToolStarFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) )
 
 
 ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index 78aab31b8..016988f8a 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chalktooltransform.desktop
+kde_services_DATA = chaltdetooltransform.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalktooltransform_la_SOURCES = \
+chaltdetooltransform_la_SOURCES = \
 	wdg_tool_transform.ui \
 	tool_transform.cc \
 	kis_tool_transform.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chalktooltransform.la
+kde_module_LTLIBRARIES = chaltdetooltransform.la
 
 noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 
 
-chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
+chaltdetooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdetooltransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chalktooltransform_la_METASOURCES = AUTO
+chaltdetooltransform_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop b/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop
index 48fe8042d..74a2eebee 100644
--- a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop
+++ b/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop
@@ -42,5 +42,5 @@ Name[zh_CN]=变形工具
 Name[zh_TW]=變形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chalktooltransform
+X-TDE-Library=chaltdetooltransform
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
index bfad9c6b5..b4c9c1bdc 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc
index 328100205..a5aead786 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolTransform> ToolTransformFactory;
-K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdetooltransform, ToolTransformFactory( "chalk" ) )
 
 
 ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index b0a9851ed..126352b85 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -31,7 +31,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kis_canvas_subject.h>
 #include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
index 8b54f7da7..97e2f2acf 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
@@ -67,7 +67,7 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr
 
         // Selection manager takes ownership?
         TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection");
-        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection");
+        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrintdeselection");
         TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection");
 
         TQ_CHECK_PTR(a);
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
index 999aaaaa6..6870e0452 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
@@ -3,7 +3,7 @@
     <MenuBar>
         <Menu name="Select"><text>&amp;Select</text>
             <Action name="growselection"/>
-            <Action name="shrinkselection"/>
+            <Action name="shrintdeselection"/>
             <Action name="borderselection"/>
         </Menu>
     </MenuBar>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index e3c4d680e..bcb0bf030 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -28,10 +28,10 @@
 #include <tqclipboard.h>
 #include <tqvbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <knotifyclient.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstartupinfo.h>
 
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 20333271d..295f6980e 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -5,23 +5,23 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = chalkselectopaque.la
+kde_module_LTLIBRARIES = chaltdeselectopaque.la
 
-chalkselectopaque_la_SOURCES = selectopaque.cc 
+chaltdeselectopaque_la_SOURCES = selectopaque.cc 
 noinst_HEADERS = selectopaque.h
 
-chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+chaltdeselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
-chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdeselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = selectopaque.rc
 EXTRA_DIST = $(chalkrc_DATA)
 
-kde_services_DATA = chalkselectopaque.desktop
+kde_services_DATA = chaltdeselectopaque.desktop
 
-chalkselectopaque_la_METASOURCES = AUTO
+chaltdeselectopaque_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
diff --git a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
index 654e809cf..db8e883cf 100644
--- a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
+++ b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
@@ -22,5 +22,5 @@ Name[uk]=Виділення непрозорих ділянок
 Name[zh_TW]=選擇不透明
 ServiceTypes=Chalk/ViewPlugin
 Type=Service
-X-TDE-Library=chalkselectopaque
+X-TDE-Library=chaltdeselectopaque
 X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
index 57e32dcef..ced4fd9a6 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -51,7 +51,7 @@
 #include "selectopaque.h"
 
 typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory;
-K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdeselectopaque, SelectOpaqueFactory( "chalk" ) )
 
 SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
index a4809d597..6ff21abf9 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="chalkselectopaque" version="1">
+<kpartgui library="chaltdeselectopaque" version="1">
 <MenuBar>
     <Menu name="Select"><text>Select</text>
 	<Separator/>