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

14 files changed, 40 insertions, 40 deletions

diff --git a/chalk/core/Makefile.am b/chalk/core/Makefile.am
index 8dff83b2..ca7829f8 100644
--- a/chalk/core/Makefile.am
+++ b/chalk/core/Makefile.am
@@ -47,7 +47,7 @@ include_HEADERS = kis_adjustment_layer.h kis_alpha_mask.h \
 libchalkimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
 libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) 
 
-if include_kunittest_tests
+if include_tdeunittest_tests
 TESTSDIR = tests
 endif
 
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index 53f17ea8..8cf324e1 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -22,10 +22,10 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include "kis_debug_areas.h"
 #include <math.h>
 #include "kis_types.h"
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 0ae94f71..7b578750 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -23,10 +23,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "kis_generic_registry.h"
 #include "kis_types.h"
diff --git a/chalk/core/tests/Makefile.am b/chalk/core/tests/Makefile.am
index 239c1ba6..97316685 100644
--- a/chalk/core/tests/Makefile.am
+++ b/chalk/core/tests/Makefile.am
@@ -10,21 +10,21 @@ 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_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la
+check_LTLIBRARIES = tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la
 
-kunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp
-kunittest_kis_integer_maths_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
-kunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp
+tdeunittest_kis_integer_maths_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
+tdeunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp
-kunittest_kis_image_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
-kunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp
+tdeunittest_kis_image_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
+tdeunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 
-kunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc
-kunittest_kis_filter_configuration_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
-kunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc
+tdeunittest_kis_filter_configuration_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
+tdeunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 
-check-local: kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la
-	kunittestmodrunner
+check-local: tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la
+	tdeunittestmodrunner
diff --git a/chalk/core/tests/kis_filter_configuration_tester.cc b/chalk/core/tests/kis_filter_configuration_tester.cc
index 6a4a2631..83d6b522 100644
--- a/chalk/core/tests/kis_filter_configuration_tester.cc
+++ b/chalk/core/tests/kis_filter_configuration_tester.cc
@@ -19,15 +19,15 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "kis_filter_configuration_tester.h"
 #include "../kis_filter_configuration.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
+KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester);
 
 void KisFilterConfigurationTester::allTests()
diff --git a/chalk/core/tests/kis_filter_configuration_tester.h b/chalk/core/tests/kis_filter_configuration_tester.h
index 6e1ca2e5..0dffee33 100644
--- a/chalk/core/tests/kis_filter_configuration_tester.h
+++ b/chalk/core/tests/kis_filter_configuration_tester.h
@@ -19,7 +19,7 @@
 #ifndef KIS_FILTER_CONFIGURATION_TESTER_H
 #define KIS_FILTER_CONFIGURATION_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KisFilterConfigurationTester : public KUnitTest::Tester
 {
diff --git a/chalk/core/tests/kis_image_tester.cpp b/chalk/core/tests/kis_image_tester.cpp
index f660f394..be125c94 100644
--- a/chalk/core/tests/kis_image_tester.cpp
+++ b/chalk/core/tests/kis_image_tester.cpp
@@ -18,8 +18,8 @@
 
 #include <tqapplication.h>
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "kis_image_tester.h"
 #include "kis_image.h"
@@ -32,7 +32,7 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_kis_image_tester, "KisImage Tester");
+KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester);
 
 void KisImageTester::allTests()
diff --git a/chalk/core/tests/kis_image_tester.h b/chalk/core/tests/kis_image_tester.h
index 4e676838..06ee65b7 100644
--- a/chalk/core/tests/kis_image_tester.h
+++ b/chalk/core/tests/kis_image_tester.h
@@ -19,7 +19,7 @@
 #ifndef KIS_IMAGE_TESTER_H
 #define KIS_IMAGE_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KisImageTester : public KUnitTest::Tester
 {
diff --git a/chalk/core/tests/kis_integer_maths_tester.cpp b/chalk/core/tests/kis_integer_maths_tester.cpp
index 1878731b..eb9d76ae 100644
--- a/chalk/core/tests/kis_integer_maths_tester.cpp
+++ b/chalk/core/tests/kis_integer_maths_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_integer_maths_tester.h"
 #include "kis_integer_maths.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_kis_integer_maths_tester, "Integer Maths Tester");
+KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester);
 
 void KisIntegerMathsTester::allTests()
diff --git a/chalk/core/tests/kis_integer_maths_tester.h b/chalk/core/tests/kis_integer_maths_tester.h
index 2a9a9a20..9e91f030 100644
--- a/chalk/core/tests/kis_integer_maths_tester.h
+++ b/chalk/core/tests/kis_integer_maths_tester.h
@@ -19,7 +19,7 @@
 #ifndef KIS_INTEGER_MATHS_TESTER_H
 #define KIS_INTEGER_MATHS_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KisIntegerMathsTester : public KUnitTest::Tester
 {
diff --git a/chalk/core/tiles/Makefile.am b/chalk/core/tiles/Makefile.am
index 1e334ab4..7fad1ab9 100644
--- a/chalk/core/tiles/Makefile.am
+++ b/chalk/core/tiles/Makefile.am
@@ -1,4 +1,4 @@
-if include_kunittest_tests
+if include_tdeunittest_tests
 TESTSDIR = tests
 endif
 
diff --git a/chalk/core/tiles/tests/Makefile.am b/chalk/core/tiles/tests/Makefile.am
index c546d7f5..c6821483 100644
--- a/chalk/core/tiles/tests/Makefile.am
+++ b/chalk/core/tiles/tests/Makefile.am
@@ -5,11 +5,11 @@ AM_CPPFLAGS = -I$(srcdir)/../ \
 
 # The check_ target makes sure we don't install the modules,
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_kis_tiled_data_tester.la
-kunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp
-kunittest_kis_tiled_data_tester_la_LIBADD = -lkunittest ../../../libchalkcommon.la
-kunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+check_LTLIBRARIES = tdeunittest_kis_tiled_data_tester.la
+tdeunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp
+tdeunittest_kis_tiled_data_tester_la_LIBADD = -ltdeunittest ../../../libchalkcommon.la
+tdeunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-check-local: kunittest_kis_tiled_data_tester.la
-	kunittestmodrunner
+check-local: tdeunittest_kis_tiled_data_tester.la
+	tdeunittestmodrunner
 
diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp
index 15d3e50b..be09579c 100644
--- a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp
+++ b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp
@@ -16,8 +16,8 @@
  *  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_tiled_data_tester.h"
 #include "kis_datamanager.h"
@@ -25,7 +25,7 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kis_tiled_data_tester, "Tiled Data Tester" );
+KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" );
 KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester );
 
 #define TEST_PIXEL_SIZE 4
diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.h b/chalk/core/tiles/tests/kis_tiled_data_tester.h
index 8a569d23..64c04bd7 100644
--- a/chalk/core/tiles/tests/kis_tiled_data_tester.h
+++ b/chalk/core/tiles/tests/kis_tiled_data_tester.h
@@ -20,7 +20,7 @@
 #ifndef KIS_TILED_DATA_TESTER_H
 #define KIS_TILED_DATA_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KisTiledDataTester : public KUnitTest::Tester
 {