summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/tools/defaulttools/kis_tool_text.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:12:56 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:12:56 -0600
commitece35c015c54312eb13f583cc247cdd9a4051b4d (patch)
tree2c0599b8705e881f2b53678f48e97ffe4f616d22 /chalk/plugins/tools/defaulttools/kis_tool_text.cc
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/defaulttools/kis_tool_text.cc')
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_text.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index 02626efe..3897d78a 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>