summaryrefslogtreecommitdiffstats
path: root/kexi/core/kexisharedactionhost_p.h
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 /kexi/core/kexisharedactionhost_p.h
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/core/kexisharedactionhost_p.h')
-rw-r--r--kexi/core/kexisharedactionhost_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h
index eef28a19..9c93a548 100644
--- a/kexi/core/kexisharedactionhost_p.h
+++ b/kexi/core/kexisharedactionhost_p.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include <tqsignalmapper.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "kexiactionproxy.h"
@@ -34,7 +34,7 @@ class KexiVolatileActionData
{
public:
KexiVolatileActionData() { plugged=false; }
-// TDEAction *kaction;
+// TDEAction *tdeaction;
bool plugged : 1;
};