Rename a number of libraries and executables to avoid conflicts with KDE4

18 files changed, 25 insertions, 25 deletions

diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index adb6a4d3..0206386a 100644
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@@ -1,4 +1,4 @@
-if include_kunittestgui
+if include_tdeunittestgui
   GUIBINPROGRAM = komacrotestgui
 else
   GUIBINPROGRAM =
@@ -7,13 +7,13 @@ endif
 bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)
 
 komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
 
-if include_kunittestgui
+if include_tdeunittestgui
   komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-  komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+  komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
 endif
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
@@ -21,8 +21,8 @@ INCLUDES = -I$(srcdir)/tests -I$(srcdir)../ $(all_includes)
 METASOURCES = AUTO
 
 guicheck: komacrotestgui
-	kunittest ./komacrotestgui 
+	tdeunittest ./komacrotestgui 
 
 check: komacrotest
 	echo $(srcdir)
-	kunittest ./komacrotest
+	tdeunittest ./komacrotest
diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp
index 65bebe66..26e38b32 100644
--- a/kexi/plugins/macros/tests/actiontests.cpp
+++ b/kexi/plugins/macros/tests/actiontests.cpp
@@ -38,7 +38,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/actiontests.h b/kexi/plugins/macros/tests/actiontests.h
index fe3fb21d..91576ea3 100644
--- a/kexi/plugins/macros/tests/actiontests.h
+++ b/kexi/plugins/macros/tests/actiontests.h
@@ -20,7 +20,7 @@
 #ifndef KOMACROTEST_ACTIONTESTS_H
 #define KOMACROTEST_ACTIONTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index bdc2e6ad..41234eca 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -40,7 +40,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/commontests.h b/kexi/plugins/macros/tests/commontests.h
index e72408b7..170974bc 100644
--- a/kexi/plugins/macros/tests/commontests.h
+++ b/kexi/plugins/macros/tests/commontests.h
@@ -20,7 +20,7 @@
 #ifndef KOMACROTEST_COMMONTESTS_H
 #define KOMACROTEST_COMMONTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 33e53eb8..15fc9db1 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -20,7 +20,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 
 static const char description[] =
 	I18N_NOOP("KoMacroTester");
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 95c019f8..d651aa01 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -21,7 +21,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-#include "kunittest/runnergui.h"
+#include "tdeunittest/runnergui.h"
 
 static const char description[] =
 	I18N_NOOP("KoMacroTestgui.");
diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp
index 47b93b0f..0ac780b0 100644
--- a/kexi/plugins/macros/tests/macroitemtests.cpp
+++ b/kexi/plugins/macros/tests/macroitemtests.cpp
@@ -36,7 +36,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/macroitemtests.h b/kexi/plugins/macros/tests/macroitemtests.h
index 902ef91e..6cd6cf8f 100644
--- a/kexi/plugins/macros/tests/macroitemtests.h
+++ b/kexi/plugins/macros/tests/macroitemtests.h
@@ -20,7 +20,7 @@
 #ifndef KOMACROTEST_ACTIONTESTS_H
 #define KOMACROTEST_ACTIONTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp
index 45f77efd..d5d2c2af 100644
--- a/kexi/plugins/macros/tests/macrotests.cpp
+++ b/kexi/plugins/macros/tests/macrotests.cpp
@@ -38,7 +38,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/macrotests.h b/kexi/plugins/macros/tests/macrotests.h
index 49d50ad5..e1a61ba5 100644
--- a/kexi/plugins/macros/tests/macrotests.h
+++ b/kexi/plugins/macros/tests/macrotests.h
@@ -20,7 +20,7 @@
 #ifndef KOMACROTEST_MACROTESTS_H
 #define KOMACROTEST_MACROTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/testobject.h b/kexi/plugins/macros/tests/testobject.h
index 99b59da2..81309d99 100644
--- a/kexi/plugins/macros/tests/testobject.h
+++ b/kexi/plugins/macros/tests/testobject.h
@@ -21,7 +21,7 @@
 #define KOMACROTEST_TESTOBJECT_H
 
 #include <tqobject.h>
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp
index 5035f929..c9724639 100644
--- a/kexi/plugins/macros/tests/variabletests.cpp
+++ b/kexi/plugins/macros/tests/variabletests.cpp
@@ -38,7 +38,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/variabletests.h b/kexi/plugins/macros/tests/variabletests.h
index e6474a5a..65c07f77 100644
--- a/kexi/plugins/macros/tests/variabletests.h
+++ b/kexi/plugins/macros/tests/variabletests.h
@@ -20,7 +20,7 @@
 #ifndef KOMACROTEST_VARIABLETESTS_H
 #define KOMACROTEST_VARIABLETESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 namespace KoMacroTest {
 
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp
index 90454d35..9627a00b 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp
@@ -32,7 +32,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.h b/kexi/plugins/macros/tests/xmlhandlertests.h
index 12d2d057..521f9ee5 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.h
+++ b/kexi/plugins/macros/tests/xmlhandlertests.h
@@ -19,7 +19,7 @@
 #ifndef KOMACROTEST_XMLHandlerTests_H
 #define KOMACROTEST_XMLHandlerTests_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 #include "../lib/macro.h"
 
 namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
index f32416c0..cc38c077 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
@@ -32,7 +32,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 #include <kxmlguiclient.h>
 
 using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.h b/kexi/plugins/macros/tests/xmlhandlertests2.h
index 49431b73..376d7b08 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.h
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.h
@@ -19,7 +19,7 @@
 #ifndef KOMACROTEST_XMLHandlerTests2_H
 #define KOMACROTEST_XMLHandlerTests2_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 #include "../lib/macro.h"
 
 namespace KoMacroTest {