summaryrefslogtreecommitdiffstats
path: root/libkcal/tests
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /libkcal/tests
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkcal/tests')
-rw-r--r--libkcal/tests/readandwrite.cpp2
-rw-r--r--libkcal/tests/testcalendar.cpp2
-rw-r--r--libkcal/tests/testcalselectdialog.cpp2
-rw-r--r--libkcal/tests/testfields.cpp2
-rw-r--r--libkcal/tests/testincidence.cpp2
-rw-r--r--libkcal/tests/testresource.cpp2
-rw-r--r--libkcal/tests/testvcalexport.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 53e082a3d..5f6c3488d 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 85f77d78e..b5c15ac45 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 2c3ae7f72..84fe89c8f 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 2d393aa65..05522dfec 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 858ed9ccd..e510cf739 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 64ada3b0a..a5f207862 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 d6997ef49..7cf619d00 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>