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

7 files changed, 26 insertions, 26 deletions

diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp
index 9486f05d..80848716 100644
--- a/kword/tests/FrameTester.cpp
+++ b/kword/tests/FrameTester.cpp
@@ -19,13 +19,13 @@
 #include <KWFrame.h>
 #include <KWFrameList.h>
 #include <KWDocument.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 #include <tqapplication.h>
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_FrameTester, "Frame Tester");
+KUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester);
 
 void KWFrameTester::allTests() {
diff --git a/kword/tests/FrameTester.h b/kword/tests/FrameTester.h
index 5f9432f9..2861200a 100644
--- a/kword/tests/FrameTester.h
+++ b/kword/tests/FrameTester.h
@@ -15,7 +15,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 #include <KWFrameSet.h>
 #include <KWTextFrameSet.h>
diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp
index e3444bd5..e438188d 100644
--- a/kword/tests/FrameViewTester.cpp
+++ b/kword/tests/FrameViewTester.cpp
@@ -15,8 +15,8 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 #include <kdebug.h>
 
 #include "FrameViewTester.h"
@@ -30,7 +30,7 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_FrameViewTester, "FrameView Tester");
+KUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester);
 
 void KWFrameViewTester::allTests() {
diff --git a/kword/tests/FrameViewTester.h b/kword/tests/FrameViewTester.h
index dceb3835..beff2396 100644
--- a/kword/tests/FrameViewTester.h
+++ b/kword/tests/FrameViewTester.h
@@ -15,7 +15,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KWFrameViewTester : public KUnitTest::Tester {
     public:
diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp
index 9b261d90..98a82233 100644
--- a/kword/tests/KWPageManagerTester.cpp
+++ b/kword/tests/KWPageManagerTester.cpp
@@ -15,8 +15,8 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 #include <kdebug.h>
 
 #include "KWPageManagerTester.h"
@@ -26,7 +26,7 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_KWPageManagerTester, "PageManager Tester");
+KUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester);
 
 void KWPageManagerTester::allTests() {
diff --git a/kword/tests/KWPageManagerTester.h b/kword/tests/KWPageManagerTester.h
index 2136bdc4..3b52bf5e 100644
--- a/kword/tests/KWPageManagerTester.h
+++ b/kword/tests/KWPageManagerTester.h
@@ -15,7 +15,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KWPageManagerTester : public KUnitTest::Tester {
     public:
diff --git a/kword/tests/Makefile.am b/kword/tests/Makefile.am
index 5b316ce7..3a362b3b 100644
--- a/kword/tests/Makefile.am
+++ b/kword/tests/Makefile.am
@@ -4,22 +4,22 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
 
 # The check_ target makes sure we don't install the modules,
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_KWPageManagerTester.la \
-		kunittest_FrameTester.la \
-		kunittest_FrameViewTester.la
+check_LTLIBRARIES = tdeunittest_KWPageManagerTester.la \
+		tdeunittest_FrameTester.la \
+		tdeunittest_FrameViewTester.la
 
-kunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp
-kunittest_KWPageManagerTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp
+tdeunittest_KWPageManagerTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_FrameTester_la_SOURCES = FrameTester.cpp
-kunittest_FrameTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_FrameTester_la_SOURCES = FrameTester.cpp
+tdeunittest_FrameTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp
-kunittest_FrameViewTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp
+tdeunittest_FrameViewTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-check-local: kunittest_KWPageManagerTester.la kunittest_FrameTester.la kunittest_FrameViewTester.la
-	kunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl
+check-local: tdeunittest_KWPageManagerTester.la tdeunittest_FrameTester.la tdeunittest_FrameViewTester.la
+	tdeunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl