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

---
 tderesources/newexchange/exchangeaddressbookadaptor.h | 2 +-
 tderesources/newexchange/exchangecalendaradaptor.cpp  | 2 +-
 tderesources/newexchange/exchangeconvertercontact.h   | 2 +-
 tderesources/newexchange/kabc_resourceexchange.cpp    | 2 +-
 tderesources/newexchange/kcal_resourceexchange.cpp    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tderesources/newexchange')

diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h
index cbf5ac6f6..fd89fa84d 100644
--- a/tderesources/newexchange/exchangeaddressbookadaptor.h
+++ b/tderesources/newexchange/exchangeaddressbookadaptor.h
@@ -29,7 +29,7 @@
 
 #include <folderlister.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <kurl.h>
 #include <tqdom.h>
 
diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp
index a6777fb27..5b51de5ed 100644
--- a/tderesources/newexchange/exchangecalendaradaptor.cpp
+++ b/tderesources/newexchange/exchangecalendaradaptor.cpp
@@ -25,7 +25,7 @@
 #include <davgroupwareglobals.h>
 #include <webdavhandler.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/davjob.h>
 #include <libkcal/resourcecached.h>
 #include "davcalendaradaptor.h"
diff --git a/tderesources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h
index 191abccb7..847b07676 100644
--- a/tderesources/newexchange/exchangeconvertercontact.h
+++ b/tderesources/newexchange/exchangeconvertercontact.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqdom.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 namespace KABC {
 
diff --git a/tderesources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/kabc_resourceexchange.cpp
index dc789ea20..bd60cd2fc 100644
--- a/tderesources/newexchange/kabc_resourceexchange.cpp
+++ b/tderesources/newexchange/kabc_resourceexchange.cpp
@@ -26,7 +26,7 @@
 #include "groupwareuploadjob.h"
 #include "tderesources_groupwareprefs.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KABC;
 
diff --git a/tderesources/newexchange/kcal_resourceexchange.cpp b/tderesources/newexchange/kcal_resourceexchange.cpp
index ce06fd763..ad2e22208 100644
--- a/tderesources/newexchange/kcal_resourceexchange.cpp
+++ b/tderesources/newexchange/kcal_resourceexchange.cpp
@@ -25,7 +25,7 @@
 #include <groupwaredownloadjob.h>
 #include <groupwareuploadjob.h>
 #include <tderesources_groupwareprefs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KCal;
 
-- 
cgit v1.2.1