diff options
Diffstat (limited to 'chalk')
190 files changed, 301 insertions, 301 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)) \ 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. diff --git a/chalk/configure.in.in b/chalk/configure.in.in index c7c81d2a..78702ad1 100644 --- a/chalk/configure.in.in +++ b/chalk/configure.in.in @@ -91,12 +91,12 @@ else AC_MSG_RESULT(no) fi -# Check for kunittest -AC_MSG_CHECKING([for kunittest]) +# Check for tdeunittest +AC_MSG_CHECKING([for tdeunittest]) -have_kunittest_header="no" -KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) -AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes") +have_tdeunittest_header="no" +KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , ) +AM_CONDITIONAL(include_tdeunittest_tests, test "$have_tdeunittest_header" = "yes") # --- OpenGL check --- 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 { diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index f702d920..a1b8e58d 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -39,7 +39,7 @@ Design Patterns * Tools are created by a Factory pattern (but it isn't dynamic yet): kis_tool_factory. Tools are intended to - become kparts. + become tdeparts. * There's the start of a Memento pattern for tools, but it doesn't seem to be used (kis_tool_memento). It was an diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index 8fe4081b..51523e7a 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -21005,9 +21005,9 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".cpp" fileName="kparts" > + <classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".cpp" fileName="tdeparts" > <textblocks> - <codeblockwithcomments tag="includes" text="#include "kparts.h"&#010;" > + <codeblockwithcomments tag="includes" text="#include "tdeparts.h"&#010;" > <header> <cppcodedocumentation tag="" writeOutText="false" /> </header> @@ -21030,7 +21030,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="kparts" id="865" parent_class="865" fileExt=".cpp" fileName="plugin" > + <classifiercodedocument writeOutCode="true" package="tdeparts" id="865" parent_class="865" fileExt=".cpp" fileName="plugin" > <textblocks> <codeblockwithcomments tag="includes" text="#include "plugin.h"&#010;" > <header> @@ -35127,7 +35127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="cppheader864" parent_class="864" fileExt=".h" fileName="kparts" > + <classifiercodedocument writeOutCode="true" package="" id="cppheader864" parent_class="864" fileExt=".h" fileName="tdeparts" > <textblocks> <codeblockwithcomments tag="hashDefBlock" text="#ifndef KPARTS_H&#010;#define KPARTS_H" > <header> @@ -35333,7 +35333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="kparts" id="cppheader865" parent_class="865" fileExt=".h" fileName="plugin" > + <classifiercodedocument writeOutCode="true" package="tdeparts" id="cppheader865" parent_class="865" fileExt=".h" fileName="plugin" > <textblocks> <codeblockwithcomments tag="hashDefBlock" text="#ifndef PLUGIN_H&#010;#define PLUGIN_H" > <header> diff --git a/chalk/plugins/README b/chalk/plugins/README index 33af951e..31f2974d 100644 --- a/chalk/plugins/README +++ b/chalk/plugins/README @@ -38,5 +38,5 @@ There are several kinds of plugins for Chalk: elements such as dialog boxes and wizards. Their parent is KisView and they provide an .rc file to merge their gui with the view gui. Extensions have the servicetype Chalk/Plugin. They are not loaded automatically by - the KParts mechanism; please do not create ordinary kparts that are to + the KParts mechanism; please do not create ordinary tdeparts that are to be loaded by the Chalk view since KParts are not versioned. diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am index d54d65be..9718d26c 100644 --- a/chalk/plugins/filters/blur/Makefile.am +++ b/chalk/plugins/filters/blur/Makefile.am @@ -14,7 +14,7 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur. kde_module_LTLIBRARIES = chalkblurfilter.la noinst_HEADERS = blur.h kis_blur_filter.h -chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/blur/blur.h b/chalk/plugins/filters/blur/blur.h index 239d05d0..e9d411cf 100644 --- a/chalk/plugins/filters/blur/blur.h +++ b/chalk/plugins/filters/blur/blur.h @@ -25,7 +25,7 @@ #define LCMS_HEADER <lcms.h> // TODO: remove it ! -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class BlurFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am index 156a60a3..a1d4754d 100644 --- a/chalk/plugins/filters/bumpmap/Makefile.am +++ b/chalk/plugins/filters/bumpmap/Makefile.am @@ -12,7 +12,7 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui kde_module_LTLIBRARIES = chalkbumpmap.la noinst_HEADERS = bumpmap.h -chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/bumpmap/bumpmap.h b/chalk/plugins/filters/bumpmap/bumpmap.h index 653b49fe..4896bb05 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.h +++ b/chalk/plugins/filters/bumpmap/bumpmap.h @@ -24,7 +24,7 @@ #include <tqwidget.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kis_types.h> #include <kis_filter.h> diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am index 25537737..b8d8a62e 100644 --- a/chalk/plugins/filters/cimg/Makefile.am +++ b/chalk/plugins/filters/cimg/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = \ kis_cimg_plugin.h\ kis_cimgconfig_widget.h -chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcimg_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.h b/chalk/plugins/filters/cimg/kis_cimg_plugin.h index d016abf1..1ce69e66 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.h +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_CIMG_PLUGIN_H_ #define _KIS_CIMG_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisCImgPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/colorify/Colorify.h b/chalk/plugins/filters/colorify/Colorify.h index 6a984134..2eb1994d 100644 --- a/chalk/plugins/filters/colorify/Colorify.h +++ b/chalk/plugins/filters/colorify/Colorify.h @@ -25,7 +25,7 @@ #define LCMS_HEADER <lcms.h> // TODO: remove it ! -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am index 65e7243e..efd37bef 100644 --- a/chalk/plugins/filters/colorify/Makefile.am +++ b/chalk/plugins/filters/colorify/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \ kde_module_LTLIBRARIES = chalkcolorify.la -chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorify_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am index 0da38c00..04811a8d 100644 --- a/chalk/plugins/filters/colors/Makefile.am +++ b/chalk/plugins/filters/colors/Makefile.am @@ -14,7 +14,7 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la noinst_HEADERS = colors.h -chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colors/colors.h b/chalk/plugins/filters/colors/colors.h index dd27cc91..73a7e4a2 100644 --- a/chalk/plugins/filters/colors/colors.h +++ b/chalk/plugins/filters/colors/colors.h @@ -25,7 +25,7 @@ #define LCMS_HEADER <lcms.h> // TODO: remove it ! -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class ChalkExtensionsColors : public KParts::Plugin { diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am index 6aeaaee5..91e63d5b 100644 --- a/chalk/plugins/filters/colorsfilters/Makefile.am +++ b/chalk/plugins/filters/colorsfilters/Makefile.am @@ -17,7 +17,7 @@ noinst_HEADERS = colorsfilters.h \ kis_perchannel_filter.h \ kis_brightness_contrast_filter.h -chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.h b/chalk/plugins/filters/colorsfilters/colorsfilters.h index 40dc8d74..fe433995 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.h +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.h @@ -20,7 +20,7 @@ #ifndef BRIGHTNESSCONTRAST_H #define BRIGHTNESSCONTRAST_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_perchannel_filter.h" class KisColorSpace; diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am index 32f5cbd1..6b507275 100644 --- a/chalk/plugins/filters/convolutionfilters/Makefile.am +++ b/chalk/plugins/filters/convolutionfilters/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = convolutionfilters.h \ kis_custom_convolution_filter_configuration_widget.h \ kis_convolution_filter.h -chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkconvolutionfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h index aa8dc749..6c92888a 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h @@ -21,7 +21,7 @@ #ifndef CONVOLUTIONFILTERS_H #define CONVOLUTIONFILTERS_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_convolution_filter.h" class KisGaussianBlurFilter : public KisConvolutionConstFilter { diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h index 064c55e3..649fd575 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_CUBISM_FILTER_PLUGIN_H_ #define _KIS_CUBISM_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisCubismFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am index 19b54e40..8057cfae 100644 --- a/chalk/plugins/filters/embossfilter/Makefile.am +++ b/chalk/plugins/filters/embossfilter/Makefile.am @@ -17,7 +17,7 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \ noinst_HEADERS = kis_emboss_filter_plugin.h \ kis_emboss_filter.h -chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkembossfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h index 81312b01..d052cd61 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h @@ -19,7 +19,7 @@ #ifndef _KIS_EMBOSS_FILTER_PLUGIN_H_ #define _KIS_EMBOSS_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisEmbossFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am index 5dcd3491..bb4e697f 100644 --- a/chalk/plugins/filters/example/Makefile.am +++ b/chalk/plugins/filters/example/Makefile.am @@ -15,7 +15,7 @@ chalkexample_la_SOURCES = example.cc kde_module_LTLIBRARIES = chalkexample.la noinst_HEADERS = example.h -chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkexample_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/example/example.h b/chalk/plugins/filters/example/example.h index 4df6705c..4a13b63d 100644 --- a/chalk/plugins/filters/example/example.h +++ b/chalk/plugins/filters/example/example.h @@ -21,7 +21,7 @@ #ifndef EXAMPLE_H #define EXAMPLE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class ChalkExample : public KParts::Plugin diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am index 24b9f381..964d8437 100644 --- a/chalk/plugins/filters/fastcolortransfer/Makefile.am +++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am @@ -16,7 +16,7 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc kde_module_LTLIBRARIES = chalkfastcolortransfer.la noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h -chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h index dbaee9f8..c677d199 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h @@ -25,7 +25,7 @@ #define LCMS_HEADER <lcms.h> // TODO: remove it ! -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kis_filter.h> class FastColorTransferPlugin : public KParts::Plugin diff --git a/chalk/plugins/filters/halftone/kis_halftone.h b/chalk/plugins/filters/halftone/kis_halftone.h index 96f22e8f..b717f8b4 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.h +++ b/chalk/plugins/filters/halftone/kis_halftone.h @@ -27,7 +27,7 @@ #define BEST_WAVELET_FREQUENCY_VALUE 2 -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class ChalkHalftone : public KParts::Plugin { diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am index 32b9bd70..e84e2a52 100644 --- a/chalk/plugins/filters/imageenhancement/Makefile.am +++ b/chalk/plugins/filters/imageenhancement/Makefile.am @@ -15,7 +15,7 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \ kde_module_LTLIBRARIES = chalkimageenhancement.la -chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.h b/chalk/plugins/filters/imageenhancement/imageenhancement.h index 7a00f352..5f3accf5 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.h +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.h @@ -22,7 +22,7 @@ #ifndef EXAMPLE_H #define EXAMPLE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class ChalkImageEnhancement : public KParts::Plugin { diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am index c794fee3..bda49eb1 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am +++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am @@ -16,7 +16,7 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \ kde_module_LTLIBRARIES = chalklenscorrectionfilter.la noinst_HEADERS = lenscorrectionfilter.h -chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalklenscorrectionfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h index a54f11a9..b944d8cf 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h @@ -21,7 +21,7 @@ #ifndef LENS_CORRECTIONFILTER_H #define LENS_CORRECTIONFILTER_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am index 314c4425..18f44d4e 100644 --- a/chalk/plugins/filters/levelfilter/Makefile.am +++ b/chalk/plugins/filters/levelfilter/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = levelfilter.h \ kis_level_filter.h \ kgradientslider.h -chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalklevelfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/levelfilter/levelfilter.h b/chalk/plugins/filters/levelfilter/levelfilter.h index 433a8d8a..3d9aeb96 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.h +++ b/chalk/plugins/filters/levelfilter/levelfilter.h @@ -20,7 +20,7 @@ #ifndef LEVEL_H #define LEVEL_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisColorSpace; class KisColorAdjustment; diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am index aea0c059..61456dd5 100644 --- a/chalk/plugins/filters/noisefilter/Makefile.am +++ b/chalk/plugins/filters/noisefilter/Makefile.am @@ -16,7 +16,7 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \ kde_module_LTLIBRARIES = chalknoisefilter.la noinst_HEADERS = noisefilter.h kis_wdg_noise.h -chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalknoisefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/noisefilter/noisefilter.h b/chalk/plugins/filters/noisefilter/noisefilter.h index c630e71f..b122f41c 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.h +++ b/chalk/plugins/filters/noisefilter/noisefilter.h @@ -21,7 +21,7 @@ #ifndef NOISEFILTER_H #define NOISEFILTER_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am index 60878f64..f3ee5987 100644 --- a/chalk/plugins/filters/oilpaintfilter/Makefile.am +++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am @@ -17,7 +17,7 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \ noinst_HEADERS = kis_oilpaint_filter_plugin.h \ kis_oilpaint_filter.h -chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkoilpaintfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h index 2900f59f..bddf947f 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_OILPAINT_FILTER_PLUGIN_H_ #define _KIS_OILPAINT_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisOilPaintFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am index e46e0ead..d1f7ea56 100644 --- a/chalk/plugins/filters/pixelizefilter/Makefile.am +++ b/chalk/plugins/filters/pixelizefilter/Makefile.am @@ -17,7 +17,7 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \ noinst_HEADERS = kis_pixelize_filter_plugin.h \ kis_pixelize_filter.h -chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkpixelizefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h index f662cf9d..7a0fb36b 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_PIXELIZE_FILTER_PLUGIN_H_ #define _KIS_PIXELIZE_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisPixelizeFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am index 584ef960..508f2462 100644 --- a/chalk/plugins/filters/raindropsfilter/Makefile.am +++ b/chalk/plugins/filters/raindropsfilter/Makefile.am @@ -17,7 +17,7 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \ noinst_HEADERS = kis_raindrops_filter_plugin.h \ kis_raindrops_filter.h -chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkraindropsfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h index edbf33bf..44cb6fcd 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h @@ -21,7 +21,7 @@ #ifndef _KIS_RAINDROPS_FILTER_PLUGIN_H_ #define _KIS_RAINDROPS_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisRainDropsFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am index b7a16572..6686fc55 100644 --- a/chalk/plugins/filters/randompickfilter/Makefile.am +++ b/chalk/plugins/filters/randompickfilter/Makefile.am @@ -16,7 +16,7 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \ kde_module_LTLIBRARIES = chalkrandompickfilter.la noinst_HEADERS = randompickfilter.h -chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrandompickfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.h b/chalk/plugins/filters/randompickfilter/randompickfilter.h index a4fa1da8..9c360e3f 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.h +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.h @@ -21,7 +21,7 @@ #ifndef RANDOMPICKFILTER_H #define RANDOMPICKFILTER_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am index ee9f141e..ad0df5f4 100644 --- a/chalk/plugins/filters/roundcorners/Makefile.am +++ b/chalk/plugins/filters/roundcorners/Makefile.am @@ -16,7 +16,7 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \ noinst_HEADERS = kis_round_corners_filter_plugin.h \ kis_round_corners_filter.h -chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkroundcornersfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h index cbf87108..879a067f 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_ROUND_CORNERS_FILTER_PLUGIN_H_ #define _KIS_ROUND_CORNERS_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisRoundCornersFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am index ae28ed1d..0284f5f8 100644 --- a/chalk/plugins/filters/smalltilesfilter/Makefile.am +++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am @@ -16,7 +16,7 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \ noinst_HEADERS = kis_small_tiles_filter_plugin.h \ kis_small_tiles_filter.h -chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksmalltilesfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h index 26c30012..bdf34acd 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SMALL_TILES_FILTER_PLUGIN_H_ #define _KIS_SMALL_TILES_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisSmallTilesFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am index da3fd164..e7e9c86f 100644 --- a/chalk/plugins/filters/sobelfilter/Makefile.am +++ b/chalk/plugins/filters/sobelfilter/Makefile.am @@ -16,7 +16,7 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \ noinst_HEADERS = kis_sobel_filter_plugin.h \ kis_sobel_filter.h -chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksobelfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h index a4cc323a..27b39d74 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SOBEL_FILTER_PLUGIN_H_ #define _KIS_SOBEL_FILTER_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisSobelFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/threadtest/threadtest.h b/chalk/plugins/filters/threadtest/threadtest.h index d7ebae7f..89b04154 100644 --- a/chalk/plugins/filters/threadtest/threadtest.h +++ b/chalk/plugins/filters/threadtest/threadtest.h @@ -21,7 +21,7 @@ #ifndef THREADTEST_H #define THREADTESt_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class ChalkThreadTest : public KParts::Plugin diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am index 1c1289ff..14f73347 100644 --- a/chalk/plugins/filters/unsharp/Makefile.am +++ b/chalk/plugins/filters/unsharp/Makefile.am @@ -13,7 +13,7 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_ kde_module_LTLIBRARIES = chalkunsharpfilter.la -chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/unsharp/unsharp.h b/chalk/plugins/filters/unsharp/unsharp.h index 5717cccc..04ef60ca 100644 --- a/chalk/plugins/filters/unsharp/unsharp.h +++ b/chalk/plugins/filters/unsharp/unsharp.h @@ -25,7 +25,7 @@ #define LCMS_HEADER <lcms.h> // TODO: remove it ! -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class UnsharpPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am index 65b047c4..4f7fc127 100644 --- a/chalk/plugins/filters/wavefilter/Makefile.am +++ b/chalk/plugins/filters/wavefilter/Makefile.am @@ -16,7 +16,7 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \ kde_module_LTLIBRARIES = chalkwavefilter.la noinst_HEADERS = wavefilter.h kis_wdg_wave.h -chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkwavefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/wavefilter/wavefilter.h b/chalk/plugins/filters/wavefilter/wavefilter.h index 8493c4f8..eebf3d92 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.h +++ b/chalk/plugins/filters/wavefilter/wavefilter.h @@ -21,7 +21,7 @@ #ifndef WAVEFILTER_H #define WAVEFILTER_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am index 186d501f..b7760318 100644 --- a/chalk/plugins/paintops/defaultpaintops/Makefile.am +++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = defaultpaintops_plugin.h kis_airbrushop.h kis_brushop.h \ kde_module_LTLIBRARIES = chalkdefaultpaintops.la -chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index 647b22e8..a4f58423 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_PAINTOPS_PLUGIN_H_ #define DEFAULT_PAINTOPS_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A plugin wrapper that adds the paintop factories to the paintop registry. diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am index 329e9bb7..95358bcf 100644 --- a/chalk/plugins/tools/defaulttools/Makefile.am +++ b/chalk/plugins/tools/defaulttools/Makefile.am @@ -44,7 +44,7 @@ noinst_HEADERS = \ kis_tool_pan.h -chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h index fc5b72c6..dbf60d93 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.h +++ b/chalk/plugins/tools/defaulttools/default_tools.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_TOOLS_H_ #define DEFAULT_TOOLS_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module wrapper around Chalk's default tools. diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am index 7f6c0899..f8ebee60 100644 --- a/chalk/plugins/tools/selectiontools/Makefile.am +++ b/chalk/plugins/tools/selectiontools/Makefile.am @@ -28,7 +28,7 @@ noinst_HEADERS = \ kis_tool_select_elliptical.h -chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h index 900174c8..825e06ab 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.h +++ b/chalk/plugins/tools/selectiontools/selection_tools.h @@ -19,7 +19,7 @@ #ifndef SELECTION_TOOLS_H_ #define SELECTION_TOOLS_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module wrapper around Chalk's selection tools. diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am index 9091a521..1cbe7013 100644 --- a/chalk/plugins/tools/tool_crop/Makefile.am +++ b/chalk/plugins/tools/tool_crop/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_crop.h \ kis_tool_crop.h -chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h index 41d9523f..0db28073 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.h +++ b/chalk/plugins/tools/tool_crop/tool_crop.h @@ -19,7 +19,7 @@ #ifndef TOOL_CROP_H_ #define TOOL_CROP_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am index 03d3395b..21628f84 100644 --- a/chalk/plugins/tools/tool_curves/Makefile.am +++ b/chalk/plugins/tools/tool_curves/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = \ kis_tool_bezier_select.h \ kis_tool_moutline.h -chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h index 779873cf..854a8165 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.h +++ b/chalk/plugins/tools/tool_curves/tool_curves.h @@ -21,7 +21,7 @@ #ifndef TOOL_BEZIER_H_ #define TOOL_BEZIER_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class ToolCurves : public KParts::Plugin { diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am index 35c23811..faaea42e 100644 --- a/chalk/plugins/tools/tool_filter/Makefile.am +++ b/chalk/plugins/tools/tool_filter/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = \ kis_tool_filter.h \ tool_filter.h -chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h index 3211d702..6255b907 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.h +++ b/chalk/plugins/tools/tool_filter/tool_filter.h @@ -19,7 +19,7 @@ #ifndef TOOL_FILTER_H_ #define TOOL_FILTER_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am index ffa08320..688b77a0 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivegrid.h \ kis_tool_perspectivegrid.h -chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h index 3e0abc4f..47fd0f40 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h @@ -19,7 +19,7 @@ #ifndef TOOL_PERSPECTIVE_GRID_H_ #define TOOL_PERSPECTIVE_GRID_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am index 24916188..e971e02b 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivetransform.h \ kis_tool_perspectivetransform.h -chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h index 2422eaa2..e43174e4 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h @@ -19,7 +19,7 @@ #ifndef TOOL_PERSPECTIVE_TRANSFORM_H_ #define TOOL_PERSPECTIVE_TRANSFORM_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index 2155322a..99b1bc96 100644 --- a/chalk/plugins/tools/tool_polygon/Makefile.am +++ b/chalk/plugins/tools/tool_polygon/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polygon.h \ kis_tool_polygon.h -chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h index 5286d008..3f9f22ae 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.h +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h @@ -19,7 +19,7 @@ #ifndef TOOL_POLYGON_H_ #define TOOL_POLYGON_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module that provides a polygon tool. diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am index 2beb6509..edd71f92 100644 --- a/chalk/plugins/tools/tool_polyline/Makefile.am +++ b/chalk/plugins/tools/tool_polyline/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polyline.h \ kis_tool_polyline.h -chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h index 2adfb05e..c8b95ed9 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.h +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h @@ -19,7 +19,7 @@ #ifndef TOOL_POLYLINE_H_ #define TOOL_POLYLINE_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am index 70d58855..9cb083f3 100644 --- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am +++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h kde_module_LTLIBRARIES = chalktoolselectsimilar.la -chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h index 5d163d08..124c126b 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h @@ -19,7 +19,7 @@ #ifndef SELECTSIMILAR_H #define SELECTSIMILAR_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class SelectSimilar : public KParts::Plugin { diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am index a6b9a47b..bada5a78 100644 --- a/chalk/plugins/tools/tool_star/Makefile.am +++ b/chalk/plugins/tools/tool_star/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_star.h \ kis_tool_star.h -chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolstar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h index 00f48957..648b5cc6 100644 --- a/chalk/plugins/tools/tool_star/tool_star.h +++ b/chalk/plugins/tools/tool_star/tool_star.h @@ -19,7 +19,7 @@ #ifndef TOOL_STAR_H_ #define TOOL_STAR_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am index b606e177..860ea753 100644 --- a/chalk/plugins/tools/tool_transform/Makefile.am +++ b/chalk/plugins/tools/tool_transform/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_transform.h \ kis_tool_transform.h -chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktooltransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h index 1ed2cdb3..0bcff2dd 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.h +++ b/chalk/plugins/tools/tool_transform/tool_transform.h @@ -19,7 +19,7 @@ #ifndef TOOL_TRANSFORM_H_ #define TOOL_TRANSFORM_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am index 57abd956..f7856a50 100644 --- a/chalk/plugins/viewplugins/colorrange/Makefile.am +++ b/chalk/plugins/viewplugins/colorrange/Makefile.am @@ -14,7 +14,7 @@ chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = colorrange.rc diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.h b/chalk/plugins/viewplugins/colorrange/colorrange.h index ebe54dc8..7ee2bc41 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/colorrange.h @@ -21,7 +21,7 @@ #ifndef COLORRANGE_H #define COLORRANGE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am index a6da5063..4186fb93 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am +++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h -chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index ea5d9e15..1cdc0fd5 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -21,7 +21,7 @@ #ifndef COLORSPACECONVERSION_H #define COLORSPACECONVERSION_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am index 137b57d7..6d8e4263 100644 --- a/chalk/plugins/viewplugins/dropshadow/Makefile.am +++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am @@ -20,7 +20,7 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \ noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \ kis_dropshadow.h dlg_dropshadow.h -chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index d835c749..0ee970a2 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_DROPSHADOW_PLUGIN_H_ #define _KIS_DROPSHADOW_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am index b2009674..64008034 100644 --- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am +++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h kde_services_DATA = chalkfiltersgallery.desktop -chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h index 8ad1e809..7f9b312e 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -22,7 +22,7 @@ #ifndef _KRITA_FILTERS_PREVIEW_H_ #define _KRITA_FILTERS_PREVIEW_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am index a5c5e3d7..1c872530 100644 --- a/chalk/plugins/viewplugins/histogram/Makefile.am +++ b/chalk/plugins/viewplugins/histogram/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget kde_services_DATA = chalkhistogram.desktop -chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h index 2e7b3bb1..abba15a2 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.h +++ b/chalk/plugins/viewplugins/histogram/histogram.h @@ -21,7 +21,7 @@ #ifndef HISTOGRAM_H #define HISTOGRAM_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; class KAction; diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am index d63edff0..66f8e477 100644 --- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am +++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am @@ -15,7 +15,7 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc kis_imagerasteredcache.cc kde_module_LTLIBRARIES = chalkhistogramdocker.la noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h -chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h index c37c9afd..6e2e325b 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -24,7 +24,7 @@ #include <tqobject.h> #include <tqpopupmenu.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kis_histogram_view.h> #include <kis_histogram.h> diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.h b/chalk/plugins/viewplugins/history_docker/historydocker.h index 217b882d..9b183256 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.h +++ b/chalk/plugins/viewplugins/history_docker/historydocker.h @@ -21,7 +21,7 @@ #ifndef _HISTORYDOCKER_H #define _HISTORYDOCKER_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class ChalkHistoryDocker : public KParts::Plugin { diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am index 73a096be..fc2fbd0d 100644 --- a/chalk/plugins/viewplugins/imagesize/Makefile.am +++ b/chalk/plugins/viewplugins/imagesize/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h kde_module_LTLIBRARIES = chalkimagesize.la -chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h index f69759a0..c91c7905 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/imagesize.h @@ -20,7 +20,7 @@ #ifndef IMAGESIZE_H #define IMAGESIZE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; class KisPainter; diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am index c19b2986..f5dc9bdb 100644 --- a/chalk/plugins/viewplugins/modify_selection/Makefile.am +++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am @@ -20,7 +20,7 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h kde_module_LTLIBRARIES = chalkmodifyselection.la -chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.h b/chalk/plugins/viewplugins/modify_selection/modify_selection.h index da438f4b..aa0eb749 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.h @@ -20,7 +20,7 @@ #ifndef MODIFY_SELECTION_H #define MODIFY_SELECTION_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am index 32da2ec3..d52913a7 100644 --- a/chalk/plugins/viewplugins/performancetest/Makefile.am +++ b/chalk/plugins/viewplugins/performancetest/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkperftest.la chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h -chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index 68931004..4401dd33 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -21,7 +21,7 @@ #ifndef PERFTEST_H_ #define PERFTEST_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kis_types.h> #include <kis_global.h> diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am index 61d729bf..f140a4b9 100644 --- a/chalk/plugins/viewplugins/rotateimage/Makefile.am +++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkrotateimage.la chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h -chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.h b/chalk/plugins/viewplugins/rotateimage/rotateimage.h index 7e371208..c566ad91 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.h @@ -20,7 +20,7 @@ #ifndef ROTATEIMAGE_H #define ROTATEIMAGE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am index 5394cf76..a0b443fb 100644 --- a/chalk/plugins/viewplugins/screenshot/Makefile.am +++ b/chalk/plugins/viewplugins/screenshot/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = chalkscreenshot.la chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h -chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -ltdeprint +chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -ltdeprint chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.h b/chalk/plugins/viewplugins/screenshot/screenshot.h index 51914fbd..8a00a8fb 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.h +++ b/chalk/plugins/viewplugins/screenshot/screenshot.h @@ -20,7 +20,7 @@ #ifndef SCREENSHOT_H #define SCREENSHOT_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KSnapshot; diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am index 5757c06d..abb558ca 100644 --- a/chalk/plugins/viewplugins/scripting/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/Makefile.am @@ -1,9 +1,9 @@ -SUBDIRS = chalkscripting chalkcore samples +SUBDIRS = chaltdescripting chalkcore samples chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = scripting.rc -kde_services_DATA = chalkscripting.desktop +kde_services_DATA = chaltdescripting.desktop INCLUDES = -I$(top_srcdir)/chalk/sdk \ @@ -15,17 +15,17 @@ INCLUDES = -I$(top_srcdir)/chalk/sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalkscripting_la_SOURCES = scripting.cc +chaltdescripting_la_SOURCES = scripting.cc -kde_module_LTLIBRARIES = chalkscripting.la +kde_module_LTLIBRARIES = chaltdescripting.la noinst_HEADERS = scripting.h -chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \ +chaltdescripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts +chaltdescripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chaltdescripting/libchaltdescripting.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) -chalkscripting_la_METASOURCES = AUTO +chaltdescripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am index e3eee892..cef0a96a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \ +INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chaltdescripting \ -I$(top_srcdir)/chalk $(KOFFICECORE_INCLUDES) $(KROSS_INCLUDES) \ -I$(top_srcdir)/chalk/ui -I$(top_srcdir)/chalk/core -I$(top_srcdir)/chalk/sdk \ -I$(top_srcdir)/chalk/chalkcolor $(all_includes) @@ -11,7 +11,7 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \ krs_wavelet.cpp -krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts krosschalkcore_la_LIBADD = \ $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \ $(LIB_QT) \ @@ -19,7 +19,7 @@ krosschalkcore_la_LIBADD = \ $(top_builddir)/lib/kross/api/libkrossapi.la \ $(top_builddir)/lib/kross/main/libkrossmain.la \ $(top_builddir)/chalk/libchalkcommon.la \ - $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \ + $(top_builddir)/chalk/plugins/viewplugins/scripting/chaltdescripting/libchaltdescripting.la \ ../../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../../chalk/core/libchalkimage.la \ ../../../../../chalk/ui/libchalkui.la diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 45c1705a..d137ab8c 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -247,11 +247,11 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) } // Wrap ChalkScriptProgress TQString packagePath; - Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress"); + Kross::Api::Object::Ptr chaltdescriptprogress = manager->getChild("ChalkScriptProgress"); if(chalkdocument) { - Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() ); - if(chalkscriptprogressqt) { - ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() ); + Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() ); + if(chaltdescriptprogressqt) { + ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); packagePath = scriptprogress->packagePath(); if(scriptprogress) { diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am deleted file mode 100644 index b805ef18..00000000 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = -I$(top_srcdir)/chalk/sdk \ - -I$(top_srcdir)/chalk/core \ - -I$(top_srcdir)/chalk/chalkcolor/ \ - -I$(top_srcdir)/chalk/ui \ - $(KROSS_INCLUDES) \ - $(KOFFICE_INCLUDES) \ - $(all_includes) - - -lib_LTLIBRARIES = libchalkscripting.la -libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp -noinst_HEADERS = kis_script_progress.h - -libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries) -libchalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -libchalkscripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop index eba3ea37..c4267097 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop @@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本 Comment[zh_TW]=允許執行命令稿 ServiceTypes=Chalk/ViewPlugin Type=Service -X-TDE-Library=chalkscripting +X-TDE-Library=chaltdescripting X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am new file mode 100644 index 00000000..a38d8df0 --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = -I$(top_srcdir)/chalk/sdk \ + -I$(top_srcdir)/chalk/core \ + -I$(top_srcdir)/chalk/chalkcolor/ \ + -I$(top_srcdir)/chalk/ui \ + $(KROSS_INCLUDES) \ + $(KOFFICE_INCLUDES) \ + $(all_includes) + + +lib_LTLIBRARIES = libchaltdescripting.la +libchaltdescripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp +noinst_HEADERS = kis_script_progress.h + +libchaltdescripting_la_LDFLAGS = -no-undefined $(all_libraries) +libchaltdescripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la + +KDE_CXXFLAGS = $(USE_EXCEPTIONS) + +libchaltdescripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp index 3967ffe7..3967ffe7 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h index b2495d8b..b2495d8b 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp index d7af4eb4..d7af4eb4 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h index 48af433c..48af433c 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 31e9897a..5cbbb85d 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -48,11 +48,11 @@ #include <kis_image.h> #include <kis_layer.h> -#include "chalkscripting/kis_script_progress.h" -#include "chalkscripting/kis_script_monitor.h" +#include "chaltdescripting/kis_script_progress.h" +#include "chaltdescripting/kis_script_monitor.h" typedef KGenericFactory<Scripting> ChalkScriptingFactory; -K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdescripting, ChalkScriptingFactory( "chalk" ) ) Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h index ad9f6059..a2353d7a 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.h +++ b/chalk/plugins/viewplugins/scripting/scripting.h @@ -21,7 +21,7 @@ #ifndef SCRIPTING_H #define SCRIPTING_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; class KisScript; diff --git a/chalk/plugins/viewplugins/scripting/scripting.rc b/chalk/plugins/viewplugins/scripting/scripting.rc index 1b4999df..b4978b4c 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.rc +++ b/chalk/plugins/viewplugins/scripting/scripting.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui library="chalkscripting" version="3"> +<kpartgui library="chaltdescripting" version="3"> <MenuBar> <Menu name="Scripts"><text>S&cripts</text> <Separator/> diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am index 80ef3928..fde60fbb 100644 --- a/chalk/plugins/viewplugins/selectopaque/Makefile.am +++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am @@ -14,7 +14,7 @@ chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = selectopaque.rc diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.h b/chalk/plugins/viewplugins/selectopaque/selectopaque.h index 11024014..ac85e8c8 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.h +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.h @@ -21,7 +21,7 @@ #ifndef SELECTOPAQUE_H #define SELECTOPAQUE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am index ce279a13..5237ce41 100644 --- a/chalk/plugins/viewplugins/separate_channels/Makefile.am +++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \ kde_services_DATA = chalkseparatechannels.desktop -chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index cd0e9a77..2190957d 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SEPARATE_CHANNELS_PLUGIN_H_ #define _KIS_SEPARATE_CHANNELS_PLUGIN_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am index 5d3bd01a..a552b0a2 100644 --- a/chalk/plugins/viewplugins/shearimage/Makefile.am +++ b/chalk/plugins/viewplugins/shearimage/Makefile.am @@ -18,7 +18,7 @@ kde_services_DATA = chalkshearimage.desktop chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h -chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.h b/chalk/plugins/viewplugins/shearimage/shearimage.h index 8bc5ae0a..9f9c1c31 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/shearimage.h @@ -20,7 +20,7 @@ #ifndef SHEARIMAGE_H #define SHEARIMAGE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am index 0d5e2758..a1262ab1 100644 --- a/chalk/plugins/viewplugins/substrate/Makefile.am +++ b/chalk/plugins/viewplugins/substrate/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalksubstrate.la chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h -chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/substrate/substrate.h b/chalk/plugins/viewplugins/substrate/substrate.h index 19e83f95..54e26d0c 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.h +++ b/chalk/plugins/viewplugins/substrate/substrate.h @@ -21,7 +21,7 @@ #ifndef SUBSTATE_H #define SUBSTATE_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am index 26b01aa8..5a3162f3 100644 --- a/chalk/plugins/viewplugins/variations/Makefile.am +++ b/chalk/plugins/viewplugins/variations/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkvariations.la chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui noinst_HEADERS = wdg_variations.h -chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/variations/variations.h b/chalk/plugins/viewplugins/variations/variations.h index e61ed196..cac1e1aa 100644 --- a/chalk/plugins/viewplugins/variations/variations.h +++ b/chalk/plugins/viewplugins/variations/variations.h @@ -21,7 +21,7 @@ #ifndef VARIATIONS_H #define VARIATIONS_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KisView; diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index 3c16049c..4dc0ed1b 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -21,7 +21,7 @@ #include <tqimage.h> #include <tqmessagebox.h> #include <tqbuffer.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <klocale.h> #include "kdebug.h" diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 8e053eaf..c876ab77 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -731,7 +731,7 @@ PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", KIcon::SizeMedium )); m_general = new GeneralTab( vbox ); #ifdef HAVE_GL - vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "kscreensaver", KIcon::SizeMedium )); + vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", KIcon::SizeMedium )); m_displaySettings = new DisplaySettingsTab( vbox ); #endif vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", KIcon::SizeMedium )); diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index cddf4c08..fccd3e09 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -23,7 +23,7 @@ #include <tqptrlist.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <KoFactory.h> diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index 045b43f9..2469a328 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -18,10 +18,10 @@ #include "kdebug.h" #include <kaction.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/ui/kis_view.cc b/chalk/ui/kis_view.cc index cf3542b2..de34e26a 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -62,11 +62,11 @@ #include <kdebug.h> #include <ksharedptr.h> #include <ktoolbar.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <kservice.h> #include <ktrader.h> -#include <kparts/componentfactory.h> -#include <kparts/event.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/event.h> // KOffice #include <KoPartSelectAction.h> |