Rename many classes and header files to avoid conflicts with KDE4

9 files changed, 14 insertions, 14 deletions

diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index d2ddbf07..704a975d 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 76ea7b29..218abbf4 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 e18b096c..b96fb737 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 bfa016ae..5c47cd20 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 4cc87291..90205d8d 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 f70d23af..e4da1b37 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 91ae71b8..dd8a8076 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 cf770196..18aa06b0 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 d941c2dc..8e32617e 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 &)