summaryrefslogtreecommitdiffstats
path: root/libtdepim/komposer/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /libtdepim/komposer/plugins
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/komposer/plugins')
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 88c4fb1ea..accd10505 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -23,11 +23,11 @@
#include <kgenericfactory.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcolordialog.h>
#include <tdefiledialog.h>
#include <kinstance.h>