summaryrefslogtreecommitdiffstats
path: root/kmail/kmmessage.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /kmail/kmmessage.cpp
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmmessage.cpp')
-rw-r--r--kmail/kmmessage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 201416b25..ba8fba5af 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -35,7 +35,7 @@ using KMail::HeaderStrategy;
#include <kaddrbook.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdehtml_part.h>
@@ -60,13 +60,13 @@ using namespace KMime::Types;
#include <assert.h>
#include <sys/time.h>
#include <time.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
#include <unistd.h>
#include "util.h"
#if ALLOW_GUI
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#endif
using namespace KMime;