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

---
 tderesources/newexchange/exchangeaddressbookadaptor.cpp | 2 +-
 tderesources/newexchange/exchangecalendaradaptor.cpp    | 2 +-
 tderesources/newexchange/exchangeglobals.cpp            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tderesources/newexchange')

diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
index 7e8ae8bb9..1abaacd4d 100644
--- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
@@ -25,7 +25,7 @@
 #include "exchangeglobals.h"
 #include <webdavhandler.h>
 #include <kdebug.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 
 using namespace KABC;
 
diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp
index 89c9b742e..a6777fb27 100644
--- a/tderesources/newexchange/exchangecalendaradaptor.cpp
+++ b/tderesources/newexchange/exchangecalendaradaptor.cpp
@@ -26,7 +26,7 @@
 #include <webdavhandler.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 #include <libkcal/resourcecached.h>
 #include "davcalendaradaptor.h"
 
diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp
index f2d90cd6d..dc74650c5 100644
--- a/tderesources/newexchange/exchangeglobals.cpp
+++ b/tderesources/newexchange/exchangeglobals.cpp
@@ -29,8 +29,8 @@
 
 #include <libkcal/resourcecached.h>
 #include <libemailfunctions/idmapper.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
 #include <kdebug.h>
 
 KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomElement &prop )
-- 
cgit v1.2.1