summaryrefslogtreecommitdiffstats
path: root/kivio/kiviopart/kivio_view.cpp
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 /kivio/kiviopart/kivio_view.cpp
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/kivio_view.cpp')
-rw-r--r--kivio/kiviopart/kivio_view.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index f6f302e3..d19b4650 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -46,12 +46,12 @@
#include <tdefiledialog.h>
#include <kdialogbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcolorbutton.h>
#include <kapplication.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kglobal.h>
#include <kmessagebox.h>