summaryrefslogtreecommitdiffstats
path: root/chalk/ui/kis_paintop_box.cc
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/ui/kis_paintop_box.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/ui/kis_paintop_box.cc')
-rw-r--r--chalk/ui/kis_paintop_box.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 9751e246..b2fcc212 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -25,12 +25,12 @@
#include <tqtooltip.h>
#include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
#include <kglobalsettings.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>