summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/tools/tool_perspectivetransform
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
commitece35c015c54312eb13f583cc247cdd9a4051b4d (patch)
tree2c0599b8705e881f2b53678f48e97ffe4f616d22 /chalk/plugins/tools/tool_perspectivetransform
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/tools/tool_perspectivetransform')
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/Makefile.am12
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc2
4 files changed, 9 insertions, 9 deletions
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index c34b906c..48c1fe7a 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 9f1a9b9c..0717f235 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 ddd70364..75e688d1 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 24d71620..be96be71 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 &)