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/caldav/config.cpp        | 2 +-
 tderesources/caldav/configwidgets.cpp | 2 +-
 tderesources/caldav/job.cpp           | 2 +-
 tderesources/caldav/plugin.cpp        | 4 ++--
 tderesources/caldav/resource.cpp      | 2 +-
 tderesources/caldav/resource.h        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tderesources/caldav')

diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp
index 5aeb2ddf6..b83660f8b 100644
--- a/tderesources/caldav/config.cpp
+++ b/tderesources/caldav/config.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <kurlrequester.h>
diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp
index ab8c79050..db6207417 100644
--- a/tderesources/caldav/configwidgets.cpp
+++ b/tderesources/caldav/configwidgets.cpp
@@ -37,7 +37,7 @@
 
 #include <libkcal/resourcecached.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/tderesources/caldav/job.cpp b/tderesources/caldav/job.cpp
index 93f91cd52..354898aed 100644
--- a/tderesources/caldav/job.cpp
+++ b/tderesources/caldav/job.cpp
@@ -16,7 +16,7 @@
 
 #include "job.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmutex.h>
 
diff --git a/tderesources/caldav/plugin.cpp b/tderesources/caldav/plugin.cpp
index c7ea06e81..479f774b5 100644
--- a/tderesources/caldav/plugin.cpp
+++ b/tderesources/caldav/plugin.cpp
@@ -18,8 +18,8 @@
 #include "config.h"
 #include "export.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 /*=========================================================================
 | NAMESPACE
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index b9285e611..e84d864d3 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -25,7 +25,7 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <tqdatetime.h>
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index ee5805327..d65c7f904 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -24,7 +24,7 @@
 #include <libkcal/resourcecached.h>
 #include <libtdepim/progressmanager.h>
 
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
 
 #include <tdepimmacros.h>
 #include <tdeconfig.h>
-- 
cgit v1.2.1