From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 plugins/kmail/bodypartformatter/text_calendar.cpp | 6 +++---
 plugins/kmail/bodypartformatter/text_vcard.cpp    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/kmail')

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 1cb2a8f59..551f61171 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -38,7 +38,7 @@
 #include <interfaces/bodyparturlhandler.h>
 #include <tdehtmlparthtmlwriter.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
@@ -58,7 +58,7 @@
 #include <email.h>
 
 #include <kglobal.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kstringhandler.h>
@@ -74,7 +74,7 @@
 #include <kmimetype.h>
 #include <kpopupmenu.h>
 #include <krun.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqurl.h>
 #include <tqdir.h>
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index ce6d38a36..853f6cd40 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -37,11 +37,11 @@
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <kglobalsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 #include <libtdepim/addresseeview.h>
-- 
cgit v1.2.1