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

8 files changed, 28 insertions, 28 deletions

diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am
index 2d492283b..c07ad6232 100644
--- a/kmail/tests/Makefile.am
+++ b/kmail/tests/Makefile.am
@@ -2,22 +2,22 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
 AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
 METASOURCES = AUTO
 
-check_LTLIBRARIES = kunittest_storagelayermodule.la \
-        kunittest_utilmodule.la \
-        kunittest_mimelibmodule.la
+check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
+        tdeunittest_utilmodule.la \
+        tdeunittest_mimelibmodule.la
 
-kunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
-kunittest_storagelayermodule_la_LIBADD = -lkunittest
-kunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
-kunittest_utilmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
-kunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
-kunittest_mimelibmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
+tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
+tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
+tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
+tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
+tdeunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
+tdeunittest_mimelibmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
 
-#LIBADD = -lkunittest
+#LIBADD = -ltdeunittest
 AM_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 check-local:
-	kunittestmodrunner
+	tdeunittestmodrunner
 
 guicheck:
-	kunittestguimodrunner
+	tdeunittestguimodrunner
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index cdb24f6d8..4565f10c1 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -4,10 +4,10 @@
  */
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
-#include "kmdict.h"
+#include "tdemdict.h"
 
 #include "messagedicttests.h"
 
diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h
index abff55dac..f60a3b2f0 100644
--- a/kmail/tests/messagedicttests.h
+++ b/kmail/tests/messagedicttests.h
@@ -7,7 +7,7 @@
 #ifndef MESSAGEDICTTESTS_H
 #define MESSAGEDICTTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KMDict;
 
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index 6f4cf1896..e11620937 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -21,12 +21,12 @@
 #include "mimelibtests.moc"
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_mimelibmodule, "Mimelib Tests" );
+KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
 KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 
 #include <mimelib/string.h>
@@ -56,7 +56,7 @@ static TQString makePrintable( const DwString& str )
 TQCString MimeLibTester::readFile(const TQString& fileName)
 {
   TQFile file( fileName );
-  // #!@#$& kunittest... VERIFY() does nothing in setUp. Using assert instead.
+  // #!@#$& tdeunittest... VERIFY() does nothing in setUp. Using assert instead.
   bool ok = file.open( IO_ReadOnly );
   if ( !ok ) {
     kdError() << fileName << " not found!" << endl;
diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h
index 0f503324e..8fd061242 100644
--- a/kmail/tests/mimelibtests.h
+++ b/kmail/tests/mimelibtests.h
@@ -20,7 +20,7 @@
 #ifndef MIMELIBTEST_H
 #define MIMELIBTEST_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 class DwString;
 
 class MimeLibTester : public KUnitTest::SlotTester
diff --git a/kmail/tests/storagelayermodule.cpp b/kmail/tests/storagelayermodule.cpp
index 91362471d..fcfb884e1 100644
--- a/kmail/tests/storagelayermodule.cpp
+++ b/kmail/tests/storagelayermodule.cpp
@@ -5,12 +5,12 @@
  * have to fix it" license.
  */
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "messagedicttests.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_storagelayermodule, "KMail Storage Layer Tests" );
+KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
 KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index d0b3135be..936cc3ab4 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -4,13 +4,13 @@
  */
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 #include "utiltests.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_utilmodule, "KMail::Util Tests" );
+KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
 KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
 
 #include "util.h"
diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h
index b2cb8c697..0bcbcdf16 100644
--- a/kmail/tests/utiltests.h
+++ b/kmail/tests/utiltests.h
@@ -7,7 +7,7 @@
 #ifndef UTILTESTS_H
 #define UTILTESTS_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class UtilTester : public KUnitTest::SlotTester
 {