summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.cpp
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 /kmail/kmcomposewin.cpp
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r--kmail/kmcomposewin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index ba8d1615b..3b35854f1 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -71,7 +71,7 @@ using TDERecentAddress::RecentAddresses;
#include <tdeio/netaccess.h>
-#include "klistboxdialog.h"
+#include "tdelistboxdialog.h"
#include "messagecomposer.h"
#include "chiasmuskeyselector.h"
@@ -80,8 +80,8 @@ using TDERecentAddress::RecentAddresses;
#include <kcompletionbox.h>
#include <kcursor.h>
#include <kcombobox.h>
-#include <kstdaccel.h>
-#include <kpopupmenu.h>
+#include <tdestdaccel.h>
+#include <tdepopupmenu.h>
#include <kedittoolbar.h>
#include <kkeydialog.h>
#include <kdebug.h>
@@ -95,7 +95,7 @@ using TDERecentAddress::RecentAddresses;
#include <klocale.h>
#include <kapplication.h>
#include <kstatusbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kdirwatch.h>
#include <kstdguiitem.h>