Additional k => tde renaming and fixes

8 files changed, 18 insertions, 18 deletions

diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index 0206386a..324a03d4 100644
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@@ -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) -ltdetexteditor
-komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 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) -ltdetexteditor
-  komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+  komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)
 endif
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp
index 912d9ff3..343c11e3 100644
--- a/kexi/plugins/macros/tests/actiontests.cpp
+++ b/kexi/plugins/macros/tests/actiontests.cpp
@@ -50,8 +50,8 @@ namespace KoMacroTest {
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
 	
-	KUNITTEST_SUITE("KoMacroTestSuite");
-	KUNITTEST_REGISTER_TESTER(ActionTests);
+	TDEUNITTEST_SUITE("KoMacroTestSuite");
+	TDEUNITTEST_REGISTER_TESTER(ActionTests);
 	
 
 	class ActionTests::Private
diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index 9d43ac41..0a18e580 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -51,8 +51,8 @@ namespace KoMacroTest {
 	/**
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
-	KUNITTEST_SUITE("CommonTestsSuite")
-	KUNITTEST_REGISTER_TESTER(CommonTests);
+	TDEUNITTEST_SUITE("CommonTestsSuite")
+	TDEUNITTEST_REGISTER_TESTER(CommonTests);
 
 	/**
 	* @internal d-pointer class to be more flexible on future extension of the
diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp
index 044808d7..08b215f7 100644
--- a/kexi/plugins/macros/tests/macroitemtests.cpp
+++ b/kexi/plugins/macros/tests/macroitemtests.cpp
@@ -48,8 +48,8 @@ namespace KoMacroTest {
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
 	
-	KUNITTEST_SUITE("KoMacroTestSuite");
-	KUNITTEST_REGISTER_TESTER(MacroitemTests);
+	TDEUNITTEST_SUITE("KoMacroTestSuite");
+	TDEUNITTEST_REGISTER_TESTER(MacroitemTests);
 	
 
 	class MacroitemTests::Private
diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp
index 7a5f30d0..853bbad2 100644
--- a/kexi/plugins/macros/tests/macrotests.cpp
+++ b/kexi/plugins/macros/tests/macrotests.cpp
@@ -49,8 +49,8 @@ namespace KoMacroTest {
 	/**
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
-	KUNITTEST_SUITE("KoMacroTestSuite")
-	KUNITTEST_REGISTER_TESTER(MacroTests);
+	TDEUNITTEST_SUITE("KoMacroTestSuite")
+	TDEUNITTEST_REGISTER_TESTER(MacroTests);
 
 	class MacroTests::Private
 	{
diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp
index 4efe3953..97420ce4 100644
--- a/kexi/plugins/macros/tests/variabletests.cpp
+++ b/kexi/plugins/macros/tests/variabletests.cpp
@@ -50,8 +50,8 @@ namespace KoMacroTest {
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
 	
-	KUNITTEST_SUITE("KoMacroTestSuite");
-	KUNITTEST_REGISTER_TESTER(VariableTests);
+	TDEUNITTEST_SUITE("KoMacroTestSuite");
+	TDEUNITTEST_REGISTER_TESTER(VariableTests);
 	
 
 	class VariableTests::Private
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp
index 971c85db..5848217d 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp
@@ -43,8 +43,8 @@ namespace KoMacroTest {
 	/**
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
-	KUNITTEST_SUITE("KoMacroTestSuite")
-	KUNITTEST_REGISTER_TESTER(XMLHandlerTests);
+	TDEUNITTEST_SUITE("KoMacroTestSuite")
+	TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests);
 
 	class XMLHandlerTests::Private
 	{
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
index 8e990d11..3cb378bc 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
@@ -43,8 +43,8 @@ namespace KoMacroTest {
 	/**
 	* Register KoMacroTest::CommonTests as TestSuite.
 	*/
-	KUNITTEST_SUITE("KoMacroTestSuite")
-	KUNITTEST_REGISTER_TESTER(XMLHandlerTests2);
+	TDEUNITTEST_SUITE("KoMacroTestSuite")
+	TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests2);
 
 	class XMLHandlerTests2::Private
 	{