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

---
 libkcal/tests/readandwrite.cpp        | 2 +-
 libkcal/tests/testcalendar.cpp        | 2 +-
 libkcal/tests/testcalselectdialog.cpp | 2 +-
 libkcal/tests/testfields.cpp          | 2 +-
 libkcal/tests/testincidence.cpp       | 2 +-
 libkcal/tests/testresource.cpp        | 2 +-
 libkcal/tests/testvcalexport.cpp      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libkcal/tests')

diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 53e082a3..5f6c3488 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqfile.h>
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 85f77d78..b5c15ac4 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp
index 2c3ae7f7..84fe89c8 100644
--- a/libkcal/tests/testcalselectdialog.cpp
+++ b/libkcal/tests/testcalselectdialog.cpp
@@ -22,7 +22,7 @@ using namespace KCal;
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 int main( int argc, char **argv )
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index 2d393aa6..05522dfe 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index 858ed9cc..e510cf73 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "icalformat.h"
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 64ada3b0..a5f20786 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index d6997ef4..7cf619d0 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqfile.h>
-- 
cgit v1.2.3