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

5 files changed, 13 insertions, 13 deletions

diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am
index 635fd672..a8e240bf 100644
--- a/chalk/chalkcolor/Makefile.am
+++ b/chalk/chalkcolor/Makefile.am
@@ -32,7 +32,7 @@ include_HEADERS =  \
     kis_colorspace_factory_registry.h kis_abstract_colorspace.h
 
 
-if include_kunittest_tests
+if include_tdeunittest_tests
 TESTSDIR = tests
 endif
 
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
index 32416c0c..a193bb31 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
@@ -18,10 +18,10 @@
  */
 
 #include "kdebug.h"
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include "kis_debug_areas.h"
diff --git a/chalk/chalkcolor/tests/Makefile.am b/chalk/chalkcolor/tests/Makefile.am
index e78141e7..d96949fe 100644
--- a/chalk/chalkcolor/tests/Makefile.am
+++ b/chalk/chalkcolor/tests/Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = \
 
 # The check_ target makes sure we don't install the modules,
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_kis_color_conversions_tester.la
+check_LTLIBRARIES = tdeunittest_kis_color_conversions_tester.la
 
-kunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp
-kunittest_kis_color_conversions_tester_la_LIBADD = -lkunittest ../libchalkcolor.la ../../libchalkcommon.la
-kunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp
+tdeunittest_kis_color_conversions_tester_la_LIBADD = -ltdeunittest ../libchalkcolor.la ../../libchalkcommon.la
+tdeunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-check-local: kunittest_kis_color_conversions_tester.la
-	kunittestmodrunner
+check-local: tdeunittest_kis_color_conversions_tester.la
+	tdeunittestmodrunner
 
diff --git a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp
index d244b5dd..4c446212 100644
--- a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp
+++ b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp
@@ -16,15 +16,15 @@
  *  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 "kis_color_conversions_tester.h"
 #include "kis_color_conversions.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_kis_color_conversions_tester, "Color Conversions Tester");
+KUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester);
 
 void KisColorConversionsTester::allTests()
diff --git a/chalk/chalkcolor/tests/kis_color_conversions_tester.h b/chalk/chalkcolor/tests/kis_color_conversions_tester.h
index 1223abbb..a7a4f678 100644
--- a/chalk/chalkcolor/tests/kis_color_conversions_tester.h
+++ b/chalk/chalkcolor/tests/kis_color_conversions_tester.h
@@ -19,7 +19,7 @@
 #ifndef KIS_COLOR_CONVERSIONS_TESTER_H
 #define KIS_COLOR_CONVERSIONS_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 #define CHECK_TOLERANCE( x, y, tolerance ) \
 if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \