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

---
 libtdepim/tests/testaddresseelineedit.cpp | 2 +-
 libtdepim/tests/testaddresseeselector.cpp | 2 +-
 libtdepim/tests/testdateedit.cpp          | 2 +-
 libtdepim/tests/testdistrlist.cpp         | 2 +-
 libtdepim/tests/testkincidencechooser.cpp | 2 +-
 libtdepim/tests/testwizard.cpp            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libtdepim/tests')

diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index 9fb3470d0..64d969fd5 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "../addresseelineedit.h"
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 438208698..8410188c2 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "../addresseeselector.h"
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 257624645..a87e950c3 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdateedit.h"
 
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index d57cc5929..0bbb536d7 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -23,7 +23,7 @@ using KPIM::DistributionList;
 
 #include <config.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index d2f8cadf3..ab113a046 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libkcal/event.h>
 using namespace KCal;
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index fd6c70eb8..f2a9a5fd3 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -26,7 +26,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqlayout.h>
-- 
cgit v1.2.1