From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeunittest/modrunner.cpp | 4 ++--
 tdeunittest/runner.cpp    | 2 +-
 tdeunittest/tester.h      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdeunittest')

diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index 4caa2d609..350778f6c 100644
--- a/tdeunittest/modrunner.cpp
+++ b/tdeunittest/modrunner.cpp
@@ -24,11 +24,11 @@
  */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "runner.h"
 
diff --git a/tdeunittest/runner.cpp b/tdeunittest/runner.cpp
index 6a961fecd..c63b6ed6c 100644
--- a/tdeunittest/runner.cpp
+++ b/tdeunittest/runner.cpp
@@ -35,7 +35,7 @@ using namespace std;
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "runner.h"
diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h
index 332381ec8..b0ce3e685 100644
--- a/tdeunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -138,7 +138,7 @@ SampleTest - 1 test passed, 1 test failed
  * #include <tdeapplication.h>
  * #include <tdecmdlineargs.h>
  * #include <tdecmdlineargs.h>
- * #include <klocale.h>
+ * #include <tdelocale.h>
  * #include <tdeunittest/runnergui.h>
  *
  * static const char description[] = I18N_NOOP("SampleTests");
-- 
cgit v1.2.3