summaryrefslogtreecommitdiffstats
path: root/lib/kross/api
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 /lib/kross/api
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kross/api')
-rw-r--r--lib/kross/api/eventaction.cpp2
-rw-r--r--lib/kross/api/eventaction.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp
index 7578eb30..89a115f6 100644
--- a/lib/kross/api/eventaction.cpp
+++ b/lib/kross/api/eventaction.cpp
@@ -21,7 +21,7 @@
#include "variant.h"
//#include <tqobject.h>
-//#include <kaction.h>
+//#include <tdeaction.h>
using namespace Kross::Api;
diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h
index 602a697f..1561957d 100644
--- a/lib/kross/api/eventaction.h
+++ b/lib/kross/api/eventaction.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
//#include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <ksharedptr.h>
#include "event.h"