summaryrefslogtreecommitdiffstats
path: root/kword/KWMailMergeLabelAction.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 /kword/KWMailMergeLabelAction.h
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWMailMergeLabelAction.h')
-rw-r--r--kword/KWMailMergeLabelAction.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h
index 558f69ad..cd104c07 100644
--- a/kword/KWMailMergeLabelAction.h
+++ b/kword/KWMailMergeLabelAction.h
@@ -24,7 +24,7 @@
#ifndef _MAILMERGE_ACTIONS_
#define _MAILMERGE_ACTIONS_
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqtoolbutton.h>
class KWMailMergeLabelAction : public TDEAction