summaryrefslogtreecommitdiffstats
path: root/kmail/kmkernel.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/kmkernel.cpp
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmkernel.cpp')
-rw-r--r--kmail/kmkernel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index e748c550..056eaa4a 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -57,7 +57,7 @@ using KMail::FolderIface;
#include "templateparser.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kstaticdeleter.h>
#include <kstandarddirs.h>
@@ -90,7 +90,7 @@ using KWallet::Wallet;
#include <X11/Xlib.h>
#include <fixx11h.h>
#include <tdecmdlineargs.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
KMKernel *KMKernel::mySelf = 0;
static bool s_askingToGoOnline = false;