diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /chalk/plugins/tools/tool_polygon | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/tools/tool_polygon')
4 files changed, 9 insertions, 9 deletions
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index ad69e2cc..c72db700 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 2b10ed9d..f58ddc8a 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 1cf41f9a..bb13e10e 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 5ace6079..c5783cba 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 &) |