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/defaulttools | |
| 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/defaulttools')
12 files changed, 13 insertions, 13 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> |