summaryrefslogtreecommitdiffstats
path: root/tdeunittest
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdeunittest
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeunittest')
-rw-r--r--tdeunittest/modrunner.cpp4
-rw-r--r--tdeunittest/runner.cpp2
-rw-r--r--tdeunittest/tester.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index 4caa2d60..350778f6 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 6a961fec..c63b6ed6 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 332381ec..b0ce3e68 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");