Rename a number of libraries and executables to avoid conflicts with KDE4

24 files changed, 24 insertions, 24 deletions

diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am
index 329e9bb7..95358bcf 100644
--- a/chalk/plugins/tools/defaulttools/Makefile.am
+++ b/chalk/plugins/tools/defaulttools/Makefile.am
@@ -44,7 +44,7 @@ noinst_HEADERS = \
 	kis_tool_pan.h 
 
 
-chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h
index fc5b72c6..dbf60d93 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.h
+++ b/chalk/plugins/tools/defaulttools/default_tools.h
@@ -19,7 +19,7 @@
 #ifndef DEFAULT_TOOLS_H_
 #define DEFAULT_TOOLS_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 /**
  * A module wrapper around Chalk's default tools.
diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index 7f6c0899..f8ebee60 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 
 
 
-chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h
index 900174c8..825e06ab 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.h
+++ b/chalk/plugins/tools/selectiontools/selection_tools.h
@@ -19,7 +19,7 @@
 #ifndef SELECTION_TOOLS_H_
 #define SELECTION_TOOLS_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 /**
  * A module wrapper around Chalk's selection tools.
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index 9091a521..1cbe7013 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 
 
-chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h
index 41d9523f..0db28073 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/tool_crop.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_CROP_H_
 #define TOOL_CROP_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index 03d3395b..21628f84 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -33,7 +33,7 @@ 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 -lkio -lkparts
+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h
index 779873cf..854a8165 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.h
+++ b/chalk/plugins/tools/tool_curves/tool_curves.h
@@ -21,7 +21,7 @@
 #ifndef TOOL_BEZIER_H_
 #define TOOL_BEZIER_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class ToolCurves : public KParts::Plugin
 {
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index 35c23811..faaea42e 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -22,7 +22,7 @@ noinst_HEADERS = \
 	kis_tool_filter.h \
 	tool_filter.h
 
-chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h
index 3211d702..6255b907 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/tool_filter.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_FILTER_H_
 #define TOOL_FILTER_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index ffa08320..688b77a0 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 
 
-chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
index 3e0abc4f..47fd0f40 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_PERSPECTIVE_GRID_H_
 #define TOOL_PERSPECTIVE_GRID_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index 24916188..e971e02b 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 
 
-chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
index 2422eaa2..e43174e4 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_PERSPECTIVE_TRANSFORM_H_
 #define TOOL_PERSPECTIVE_TRANSFORM_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index 2155322a..99b1bc96 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 
 
-chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h
index 5286d008..3f9f22ae 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.h
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_POLYGON_H_
 #define TOOL_POLYGON_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 /**
  * A module that provides a polygon tool.
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index 2beb6509..edd71f92 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 
 
-chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h
index 2adfb05e..c8b95ed9 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.h
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_POLYLINE_H_
 #define TOOL_POLYLINE_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 70d58855..9cb083f3 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
 kde_module_LTLIBRARIES = chalktoolselectsimilar.la
 
-chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
index 5d163d08..124c126b 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
@@ -19,7 +19,7 @@
 #ifndef SELECTSIMILAR_H
 #define SELECTSIMILAR_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class SelectSimilar : public KParts::Plugin
 {
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index a6b9a47b..bada5a78 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 
 
-chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h
index 00f48957..648b5cc6 100644
--- a/chalk/plugins/tools/tool_star/tool_star.h
+++ b/chalk/plugins/tools/tool_star/tool_star.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;
 
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index b606e177..860ea753 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 
 
-chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h
index 1ed2cdb3..0bcff2dd 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.h
+++ b/chalk/plugins/tools/tool_transform/tool_transform.h
@@ -19,7 +19,7 @@
 #ifndef TOOL_TRANSFORM_H_
 #define TOOL_TRANSFORM_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KisView;