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/exchange/resourceexchange.cpp       | 6 +++---
 tderesources/exchange/resourceexchangeconfig.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tderesources/exchange')

diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index 6335dc64b..a85c741d2 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -29,8 +29,8 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendar.h>
@@ -38,7 +38,7 @@
 
 #include <tderesources/configwidget.h>
 
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
 
 #include "dateset.h"
 #include "exchangeaccount.h"
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 36774901b..3b3bf14f2 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -22,10 +22,10 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "exchangeaccount.h"
 #include "resourceexchangeconfig.h"
-- 
cgit v1.2.1