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

---
 plugins/kmail/bodypartformatter/attendeeselector.cpp |  2 +-
 plugins/kmail/bodypartformatter/delegateselector.cpp |  2 +-
 plugins/kmail/bodypartformatter/text_calendar.cpp    | 10 +++++-----
 plugins/kmail/bodypartformatter/text_vcard.cpp       | 14 +++++++-------
 plugins/kmail/bodypartformatter/text_xdiff.cpp       |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index dae65dc3e..08bf9c008 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -23,7 +23,7 @@
 #include <libtdepim/addresseelineedit.h>
 #include <libemailfunctions/email.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <tqlayout.h>
diff --git a/plugins/kmail/bodypartformatter/delegateselector.cpp b/plugins/kmail/bodypartformatter/delegateselector.cpp
index d175c6b4d..e4d3c6e1c 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.cpp
+++ b/plugins/kmail/bodypartformatter/delegateselector.cpp
@@ -21,7 +21,7 @@
 
 #include <libtdepim/addresseelineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index b85cca490..bfe78c615 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -57,19 +57,19 @@
 
 #include <email.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kdcopservicestarter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 74b564570..61a254c4b 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -33,14 +33,14 @@
 #include <tqurl.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 
@@ -55,8 +55,8 @@ using KMail::Interface::BodyPart;
 #include <tdeimproxy.h>
 #include <tdepopupmenu.h>
 
-#include <kabc/vcardconverter.h>
-#include <kabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
 using KABC::VCardConverter;
 using KABC::Addressee;
 
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 7e364450c..8d4937c7f 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -37,13 +37,13 @@
 #include <kmail/callback.h>
 #include <kmail/kmmessage.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
-- 
cgit v1.2.1