diff options
Diffstat (limited to 'chalk/colorspaces')
41 files changed, 81 insertions, 81 deletions
diff --git a/chalk/colorspaces/cmyk_u16/Makefile.am b/chalk/colorspaces/cmyk_u16/Makefile.am index e84347a0..f6dd8c87 100644 --- a/chalk/colorspaces/cmyk_u16/Makefile.am +++ b/chalk/colorspaces/cmyk_u16/Makefile.am @@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h -chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_cmyk_u16_plugin_la_LIBADD = libchalk_cmyk_u16.la ../../chalkcolor/libchalkcolor.la chalk_cmyk_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h index c64daf46..e34951a5 100644 --- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h +++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef CMYK_U16_PLUGIN_H_ #define CMYK_U16_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the CMYK U16 colour space strategy. diff --git a/chalk/colorspaces/cmyk_u8/Makefile.am b/chalk/colorspaces/cmyk_u8/Makefile.am index dad6d3fe..b93d840b 100644 --- a/chalk/colorspaces/cmyk_u8/Makefile.am +++ b/chalk/colorspaces/cmyk_u8/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = chalkcmykplugin.la chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h -chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkcmykplugin_la_LIBADD = ../../chalkcolor/libchalkcolor.la chalkcmykplugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h index 7fa5e0ec..c633a026 100644 --- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h +++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h @@ -19,7 +19,7 @@ #ifndef CMYK_PLUGIN_H_ #define CMYK_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the CMYK colour space strategy. diff --git a/chalk/colorspaces/gray_u16/Makefile.am b/chalk/colorspaces/gray_u16/Makefile.am index eca6db2d..3ccbd088 100644 --- a/chalk/colorspaces/gray_u16/Makefile.am +++ b/chalk/colorspaces/gray_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h -chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_gray_u16_plugin_la_LIBADD = libchalk_gray_u16.la ../../chalkcolor/libchalkcolor.la chalk_gray_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.h b/chalk/colorspaces/gray_u16/gray_u16_plugin.h index d1b2c938..7fc9891d 100644 --- a/chalk/colorspaces/gray_u16/gray_u16_plugin.h +++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef GRAY_U16_PLUGIN_H_ #define GRAY_U16_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the GRAY U16 colour space strategy. diff --git a/chalk/colorspaces/gray_u8/Makefile.am b/chalk/colorspaces/gray_u8/Makefile.am index 1488b549..38b29fd8 100644 --- a/chalk/colorspaces/gray_u8/Makefile.am +++ b/chalk/colorspaces/gray_u8/Makefile.am @@ -18,12 +18,12 @@ kde_module_LTLIBRARIES = chalkgrayplugin.la chalkgrayplugin_la_SOURCES = gray_plugin.cc noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h -chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkgrayplugin_la_LIBADD = libchalkgrayscale.la ../../chalkcolor/libchalkcolor.la chalkgrayplugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/gray_u8/gray_plugin.h b/chalk/colorspaces/gray_u8/gray_plugin.h index d33778f0..7447ccd6 100644 --- a/chalk/colorspaces/gray_u8/gray_plugin.h +++ b/chalk/colorspaces/gray_u8/gray_plugin.h @@ -19,7 +19,7 @@ #ifndef GRAY_PLUGIN_H_ #define GRAY_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the GRAY colour space strategy. diff --git a/chalk/colorspaces/gray_u8/tests/Makefile.am b/chalk/colorspaces/gray_u8/tests/Makefile.am index 35e83689..c9c658d7 100644 --- a/chalk/colorspaces/gray_u8/tests/Makefile.am +++ b/chalk/colorspaces/gray_u8/tests/Makefile.am @@ -6,12 +6,12 @@ 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_strategy_colorspace_grayscale_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_grayscale_tester.la -kunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp -kunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -lkunittest ../libchalkgrayscale.la -kunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -ltdeunittest ../libchalkgrayscale.la +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_grayscale_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_grayscale_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp index 0374c072..485b0a39 100644 --- a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp +++ b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_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_factory.h" #include "kis_strategy_colorspace_grayscale_tester.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester ); void KisGrayColorSpaceTester::allTests() diff --git a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h index 9b5f8d5e..553242c9 100644 --- a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h +++ b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H #define KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KisGrayColorSpaceTester : public KUnitTest::Tester { diff --git a/chalk/colorspaces/lms_f32/Makefile.am b/chalk/colorspaces/lms_f32/Makefile.am index db835606..309f6d17 100644 --- a/chalk/colorspaces/lms_f32/Makefile.am +++ b/chalk/colorspaces/lms_f32/Makefile.am @@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h -chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_lms_f32_plugin_la_LIBADD = libchalk_lms_f32.la ../../chalkcolor/libchalkcolor.la chalk_lms_f32_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.h b/chalk/colorspaces/lms_f32/lms_f32_plugin.h index fe54f4ea..24e11ed5 100644 --- a/chalk/colorspaces/lms_f32/lms_f32_plugin.h +++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.h @@ -21,7 +21,7 @@ #ifndef LMS_F32_PLUGIN_H_ #define LMS_F32_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the LMS F32 colour space strategy. diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am index 2419bb8c..f93fbcbb 100644 --- a/chalk/colorspaces/rgb_f16half/Makefile.am +++ b/chalk/colorspaces/rgb_f16half/Makefile.am @@ -22,12 +22,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h -chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_f16half_plugin_la_LIBADD = libchalk_rgb_f16half.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f16half_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h index 1c7818f0..699ba810 100644 --- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h +++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h @@ -20,7 +20,7 @@ #ifndef RGB_F16HALF_PLUGIN_H_ #define RGB_F16HALF_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the RGB F16Half colour space strategy. diff --git a/chalk/colorspaces/rgb_f16half/tests/Makefile.am b/chalk/colorspaces/rgb_f16half/tests/Makefile.am index 284359ee..cdb3f06c 100644 --- a/chalk/colorspaces/rgb_f16half/tests/Makefile.am +++ b/chalk/colorspaces/rgb_f16half/tests/Makefile.am @@ -8,12 +8,12 @@ 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_rgb_f16half_colorspace_tester.la +check_LTLIBRARIES = tdeunittest_kis_rgb_f16half_colorspace_tester.la -kunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc -kunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f16half.la -kunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc +tdeunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f16half.la +tdeunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_rgb_f16half_colorspace_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_rgb_f16half_colorspace_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc index f5e39f84..4fc4d847 100644 --- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc +++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "kis_factory.h" #include "kis_rgb_f16half_colorspace.h" @@ -29,7 +29,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h index 6547e35b..fcae06d0 100644 --- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h +++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h @@ -21,7 +21,7 @@ #ifndef KIS_RGB_F16HALF_COLORSPACE_TESTER_H #define KIS_RGB_F16HALF_COLORSPACE_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_f32/Makefile.am b/chalk/colorspaces/rgb_f32/Makefile.am index cb20ad1f..ee184ef5 100644 --- a/chalk/colorspaces/rgb_f32/Makefile.am +++ b/chalk/colorspaces/rgb_f32/Makefile.am @@ -21,12 +21,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h -chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_f32_plugin_la_LIBADD = libchalk_rgb_f32.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f32_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h index 28e3e5a5..f43251fd 100644 --- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h +++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h @@ -20,7 +20,7 @@ #ifndef RGB_F32_PLUGIN_H_ #define RGB_F32_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the RGB F32 colour space strategy. diff --git a/chalk/colorspaces/rgb_f32/tests/Makefile.am b/chalk/colorspaces/rgb_f32/tests/Makefile.am index 5980c24e..9ad10271 100644 --- a/chalk/colorspaces/rgb_f32/tests/Makefile.am +++ b/chalk/colorspaces/rgb_f32/tests/Makefile.am @@ -6,12 +6,12 @@ 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_strategy_colorspace_rgb_f32_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f32.la -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f32.la +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_f32_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc index eb9f9637..48dd8ea4 100644 --- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc +++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "kis_factory.h" #include "kis_strategy_colorspace_rgb_f32_tester.h" @@ -28,7 +28,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h index 1153f147..30ac552c 100644 --- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h +++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h @@ -21,7 +21,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_u16/Makefile.am b/chalk/colorspaces/rgb_u16/Makefile.am index 7c4277f7..f19e89ac 100644 --- a/chalk/colorspaces/rgb_u16/Makefile.am +++ b/chalk/colorspaces/rgb_u16/Makefile.am @@ -19,12 +19,12 @@ kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h -chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_u16_plugin_la_LIBADD = libchalk_rgb_u16.la ../../chalkcolor/libchalkcolor.la chalk_rgb_u16_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h index fd9f3ee8..29095bc8 100644 --- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h +++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef RGB_U16_PLUGIN_H_ #define RGB_U16_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the RGB U16 colour space strategy. diff --git a/chalk/colorspaces/rgb_u16/tests/Makefile.am b/chalk/colorspaces/rgb_u16/tests/Makefile.am index dcf23893..76c4d175 100644 --- a/chalk/colorspaces/rgb_u16/tests/Makefile.am +++ b/chalk/colorspaces/rgb_u16/tests/Makefile.am @@ -6,12 +6,12 @@ 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_strategy_colorspace_rgb_u16_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -lkunittest ../libchalk_rgb_u16.la -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_u16.la +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_u16_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc index e260b4d5..1a3a7539 100644 --- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc +++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc @@ -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_factory.h" #include "kis_strategy_colorspace_rgb_u16_tester.h" @@ -27,7 +27,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h index 848cf1ac..4c60c82f 100644 --- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h +++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_u8/Makefile.am b/chalk/colorspaces/rgb_u8/Makefile.am index 6938f85c..16c23c01 100644 --- a/chalk/colorspaces/rgb_u8/Makefile.am +++ b/chalk/colorspaces/rgb_u8/Makefile.am @@ -19,13 +19,13 @@ kde_module_LTLIBRARIES = chalkrgbplugin.la chalkrgbplugin_la_SOURCES = rgb_plugin.cc noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h -chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkrgbplugin_la_LIBADD = libchalkrgb.la ../../chalkcolor/libchalkcolor.la chalkrgbplugin_la_METASOURCES = AUTO #METASOURCES = AUTO # XXX: which of the two? -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.h b/chalk/colorspaces/rgb_u8/rgb_plugin.h index 00b34ede..ddfe3b74 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.h +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.h @@ -19,7 +19,7 @@ #ifndef RGB_PLUGIN_H_ #define RGB_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the RGB colour space strategy. diff --git a/chalk/colorspaces/rgb_u8/tests/Makefile.am b/chalk/colorspaces/rgb_u8/tests/Makefile.am index 5e9497a5..a5c65479 100644 --- a/chalk/colorspaces/rgb_u8/tests/Makefile.am +++ b/chalk/colorspaces/rgb_u8/tests/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/../../../sdk \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_strategy_colorspace_rgb_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_tester.la -kunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp -kunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -lkunittest ../libchalkrgb.la -kunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp +tdeunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -ltdeunittest ../libchalkrgb.la +tdeunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp index 1d3526f4..ee0c4479 100644 --- a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp +++ b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_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_factory.h" #include "kis_strategy_colorspace_rgb_tester.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester ); void KisRgbColorSpaceTester::allTests() diff --git a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h index 16fc4e83..ad362d74 100644 --- a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h +++ b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KisRgbColorSpaceTester : public KUnitTest::Tester { diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am index 8ad9b0db..14639057 100644 --- a/chalk/colorspaces/wet/Makefile.am +++ b/chalk/colorspaces/wet/Makefile.am @@ -20,7 +20,7 @@ kde_module_LTLIBRARIES = chalkwetplugin.la chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h -chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../chalk/chalkcolor/libchalkcolor.la \ ../../../chalk/core/libchalkimage.la \ diff --git a/chalk/colorspaces/wet/wet_plugin.h b/chalk/colorspaces/wet/wet_plugin.h index 615981b9..dc1b3568 100644 --- a/chalk/colorspaces/wet/wet_plugin.h +++ b/chalk/colorspaces/wet/wet_plugin.h @@ -19,7 +19,7 @@ #ifndef WET_PLUGIN_H_ #define WET_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_types.h" diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h index 68b379eb..0bc64e71 100644 --- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h +++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h @@ -19,7 +19,7 @@ #ifndef WSBRUSH_PAINTOP_PLUGIN_H_ #define WSBRUSH_PAINTOP_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_types.h" diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h index 9dfab1ce..d9374365 100644 --- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h +++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h @@ -19,7 +19,7 @@ #ifndef WET_STICKY_PLUGIN_H_ #define WET_STICKY_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the Wet & Sticky colour space strategy. diff --git a/chalk/colorspaces/ycbcr_u16/Makefile.am b/chalk/colorspaces/ycbcr_u16/Makefile.am index 0174a9b3..eadf17b0 100644 --- a/chalk/colorspaces/ycbcr_u16/Makefile.am +++ b/chalk/colorspaces/ycbcr_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h -chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_ycbcr_u16_plugin_la_LIBADD = libchalk_ycbcr_u16.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h index 55c2b8ee..c1373ae9 100644 --- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h +++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef YCBCR_U16_PLUGIN_H_ #define YCBCR_U16_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the YCbCr U16 colour space strategy. diff --git a/chalk/colorspaces/ycbcr_u8/Makefile.am b/chalk/colorspaces/ycbcr_u8/Makefile.am index b8d4bcf2..8240f2cf 100644 --- a/chalk/colorspaces/ycbcr_u8/Makefile.am +++ b/chalk/colorspaces/ycbcr_u8/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h -chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_ycbcr_u8_plugin_la_LIBADD = libchalk_ycbcr_u8.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h index 461b5fdb..a94d8195 100644 --- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h +++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h @@ -19,7 +19,7 @@ #ifndef YCBCR_U8_PLUGIN_H_ #define YCBCR_U8_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper around the YCbCr U8 colour space strategy. |