summaryrefslogtreecommitdiffstats
path: root/kmail/kmfoldertree.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:59:38 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /kmail/kmfoldertree.cpp
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmfoldertree.cpp')
-rw-r--r--kmail/kmfoldertree.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 0b13f07b8..bf6846613 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -31,9 +31,9 @@ using KMail::FolderViewToolTip;
using namespace KPIM;
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdepopupmenu.h>
#include <kdebug.h>