summaryrefslogtreecommitdiffstats
path: root/chalk/core
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/core
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core')
-rw-r--r--chalk/core/kis_filter_registry.cc2
-rw-r--r--chalk/core/kis_strategy_move.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index 2ba41d54..abccf8bc 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -19,7 +19,7 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdeparts/plugin.h>
diff --git a/chalk/core/kis_strategy_move.cc b/chalk/core/kis_strategy_move.cc
index 59679056..3eef47d6 100644
--- a/chalk/core/kis_strategy_move.cc
+++ b/chalk/core/kis_strategy_move.cc
@@ -19,7 +19,7 @@
#include <tqpoint.h>
#include <tqcolor.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcommand.h>
#include <klocale.h>
#include <kdebug.h>