From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kontact/plugins/kmail/kcmkmailsummary.cpp | 2 +-
 kontact/plugins/kmail/kmail_plugin.cpp    | 4 ++--
 kontact/plugins/kmail/kmail_plugin.h      | 2 +-
 kontact/plugins/kmail/summarywidget.cpp   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kontact/plugins/kmail')

diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 3a4500172..497e27803 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcmkmailsummary.h"
 
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 90d7b6ddd..1fa5fc9fc 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -31,9 +31,9 @@
 #include <tdeparts/componentfactory.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index d2c5f4a31..eb1914ec4 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -24,7 +24,7 @@
 #ifndef KMAIL_PLUGIN_H
 #define KMAIL_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kmailIface_stub.h"
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index b203c3628..9ac186028 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -30,9 +30,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "core.h"
-- 
cgit v1.2.1