diff --git a/admin b/admin index b4d585c64..6b7f7225e 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am index a8e240bf4..52d6b3383 100644 --- a/chalk/chalkcolor/Makefile.am +++ b/chalk/chalkcolor/Makefile.am @@ -19,7 +19,7 @@ libchalkcolor_la_SOURCES = kis_color.cc kis_colorspace.cc \ kis_u16_base_colorspace.cc kis_f32_base_colorspace.cc $(OPENEXR_SOURCES) libchalkcolor_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries) -libchalkcolor_la_LIBADD = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) +libchalkcolor_la_LIBADD = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) include_HEADERS = \ kis_channelinfo.h \ diff --git a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp index 4c4462127..43168d55b 100644 --- a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp +++ b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp @@ -24,8 +24,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester); +TDEUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester); void KisColorConversionsTester::allTests() { 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 485b0a391..10071c9da 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 @@ -25,8 +25,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester ); void KisGrayColorSpaceTester::allTests() { 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 4fc4d847c..bb2094ef5 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 @@ -29,8 +29,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester ); #define PIXEL_BLUE 0 #define PIXEL_GREEN 1 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 48dd8ea47..4a446a83b 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 @@ -28,8 +28,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester ); #define PIXEL_BLUE 0 #define PIXEL_GREEN 1 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 1a3a7539f..dedc28a9d 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 @@ -27,8 +27,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester ); #define PIXEL_BLUE 0 #define PIXEL_GREEN 1 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 ee0c4479a..0e847bf2c 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 @@ -25,8 +25,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester ); void KisRgbColorSpaceTester::allTests() { diff --git a/chalk/core/tests/kis_filter_configuration_tester.cc b/chalk/core/tests/kis_filter_configuration_tester.cc index 83d6b522a..135e72489 100644 --- a/chalk/core/tests/kis_filter_configuration_tester.cc +++ b/chalk/core/tests/kis_filter_configuration_tester.cc @@ -27,8 +27,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester); +TDEUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester); void KisFilterConfigurationTester::allTests() { diff --git a/chalk/core/tests/kis_image_tester.cpp b/chalk/core/tests/kis_image_tester.cpp index be125c947..f0ebbcb02 100644 --- a/chalk/core/tests/kis_image_tester.cpp +++ b/chalk/core/tests/kis_image_tester.cpp @@ -32,8 +32,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester); +TDEUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KisImageTester); void KisImageTester::allTests() { diff --git a/chalk/core/tests/kis_integer_maths_tester.cpp b/chalk/core/tests/kis_integer_maths_tester.cpp index eb9d76ae0..24adc1941 100644 --- a/chalk/core/tests/kis_integer_maths_tester.cpp +++ b/chalk/core/tests/kis_integer_maths_tester.cpp @@ -24,8 +24,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester); +TDEUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester); void KisIntegerMathsTester::allTests() { diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp index be09579c2..2dbf77e75 100644 --- a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp +++ b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp @@ -25,8 +25,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" ); -KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester ); +TDEUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester ); #define TEST_PIXEL_SIZE 4 diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index c103b208c..8fae7b488 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -35129,7 +35129,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35322,7 +35322,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index ce8071c6a..f25449ec4 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -911,7 +911,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB // set the annotations exportAnnotationsForImage(image, annotationsStart, annotationsEnd); - // XXX: Write to a temp file, then have Chalk use KIO to copy temp + // XXX: Write to a temp file, then have Chalk use TDEIO to copy temp // image to remote location. WriteImage(ii, image); diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index 9a44ed975..5f8bafa3a 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -854,7 +854,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB // set the annotations exportAnnotationsForImage(image, annotationsStart, annotationsEnd); - // XXX: Write to a temp file, then have Chalk use KIO to copy temp + // XXX: Write to a temp file, then have Chalk use TDEIO to copy temp // image to remote location. WriteImage(ii, image); diff --git a/filters/generic_wrapper/Makefile.am b/filters/generic_wrapper/Makefile.am index ecb0bf0cf..8d1cb7a05 100644 --- a/filters/generic_wrapper/Makefile.am +++ b/filters/generic_wrapper/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libgenerickofilter.la libgenerickofilter_la_SOURCES = generic_filter.cc libgenerickofilter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libgenerickofilter_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KIO) +libgenerickofilter_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEIO) METASOURCES = AUTO diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am index e00b285d1..1a2b49d33 100644 --- a/filters/kformula/latex/Makefile.am +++ b/filters/kformula/latex/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am index 29bcceb53..94e04539a 100644 --- a/filters/kformula/png/Makefile.am +++ b/filters/kformula/png/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am index e1edf7735..443abda5f 100644 --- a/filters/kformula/svg/Makefile.am +++ b/filters/kformula/svg/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am index 2a968628c..21ea2021b 100644 --- a/filters/kspread/latex/export/Makefile.am +++ b/filters/kspread/latex/export/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \ #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am index 213289672..24900b6ef 100644 --- a/filters/kword/latex/export/Makefile.am +++ b/filters/kword/latex/export/Makefile.am @@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am index 34d0d8a49..25c8a12ea 100644 --- a/filters/kword/latex/import/Makefile.am +++ b/filters/kword/latex/import/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am index 01fcec66c..d397bcd7b 100644 --- a/filters/kword/latex/import/parser/Makefile.am +++ b/filters/kword/latex/import/parser/Makefile.am @@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y check_PROGRAMS = texlauncher texlauncher_SOURCES = texlauncher.cc texlauncher_LDADD = liblatexexport.la -texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am index c2b727a99..3686a993e 100644 --- a/karbon/plugins/flattenpath/Makefile.am +++ b/karbon/plugins/flattenpath/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co kde_module_LTLIBRARIES = karbon_flattenpathplugin.la karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc -karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_flattenpathplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am index 20a290c29..d2cb53e31 100644 --- a/karbon/plugins/imagetool/Makefile.am +++ b/karbon/plugins/imagetool/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co kde_module_LTLIBRARIES = karbon_imagetoolplugin.la karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc -karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_imagetoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am index 9cc221b0d..a8b9ce0de 100644 --- a/karbon/plugins/insertknots/Makefile.am +++ b/karbon/plugins/insertknots/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co kde_module_LTLIBRARIES = karbon_insertknotsplugin.la karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc -karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_insertknotsplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am index d49439b2d..1b56da82c 100644 --- a/karbon/plugins/roundcorners/Makefile.am +++ b/karbon/plugins/roundcorners/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co kde_module_LTLIBRARIES = karbon_roundcornersplugin.la karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc -karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_roundcornersplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am index 372410f9a..a8e622a05 100644 --- a/karbon/plugins/shadoweffect/Makefile.am +++ b/karbon/plugins/shadoweffect/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/karbon -I$ kde_module_LTLIBRARIES = karbon_shadoweffectplugin.la karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc -karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_shadoweffectplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am index ba5f822af..3272ffd52 100644 --- a/karbon/plugins/whirlpinch/Makefile.am +++ b/karbon/plugins/whirlpinch/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/cor kde_module_LTLIBRARIES = karbon_whirlpinchplugin.la karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cc -karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_whirlpinchplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am index e93315c1f..a3cb2f096 100644 --- a/karbon/plugins/zoomtool/Makefile.am +++ b/karbon/plugins/zoomtool/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co kde_module_LTLIBRARIES = karbon_zoomtoolplugin.la karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc -karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ +karbon_zoomtoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am index 7e94aea19..06d4e3059 100644 --- a/karbon/tools/Makefile.am +++ b/karbon/tools/Makefile.am @@ -56,7 +56,7 @@ karbon_defaulttools_la_SOURCES = \ vtexttool.cc \ vdefaulttools.cc -karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la +karbon_defaulttools_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio karbon_defaulttools_la_METASOURCES = \ diff --git a/kexi/formeditor/Makefile.am b/kexi/formeditor/Makefile.am index 5295c223c..2ffdf8f7d 100644 --- a/kexi/formeditor/Makefile.am +++ b/kexi/formeditor/Makefile.am @@ -22,7 +22,7 @@ libkformdesigner_la_LIBADD = \ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ $(top_builddir)/lib/koproperty/libkoproperty.la \ - $(LIB_KPARTS) + $(LIB_TDEPARTS) servicetypesdir = $(kde_servicetypesdir) servicetypes_DATA=widgetfactory.desktop diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am index f1a563070..e7f527708 100644 --- a/kexi/formeditor/test/Makefile.am +++ b/kexi/formeditor/test/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes) -kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la diff --git a/kexi/kexidb/Makefile.am b/kexi/kexidb/Makefile.am index fc887a69a..e2465394a 100644 --- a/kexi/kexidb/Makefile.am +++ b/kexi/kexidb/Makefile.am @@ -53,7 +53,7 @@ transaction.h \ utils.h \ parser/parser.h -libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) \ +libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) \ $(top_builddir)/kexi/kexiutils/libkexiutils.la libkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am index 9f40ebe05..19038b148 100644 --- a/kexi/kexidb/drivers/mySQL/Makefile.am +++ b/kexi/kexidb/drivers/mySQL/Makefile.am @@ -16,7 +16,7 @@ kexidb_mysqldriver_la_SOURCES = \ mysqlkeywords.cpp \ mysqlpreparedstatement.cpp -kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \ +kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) \ $(LIB_QT) \ $(MYSQL_LIBS) \ -lmysqlclient \ diff --git a/kexi/kexidb/drivers/odbc/Makefile.am b/kexi/kexidb/drivers/odbc/Makefile.am index 2570181a8..97c693011 100644 --- a/kexi/kexidb/drivers/odbc/Makefile.am +++ b/kexi/kexidb/drivers/odbc/Makefile.am @@ -8,7 +8,7 @@ kexidb_odbcdriver_la_METASOURCES = AUTO kexidb_odbcdriver_la_SOURCES = odbcdriver.cpp odbcconnection.cpp -kexidb_odbcdriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la +kexidb_odbcdriver_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la kexidb_odbcdriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am index de03e9472..6f5d73e27 100644 --- a/kexi/kexidb/drivers/pqxx/Makefile.am +++ b/kexi/kexidb/drivers/pqxx/Makefile.am @@ -9,7 +9,7 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \ pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp -kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la +kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \ -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \ diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am index 059958690..0b782243a 100644 --- a/kexi/kexidb/drivers/sqlite/Makefile.am +++ b/kexi/kexidb/drivers/sqlite/Makefile.am @@ -11,7 +11,7 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \ sqlitealter.cpp -kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ +kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \ $(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am index a49139cd7..7e783c4a7 100644 --- a/kexi/kexidb/drivers/sqlite2/Makefile.am +++ b/kexi/kexidb/drivers/sqlite2/Makefile.am @@ -15,7 +15,7 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \ sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp -kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ +kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \ $(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ diff --git a/kexi/kexidb/parser/Makefile.am b/kexi/kexidb/parser/Makefile.am index 916567903..3a1f141c1 100644 --- a/kexi/kexidb/parser/Makefile.am +++ b/kexi/kexidb/parser/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/kexi/Makefile.global lib_LTLIBRARIES = libkexidbparser.la libkexidbparser_la_SOURCES = sqlscanner.cpp sqlparser.cpp parser.cpp parser_p.cpp -libkexidbparser_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) ../libkexidb.la +libkexidbparser_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) ../libkexidb.la libkexidbparser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) noinst_HEADERS = parser_p.h diff --git a/kexi/kexiutils/Makefile.am b/kexi/kexiutils/Makefile.am index dd506ef85..616b57a75 100644 --- a/kexi/kexiutils/Makefile.am +++ b/kexi/kexiutils/Makefile.am @@ -14,7 +14,7 @@ libkexiutils_la_LDFLAGS = \ $(KDE_RPATH) $(all_libraries) \ $(VER_INFO) -Wnounresolved -no-undefined -libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_KIO) +libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEIO) INCLUDES = -I$(top_srcdir)/kexi $(all_includes) diff --git a/kexi/main/Makefile.am b/kexi/main/Makefile.am index ca95b8ea3..fe254a177 100644 --- a/kexi/main/Makefile.am +++ b/kexi/main/Makefile.am @@ -18,7 +18,7 @@ libkeximain_la_LIBADD = $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir $(top_builddir)/kexi/main/printing/libkeximainprinting.la \ $(top_builddir)/lib/koproperty/libkoproperty.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(LIB_TDEPRINT) + $(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_TDEIO) $(LIB_TDEPRINT) #disabled ../migration/libkeximigrate.la diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 6aaa6acee..2dbf58fe0 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. Loosely based on tdevelop/src/statusbar.cpp - Copyright (C) 2001 by Bernd Gehrmann + Copyright (C) 2001 by Bernd Gehrmann */ #include "kexistatusbar.h" diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index 87ee7e6a3..c4d58c321 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. Loosely based on tdevelop/src/statusbar.h - Copyright (C) 2001 by Bernd Gehrmann + Copyright (C) 2001 by Bernd Gehrmann */ #ifndef KEXISTATUSBAR_H diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am index 9f8f386db..eaac66a81 100644 --- a/kexi/migration/Makefile.am +++ b/kexi/migration/Makefile.am @@ -53,5 +53,5 @@ keximigratetest_LDADD = libkeximigrate.la \ $(top_builddir)/kexi/main/libkeximain.la \ $(LIB_QT) $(LIB_TDECORE) -keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am index 5b96b1cec..eaea53b9b 100644 --- a/kexi/migration/mysql/Makefile.am +++ b/kexi/migration/mysql/Makefile.am @@ -8,7 +8,7 @@ keximigrate_mysql_la_METASOURCES = AUTO keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp -keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \ +keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \ ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am index 99029676c..a3d78de50 100644 --- a/kexi/migration/pqxx/Makefile.am +++ b/kexi/migration/pqxx/Makefile.am @@ -9,8 +9,8 @@ keximigrate_pqxx_la_METASOURCES = AUTO keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp #TODO share -libs with pqxx kexidb drv! -#keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la -keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \ +#keximigrate_pqxx_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la +keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \ ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la diff --git a/kexi/migration/txt/Makefile.am b/kexi/migration/txt/Makefile.am index 46964222e..a7dbe779c 100644 --- a/kexi/migration/txt/Makefile.am +++ b/kexi/migration/txt/Makefile.am @@ -8,7 +8,7 @@ keximigrate_txtmigrate_la_METASOURCES = AUTO keximigrate_txtmigrate_la_SOURCES = txtmigrate.cpp -keximigrate_txtmigrate_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la +keximigrate_txtmigrate_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la keximigrate_txtmigrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am index 0206386a8..324a03d44 100644 --- a/kexi/plugins/macros/tests/Makefile.am +++ b/kexi/plugins/macros/tests/Makefile.am @@ -7,13 +7,13 @@ endif bin_PROGRAMS = komacrotest $(GUIBINPROGRAM) komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp -komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS) +komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS) if include_tdeunittestgui komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp - komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor - komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS) + komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor + komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS) endif KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp index 912d9ff3c..343c11e3e 100644 --- a/kexi/plugins/macros/tests/actiontests.cpp +++ b/kexi/plugins/macros/tests/actiontests.cpp @@ -50,8 +50,8 @@ namespace KoMacroTest { * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite"); - KUNITTEST_REGISTER_TESTER(ActionTests); + TDEUNITTEST_SUITE("KoMacroTestSuite"); + TDEUNITTEST_REGISTER_TESTER(ActionTests); class ActionTests::Private diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp index 9d43ac414..0a18e5800 100644 --- a/kexi/plugins/macros/tests/commontests.cpp +++ b/kexi/plugins/macros/tests/commontests.cpp @@ -51,8 +51,8 @@ namespace KoMacroTest { /** * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("CommonTestsSuite") - KUNITTEST_REGISTER_TESTER(CommonTests); + TDEUNITTEST_SUITE("CommonTestsSuite") + TDEUNITTEST_REGISTER_TESTER(CommonTests); /** * @internal d-pointer class to be more flexible on future extension of the diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp index 044808d7b..08b215f71 100644 --- a/kexi/plugins/macros/tests/macroitemtests.cpp +++ b/kexi/plugins/macros/tests/macroitemtests.cpp @@ -48,8 +48,8 @@ namespace KoMacroTest { * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite"); - KUNITTEST_REGISTER_TESTER(MacroitemTests); + TDEUNITTEST_SUITE("KoMacroTestSuite"); + TDEUNITTEST_REGISTER_TESTER(MacroitemTests); class MacroitemTests::Private diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp index 7a5f30d0e..853bbad2e 100644 --- a/kexi/plugins/macros/tests/macrotests.cpp +++ b/kexi/plugins/macros/tests/macrotests.cpp @@ -49,8 +49,8 @@ namespace KoMacroTest { /** * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite") - KUNITTEST_REGISTER_TESTER(MacroTests); + TDEUNITTEST_SUITE("KoMacroTestSuite") + TDEUNITTEST_REGISTER_TESTER(MacroTests); class MacroTests::Private { diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp index 4efe39532..97420ce41 100644 --- a/kexi/plugins/macros/tests/variabletests.cpp +++ b/kexi/plugins/macros/tests/variabletests.cpp @@ -50,8 +50,8 @@ namespace KoMacroTest { * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite"); - KUNITTEST_REGISTER_TESTER(VariableTests); + TDEUNITTEST_SUITE("KoMacroTestSuite"); + TDEUNITTEST_REGISTER_TESTER(VariableTests); class VariableTests::Private diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index 971c85db3..5848217d2 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -43,8 +43,8 @@ namespace KoMacroTest { /** * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite") - KUNITTEST_REGISTER_TESTER(XMLHandlerTests); + TDEUNITTEST_SUITE("KoMacroTestSuite") + TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests); class XMLHandlerTests::Private { diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp index 8e990d119..3cb378bce 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp @@ -43,8 +43,8 @@ namespace KoMacroTest { /** * Register KoMacroTest::CommonTests as TestSuite. */ - KUNITTEST_SUITE("KoMacroTestSuite") - KUNITTEST_REGISTER_TESTER(XMLHandlerTests2); + TDEUNITTEST_SUITE("KoMacroTestSuite") + TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests2); class XMLHandlerTests2::Private { diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am index 4de0b3967..c4708ba98 100644 --- a/kexi/tests/altertable/Makefile.am +++ b/kexi/tests/altertable/Makefile.am @@ -18,5 +18,5 @@ kexialtertabletest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/ $(top_builddir)/kexi/main/libkeximain.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la -kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am index 75b0c615f..5e4d78aed 100644 --- a/kexi/tests/newapi/Makefile.am +++ b/kexi/tests/newapi/Makefile.am @@ -20,14 +20,14 @@ kexidbtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexid ../../kexidb/parser/libkexidbparser.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ../../widget/tableview/libkexidatatable.la -kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ # ../../kexidb/parser/libkexidbparser.la -#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp #kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la -#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am index 6c15c5cde..b56d7bff7 100644 --- a/kexi/tests/widgets/Makefile.am +++ b/kexi/tests/widgets/Makefile.am @@ -8,7 +8,7 @@ kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_TDECORE) \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la -kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/kexi/widget/utils/tdelistviewitemtemplate.h b/kexi/widget/utils/tdelistviewitemtemplate.h index 21430b247..95f46d04a 100644 --- a/kexi/widget/utils/tdelistviewitemtemplate.h +++ b/kexi/widget/utils/tdelistviewitemtemplate.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KLISTVIEWITEMTEMPLATE_H -#define KLISTVIEWITEMTEMPLATE_H +#ifndef TDELISTVIEWITEMTEMPLATE_H +#define TDELISTVIEWITEMTEMPLATE_H #include diff --git a/kplato/tests/CalendarTester.cpp b/kplato/tests/CalendarTester.cpp index d5a3956b7..9c67d0680 100644 --- a/kplato/tests/CalendarTester.cpp +++ b/kplato/tests/CalendarTester.cpp @@ -27,8 +27,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(CalendarTester); +TDEUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(CalendarTester); void CalendarTester::allTests() { testSingleDay(); diff --git a/kplato/tests/DateTimeTester.cpp b/kplato/tests/DateTimeTester.cpp index e3558a326..beee3c5bc 100644 --- a/kplato/tests/DateTimeTester.cpp +++ b/kplato/tests/DateTimeTester.cpp @@ -26,8 +26,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester); +TDEUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester); void DateTimeTester::allTests() { testSubtract(); diff --git a/kplato/tests/DurationTester.cpp b/kplato/tests/DurationTester.cpp index b6ac6d725..3266a2bdb 100644 --- a/kplato/tests/DurationTester.cpp +++ b/kplato/tests/DurationTester.cpp @@ -23,8 +23,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(DurationTester); +TDEUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(DurationTester); void DurationTester::allTests() { testArithmetic(); diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index fde8efbf0..b43012a4b 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -131,7 +131,7 @@ void KPrConfig::openPage(int flags) showPage( 0 ); else if(flags & KP_COLOR) showPage(1 ); - else if(flags & KP_KSPELL) + else if(flags & KP_TDESPELL) showPage(2); else if(flags & KP_MISC) showPage(3 ); diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h index b1696eb44..d69bd0ea4 100644 --- a/kpresenter/KPrConfig.h +++ b/kpresenter/KPrConfig.h @@ -215,7 +215,7 @@ class KPrConfig : public KDialogBase Q_OBJECT public: - enum { KP_INTERFACE = 1, KP_COLOR=2, KP_KSPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 }; + enum { KP_INTERFACE = 1, KP_COLOR=2, KP_TDESPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 }; KPrConfig( KPrView* parent ); public slots: void slotApply(); diff --git a/kugar/README b/kugar/README index 52dbd2560..6c6372a93 100644 --- a/kugar/README +++ b/kugar/README @@ -7,7 +7,7 @@ can be reached via Email: treat@kde.org or visit http://www.koffice.org/kugar/ The former maintainer and the author of Kugar Report Designer -part can be reached via Email: adymo@tdevelop.org +part can be reached via Email: adymo@kdevelop.org The former maintainer and author of Kugar report viewer and konqueror part can be reached via Email: phil@river-bank.demon.co.uk diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am index d9ff555fd..487e8c37f 100644 --- a/kugar/kudesigner/Makefile.am +++ b/kugar/kudesigner/Makefile.am @@ -9,13 +9,13 @@ lib_LTLIBRARIES = libkudesignercore.la libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \ kudesigner_doc.cpp libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_TDEPRINT) +libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_TDEIO) $(LIB_TDEPRINT) ## The part kde_module_LTLIBRARIES = libkudesignerpart.la libkudesignerpart_la_SOURCES = kudesigner_part.cpp libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) +libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE) ## The tdeinit loadable module tdeinit_LTLIBRARIES = kudesigner.la diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index a78db689f..83b6db46f 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2005 by Alexander Dymo * -* adymo@tdevelop.org * +* adymo@kdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/kugar/kudesigner_lib/structurewidget.h b/kugar/kudesigner_lib/structurewidget.h index 0d527d315..111493380 100644 --- a/kugar/kudesigner_lib/structurewidget.h +++ b/kugar/kudesigner_lib/structurewidget.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2005 by Alexander Dymo * -* adymo@tdevelop.org * +* adymo@kdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/kugar/part/Makefile.am b/kugar/part/Makefile.am index 6f9088415..5a7b5cba5 100644 --- a/kugar/part/Makefile.am +++ b/kugar/part/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = kde_module_LTLIBRARIES = libkugarpart.la libkugarpart_la_SOURCES = kugar_part.cpp kugar_factory.cpp kugar_view.cpp libkugarpart_la_LDFLAGS = $(all_libraries) -module -avoid-version -libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_KPARTS) $(LIB_TDEPRINT) $(LIB_KOFFICECORE) +libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_TDEPARTS) $(LIB_TDEPRINT) $(LIB_KOFFICECORE) libkugarpart_la_METASOURCES = AUTO diff --git a/kword/HACKING b/kword/HACKING index e0ce97a5f..b288e2e81 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -53,8 +53,8 @@ DIRECTORIES: source to allow merging of a (large) number of email addresses into a single document subdirectories: - kabc: - kwmailmerge_kabc.h/cc - KABC addressbook interface + tdeabc: + kwmailmerge_tdeabc.h/cc - KABC addressbook interface sql: various QTSQL interface implementation files to handle table selection and mailmerge data diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 6d1a28b28..82a96bd3d 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -136,7 +136,7 @@ void KWConfig::unitChanged( int u ) void KWConfig::openPage(int flags) { - if(flags & KW_KSPELL) + if(flags & KW_TDESPELL) showPage( 2 ); else if(flags & KP_INTERFACE) showPage(0 ); diff --git a/kword/KWConfig.h b/kword/KWConfig.h index bc864ff80..8700bcb27 100644 --- a/kword/KWConfig.h +++ b/kword/KWConfig.h @@ -187,7 +187,7 @@ class KWConfig : public KDialogBase Q_OBJECT public: - enum { KW_KSPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32}; + enum { KW_TDESPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32}; KWConfig( KWView* parent ); void openPage(int flags); public slots: diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am index f0a10db5d..773e43085 100644 --- a/kword/mailmerge/Makefile.am +++ b/kword/mailmerge/Makefile.am @@ -18,5 +18,5 @@ if include_sql SQLDIRECTORY=sql endif -SUBDIRS = . kabc kspread $(SQLDIRECTORY) +SUBDIRS = . tdeabc kspread $(SQLDIRECTORY) diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am deleted file mode 100644 index 98231fed2..000000000 --- a/kword/mailmerge/kabc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -KDE_CXXFLAGS = $(USE_RTTI) -INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \ - $(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes) - -kde_module_LTLIBRARIES = kwmailmerge_kabc.la - -## Plugin encapsulating the QT SQL database interface -kwmailmerge_kabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui -kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC) - -METASOURCES = AUTO - -services_DATA=kwmailmerge_kabc.desktop -servicesdir=$(kde_servicesdir) - diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp similarity index 99% rename from kword/mailmerge/kabc/KWMailMergeTDEABC.cpp rename to kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp index dce0f5daf..2be130034 100644 --- a/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp @@ -537,7 +537,7 @@ TQStringList KWMailMergeTDEABC::singleRecords() const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_tdeabc( TDEInstance *inst, TQObject *parent ) { return new KWMailMergeTDEABC( inst, parent ); } diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABC.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h similarity index 100% rename from kword/mailmerge/kabc/KWMailMergeTDEABC.h rename to kword/mailmerge/tdeabc/KWMailMergeTDEABC.h diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp similarity index 100% rename from kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp rename to kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h similarity index 100% rename from kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h rename to kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h diff --git a/kword/mailmerge/tdeabc/Makefile.am b/kword/mailmerge/tdeabc/Makefile.am new file mode 100644 index 000000000..0856d2c69 --- /dev/null +++ b/kword/mailmerge/tdeabc/Makefile.am @@ -0,0 +1,17 @@ + +KDE_CXXFLAGS = $(USE_RTTI) +INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \ + $(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes) + +kde_module_LTLIBRARIES = kwmailmerge_tdeabc.la + +## Plugin encapsulating the QT SQL database interface +kwmailmerge_tdeabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui +kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts +kwmailmerge_tdeabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC) + +METASOURCES = AUTO + +services_DATA=kwmailmerge_tdeabc.desktop +servicesdir=$(kde_servicesdir) + diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/tdeabc/addresspicker.ui similarity index 100% rename from kword/mailmerge/kabc/addresspicker.ui rename to kword/mailmerge/tdeabc/addresspicker.ui diff --git a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop similarity index 99% rename from kword/mailmerge/kabc/kwmailmerge_kabc.desktop rename to kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop index f300c0beb..924d6516b 100644 --- a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop +++ b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop @@ -100,6 +100,6 @@ Comment[uk]=Цей тип джерела даних дає доступ до з Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。 Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。 -X-TDE-Library=kwmailmerge_kabc +X-TDE-Library=kwmailmerge_tdeabc X-TDE-Capabilities=open X-TDE-InternalName=KABC diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp index a5ccd80a8..4c5c57c30 100644 --- a/kword/tests/FrameTester.cpp +++ b/kword/tests/FrameTester.cpp @@ -25,8 +25,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester); +TDEUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester); void KWFrameTester::allTests() { int argc = 0; diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp index e438188df..c91de7e62 100644 --- a/kword/tests/FrameViewTester.cpp +++ b/kword/tests/FrameViewTester.cpp @@ -30,8 +30,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester); +TDEUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester); void KWFrameViewTester::allTests() { testListeners(); diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp index 98a82233c..ee4c09dea 100644 --- a/kword/tests/KWPageManagerTester.cpp +++ b/kword/tests/KWPageManagerTester.cpp @@ -26,8 +26,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester); +TDEUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester); void KWPageManagerTester::allTests() { getAddPages(); diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am index 22349ce79..28ac23248 100644 --- a/lib/kofficecore/Makefile.am +++ b/lib/kofficecore/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . tests KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL) INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes) -libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \ +libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_TDEPARTS) \ $(LIB_TDEPRINT) $(LIB_TDEABC) $(LIB_KWMF) -lDCOP ####### Files diff --git a/lib/kofficeui/Makefile.am b/lib/kofficeui/Makefile.am index cef66f55c..c74406d85 100644 --- a/lib/kofficeui/Makefile.am +++ b/lib/kofficeui/Makefile.am @@ -50,7 +50,7 @@ include_HEADERS = \ #AM_CXXFLAGS = -DQT_PLUGIN #kde_widget_LTLIBRARIES = kofficewidgets.la #kofficewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) -#kofficewidgets_la_LIBADD = $(LIB_KIO) libkofficeui.la +#kofficewidgets_la_LIBADD = $(LIB_TDEIO) libkofficeui.la #kofficewidgets_la_SOURCES = kofficewidgets.cpp #kofficewidgets.cpp: $(srcdir)/koffice.widgets diff --git a/lib/kofficeui/ttdeaction.h b/lib/kofficeui/ttdeaction.h index 015bcce98..bc5912f47 100644 --- a/lib/kofficeui/ttdeaction.h +++ b/lib/kofficeui/ttdeaction.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#ifndef TKACTION_H -#define TKACTION_H +#ifndef TTDEACTION_H +#define TTDEACTION_H #include #include diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h index 706a8c03b..3a899fc8d 100644 --- a/lib/kofficeui/ttdetoolbarbutton.h +++ b/lib/kofficeui/ttdetoolbarbutton.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#ifndef TKTOOLBARBUTTON_H -#define TKTOOLBARBUTTON_H +#ifndef TTDETOOLBARBUTTON_H +#define TTDETOOLBARBUTTON_H #include diff --git a/lib/koproperty/editors/Makefile.am b/lib/koproperty/editors/Makefile.am index f617a19f7..b9904d181 100644 --- a/lib/koproperty/editors/Makefile.am +++ b/lib/koproperty/editors/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) noinst_LTLIBRARIES = libkopropertyeditors.la -libkopropertyeditors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +libkopropertyeditors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) libkopropertyeditors_la_LDFLAGS = -Wno-unresolved $(all_libraries) libkopropertyeditors_la_SOURCES = booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp \ datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp pixmapedit.cpp pointedit.cpp \ diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am index 8bdfdbe13..81619f8e1 100644 --- a/lib/koproperty/test/Makefile.am +++ b/lib/koproperty/test/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO noinst_PROGRAMS = propertytest propertytest_SOURCES = main.cpp test.cpp -propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor propertytest_LDADD = $(LIB_KOPROPERTY) # this is where the shell's XML-GUI resource file goes diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am index 5302f0ef8..a509da52e 100644 --- a/lib/kotext/kohyphen/Makefile.am +++ b/lib/kotext/kohyphen/Makefile.am @@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest kohyphentest_SOURCES = kohyphentest.cpp kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE) -kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 6a0360aa6..559375fd7 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -29,8 +29,8 @@ #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" -KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester"); -KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester); +TDEUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester"); +TDEUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester); #undef COMPARE /// for source-compat with qttestlib: use COMPARE(x,y) if you plan to port to qttestlib later. diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index fd7754b26..7080201ba 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest TESTS = kotextformattertest kovariabletest LDADD = ../libkotext.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am index b048c26e6..848ecac74 100644 --- a/lib/kross/runner/Makefile.am +++ b/lib/kross/runner/Makefile.am @@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner krossrunner_SOURCES = main.cpp krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am index 37bee54fe..e7a9164ad 100644 --- a/lib/kross/test/Makefile.am +++ b/lib/kross/test/Makefile.am @@ -12,6 +12,6 @@ krosstest_LDADD = \ ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/store/Makefile.am b/lib/store/Makefile.am index e1eb1402b..2bd3d085d 100644 --- a/lib/store/Makefile.am +++ b/lib/store/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes) ####### Files -libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libkstore_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h diff --git a/plugins/scan/Makefile.am b/plugins/scan/Makefile.am index 341d6af79..b923fa610 100644 --- a/plugins/scan/Makefile.am +++ b/plugins/scan/Makefile.am @@ -16,7 +16,7 @@ kofficescan_la_SOURCES = scan.cpp noinst_HEADERS = scan.h kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE) +kofficescan_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_KOFFICECORE) kofficescan_la_METASOURCES = AUTO diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am index 4bebc4b31..c0f9350d2 100644 --- a/tools/converter/Makefile.am +++ b/tools/converter/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) bin_PROGRAMS = koconverter koconverter_SOURCES = koconverter.cpp -koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la METASOURCES = AUTO diff --git a/tools/kthesaurus/Makefile.am b/tools/kthesaurus/Makefile.am index 4456d8351..95d0acb4e 100644 --- a/tools/kthesaurus/Makefile.am +++ b/tools/kthesaurus/Makefile.am @@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kthesaurus.la kthesaurus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version kthesaurus_la_SOURCES = main.cc -kthesaurus_la_LIBADD = $(LIB_KSYCOCA) +kthesaurus_la_LIBADD = $(LIB_TDESYCOCA) appsdir = $(kde_appsdir)/Office apps_DATA = KThesaurus.desktop diff --git a/tools/thesaurus/Makefile.am b/tools/thesaurus/Makefile.am index 7ffeef008..927c7245b 100644 --- a/tools/thesaurus/Makefile.am +++ b/tools/thesaurus/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -libthesaurustool_la_LIBADD = $(LIB_KSYCOCA) +libthesaurustool_la_LIBADD = $(LIB_TDESYCOCA) ####### Files