From 15ae7be824e362e8397532d7d60a3a93055caa41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:57:37 +0200 Subject: Additional k => tde renaming and fixes --- admin | 2 +- chalk/chalkcolor/Makefile.am | 2 +- .../tests/kis_color_conversions_tester.cpp | 4 +- .../kis_strategy_colorspace_grayscale_tester.cpp | 4 +- .../tests/kis_rgb_f16half_colorspace_tester.cc | 4 +- .../kis_strategy_colorspace_rgb_f32_tester.cc | 4 +- .../kis_strategy_colorspace_rgb_u16_tester.cc | 4 +- .../tests/kis_strategy_colorspace_rgb_tester.cpp | 4 +- .../core/tests/kis_filter_configuration_tester.cc | 4 +- chalk/core/tests/kis_image_tester.cpp | 4 +- chalk/core/tests/kis_integer_maths_tester.cpp | 4 +- chalk/core/tiles/tests/kis_tiled_data_tester.cpp | 4 +- chalk/doc/colorspaces.xmi | 4 +- .../chalk/gmagick/kis_image_magick_converter.cc | 2 +- filters/chalk/magick/kis_image_magick_converter.cc | 2 +- filters/generic_wrapper/Makefile.am | 2 +- filters/kformula/latex/Makefile.am | 2 +- filters/kformula/png/Makefile.am | 2 +- filters/kformula/svg/Makefile.am | 2 +- filters/kspread/latex/export/Makefile.am | 2 +- filters/kword/latex/export/Makefile.am | 2 +- filters/kword/latex/import/Makefile.am | 2 +- filters/kword/latex/import/parser/Makefile.am | 2 +- karbon/plugins/flattenpath/Makefile.am | 2 +- karbon/plugins/imagetool/Makefile.am | 2 +- karbon/plugins/insertknots/Makefile.am | 2 +- karbon/plugins/roundcorners/Makefile.am | 2 +- karbon/plugins/shadoweffect/Makefile.am | 2 +- karbon/plugins/whirlpinch/Makefile.am | 2 +- karbon/plugins/zoomtool/Makefile.am | 2 +- karbon/tools/Makefile.am | 2 +- kexi/formeditor/Makefile.am | 2 +- kexi/formeditor/test/Makefile.am | 2 +- kexi/kexidb/Makefile.am | 2 +- kexi/kexidb/drivers/mySQL/Makefile.am | 2 +- kexi/kexidb/drivers/odbc/Makefile.am | 2 +- kexi/kexidb/drivers/pqxx/Makefile.am | 2 +- kexi/kexidb/drivers/sqlite/Makefile.am | 2 +- kexi/kexidb/drivers/sqlite2/Makefile.am | 2 +- kexi/kexidb/parser/Makefile.am | 2 +- kexi/kexiutils/Makefile.am | 2 +- kexi/main/Makefile.am | 2 +- kexi/main/kexistatusbar.cpp | 2 +- kexi/main/kexistatusbar.h | 2 +- kexi/migration/Makefile.am | 2 +- kexi/migration/mysql/Makefile.am | 2 +- kexi/migration/pqxx/Makefile.am | 4 +- kexi/migration/txt/Makefile.am | 2 +- kexi/plugins/macros/tests/Makefile.am | 8 +- kexi/plugins/macros/tests/actiontests.cpp | 4 +- kexi/plugins/macros/tests/commontests.cpp | 4 +- kexi/plugins/macros/tests/macroitemtests.cpp | 4 +- kexi/plugins/macros/tests/macrotests.cpp | 4 +- kexi/plugins/macros/tests/variabletests.cpp | 4 +- kexi/plugins/macros/tests/xmlhandlertests.cpp | 4 +- kexi/plugins/macros/tests/xmlhandlertests2.cpp | 4 +- kexi/tests/altertable/Makefile.am | 2 +- kexi/tests/newapi/Makefile.am | 6 +- kexi/tests/widgets/Makefile.am | 2 +- kexi/widget/utils/tdelistviewitemtemplate.h | 4 +- kplato/tests/CalendarTester.cpp | 4 +- kplato/tests/DateTimeTester.cpp | 4 +- kplato/tests/DurationTester.cpp | 4 +- kpresenter/KPrConfig.cpp | 2 +- kpresenter/KPrConfig.h | 2 +- kugar/README | 2 +- kugar/kudesigner/Makefile.am | 4 +- kugar/kudesigner_lib/structurewidget.cpp | 2 +- kugar/kudesigner_lib/structurewidget.h | 2 +- kugar/part/Makefile.am | 2 +- kword/HACKING | 4 +- kword/KWConfig.cpp | 2 +- kword/KWConfig.h | 2 +- kword/mailmerge/Makefile.am | 2 +- kword/mailmerge/kabc/KWMailMergeTDEABC.cpp | 551 --------------------- kword/mailmerge/kabc/KWMailMergeTDEABC.h | 186 ------- kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp | 546 -------------------- kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h | 150 ------ kword/mailmerge/kabc/Makefile.am | 17 - kword/mailmerge/kabc/addresspicker.ui | 297 ----------- kword/mailmerge/kabc/kwmailmerge_kabc.desktop | 105 ---- kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp | 551 +++++++++++++++++++++ kword/mailmerge/tdeabc/KWMailMergeTDEABC.h | 186 +++++++ kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp | 546 ++++++++++++++++++++ kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h | 150 ++++++ kword/mailmerge/tdeabc/Makefile.am | 17 + kword/mailmerge/tdeabc/addresspicker.ui | 297 +++++++++++ kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop | 105 ++++ kword/tests/FrameTester.cpp | 4 +- kword/tests/FrameViewTester.cpp | 4 +- kword/tests/KWPageManagerTester.cpp | 4 +- lib/kofficecore/Makefile.am | 2 +- lib/kofficeui/Makefile.am | 2 +- lib/kofficeui/ttdeaction.h | 4 +- lib/kofficeui/ttdetoolbarbutton.h | 4 +- lib/koproperty/editors/Makefile.am | 2 +- lib/koproperty/test/Makefile.am | 2 +- lib/kotext/kohyphen/Makefile.am | 2 +- lib/kotext/tests/KoUserStyleTester.cpp | 4 +- lib/kotext/tests/Makefile.am | 2 +- lib/kross/runner/Makefile.am | 2 +- lib/kross/test/Makefile.am | 2 +- lib/store/Makefile.am | 2 +- plugins/scan/Makefile.am | 2 +- tools/converter/Makefile.am | 2 +- tools/kthesaurus/Makefile.am | 2 +- tools/thesaurus/Makefile.am | 2 +- 107 files changed, 1981 insertions(+), 1981 deletions(-) delete mode 100644 kword/mailmerge/kabc/KWMailMergeTDEABC.cpp delete mode 100644 kword/mailmerge/kabc/KWMailMergeTDEABC.h delete mode 100644 kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp delete mode 100644 kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h delete mode 100644 kword/mailmerge/kabc/Makefile.am delete mode 100644 kword/mailmerge/kabc/addresspicker.ui delete mode 100644 kword/mailmerge/kabc/kwmailmerge_kabc.desktop create mode 100644 kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp create mode 100644 kword/mailmerge/tdeabc/KWMailMergeTDEABC.h create mode 100644 kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp create mode 100644 kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h create mode 100644 kword/mailmerge/tdeabc/Makefile.am create mode 100644 kword/mailmerge/tdeabc/addresspicker.ui create mode 100644 kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop diff --git a/admin b/admin index b4d585c6..6b7f7225 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 a8e240bf..52d6b338 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 4c446212..43168d55 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 485b0a39..10071c9d 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 4fc4d847..bb2094ef 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 48dd8ea4..4a446a83 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 1a3a7539..dedc28a9 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 ee0c4479..0e847bf2 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 83d6b522..135e7248 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 be125c94..f0ebbcb0 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 eb9d76ae..24adc194 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 be09579c..2dbf77e7 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 c103b208..8fae7b48 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 ce8071c6..f25449ec 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 9a44ed97..5f8bafa3 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 ecb0bf0c..8d1cb7a0 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 e00b285d..1a2b49d3 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 29bcceb5..94e04539 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 e1edf773..443abda5 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 2a968628..21ea2021 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 21328967..24900b6e 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 34d0d8a4..25c8a12e 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 01fcec66..d397bcd7 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 c2b727a9..3686a993 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 20a290c2..d2cb53e3 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 9cc221b0..a8b9ce0d 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 d49439b2..1b56da82 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 372410f9..a8e622a0 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 ba5f822a..3272ffd5 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 e93315c1..a3cb2f09 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 7e94aea1..06d4e305 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 5295c223..2ffdf8f7 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 f1a56307..e7f52770 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 fc887a69..e2465394 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 9f40ebe0..19038b14 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 2570181a..97c69301 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 de03e947..6f5d73e2 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 05995869..0b782243 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 a49139cd..7e783c4a 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 91656790..3a1f141c 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 dd506ef8..616b57a7 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 ca95b8ea..fe254a17 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 6aaa6ace..2dbf58fe 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 87ee7e6a..c4d58c32 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 9f8f386d..eaac66a8 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 5b96b1ce..eaea53b9 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 99029676..a3d78de5 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 46964222..a7dbe779 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 0206386a..324a03d4 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 912d9ff3..343c11e3 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 9d43ac41..0a18e580 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 044808d7..08b215f7 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 7a5f30d0..853bbad2 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 4efe3953..97420ce4 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 971c85db..5848217d 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 8e990d11..3cb378bc 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 4de0b396..c4708ba9 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 75b0c615..5e4d78ae 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 6c15c5cd..b56d7bff 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 21430b24..95f46d04 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 d5a3956b..9c67d068 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 e3558a32..beee3c5b 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 b6ac6d72..3266a2bd 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 fde8efbf..b43012a4 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 b1696eb4..d69bd0ea 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 52dbd256..6c6372a9 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 d9ff555f..487e8c37 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 a78db689..83b6db46 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 0d527d31..11149338 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 6f908841..5a7b5cba 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 e0ce97a5..b288e2e8 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 6d1a28b2..82a96bd3 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 bc864ff8..8700bcb2 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 f0a10db5..773e4308 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/KWMailMergeTDEABC.cpp b/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp deleted file mode 100644 index dce0f5da..00000000 --- a/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp +++ /dev/null @@ -1,551 +0,0 @@ -/* - This file is part of the KDE project - Copyright (C) 2003 Tobias Koenig - Joseph Wenninger - Ingo Kloecker - Copyright (C) 2004 Tobias Koenig - Joseph Wenninger - Ingo Kloecker - Dirk Schmidt - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include -#include -#include - -#include "KWMailMergeTDEABC.h" -#include "KWMailMergeTDEABCConfig.h" - -KWMailMergeTDEABC::KWMailMergeTDEABC( TDEInstance *inst, TQObject *parent ) - : KWMailMergeDataSource( inst, parent ) -{ - _addressBook = TDEABC::StdAddressBook::self(); - _iterator = _addressBook->begin(); - - - // init record list - // Using names from kaddressbook. - sampleRecord[ ("KAddressbook identifier") ] = TDEABC::Addressee::uidLabel(); - sampleRecord[ ("Name" ) ] = TDEABC::Addressee::nameLabel(); - sampleRecord[ ("Formatted name" ) ] = TDEABC::Addressee::formattedNameLabel(); - sampleRecord[ ("Family names" ) ] = TDEABC::Addressee::familyNameLabel(); - sampleRecord[ ("Given name" ) ] = TDEABC::Addressee::givenNameLabel(); - sampleRecord[ ("Additional names" ) ] = TDEABC::Addressee::additionalNameLabel(); - sampleRecord[ ("Honorific prefixes" ) ] = TDEABC::Addressee::prefixLabel(); - sampleRecord[ ("Honorific suffixes" ) ] = TDEABC::Addressee::suffixLabel(); - sampleRecord[ ("Nick name" ) ] = TDEABC::Addressee::nickNameLabel(); - sampleRecord[ ("Birthday" ) ] = TDEABC::Addressee::birthdayLabel(); - sampleRecord[ ("Home address: Street" ) ] = TDEABC::Addressee::homeAddressStreetLabel(); - sampleRecord[ ("Home address: Locality" ) ] = TDEABC::Addressee::homeAddressLocalityLabel(); - sampleRecord[ ("Home address: Region" ) ] = TDEABC::Addressee::homeAddressRegionLabel(); - sampleRecord[ ("Home address: Postal code" ) ] = TDEABC::Addressee::homeAddressPostalCodeLabel(); - sampleRecord[ ("Home address: Country" ) ] = TDEABC::Addressee::homeAddressCountryLabel(); - sampleRecord[ ("Home address: Label" ) ] = TDEABC::Addressee::homeAddressLabelLabel(); - sampleRecord[ ("Business address: Street" ) ] = TDEABC::Addressee::businessAddressStreetLabel(); - sampleRecord[ ("Business address: Locality" ) ] = TDEABC::Addressee::businessAddressLocalityLabel(); - sampleRecord[ ("Business address: Region" ) ] = TDEABC::Addressee::businessAddressRegionLabel(); - sampleRecord[ ("Business address: Postal code" ) ] = TDEABC::Addressee::businessAddressPostalCodeLabel(); - sampleRecord[ ("Business address: Country" ) ] = TDEABC::Addressee::businessAddressCountryLabel(); - sampleRecord[ ("Business address: Label" ) ] = TDEABC::Addressee::businessAddressLabelLabel(); - sampleRecord[ ("Home phone" ) ] = TDEABC::Addressee::homePhoneLabel(); - sampleRecord[ ("Business phone" ) ] = TDEABC::Addressee::businessPhoneLabel(); - sampleRecord[ ("Mobile phone" ) ] = TDEABC::Addressee::mobilePhoneLabel(); - sampleRecord[ ("Home fax" ) ] = TDEABC::Addressee::homeFaxLabel(); - sampleRecord[ ("Business fax" ) ] = TDEABC::Addressee::businessFaxLabel(); - sampleRecord[ ("Car phone" ) ] = TDEABC::Addressee::carPhoneLabel(); - sampleRecord[ ("ISDN" ) ] = TDEABC::Addressee::isdnLabel(); - sampleRecord[ ("Pager" ) ] = TDEABC::Addressee::pagerLabel(); - sampleRecord[ ("Email" ) ] = TDEABC::Addressee::emailLabel(); - sampleRecord[ ("Mailer" ) ] = TDEABC::Addressee::mailerLabel(); - sampleRecord[ ("Time zone" ) ] = TDEABC::Addressee::timeZoneLabel(); - sampleRecord[ ("Geographic position" ) ] = TDEABC::Addressee::geoLabel(); - sampleRecord[ ("Title" ) ] = TDEABC::Addressee::titleLabel(); - sampleRecord[ ("Role" ) ] = TDEABC::Addressee::roleLabel(); - sampleRecord[ ("Organization" ) ] = TDEABC::Addressee::organizationLabel(); - sampleRecord[ ("Note" ) ] = TDEABC::Addressee::noteLabel(); - sampleRecord[ ("productId" ) ] = TDEABC::Addressee::productIdLabel(); - sampleRecord[ ("Revision" ) ] = TDEABC::Addressee::revisionLabel(); - sampleRecord[ ("sortString" ) ] = TDEABC::Addressee::sortStringLabel(); - sampleRecord[ ("URL" ) ] = TDEABC::Addressee::urlLabel(); - sampleRecord[ ("Secrecy" ) ] = TDEABC::Addressee::secrecyLabel(); - sampleRecord[ ("Preferred address: Street" ) ] = TQString( "preferedAddressStreet" ); - sampleRecord[ ("Preferred address: Locality" ) ] = TQString( "preferedAddressLocality" ); - sampleRecord[ ("Preferred address: Region" ) ] = TQString( "preferedAddressRegion" ); - sampleRecord[ ("Preferred address: Postal code" ) ] = TQString( "preferedAddressPostalCode" ); - sampleRecord[ ("Preferred address: Country" ) ] = TQString( "preferedAddressCountry" ); - sampleRecord[ ("Preferred address: Label" ) ] = TQString( "preferedAddressLabel" ); -} - - -KWMailMergeTDEABC::~KWMailMergeTDEABC() -{ - ; -} - - -void KWMailMergeTDEABC::addEntry( const TQString &uid ) -{ - _individualUIDs.append( uid ); - makeUIDsExclusive(); -} - - -void KWMailMergeTDEABC::addList( const TQString &id ) -{ - _lists.append( id ); - parseList( id ); - makeUIDsExclusive(); -} - - -void KWMailMergeTDEABC::clear() -{ - _exclusiveUIDs.clear(); - _individualUIDs.clear(); - _listUIDs.clear(); - _lists.clear(); -} - - -int KWMailMergeTDEABC::getNumRecords() const -{ - kdDebug() << "KWMailMergeTDEABC::getNumRecords(): " << _exclusiveUIDs.count() << endl; - return _exclusiveUIDs.count(); -} - - -TQString KWMailMergeTDEABC::getValue( const TQString &name, int record ) const -{ - kdDebug() << "KWMailMergeTDEABC::getValue(" << name << ", " << record << ")" << endl; - if ( record < 0 ) - return name; - - // This doesn't ever happen, right? So why is it there? Dirk Schmidt - if ( record == -1 && _iterator == _addressBook->end() ) - return ""; - - // - // Set the iterator to the asked Addressee. - // - bool uidAvailable = false; - if ( record != -1 ) - { - int counter = 0; - - for ( _UIDIterator = _exclusiveUIDs.begin(); _UIDIterator != _exclusiveUIDs.end() - && counter < record; _UIDIterator++ ) - { - counter++; - } - - for ( _iterator = _addressBook->begin(); _iterator != _addressBook->end(); ++_iterator ) - { - - if( _iterator->uid() == *_UIDIterator ) - { - uidAvailable = true; - break; - } - } - } - - if( !uidAvailable ) - { - return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) ); - } - - - TDEABC::Addressee addr = *_iterator; - _iterator++; // Don't know why. Could be removed? Dirk Schmidt - - - // - // Return the asked variable. - // - if ( name == "KAddressbook identifier" ) - return addr.uid(); - if ( name == "Name" ) - return addr.name(); - if ( name == "Formatted name" ) - return addr.formattedName(); - if ( name == "Family names" ) - return addr.familyName(); - if ( name == "Given name" ) - return addr.givenName(); - if ( name == "Additional names" ) - return addr.additionalName(); - if ( name == "Honorific prefixes" ) - return addr.prefix(); - if ( name == "Honorific suffixes" ) - return addr.suffix(); - if ( name == "Nick name" ) - return addr.nickName(); - if ( name == "Birthday" ) - return TDEGlobal::locale()->formatDate( addr.birthday().date() ); - - if ( name == "Home address: Street" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.street(); - } - if ( name == "Home address: Locality" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.locality(); - } - if ( name == "Home address: Region" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.region(); - } - if ( name == "Home address: Postal code" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.postalCode(); - } - if ( name == "Home address: Country" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.country(); - } - if ( name == "Home address: Label" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Home ); - return a.label(); - } - - if ( name == "Business address: Street" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.street(); - } - if ( name == "Business address: Locality" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.locality(); - } - if ( name == "Business address: Region" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.region(); - } - if ( name == "Business address: Postal code" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.postalCode(); - } - if ( name == "Business address: Country" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.country(); - } - if ( name == "Business address: Label" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Work ); - return a.label(); - } - - if ( name == "Prefered address: Street" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.street(); - } - - if ( name == "Prefered address: Locality" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.locality(); - } - if ( name == "Prefered address: Region" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.region(); - } - if ( name == "Prefered address: Postal code" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.postalCode(); - } - if ( name == "Prefered address: Country" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.country(); - } - if ( name == "Prefered address: Label" ) - { - TDEABC::Address a = addr.address( TDEABC::Address::Pref ); - return a.label(); - } - - if ( name == "Home phone" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home ); - return phone.number(); - } - if ( name == "Business phone" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Work ); - return phone.number(); - } - if ( name == "Mobile phone" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Cell ); - return phone.number(); - } - if ( name == "Home fax" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax ); - return phone.number(); - } - if ( name == "Business fax" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Fax ); - return phone.number(); - } - if ( name == "Car phone" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Car ); - return phone.number(); - } - if ( name == "ISDN" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Isdn ); - return phone.number(); - } - if ( name == "Pager" ) - { - TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Pager ); - return phone.number(); - } - - if ( name == "Email" ) - return addr.preferredEmail(); - if ( name == "Mailer" ) - return addr.mailer(); - if ( name == "Time zone" ) - { - TDEABC::TimeZone zone = addr.timeZone(); - return TQString::number( zone.offset() ); - } - if ( name == "Geographic position" ) - { - TDEABC::Geo geo = addr.geo(); - TQString lat; - TQString longi; - if( geo.latitude()<0 ) - lat = TQString( i18n("%1 South") ).arg( -geo.latitude() ); - else - lat = TQString( i18n("%1 North") ).arg( geo.latitude() ); - - if( geo.longitude()<0 ) - // There is something going wrong, because "W" is replaced by "q ". - // Needs fix. - longi = TQString( i18n("%1 West") ).arg( -geo.longitude() ); - else - longi = TQString( i18n("%1 East") ).arg( geo.longitude() ); - - return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi ); - } - - if ( name == "Title" ) - return addr.title(); - if ( name == "Role" ) - return addr.role(); - if ( name == "Organization" ) - return addr.organization(); - if ( name == "Note" ) - return addr.note(); - if ( name == "productId" ) - return addr.productId(); - if ( name == "Revision" ) - return TDEGlobal::locale()->formatDate( addr.revision().date() ); - if ( name == "sortString" ) - return addr.sortString(); - if ( name == "URL" ) - return addr.url().url(); - if ( name == "Secrecy" ) - { - TDEABC::Secrecy secrecy = addr.secrecy(); - return TDEABC::Secrecy::typeLabel( secrecy.type() ); - } - - return ( i18n("Unkown mail merge variable: %1").arg ( name ) ) ; -} - - -TQStringList KWMailMergeTDEABC::lists() const -{ - return _lists; -} - - -void KWMailMergeTDEABC::load( TQDomElement& parentElem ) -{ - clear(); - TQDomNode contentNode=parentElem.namedItem("CONTENT"); - if( contentNode.isNull() ) - return; - for( TQDomNode rec=contentNode.firstChild(); !rec.isNull(); rec=rec.nextSibling() ) - { - if( rec.nodeName()== "RECORD" ) - { - for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); - recEnt=recEnt.nextSibling().toElement() ) - { - addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); - } - } - else if( rec.nodeName() == "LIST" ) - { - for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); - recEnt=recEnt.nextSibling().toElement() ) - { - addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); - } - } - else - kdDebug() << "rec.nodeName(): " << rec.nodeName() << endl; - } -} - - -void KWMailMergeTDEABC::makeUIDsExclusive() -{ - _exclusiveUIDs = _individualUIDs + _listUIDs; - _exclusiveUIDs.sort(); - kdDebug() << "KWMailMergeTDEABC::makeUIDsExclusive(): before: " << _exclusiveUIDs.join(",") - << endl; - TQString uid; - for( TQStringList::Iterator it=_exclusiveUIDs.begin(); - it!=_exclusiveUIDs.end(); ++it ) - { - if( *it == uid ) - { - it = _exclusiveUIDs.remove( it ); - } - uid = *it; - } - kdDebug() << "KWMailMergeTDEABC::makeUIDsExclusive(): after: " << _exclusiveUIDs.join(",") - << endl; -} - - -void KWMailMergeTDEABC::parseList( const TQString& listName ) -{ - if( listName.isEmpty() ) - return; - - kdDebug() << "KWMailMergeTDEABC::parseList: " << listName << endl; - TDEABC::DistributionListManager dlm ( _addressBook ); - dlm.load(); - - TQStringList::Iterator listIt; - - TDEABC::DistributionList* list = dlm.list( listName ); - TDEABC::DistributionList::Entry::List entries = list->entries(); - - TDEABC::DistributionList::Entry::List::Iterator itemIt; - for ( itemIt = entries.begin(); itemIt != entries.end(); ++itemIt ) - { - kdDebug() << "WMailMergeTDEABC::parseList: Listentry UID: " << - (*itemIt).addressee.uid() << endl; - _listUIDs.append( (*itemIt).addressee.uid() ); - } -} - - -void KWMailMergeTDEABC::refresh( bool ) -{ - kdDebug() << "KWMailMergeTDEABC::refresh()" << endl; - _iterator = _addressBook->begin(); - _UIDIterator = _individualUIDs.begin(); - -} - - -void KWMailMergeTDEABC::save( TQDomDocument& doc, TQDomElement& parent) -{ - TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); - parent.appendChild(cont); - - TQValueList::ConstIterator it = _individualUIDs.begin(); - for( ; it != _individualUIDs.end(); ++it ) - { - TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); - cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); - recEnt.setAttribute(TQString::fromLatin1("uid"),*it); - rec.appendChild(recEnt); - } - - it = _lists.begin(); - for( ; !(it == _lists.end()); ++it ) - { - TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); - cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); - recEnt.setAttribute(TQString::fromLatin1("listid"),*it); - rec.appendChild(recEnt); - } -} - -bool KWMailMergeTDEABC::showConfigDialog( TQWidget* par, int action ) -{ - bool ret=false; - if (action == KWSLCreate ) - { - clear(); - } - - //if (action==KWSLOpen) - { - KWMailMergeTDEABCConfig *dia=new KWMailMergeTDEABCConfig( par, this ); - - ret=( dia->exec() == TQDialog::Accepted ); - kdDebug() << "KWMailMergeTDEABCConfig::Accepted " << ret << endl; - delete dia; - } - refresh(false); - - return ret; -} - - -TQStringList KWMailMergeTDEABC::singleRecords() const -{ - return _individualUIDs; -} - - - -extern "C" -{ - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent ) - { - return new KWMailMergeTDEABC( inst, parent ); - } -} - - - - -#include "KWMailMergeTDEABC.moc" - - diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABC.h b/kword/mailmerge/kabc/KWMailMergeTDEABC.h deleted file mode 100644 index 3db02d91..00000000 --- a/kword/mailmerge/kabc/KWMailMergeTDEABC.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - This file is part of the KDE project - Copyright (C) 2003 Tobias Koenig - Copyright (C) 2004 Tobias Koenig - Dirk Schmidt - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. -*/ - -#ifndef _KWMAILMERGE_KABC_H_ -#define _KWMAILMERGE_KABC_H_ - -#include -#include - -#include - -#include "KWMailMergeDataSource.h" - -class KWMailMergeTDEABC: public KWMailMergeDataSource -{ - Q_OBJECT - - -public: - KWMailMergeTDEABC( TDEInstance *inst, TQObject *parent ); - ~KWMailMergeTDEABC(); - - /** - Saves the mail merge list to the kword document. - */ - virtual void save( TQDomDocument&, TQDomElement& ); - - /** - Loads the mail merge list stored in the kword document. - */ - virtual void load( TQDomElement& ); - - /** - @param name The name of the value e.g. "Family name". - @param record The position of the the entry in mail merge list. - @return The value of the mail merge variable. - - If @p record equals -1, @p name is returned. - */ - virtual class TQString getValue( const class TQString &name, int record = -1 ) const; - - /** - @return The number of available contacts in mail merge list. - */ - virtual int getNumRecords() const; - - /** - Only for compatability reasons. - - @param force Hasn't any effect. - */ - virtual void refresh( bool force ); - - /** - Shows a KWMailMergeTDEABCConfig dialog for selecting entries from KAddressbook. - */ - virtual bool showConfigDialog( TQWidget*, int action); - -protected: - friend class KWMailMergeTDEABCConfig; - - /** - Adds an entry from TDEABC::StdAddressBook::self() - to the mail merge list. - - To be called by KWMailMergeTDEABC::load() and - KWMailMergeTDEABCConfig::acceptSelection() only. - - @param uid The entry's TDEABC::Addressee::uid(). - */ - void addEntry( const TQString &uid ); - - /** - Adds a distribution list to the mail merge list. - - To be called by KWMailMergeTDEABC::load() and - KWMailMergeTDEABCConfig::acceptSelection() only. - - @param id The DistributionList::name(). - */ - void addList( const TQString &id ); - - /** - Removes all entries and distribution lists from the mail merge list. - */ - void clear(); - - /** - @return All selected DistributionList::name(). - - To be called by KWMailMergeTDEABCConfig::initSelectedLists() - */ - virtual TQStringList lists() const; - - /** - @return The TDEABC::Addressee::uid() of all individually selected - entries in mail merge list. - - To be called by KWMailMergeTDEABCConfig::initSelectedAddressees() - */ - virtual TQStringList singleRecords() const; - -private: - /** - The TDEABC::StdAddressBook::self(). - */ - TDEABC::AddressBook* _addressBook; - - /** - Just an Iterator. - */ - mutable TDEABC::AddressBook::ConstIterator _iterator; - - /** - Just an Iterator. - */ - mutable TQStringList::ConstIterator _UIDIterator; - - /** - The "real" mail merge list. A list of TQStrings. Each represents - the TDEABC::Addressee::uid() of a KAdressbook entry. - There is no UID twice in this list. - - Needed because selected contacts may appear in a selected - distribution list, too. And we don't want to print it multiple. - */ - TQStringList _exclusiveUIDs; - - /** - This list contains all the TDEABC::Addressee::uid() selected - individually with the KWMailMergeTDEABCConfig dialog. - */ - TQStringList _individualUIDs; - - /** - This list contains all the TDEABC::Addressee::uid() from the distribution - lists selected with the KWMailMergeTDEABCConfig dialog. - */ - TQStringList _listUIDs; - - /** - This list contains all the DistributionList::name() selected with the - KWMailMergeTDEABCConfig dialog. - */ - TQStringList _lists; - - - /** - Appends all TDEABC::Addressee::uid() of a distribution list to _listUIDs - and updates the mail merge list. - - To be used by KWMailMergeTDEABCConfig::addList( const TQString &id ) - only. - - @param listName The DistributionList::name() of the distribution list. - */ - void parseList( const TQString& listName ); - - /** - Removes duplicate entries in the mail merge list. - */ - void makeUIDsExclusive(); - -}; - -#endif - diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp deleted file mode 100644 index 440e208a..00000000 --- a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp +++ /dev/null @@ -1,546 +0,0 @@ -/* - This file is part of the KDE project - Copyright (C) 2004 Dirk Schmidt - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. -*/ - - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "addresspicker.h" -#include "KWMailMergeTDEABC.h" -#include "KWMailMergeTDEABCConfig.h" - - -KWMailMergeTDEABCConfig::KWMailMergeTDEABCConfig( TQWidget *parent, KWMailMergeTDEABC *db_) - :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), - Ok | Cancel, Ok, parent, "", true) -{ - _db = db_; - - (new TQVBoxLayout(plainPage()))->setAutoAdd(true); - setMainWidget( _ui=new AddressPickerUI( plainPage() ) ); - - updateAvailable(); - initSelectedAddressees(); - initSelectedLists(); - initSlotSignalConnections(); -} - - -KWMailMergeTDEABCConfig::~KWMailMergeTDEABCConfig() -{ - ; -} - - -void KWMailMergeTDEABCConfig::acceptSelection() -{ - _db->clear(); - - TQListViewItem* top = _ui->mSelectedView->firstChild(); - while(top) - { - kdDebug() << "acceptSelection(): " << top->text(0) << endl; - if( top->text(0) == i18n("Distribution Lists") ) - { - TQListViewItem* item = top->firstChild(); - while(item) - { - kdDebug() << "acceptSelection(): " << item->text(0) << endl; - _db->addList( item->text(0) ); - item = item->nextSibling(); - } - } - else if( top->text(0) == i18n("Single Entries") ) - { - TQListViewItem* item = top->firstChild(); - while(item) - { - kdDebug() << "acceptSelection(): " << item->text(0) << endl; - _db->addEntry( item->text(-1) ); - item = item->nextSibling(); - } - } - top = top->nextSibling(); - } - -} - - -void KWMailMergeTDEABCConfig::addSelectedContacts() -{ - TQListViewItemIterator it( _ui->mAvailableView, TQListViewItemIterator::Selected ); - TQListViewItem* selected = _ui->mSelectedView->findItem( - i18n("Single Entries"), 0, TQt::ExactMatch ); - TQListViewItem* selectedLists = _ui->mSelectedView->findItem( - i18n("Distribution Lists"), 0, TQt::ExactMatch ); - while ( it.current() ) - { - if( it.current()->depth() > 0 ) - { - TQString uid = it.current()->text( -1 ); - kdDebug() << "addSelectedContacts(): uid :" << uid << endl; - if( !uid.isEmpty() ) - { - KWMailMergeTDEABCConfigListItem *item = - static_cast ( it.current() ); - if( selected ) - { - selected->insertItem( item ); - selected->setOpen( true ); - destroyAvailableClones( uid ); - } - } - else if( it.current()->parent()->text(0) == i18n("Distribution Lists") ) - { - if( selectedLists ) - { - selectedLists->insertItem( it.current() ); - selectedLists->setOpen( true ); - } - } - } - ++it; - } - _ui->mSelectedView->selectAll( false ); -} - - -void KWMailMergeTDEABCConfig::destroyAvailableClones( const TQString& uid ) -{ - if( uid.isEmpty() ) - return; - - TQListViewItemIterator it( _ui->mAvailableView ); - - while ( it.current() ) - { - if( it.current()->depth() > 0) - { - if( it.current()->text(-1)== uid ) - { - delete it.current(); - } - } - ++it; - } -} - - -void KWMailMergeTDEABCConfig::filterChanged( const TQString& txt ) -{ - kdDebug() << "KWMailMergeTDEABCConfig::filterChanged( " << txt << " )" << endl; - - bool showAll = txt.isEmpty(); - - TQListViewItem* category = _ui->mAvailableView->firstChild(); - while(category) - { - if( category->text(0)!=i18n("Distribution Lists") ) - { - TQListViewItem* item = category->firstChild(); - while(item) - { - if(showAll) - { - item->setVisible( true ); - } - else - { - item->setVisible( item->text(0).contains( txt, false ) ); - } - item = item->nextSibling(); - } - category->setOpen( !showAll ); - } - else - { - category->setVisible( showAll ); - } - category = category->nextSibling(); - } -} - - -void KWMailMergeTDEABCConfig::initSelectedAddressees() -{ - TQStringList records = _db->singleRecords(); - - TQListViewItem* category = _ui->mAvailableView->firstChild(); - TQListViewItem* selected = _ui->mSelectedView->findItem( - i18n("Single Entries"), 0, TQt::ExactMatch ); - while ( category && (records.count()>0) ) - { - if( category->text(0) != i18n("Distribution Lists") ) - { - KWMailMergeTDEABCConfigListItem* item = - static_cast ( category->firstChild() ); - while( item && (records.count()>0) ) - { - // Need some temporary item, because after selected->insertItem( item ) - // the item->nextSibling() is not the one we want. - KWMailMergeTDEABCConfigListItem* nextItem = - static_cast ( item->nextSibling() ); - - for( TQStringList::Iterator itRecords = records.begin(); - itRecords != records.end(); ++itRecords ) - { - TQString uid = *itRecords; - if( item->text(-1) == uid ) - { - selected->insertItem( item ); - - // downsize records to speed up iterations - itRecords = records.remove( itRecords ); - --itRecords; - - destroyAvailableClones( uid ); - } - } - item = nextItem; - } - } - category = category->nextSibling(); - } -} - - -void KWMailMergeTDEABCConfig::initSelectedLists() -{ - TQStringList lists = _db->lists(); - - kdDebug() << "::initSelectedLists()" << lists.join(",") << endl; - - TQListViewItem* l = _ui->mAvailableView->findItem( - i18n("Distribution Lists"), 0, TQt::ExactMatch ); - TQListViewItem* selected = _ui->mSelectedView->findItem( - i18n("Distribution Lists"), 0, TQt::ExactMatch ); - - TQListViewItem* item = ( l->firstChild() ); - while( item && (lists.count()>0) ) - { - TQListViewItem* nextItem = item->nextSibling(); - - for( TQStringList::Iterator itLists = lists.begin(); - itLists != lists.end(); ++itLists ) - { - TQString id = *itLists; - if( item->text(0) == id ) - { - selected->insertItem( item ); - itLists = lists.remove( itLists ); - --itLists; - } - } - item = nextItem; - } -} - - -void KWMailMergeTDEABCConfig::initSlotSignalConnections() -{ - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( acceptSelection() ) ); - connect( _ui->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addSelectedContacts() ) ); - connect( _ui->mAddressBook, TQT_SIGNAL( clicked() ), TQT_SLOT( launchAddressbook() ) ); - - connect( _ui->mAvailableView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( addSelectedContacts() ) ); - - connect( _ui->mFilterEdit, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( filterChanged(const TQString &) ) ); - connect( _ui->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelectedContacts() ) ); - connect( _ui->mSaveList, TQT_SIGNAL( clicked() ), TQT_SLOT( saveDistributionList() ) ); - connect( _ui->mSelectedView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( removeSelectedContacts() ) ); -} - - -void KWMailMergeTDEABCConfig::launchAddressbook() const -{ - kapp->startServiceByDesktopName( "kaddressbook", TQString() ); -} - - - -void KWMailMergeTDEABCConfig::removeContact( TQListViewItem* item ) -{ - TQStringList& categories = _usedCategories; - TQListViewItem* availableLists = _ui->mAvailableView->findItem( - i18n("Distribution Lists"), 0, TQt::ExactMatch ); - if( item->depth() > 0 ) - { - if( !item->text( -1 ).isEmpty() ) // remove selected single entry here - { - KWMailMergeTDEABCConfigListItem* rightItem = - static_cast ( item ); - - TQStringList entryCategories = rightItem->addressee().categories(); - for ( TQStringList::Iterator itEntryCat = entryCategories.begin(); - itEntryCat != entryCategories.end(); ++itEntryCat ) - { - int i = categories.findIndex(*itEntryCat); - if( i == -1 ) - { - TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, - *itEntryCat ); - categories.append( *itEntryCat ); - - KWMailMergeTDEABCConfigListItem* leftItem = new KWMailMergeTDEABCConfigListItem( - category, rightItem->addressee() ); - } - else - { - KWMailMergeTDEABCConfigListItem* leftItem = new - KWMailMergeTDEABCConfigListItem( - _ui->mAvailableView->findItem( - *itEntryCat, 0, - TQt::ExactMatch), - rightItem->addressee() ); - } - } - if( entryCategories.isEmpty() ) - { - TQString noCat = i18n("no category"); - KWMailMergeTDEABCConfigListItem* leftItem = new KWMailMergeTDEABCConfigListItem( - _ui->mAvailableView->findItem( - noCat, 0, TQt::ExactMatch), - rightItem->addressee() ); - } - delete item; - } - else if( item->parent()->text(0) == i18n("Distribution Lists") ) // remove a list - { - if( availableLists ) - availableLists->insertItem( item ); - } - } -} - -void KWMailMergeTDEABCConfig::removeSelectedContacts() -{ - TQListViewItemIterator it( _ui->mSelectedView, TQListViewItemIterator::Selected ); - - while( it.current() ) - { - kdDebug() << "removeSelectedContacts(): text: " << it.current()->text(-1) << endl; - removeContact( it.current() ); - ++it; - } - _ui->mAvailableView->selectAll( false ); -} - - -void KWMailMergeTDEABCConfig::saveDistributionList() -{ - TDEABC::DistributionListManager dlm( TDEABC::StdAddressBook::self() ); - dlm.load(); - - bool ok = false; - TQString listName = KInputDialog::getText( i18n("New Distribution List"), - i18n("Please enter name:"), - TQString(), &ok, - this ); - if ( !ok || listName.isEmpty() ) - return; - - if ( dlm.list( listName ) ) - { - KMessageBox::information( 0, - i18n( "Distribution list with the given name %1 " - "already exists. Please select a different name." ) - .arg( listName ) ); - return; - } - TDEABC::DistributionList *distList = new TDEABC::DistributionList( &dlm, listName ); - - TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem( - i18n("Distribution Lists"),0 , TQt::ExactMatch), listName ); - - TQListViewItem* category = _ui->mSelectedView->firstChild(); - while(category) - { - if( category->text(0)==i18n("Single Entries") ) - { - KWMailMergeTDEABCConfigListItem* item = - static_cast ( category->firstChild() ); - - while(item) - { - distList->insertEntry( item->addressee() ); - - TDEABC::Addressee addr = item->addressee(); - TQString formattedName = addr.formattedName(); - TQListViewItem* newItem = new TQListViewItem( - newListItem, item->addressee().formattedName() ); - newItem->setEnabled( false ); - - item = static_cast( item->nextSibling() ); - } - - TQListViewItemIterator it ( category->firstChild() ); - while( it.current() ) - { - removeContact( it.current() ); - ++it; - } - } - category = category->nextSibling(); - } - - dlm.save(); - newListItem->setOpen( true ); -} - - -void KWMailMergeTDEABCConfig::updateAvailable() -{ - _ui->mAvailableView->clear(); - _ui->mAvailableView->setRootIsDecorated( true ); - - // - // First append the addressees. - // - TQListViewItem* noCategory = new TQListViewItem( _ui->mAvailableView, - i18n("no category") ); - - TQStringList& categories = _usedCategories ; - categories.clear(); - - TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self(); - for( TDEABC::AddressBook::Iterator itAddr = addressBook->begin(); - itAddr != addressBook->end(); ++itAddr ) - { - - TQStringList entryCategories = itAddr->categories(); - for ( TQStringList::Iterator itCat = entryCategories.begin(); - itCat != entryCategories.end(); ++itCat ) - { - int i = categories.findIndex(*itCat); - - // Create category, if not yet in listview and append item to it. - if( i == -1 ) - { - TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, *itCat ); - categories.append( *itCat ); - - KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( - category, *itAddr ); - } - // Append item to existing category in listview. - else - { - KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( - _ui->mAvailableView->findItem( - *itCat, 0, TQt::ExactMatch), - *itAddr ); - } - - } - // If Addressee does not belong to any category, append it to "no category". - if( entryCategories.isEmpty() ) - { - KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( - noCategory, *itAddr ); - } - } - - // - // Now append the distribution lists - // - TDEABC::DistributionListManager dlm ( addressBook ); - dlm.load(); - - TQStringList distributionLists = dlm.listNames(); - TQListViewItem* distributionListsItem = new TQListViewItem( _ui->mAvailableView, - i18n("Distribution Lists") ); - - TQStringList::Iterator itDistributionLists; - - for( itDistributionLists = distributionLists.begin(); - itDistributionLists != distributionLists.end(); ++itDistributionLists ) - { - TDEABC::DistributionList* list = dlm.list( *itDistributionLists ); - - TDEABC::DistributionList::Entry::List entries = list->entries(); - - TQListViewItem* listItem = new TQListViewItem( distributionListsItem, - *itDistributionLists ); - - TDEABC::DistributionList::Entry::List::Iterator itList; - for ( itList = entries.begin(); itList != entries.end(); ++itList ) - { - // Create a normal TQListViewItem and disable it, because this is not a - // distribution-list-editor. KAddressbook should be used instead. - TQListViewItem* item = new TQListViewItem( - listItem, (*itList).addressee.formattedName() ); - item->setEnabled( false ); - } - - } -} - - - -KWMailMergeTDEABCConfigListItem::KWMailMergeTDEABCConfigListItem( TQListView *parent, - const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) -{ - setText( 0, addressEntry.formattedName() ); - _addressEntry = addressEntry; -} - -KWMailMergeTDEABCConfigListItem::KWMailMergeTDEABCConfigListItem( TQListViewItem *parent, - const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) -{ - setText( 0, addressEntry.formattedName() ); - _addressEntry = addressEntry; -} - -KWMailMergeTDEABCConfigListItem::~KWMailMergeTDEABCConfigListItem() -{} - -TDEABC::Addressee KWMailMergeTDEABCConfigListItem::addressee() const -{ - return _addressEntry; -} - -TQString KWMailMergeTDEABCConfigListItem::text( int column ) const -{ - if( column == -1 ) - { - return _addressEntry.uid(); - } - else - { - return TQListViewItem::text( column ); - } -} - -#include "KWMailMergeTDEABCConfig.moc" diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h b/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h deleted file mode 100644 index 1a23b44c..00000000 --- a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h +++ /dev/null @@ -1,150 +0,0 @@ -/* - This file is part of the KDE project - Copyright (C) 2004 Dirk Schmidt - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. -*/ - -#ifndef _KWMAILMERGE_KABC_CONFIG_H_ -#define _KWMAILMERGE_KABC_CONFIG_H_ - -#include -#include -#include - -#include "KWMailMergeTDEABC.h" - - -class AddressPickerUI; -class KWMailMergeTDEABC; - -class KWMailMergeTDEABCConfig: public KDialogBase -{ - Q_OBJECT - -public: - KWMailMergeTDEABCConfig( TQWidget *parent, KWMailMergeTDEABC *db_ ); - virtual ~KWMailMergeTDEABCConfig(); - - -private slots: - - /** - Moves selected items from the left Listview to the right one. - */ - void addSelectedContacts(); - - /** - Moves selected items from the right Listview to the left one. - */ - void removeSelectedContacts(); - - /** - Executes KAddressbook as external application. - */ - void launchAddressbook() const; - - /** - Updates the parent's mail merge list from items in the right Listview. - */ - void acceptSelection(); - - /** - Hides items in the left listview, which are not matching @p txt. - */ - void filterChanged( const TQString& txt ); - - /** - Saves the selected single entries to a new TDEABC::DistributionList in KAddressbook. - */ - void saveDistributionList(); -private: - /** - The addresspicker widget. - */ - AddressPickerUI *_ui; - - /** - Store all categories used in the addressbook, to avoid some iterator cycles. - */ - TQStringList _usedCategories; - - /** - The mail merge list. - */ - KWMailMergeTDEABC *_db; - - /** - Removes duplicates in the left TQListView, when moving an item to the right. - */ - void destroyAvailableClones( const TQString& uid ); - - /** - Appends the previously selected entries to the right TQListView. - */ - void initSelectedAddressees(); - - /** - Appends the previously selected distribution lists to the right TQListView. - */ - void initSelectedLists(); - - /** - Just connects signals and slots. - */ - void initSlotSignalConnections(); - - /** - Moves @p item from the right Listview to the left one. - - Called by KWMailMergeTDEABCConfig::removeSelectedContacts(). - */ - void removeContact( TQListViewItem* item ); - - /** - Appends all KAddressbook entries in TDEABC::StdAddressBook::self() and all - TDEABC::DistributionLists to the left TQListView. - */ - void updateAvailable(); -}; - - -class KWMailMergeTDEABCConfigListItem : public TQListViewItem -{ - -public: - KWMailMergeTDEABCConfigListItem( TQListView *parent, const TDEABC::Addressee& addressEntry ); - KWMailMergeTDEABCConfigListItem( TQListViewItem *parent, const TDEABC::Addressee& addressEntry ); - virtual ~KWMailMergeTDEABCConfigListItem(); - - /** - Returns the TDEABC::Addressee of a KWMailMergeTDEABCConfigListItem. - */ - TDEABC::Addressee addressee() const; - - /** - This is an overloaded member function of TQListViewItem::text( int column ). - It Returns the TDEABC::Addressee::uid(), if column is set to -1. - Otherwise TQListViewItem::text( int column ) is returned. - */ - TQString text( int column ) const; - - -private: - TDEABC::Addressee _addressEntry; - -}; -#endif diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am deleted file mode 100644 index 98231fed..00000000 --- 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/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui deleted file mode 100644 index 44dc8c8f..00000000 --- a/kword/mailmerge/kabc/addresspicker.ui +++ /dev/null @@ -1,297 +0,0 @@ - -AddressPickerUI - - - AddressPickerUI - - - - 0 - 0 - 617 - 434 - - - - Address Selection - - - - unnamed - - - - layout10 - - - - unnamed - - - - spacer1 - - - Vertical - - - Expanding - - - - 20 - 16 - - - - - - mAddButton - - - true - - - &Add >> - - - - - mRemoveButton - - - true - - - << &Remove - - - - - spacer2_2 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - - - mSaveList - - - true - - - Save as &Distribution List... - - - Save selected single entries to a new distribution list. - - - - - layout1 - - - - unnamed - - - - TextLabel2 - - - &Filter on: - - - mFilterEdit - - - - - mFilterEdit - - - - 1 - 0 - 1 - 0 - - - - - - - - - - - - Name - - - true - - - true - - - - - Distribution Lists - - - - - - - - Single Entries - - - - - - - mSelectedView - - - - 7 - 1 - 0 - 0 - - - - Extended - - - true - - - true - - - true - - - AllColumns - - - true - - - - - mAddressBook - - - Address B&ook - - - Launch KAddressbook - - - - - textLabel1 - - - - 1 - - - - &Address Book - - - WordBreak|AlignCenter - - - mAvailableView - - - - - textLabel2 - - - - 1 - - - - &Selected Addresses - - - WordBreak|AlignCenter - - - mSelectedView - - - - - - Name - - - true - - - true - - - - mAvailableView - - - - 7 - 7 - 0 - 0 - - - - Extended - - - true - - - true - - - true - - - AllColumns - - - true - - - - - - - kpushbutton.h - kpushbutton.h - tdelistview.h - tdelistview.h - - diff --git a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop b/kword/mailmerge/kabc/kwmailmerge_kabc.desktop deleted file mode 100644 index f300c0be..00000000 --- a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop +++ /dev/null @@ -1,105 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=KWord/MailMergePlugin - -Name=TDE Addressbook Plugin -Name[bg]=Приставка за адресника на TDE -Name[br]=Lugent Karned chomlec'hioù TDE -Name[ca]=Connector de llibreta d'adreces TDE -Name[cs]=Modul Knihy adres TDE -Name[cy]=Ategyn Llyfr Cyfeiriadau TDE -Name[da]=TDE's adressebog Plugin -Name[de]=TDE Adressbuch-Modul -Name[el]=Πρόσθετο βιβλίου διευθύνσεων του TDE -Name[eo]=TDE Adresaro-kromprogramo -Name[es]=Accesorio de la libreta de direcciones de TDE -Name[et]=TDE aadressiraamatu plugin -Name[eu]=TDE-ren helbide-liburuaren plugina -Name[fa]=وصلۀ کتاب نشانی TDE -Name[fi]=TDE:n osoitekirjan liitännäinen -Name[fr]=Module externe de carnet d'adresses de TDE -Name[fy]=Adresboekplugin foar TDE -Name[gl]=Plugin do Libro de Enderezos de TDE -Name[he]=תוסף של פנקס הכתובות של TDE -Name[hi]=केडीई पतापुस्तिका प्लगिन -Name[hr]=TDE dodatak adresara -Name[hu]=Illesztőmodul a TDE címjegyzékhez -Name[is]=TDE vistfanga íforrit -Name[it]=Plugin per la rubrica degli indirizzi TDE -Name[ja]=TDE アドレス帳プラグイン -Name[km]=កម្មវិធី​ជំនួយ​សៀវភៅ​អាសយដ្ឋាន TDE -Name[lv]=TDE adrešu grāmatiņas spraudnis -Name[ms]=Plugin Buku Alamat TDE -Name[nb]=Programtillegg for TDE-adresseboka -Name[nds]=Adressbook-Moduul för TDE -Name[ne]=TDE ठेगानापुस्तक प्लगइन -Name[nl]=Adresboekplugin voor TDE -Name[nn]=Programtillegg for TDE-adresseboka -Name[pl]=Wtyczka Książki adresowej TDE -Name[pt]='Plugin' do Livro de Endereços do TDE -Name[pt_BR]=Livro de Endereços do TDE -Name[ru]=Модуль адресной книги TDE -Name[se]=TDE:a čujuhusgirjemoduvla -Name[sk]=Modul pre TDE adresár -Name[sl]=Vstavek Adresar TDE -Name[sr]=Прикључак за TDE-ов адресар -Name[sr@Latn]=Priključak za TDE-ov adresar -Name[sv]=Insticksprogram för TDE:s adressbok -Name[ta]= TDE முகவரிப்புத்தகம் சொருகு -Name[tg]=Дарҷ кардани TDE Китоби Адресҳо -Name[tr]=TDE Adres Defteri Eklentisi -Name[uk]=Втулок адресної книги TDE -Name[uz]=TDE manzillar daftari plagini -Name[uz@cyrillic]=TDE манзиллар дафтари плагини -Name[wa]=Tchôke-divins calpin d' adresses TDE -Name[zh_CN]=TDE 地址簿插件 -Name[zh_TW]=TDE 通訊錄外掛程式 -Comment=This datasource type lets you use your TDE Address Book entries. -Comment[bg]=Този източник на данни се свързва директно с адресника на TDE и чете данните от там. -Comment[ca]=Aquest tipus de font de dades permet usar les entrades de la llibreta d'adreces del TDE. -Comment[cs]=Tento zdroj dat umožňuje využít položky z Knihy adres. -Comment[cy]=Mae'r math yma o ffynhonell ddata yn eich galluogi i ddefnyddio eich cofnodion Llyfr Cyfeiriadau TDE. -Comment[da]=Denne datakildetype lader dig bruge dine TDE adressebogsindgange. -Comment[de]=Dieser Quellentyp ermöglicht die Verwendung von TDE-Adressbucheinträgen. -Comment[el]=Αυτή η πηγή δεδομένων σας επιτρέπει να χρησιμοποιήσετε τις καταχωρήσεις σας από το βιβλίο διευθύνσεων του TDE. -Comment[es]=Este tipo de fuente de datos le permite usar las entradas de su libreta de direcciones de TDE. -Comment[et]=See andmeallika tüüp võimaldab kasutada TDE aadressiraamatu kirjeid. -Comment[eu]=Datu-iturburu honek zure TDE-ko helbide-liburuko sarrerak erabiltzeko aukera ematen dizu. -Comment[fa]=این نوع متن داده‌ به شما اجازۀ استفاده از مدخلهای کتاب نشانی TDE را می‌دهد. -Comment[fi]=Tämän tietolähteen avulla voit käyttää TDE:n osoitekirjan tietoja. -Comment[fr]=Ce type de source de données vous permet d'utiliser votre carnet d'adresses TDE. -Comment[fy]=Mei dizze plugin ha jo taging ta jo TDE adresboek. -Comment[gl]=Este tipo de fonte de datos armacena os datos directamente no Libro de Enderezos de TDE. -Comment[he]=טיפוס מקור נתונים זה מאפשר לך להשתמש ברשומות שלך מתוך פנקס הכתובות של TDE. -Comment[hi]=यह डाटा स्रोत क़िस्म आपको केडीई पता पुस्तिका प्रविष्टियों को इस्तेमाल करने देती है. -Comment[hu]=Ez az adatforrástípus a TDE címjegyzék adatait teszi hozzáférhetővé. -Comment[is]=Þessi auðlindategund gerir þér kleyft að nota færslur frá TDE vistfangaskránni þinni. -Comment[it]=Questo tipo di fonte di dati permette di usare le voci della rubrica degli indirizzi di TDE. -Comment[ja]=TDE アドレス帳のデータを使用できるようにします。 -Comment[km]=ប្រភេទ​ប្រភព​ទិន្នន័យ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ធាតុ​សៀវភៅ​អាសយដ្ឋាន TDE របស់​អ្នក ។ -Comment[ms]=Jenis sumber data ini membenarkan anda menggunakan entri Buku Alamat TDE anda. -Comment[nb]=Med denne datakildetypen kan du få tilgang til oppføringene i TDE-adresseboka. -Comment[nds]=Mit dissen Datenborntyp laat sik TDE-Adressbookindrääg bruken. -Comment[ne]=यो डेटासंसाधनले तपाईंलाई तपाईंको TDE ठेगाना पुस्तक प्रविष्टिहरू प्रयोग गर्न दिन्छ । -Comment[nl]=Via deze plugin hebt u toegang tot uw TDE-adresboek. -Comment[nn]=Med denne datakjeldetypen kan du få tilgang til oppføringane i TDE-adresseboka. -Comment[pl]=To źródło danych pozwala Ci używać Twoich wpisów z Książki adresowej TDE. -Comment[pt]=Este tipo de fonte de dados armazena os dados directamente no Livro de Endereços do TDE. -Comment[pt_BR]=Este tipo de fonte de dados permite-lhe usar suas entradas do Livro de Endereços do TDE. -Comment[ru]=Источник данных, работающий с записями адресной книги TDE -Comment[se]=Dát dáhtagáldu diktá du geavahit TDE-čujuhusgirjemerkošiid. -Comment[sk]=Tento typ zdroja dát umožňuje používať záznamy z TDE adresára. -Comment[sl]=Ta tip vira podatkov vam omogoča uporabljati vnose vašega Adresarja TDE. -Comment[sr]=Овај тип извора података омогућава вам да користите ставке из TDE-овог адресара. -Comment[sr@Latn]=Ovaj tip izvora podataka omogućava vam da koristite stavke iz TDE-ovog adresara. -Comment[sv]=Den här typen av datakälla låter dig använda information från TDE:s adressbok -Comment[ta]=பலகத்தின் தோற்றத்தை நீங்கள் இங்கே வடிவமைக்கலாம். -Comment[tg]=Ин намуди манбаъи маълумот гузоштани шумо истифода кардан шуморо воридҳои Китоби Адресҳои TDE. -Comment[tr]=Bu veri kaynağı biçimi TDE Adres Defteri girdilerini kullanmanızı sağlar. -Comment[uk]=Цей тип джерела даних дає доступ до записів адресної книги TDE. -Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。 -Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。 - -X-TDE-Library=kwmailmerge_kabc -X-TDE-Capabilities=open -X-TDE-InternalName=KABC diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp new file mode 100644 index 00000000..2be13003 --- /dev/null +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp @@ -0,0 +1,551 @@ +/* + This file is part of the KDE project + Copyright (C) 2003 Tobias Koenig + Joseph Wenninger + Ingo Kloecker + Copyright (C) 2004 Tobias Koenig + Joseph Wenninger + Ingo Kloecker + Dirk Schmidt + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include +#include +#include + +#include "KWMailMergeTDEABC.h" +#include "KWMailMergeTDEABCConfig.h" + +KWMailMergeTDEABC::KWMailMergeTDEABC( TDEInstance *inst, TQObject *parent ) + : KWMailMergeDataSource( inst, parent ) +{ + _addressBook = TDEABC::StdAddressBook::self(); + _iterator = _addressBook->begin(); + + + // init record list + // Using names from kaddressbook. + sampleRecord[ ("KAddressbook identifier") ] = TDEABC::Addressee::uidLabel(); + sampleRecord[ ("Name" ) ] = TDEABC::Addressee::nameLabel(); + sampleRecord[ ("Formatted name" ) ] = TDEABC::Addressee::formattedNameLabel(); + sampleRecord[ ("Family names" ) ] = TDEABC::Addressee::familyNameLabel(); + sampleRecord[ ("Given name" ) ] = TDEABC::Addressee::givenNameLabel(); + sampleRecord[ ("Additional names" ) ] = TDEABC::Addressee::additionalNameLabel(); + sampleRecord[ ("Honorific prefixes" ) ] = TDEABC::Addressee::prefixLabel(); + sampleRecord[ ("Honorific suffixes" ) ] = TDEABC::Addressee::suffixLabel(); + sampleRecord[ ("Nick name" ) ] = TDEABC::Addressee::nickNameLabel(); + sampleRecord[ ("Birthday" ) ] = TDEABC::Addressee::birthdayLabel(); + sampleRecord[ ("Home address: Street" ) ] = TDEABC::Addressee::homeAddressStreetLabel(); + sampleRecord[ ("Home address: Locality" ) ] = TDEABC::Addressee::homeAddressLocalityLabel(); + sampleRecord[ ("Home address: Region" ) ] = TDEABC::Addressee::homeAddressRegionLabel(); + sampleRecord[ ("Home address: Postal code" ) ] = TDEABC::Addressee::homeAddressPostalCodeLabel(); + sampleRecord[ ("Home address: Country" ) ] = TDEABC::Addressee::homeAddressCountryLabel(); + sampleRecord[ ("Home address: Label" ) ] = TDEABC::Addressee::homeAddressLabelLabel(); + sampleRecord[ ("Business address: Street" ) ] = TDEABC::Addressee::businessAddressStreetLabel(); + sampleRecord[ ("Business address: Locality" ) ] = TDEABC::Addressee::businessAddressLocalityLabel(); + sampleRecord[ ("Business address: Region" ) ] = TDEABC::Addressee::businessAddressRegionLabel(); + sampleRecord[ ("Business address: Postal code" ) ] = TDEABC::Addressee::businessAddressPostalCodeLabel(); + sampleRecord[ ("Business address: Country" ) ] = TDEABC::Addressee::businessAddressCountryLabel(); + sampleRecord[ ("Business address: Label" ) ] = TDEABC::Addressee::businessAddressLabelLabel(); + sampleRecord[ ("Home phone" ) ] = TDEABC::Addressee::homePhoneLabel(); + sampleRecord[ ("Business phone" ) ] = TDEABC::Addressee::businessPhoneLabel(); + sampleRecord[ ("Mobile phone" ) ] = TDEABC::Addressee::mobilePhoneLabel(); + sampleRecord[ ("Home fax" ) ] = TDEABC::Addressee::homeFaxLabel(); + sampleRecord[ ("Business fax" ) ] = TDEABC::Addressee::businessFaxLabel(); + sampleRecord[ ("Car phone" ) ] = TDEABC::Addressee::carPhoneLabel(); + sampleRecord[ ("ISDN" ) ] = TDEABC::Addressee::isdnLabel(); + sampleRecord[ ("Pager" ) ] = TDEABC::Addressee::pagerLabel(); + sampleRecord[ ("Email" ) ] = TDEABC::Addressee::emailLabel(); + sampleRecord[ ("Mailer" ) ] = TDEABC::Addressee::mailerLabel(); + sampleRecord[ ("Time zone" ) ] = TDEABC::Addressee::timeZoneLabel(); + sampleRecord[ ("Geographic position" ) ] = TDEABC::Addressee::geoLabel(); + sampleRecord[ ("Title" ) ] = TDEABC::Addressee::titleLabel(); + sampleRecord[ ("Role" ) ] = TDEABC::Addressee::roleLabel(); + sampleRecord[ ("Organization" ) ] = TDEABC::Addressee::organizationLabel(); + sampleRecord[ ("Note" ) ] = TDEABC::Addressee::noteLabel(); + sampleRecord[ ("productId" ) ] = TDEABC::Addressee::productIdLabel(); + sampleRecord[ ("Revision" ) ] = TDEABC::Addressee::revisionLabel(); + sampleRecord[ ("sortString" ) ] = TDEABC::Addressee::sortStringLabel(); + sampleRecord[ ("URL" ) ] = TDEABC::Addressee::urlLabel(); + sampleRecord[ ("Secrecy" ) ] = TDEABC::Addressee::secrecyLabel(); + sampleRecord[ ("Preferred address: Street" ) ] = TQString( "preferedAddressStreet" ); + sampleRecord[ ("Preferred address: Locality" ) ] = TQString( "preferedAddressLocality" ); + sampleRecord[ ("Preferred address: Region" ) ] = TQString( "preferedAddressRegion" ); + sampleRecord[ ("Preferred address: Postal code" ) ] = TQString( "preferedAddressPostalCode" ); + sampleRecord[ ("Preferred address: Country" ) ] = TQString( "preferedAddressCountry" ); + sampleRecord[ ("Preferred address: Label" ) ] = TQString( "preferedAddressLabel" ); +} + + +KWMailMergeTDEABC::~KWMailMergeTDEABC() +{ + ; +} + + +void KWMailMergeTDEABC::addEntry( const TQString &uid ) +{ + _individualUIDs.append( uid ); + makeUIDsExclusive(); +} + + +void KWMailMergeTDEABC::addList( const TQString &id ) +{ + _lists.append( id ); + parseList( id ); + makeUIDsExclusive(); +} + + +void KWMailMergeTDEABC::clear() +{ + _exclusiveUIDs.clear(); + _individualUIDs.clear(); + _listUIDs.clear(); + _lists.clear(); +} + + +int KWMailMergeTDEABC::getNumRecords() const +{ + kdDebug() << "KWMailMergeTDEABC::getNumRecords(): " << _exclusiveUIDs.count() << endl; + return _exclusiveUIDs.count(); +} + + +TQString KWMailMergeTDEABC::getValue( const TQString &name, int record ) const +{ + kdDebug() << "KWMailMergeTDEABC::getValue(" << name << ", " << record << ")" << endl; + if ( record < 0 ) + return name; + + // This doesn't ever happen, right? So why is it there? Dirk Schmidt + if ( record == -1 && _iterator == _addressBook->end() ) + return ""; + + // + // Set the iterator to the asked Addressee. + // + bool uidAvailable = false; + if ( record != -1 ) + { + int counter = 0; + + for ( _UIDIterator = _exclusiveUIDs.begin(); _UIDIterator != _exclusiveUIDs.end() + && counter < record; _UIDIterator++ ) + { + counter++; + } + + for ( _iterator = _addressBook->begin(); _iterator != _addressBook->end(); ++_iterator ) + { + + if( _iterator->uid() == *_UIDIterator ) + { + uidAvailable = true; + break; + } + } + } + + if( !uidAvailable ) + { + return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) ); + } + + + TDEABC::Addressee addr = *_iterator; + _iterator++; // Don't know why. Could be removed? Dirk Schmidt + + + // + // Return the asked variable. + // + if ( name == "KAddressbook identifier" ) + return addr.uid(); + if ( name == "Name" ) + return addr.name(); + if ( name == "Formatted name" ) + return addr.formattedName(); + if ( name == "Family names" ) + return addr.familyName(); + if ( name == "Given name" ) + return addr.givenName(); + if ( name == "Additional names" ) + return addr.additionalName(); + if ( name == "Honorific prefixes" ) + return addr.prefix(); + if ( name == "Honorific suffixes" ) + return addr.suffix(); + if ( name == "Nick name" ) + return addr.nickName(); + if ( name == "Birthday" ) + return TDEGlobal::locale()->formatDate( addr.birthday().date() ); + + if ( name == "Home address: Street" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.street(); + } + if ( name == "Home address: Locality" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.locality(); + } + if ( name == "Home address: Region" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.region(); + } + if ( name == "Home address: Postal code" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.postalCode(); + } + if ( name == "Home address: Country" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.country(); + } + if ( name == "Home address: Label" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Home ); + return a.label(); + } + + if ( name == "Business address: Street" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.street(); + } + if ( name == "Business address: Locality" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.locality(); + } + if ( name == "Business address: Region" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.region(); + } + if ( name == "Business address: Postal code" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.postalCode(); + } + if ( name == "Business address: Country" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.country(); + } + if ( name == "Business address: Label" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Work ); + return a.label(); + } + + if ( name == "Prefered address: Street" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.street(); + } + + if ( name == "Prefered address: Locality" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.locality(); + } + if ( name == "Prefered address: Region" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.region(); + } + if ( name == "Prefered address: Postal code" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.postalCode(); + } + if ( name == "Prefered address: Country" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.country(); + } + if ( name == "Prefered address: Label" ) + { + TDEABC::Address a = addr.address( TDEABC::Address::Pref ); + return a.label(); + } + + if ( name == "Home phone" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home ); + return phone.number(); + } + if ( name == "Business phone" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Work ); + return phone.number(); + } + if ( name == "Mobile phone" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Cell ); + return phone.number(); + } + if ( name == "Home fax" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax ); + return phone.number(); + } + if ( name == "Business fax" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Fax ); + return phone.number(); + } + if ( name == "Car phone" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Car ); + return phone.number(); + } + if ( name == "ISDN" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Isdn ); + return phone.number(); + } + if ( name == "Pager" ) + { + TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Pager ); + return phone.number(); + } + + if ( name == "Email" ) + return addr.preferredEmail(); + if ( name == "Mailer" ) + return addr.mailer(); + if ( name == "Time zone" ) + { + TDEABC::TimeZone zone = addr.timeZone(); + return TQString::number( zone.offset() ); + } + if ( name == "Geographic position" ) + { + TDEABC::Geo geo = addr.geo(); + TQString lat; + TQString longi; + if( geo.latitude()<0 ) + lat = TQString( i18n("%1 South") ).arg( -geo.latitude() ); + else + lat = TQString( i18n("%1 North") ).arg( geo.latitude() ); + + if( geo.longitude()<0 ) + // There is something going wrong, because "W" is replaced by "q ". + // Needs fix. + longi = TQString( i18n("%1 West") ).arg( -geo.longitude() ); + else + longi = TQString( i18n("%1 East") ).arg( geo.longitude() ); + + return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi ); + } + + if ( name == "Title" ) + return addr.title(); + if ( name == "Role" ) + return addr.role(); + if ( name == "Organization" ) + return addr.organization(); + if ( name == "Note" ) + return addr.note(); + if ( name == "productId" ) + return addr.productId(); + if ( name == "Revision" ) + return TDEGlobal::locale()->formatDate( addr.revision().date() ); + if ( name == "sortString" ) + return addr.sortString(); + if ( name == "URL" ) + return addr.url().url(); + if ( name == "Secrecy" ) + { + TDEABC::Secrecy secrecy = addr.secrecy(); + return TDEABC::Secrecy::typeLabel( secrecy.type() ); + } + + return ( i18n("Unkown mail merge variable: %1").arg ( name ) ) ; +} + + +TQStringList KWMailMergeTDEABC::lists() const +{ + return _lists; +} + + +void KWMailMergeTDEABC::load( TQDomElement& parentElem ) +{ + clear(); + TQDomNode contentNode=parentElem.namedItem("CONTENT"); + if( contentNode.isNull() ) + return; + for( TQDomNode rec=contentNode.firstChild(); !rec.isNull(); rec=rec.nextSibling() ) + { + if( rec.nodeName()== "RECORD" ) + { + for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); + recEnt=recEnt.nextSibling().toElement() ) + { + addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); + } + } + else if( rec.nodeName() == "LIST" ) + { + for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); + recEnt=recEnt.nextSibling().toElement() ) + { + addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); + } + } + else + kdDebug() << "rec.nodeName(): " << rec.nodeName() << endl; + } +} + + +void KWMailMergeTDEABC::makeUIDsExclusive() +{ + _exclusiveUIDs = _individualUIDs + _listUIDs; + _exclusiveUIDs.sort(); + kdDebug() << "KWMailMergeTDEABC::makeUIDsExclusive(): before: " << _exclusiveUIDs.join(",") + << endl; + TQString uid; + for( TQStringList::Iterator it=_exclusiveUIDs.begin(); + it!=_exclusiveUIDs.end(); ++it ) + { + if( *it == uid ) + { + it = _exclusiveUIDs.remove( it ); + } + uid = *it; + } + kdDebug() << "KWMailMergeTDEABC::makeUIDsExclusive(): after: " << _exclusiveUIDs.join(",") + << endl; +} + + +void KWMailMergeTDEABC::parseList( const TQString& listName ) +{ + if( listName.isEmpty() ) + return; + + kdDebug() << "KWMailMergeTDEABC::parseList: " << listName << endl; + TDEABC::DistributionListManager dlm ( _addressBook ); + dlm.load(); + + TQStringList::Iterator listIt; + + TDEABC::DistributionList* list = dlm.list( listName ); + TDEABC::DistributionList::Entry::List entries = list->entries(); + + TDEABC::DistributionList::Entry::List::Iterator itemIt; + for ( itemIt = entries.begin(); itemIt != entries.end(); ++itemIt ) + { + kdDebug() << "WMailMergeTDEABC::parseList: Listentry UID: " << + (*itemIt).addressee.uid() << endl; + _listUIDs.append( (*itemIt).addressee.uid() ); + } +} + + +void KWMailMergeTDEABC::refresh( bool ) +{ + kdDebug() << "KWMailMergeTDEABC::refresh()" << endl; + _iterator = _addressBook->begin(); + _UIDIterator = _individualUIDs.begin(); + +} + + +void KWMailMergeTDEABC::save( TQDomDocument& doc, TQDomElement& parent) +{ + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); + parent.appendChild(cont); + + TQValueList::ConstIterator it = _individualUIDs.begin(); + for( ; it != _individualUIDs.end(); ++it ) + { + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); + cont.appendChild(rec); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("uid"),*it); + rec.appendChild(recEnt); + } + + it = _lists.begin(); + for( ; !(it == _lists.end()); ++it ) + { + TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); + cont.appendChild(rec); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("listid"),*it); + rec.appendChild(recEnt); + } +} + +bool KWMailMergeTDEABC::showConfigDialog( TQWidget* par, int action ) +{ + bool ret=false; + if (action == KWSLCreate ) + { + clear(); + } + + //if (action==KWSLOpen) + { + KWMailMergeTDEABCConfig *dia=new KWMailMergeTDEABCConfig( par, this ); + + ret=( dia->exec() == TQDialog::Accepted ); + kdDebug() << "KWMailMergeTDEABCConfig::Accepted " << ret << endl; + delete dia; + } + refresh(false); + + return ret; +} + + +TQStringList KWMailMergeTDEABC::singleRecords() const +{ + return _individualUIDs; +} + + + +extern "C" +{ + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_tdeabc( TDEInstance *inst, TQObject *parent ) + { + return new KWMailMergeTDEABC( inst, parent ); + } +} + + + + +#include "KWMailMergeTDEABC.moc" + + diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h new file mode 100644 index 00000000..3db02d91 --- /dev/null +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h @@ -0,0 +1,186 @@ +/* + This file is part of the KDE project + Copyright (C) 2003 Tobias Koenig + Copyright (C) 2004 Tobias Koenig + Dirk Schmidt + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. +*/ + +#ifndef _KWMAILMERGE_KABC_H_ +#define _KWMAILMERGE_KABC_H_ + +#include +#include + +#include + +#include "KWMailMergeDataSource.h" + +class KWMailMergeTDEABC: public KWMailMergeDataSource +{ + Q_OBJECT + + +public: + KWMailMergeTDEABC( TDEInstance *inst, TQObject *parent ); + ~KWMailMergeTDEABC(); + + /** + Saves the mail merge list to the kword document. + */ + virtual void save( TQDomDocument&, TQDomElement& ); + + /** + Loads the mail merge list stored in the kword document. + */ + virtual void load( TQDomElement& ); + + /** + @param name The name of the value e.g. "Family name". + @param record The position of the the entry in mail merge list. + @return The value of the mail merge variable. + + If @p record equals -1, @p name is returned. + */ + virtual class TQString getValue( const class TQString &name, int record = -1 ) const; + + /** + @return The number of available contacts in mail merge list. + */ + virtual int getNumRecords() const; + + /** + Only for compatability reasons. + + @param force Hasn't any effect. + */ + virtual void refresh( bool force ); + + /** + Shows a KWMailMergeTDEABCConfig dialog for selecting entries from KAddressbook. + */ + virtual bool showConfigDialog( TQWidget*, int action); + +protected: + friend class KWMailMergeTDEABCConfig; + + /** + Adds an entry from TDEABC::StdAddressBook::self() + to the mail merge list. + + To be called by KWMailMergeTDEABC::load() and + KWMailMergeTDEABCConfig::acceptSelection() only. + + @param uid The entry's TDEABC::Addressee::uid(). + */ + void addEntry( const TQString &uid ); + + /** + Adds a distribution list to the mail merge list. + + To be called by KWMailMergeTDEABC::load() and + KWMailMergeTDEABCConfig::acceptSelection() only. + + @param id The DistributionList::name(). + */ + void addList( const TQString &id ); + + /** + Removes all entries and distribution lists from the mail merge list. + */ + void clear(); + + /** + @return All selected DistributionList::name(). + + To be called by KWMailMergeTDEABCConfig::initSelectedLists() + */ + virtual TQStringList lists() const; + + /** + @return The TDEABC::Addressee::uid() of all individually selected + entries in mail merge list. + + To be called by KWMailMergeTDEABCConfig::initSelectedAddressees() + */ + virtual TQStringList singleRecords() const; + +private: + /** + The TDEABC::StdAddressBook::self(). + */ + TDEABC::AddressBook* _addressBook; + + /** + Just an Iterator. + */ + mutable TDEABC::AddressBook::ConstIterator _iterator; + + /** + Just an Iterator. + */ + mutable TQStringList::ConstIterator _UIDIterator; + + /** + The "real" mail merge list. A list of TQStrings. Each represents + the TDEABC::Addressee::uid() of a KAdressbook entry. + There is no UID twice in this list. + + Needed because selected contacts may appear in a selected + distribution list, too. And we don't want to print it multiple. + */ + TQStringList _exclusiveUIDs; + + /** + This list contains all the TDEABC::Addressee::uid() selected + individually with the KWMailMergeTDEABCConfig dialog. + */ + TQStringList _individualUIDs; + + /** + This list contains all the TDEABC::Addressee::uid() from the distribution + lists selected with the KWMailMergeTDEABCConfig dialog. + */ + TQStringList _listUIDs; + + /** + This list contains all the DistributionList::name() selected with the + KWMailMergeTDEABCConfig dialog. + */ + TQStringList _lists; + + + /** + Appends all TDEABC::Addressee::uid() of a distribution list to _listUIDs + and updates the mail merge list. + + To be used by KWMailMergeTDEABCConfig::addList( const TQString &id ) + only. + + @param listName The DistributionList::name() of the distribution list. + */ + void parseList( const TQString& listName ); + + /** + Removes duplicate entries in the mail merge list. + */ + void makeUIDsExclusive(); + +}; + +#endif + diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp new file mode 100644 index 00000000..440e208a --- /dev/null +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp @@ -0,0 +1,546 @@ +/* + This file is part of the KDE project + Copyright (C) 2004 Dirk Schmidt + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. +*/ + + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "addresspicker.h" +#include "KWMailMergeTDEABC.h" +#include "KWMailMergeTDEABCConfig.h" + + +KWMailMergeTDEABCConfig::KWMailMergeTDEABCConfig( TQWidget *parent, KWMailMergeTDEABC *db_) + :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), + Ok | Cancel, Ok, parent, "", true) +{ + _db = db_; + + (new TQVBoxLayout(plainPage()))->setAutoAdd(true); + setMainWidget( _ui=new AddressPickerUI( plainPage() ) ); + + updateAvailable(); + initSelectedAddressees(); + initSelectedLists(); + initSlotSignalConnections(); +} + + +KWMailMergeTDEABCConfig::~KWMailMergeTDEABCConfig() +{ + ; +} + + +void KWMailMergeTDEABCConfig::acceptSelection() +{ + _db->clear(); + + TQListViewItem* top = _ui->mSelectedView->firstChild(); + while(top) + { + kdDebug() << "acceptSelection(): " << top->text(0) << endl; + if( top->text(0) == i18n("Distribution Lists") ) + { + TQListViewItem* item = top->firstChild(); + while(item) + { + kdDebug() << "acceptSelection(): " << item->text(0) << endl; + _db->addList( item->text(0) ); + item = item->nextSibling(); + } + } + else if( top->text(0) == i18n("Single Entries") ) + { + TQListViewItem* item = top->firstChild(); + while(item) + { + kdDebug() << "acceptSelection(): " << item->text(0) << endl; + _db->addEntry( item->text(-1) ); + item = item->nextSibling(); + } + } + top = top->nextSibling(); + } + +} + + +void KWMailMergeTDEABCConfig::addSelectedContacts() +{ + TQListViewItemIterator it( _ui->mAvailableView, TQListViewItemIterator::Selected ); + TQListViewItem* selected = _ui->mSelectedView->findItem( + i18n("Single Entries"), 0, TQt::ExactMatch ); + TQListViewItem* selectedLists = _ui->mSelectedView->findItem( + i18n("Distribution Lists"), 0, TQt::ExactMatch ); + while ( it.current() ) + { + if( it.current()->depth() > 0 ) + { + TQString uid = it.current()->text( -1 ); + kdDebug() << "addSelectedContacts(): uid :" << uid << endl; + if( !uid.isEmpty() ) + { + KWMailMergeTDEABCConfigListItem *item = + static_cast ( it.current() ); + if( selected ) + { + selected->insertItem( item ); + selected->setOpen( true ); + destroyAvailableClones( uid ); + } + } + else if( it.current()->parent()->text(0) == i18n("Distribution Lists") ) + { + if( selectedLists ) + { + selectedLists->insertItem( it.current() ); + selectedLists->setOpen( true ); + } + } + } + ++it; + } + _ui->mSelectedView->selectAll( false ); +} + + +void KWMailMergeTDEABCConfig::destroyAvailableClones( const TQString& uid ) +{ + if( uid.isEmpty() ) + return; + + TQListViewItemIterator it( _ui->mAvailableView ); + + while ( it.current() ) + { + if( it.current()->depth() > 0) + { + if( it.current()->text(-1)== uid ) + { + delete it.current(); + } + } + ++it; + } +} + + +void KWMailMergeTDEABCConfig::filterChanged( const TQString& txt ) +{ + kdDebug() << "KWMailMergeTDEABCConfig::filterChanged( " << txt << " )" << endl; + + bool showAll = txt.isEmpty(); + + TQListViewItem* category = _ui->mAvailableView->firstChild(); + while(category) + { + if( category->text(0)!=i18n("Distribution Lists") ) + { + TQListViewItem* item = category->firstChild(); + while(item) + { + if(showAll) + { + item->setVisible( true ); + } + else + { + item->setVisible( item->text(0).contains( txt, false ) ); + } + item = item->nextSibling(); + } + category->setOpen( !showAll ); + } + else + { + category->setVisible( showAll ); + } + category = category->nextSibling(); + } +} + + +void KWMailMergeTDEABCConfig::initSelectedAddressees() +{ + TQStringList records = _db->singleRecords(); + + TQListViewItem* category = _ui->mAvailableView->firstChild(); + TQListViewItem* selected = _ui->mSelectedView->findItem( + i18n("Single Entries"), 0, TQt::ExactMatch ); + while ( category && (records.count()>0) ) + { + if( category->text(0) != i18n("Distribution Lists") ) + { + KWMailMergeTDEABCConfigListItem* item = + static_cast ( category->firstChild() ); + while( item && (records.count()>0) ) + { + // Need some temporary item, because after selected->insertItem( item ) + // the item->nextSibling() is not the one we want. + KWMailMergeTDEABCConfigListItem* nextItem = + static_cast ( item->nextSibling() ); + + for( TQStringList::Iterator itRecords = records.begin(); + itRecords != records.end(); ++itRecords ) + { + TQString uid = *itRecords; + if( item->text(-1) == uid ) + { + selected->insertItem( item ); + + // downsize records to speed up iterations + itRecords = records.remove( itRecords ); + --itRecords; + + destroyAvailableClones( uid ); + } + } + item = nextItem; + } + } + category = category->nextSibling(); + } +} + + +void KWMailMergeTDEABCConfig::initSelectedLists() +{ + TQStringList lists = _db->lists(); + + kdDebug() << "::initSelectedLists()" << lists.join(",") << endl; + + TQListViewItem* l = _ui->mAvailableView->findItem( + i18n("Distribution Lists"), 0, TQt::ExactMatch ); + TQListViewItem* selected = _ui->mSelectedView->findItem( + i18n("Distribution Lists"), 0, TQt::ExactMatch ); + + TQListViewItem* item = ( l->firstChild() ); + while( item && (lists.count()>0) ) + { + TQListViewItem* nextItem = item->nextSibling(); + + for( TQStringList::Iterator itLists = lists.begin(); + itLists != lists.end(); ++itLists ) + { + TQString id = *itLists; + if( item->text(0) == id ) + { + selected->insertItem( item ); + itLists = lists.remove( itLists ); + --itLists; + } + } + item = nextItem; + } +} + + +void KWMailMergeTDEABCConfig::initSlotSignalConnections() +{ + connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( acceptSelection() ) ); + connect( _ui->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addSelectedContacts() ) ); + connect( _ui->mAddressBook, TQT_SIGNAL( clicked() ), TQT_SLOT( launchAddressbook() ) ); + + connect( _ui->mAvailableView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQT_SLOT( addSelectedContacts() ) ); + + connect( _ui->mFilterEdit, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( filterChanged(const TQString &) ) ); + connect( _ui->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelectedContacts() ) ); + connect( _ui->mSaveList, TQT_SIGNAL( clicked() ), TQT_SLOT( saveDistributionList() ) ); + connect( _ui->mSelectedView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQT_SLOT( removeSelectedContacts() ) ); +} + + +void KWMailMergeTDEABCConfig::launchAddressbook() const +{ + kapp->startServiceByDesktopName( "kaddressbook", TQString() ); +} + + + +void KWMailMergeTDEABCConfig::removeContact( TQListViewItem* item ) +{ + TQStringList& categories = _usedCategories; + TQListViewItem* availableLists = _ui->mAvailableView->findItem( + i18n("Distribution Lists"), 0, TQt::ExactMatch ); + if( item->depth() > 0 ) + { + if( !item->text( -1 ).isEmpty() ) // remove selected single entry here + { + KWMailMergeTDEABCConfigListItem* rightItem = + static_cast ( item ); + + TQStringList entryCategories = rightItem->addressee().categories(); + for ( TQStringList::Iterator itEntryCat = entryCategories.begin(); + itEntryCat != entryCategories.end(); ++itEntryCat ) + { + int i = categories.findIndex(*itEntryCat); + if( i == -1 ) + { + TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, + *itEntryCat ); + categories.append( *itEntryCat ); + + KWMailMergeTDEABCConfigListItem* leftItem = new KWMailMergeTDEABCConfigListItem( + category, rightItem->addressee() ); + } + else + { + KWMailMergeTDEABCConfigListItem* leftItem = new + KWMailMergeTDEABCConfigListItem( + _ui->mAvailableView->findItem( + *itEntryCat, 0, + TQt::ExactMatch), + rightItem->addressee() ); + } + } + if( entryCategories.isEmpty() ) + { + TQString noCat = i18n("no category"); + KWMailMergeTDEABCConfigListItem* leftItem = new KWMailMergeTDEABCConfigListItem( + _ui->mAvailableView->findItem( + noCat, 0, TQt::ExactMatch), + rightItem->addressee() ); + } + delete item; + } + else if( item->parent()->text(0) == i18n("Distribution Lists") ) // remove a list + { + if( availableLists ) + availableLists->insertItem( item ); + } + } +} + +void KWMailMergeTDEABCConfig::removeSelectedContacts() +{ + TQListViewItemIterator it( _ui->mSelectedView, TQListViewItemIterator::Selected ); + + while( it.current() ) + { + kdDebug() << "removeSelectedContacts(): text: " << it.current()->text(-1) << endl; + removeContact( it.current() ); + ++it; + } + _ui->mAvailableView->selectAll( false ); +} + + +void KWMailMergeTDEABCConfig::saveDistributionList() +{ + TDEABC::DistributionListManager dlm( TDEABC::StdAddressBook::self() ); + dlm.load(); + + bool ok = false; + TQString listName = KInputDialog::getText( i18n("New Distribution List"), + i18n("Please enter name:"), + TQString(), &ok, + this ); + if ( !ok || listName.isEmpty() ) + return; + + if ( dlm.list( listName ) ) + { + KMessageBox::information( 0, + i18n( "Distribution list with the given name %1 " + "already exists. Please select a different name." ) + .arg( listName ) ); + return; + } + TDEABC::DistributionList *distList = new TDEABC::DistributionList( &dlm, listName ); + + TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem( + i18n("Distribution Lists"),0 , TQt::ExactMatch), listName ); + + TQListViewItem* category = _ui->mSelectedView->firstChild(); + while(category) + { + if( category->text(0)==i18n("Single Entries") ) + { + KWMailMergeTDEABCConfigListItem* item = + static_cast ( category->firstChild() ); + + while(item) + { + distList->insertEntry( item->addressee() ); + + TDEABC::Addressee addr = item->addressee(); + TQString formattedName = addr.formattedName(); + TQListViewItem* newItem = new TQListViewItem( + newListItem, item->addressee().formattedName() ); + newItem->setEnabled( false ); + + item = static_cast( item->nextSibling() ); + } + + TQListViewItemIterator it ( category->firstChild() ); + while( it.current() ) + { + removeContact( it.current() ); + ++it; + } + } + category = category->nextSibling(); + } + + dlm.save(); + newListItem->setOpen( true ); +} + + +void KWMailMergeTDEABCConfig::updateAvailable() +{ + _ui->mAvailableView->clear(); + _ui->mAvailableView->setRootIsDecorated( true ); + + // + // First append the addressees. + // + TQListViewItem* noCategory = new TQListViewItem( _ui->mAvailableView, + i18n("no category") ); + + TQStringList& categories = _usedCategories ; + categories.clear(); + + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self(); + for( TDEABC::AddressBook::Iterator itAddr = addressBook->begin(); + itAddr != addressBook->end(); ++itAddr ) + { + + TQStringList entryCategories = itAddr->categories(); + for ( TQStringList::Iterator itCat = entryCategories.begin(); + itCat != entryCategories.end(); ++itCat ) + { + int i = categories.findIndex(*itCat); + + // Create category, if not yet in listview and append item to it. + if( i == -1 ) + { + TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, *itCat ); + categories.append( *itCat ); + + KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( + category, *itAddr ); + } + // Append item to existing category in listview. + else + { + KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( + _ui->mAvailableView->findItem( + *itCat, 0, TQt::ExactMatch), + *itAddr ); + } + + } + // If Addressee does not belong to any category, append it to "no category". + if( entryCategories.isEmpty() ) + { + KWMailMergeTDEABCConfigListItem* item = new KWMailMergeTDEABCConfigListItem( + noCategory, *itAddr ); + } + } + + // + // Now append the distribution lists + // + TDEABC::DistributionListManager dlm ( addressBook ); + dlm.load(); + + TQStringList distributionLists = dlm.listNames(); + TQListViewItem* distributionListsItem = new TQListViewItem( _ui->mAvailableView, + i18n("Distribution Lists") ); + + TQStringList::Iterator itDistributionLists; + + for( itDistributionLists = distributionLists.begin(); + itDistributionLists != distributionLists.end(); ++itDistributionLists ) + { + TDEABC::DistributionList* list = dlm.list( *itDistributionLists ); + + TDEABC::DistributionList::Entry::List entries = list->entries(); + + TQListViewItem* listItem = new TQListViewItem( distributionListsItem, + *itDistributionLists ); + + TDEABC::DistributionList::Entry::List::Iterator itList; + for ( itList = entries.begin(); itList != entries.end(); ++itList ) + { + // Create a normal TQListViewItem and disable it, because this is not a + // distribution-list-editor. KAddressbook should be used instead. + TQListViewItem* item = new TQListViewItem( + listItem, (*itList).addressee.formattedName() ); + item->setEnabled( false ); + } + + } +} + + + +KWMailMergeTDEABCConfigListItem::KWMailMergeTDEABCConfigListItem( TQListView *parent, + const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) +{ + setText( 0, addressEntry.formattedName() ); + _addressEntry = addressEntry; +} + +KWMailMergeTDEABCConfigListItem::KWMailMergeTDEABCConfigListItem( TQListViewItem *parent, + const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) +{ + setText( 0, addressEntry.formattedName() ); + _addressEntry = addressEntry; +} + +KWMailMergeTDEABCConfigListItem::~KWMailMergeTDEABCConfigListItem() +{} + +TDEABC::Addressee KWMailMergeTDEABCConfigListItem::addressee() const +{ + return _addressEntry; +} + +TQString KWMailMergeTDEABCConfigListItem::text( int column ) const +{ + if( column == -1 ) + { + return _addressEntry.uid(); + } + else + { + return TQListViewItem::text( column ); + } +} + +#include "KWMailMergeTDEABCConfig.moc" diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h new file mode 100644 index 00000000..1a23b44c --- /dev/null +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h @@ -0,0 +1,150 @@ +/* + This file is part of the KDE project + Copyright (C) 2004 Dirk Schmidt + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. +*/ + +#ifndef _KWMAILMERGE_KABC_CONFIG_H_ +#define _KWMAILMERGE_KABC_CONFIG_H_ + +#include +#include +#include + +#include "KWMailMergeTDEABC.h" + + +class AddressPickerUI; +class KWMailMergeTDEABC; + +class KWMailMergeTDEABCConfig: public KDialogBase +{ + Q_OBJECT + +public: + KWMailMergeTDEABCConfig( TQWidget *parent, KWMailMergeTDEABC *db_ ); + virtual ~KWMailMergeTDEABCConfig(); + + +private slots: + + /** + Moves selected items from the left Listview to the right one. + */ + void addSelectedContacts(); + + /** + Moves selected items from the right Listview to the left one. + */ + void removeSelectedContacts(); + + /** + Executes KAddressbook as external application. + */ + void launchAddressbook() const; + + /** + Updates the parent's mail merge list from items in the right Listview. + */ + void acceptSelection(); + + /** + Hides items in the left listview, which are not matching @p txt. + */ + void filterChanged( const TQString& txt ); + + /** + Saves the selected single entries to a new TDEABC::DistributionList in KAddressbook. + */ + void saveDistributionList(); +private: + /** + The addresspicker widget. + */ + AddressPickerUI *_ui; + + /** + Store all categories used in the addressbook, to avoid some iterator cycles. + */ + TQStringList _usedCategories; + + /** + The mail merge list. + */ + KWMailMergeTDEABC *_db; + + /** + Removes duplicates in the left TQListView, when moving an item to the right. + */ + void destroyAvailableClones( const TQString& uid ); + + /** + Appends the previously selected entries to the right TQListView. + */ + void initSelectedAddressees(); + + /** + Appends the previously selected distribution lists to the right TQListView. + */ + void initSelectedLists(); + + /** + Just connects signals and slots. + */ + void initSlotSignalConnections(); + + /** + Moves @p item from the right Listview to the left one. + + Called by KWMailMergeTDEABCConfig::removeSelectedContacts(). + */ + void removeContact( TQListViewItem* item ); + + /** + Appends all KAddressbook entries in TDEABC::StdAddressBook::self() and all + TDEABC::DistributionLists to the left TQListView. + */ + void updateAvailable(); +}; + + +class KWMailMergeTDEABCConfigListItem : public TQListViewItem +{ + +public: + KWMailMergeTDEABCConfigListItem( TQListView *parent, const TDEABC::Addressee& addressEntry ); + KWMailMergeTDEABCConfigListItem( TQListViewItem *parent, const TDEABC::Addressee& addressEntry ); + virtual ~KWMailMergeTDEABCConfigListItem(); + + /** + Returns the TDEABC::Addressee of a KWMailMergeTDEABCConfigListItem. + */ + TDEABC::Addressee addressee() const; + + /** + This is an overloaded member function of TQListViewItem::text( int column ). + It Returns the TDEABC::Addressee::uid(), if column is set to -1. + Otherwise TQListViewItem::text( int column ) is returned. + */ + TQString text( int column ) const; + + +private: + TDEABC::Addressee _addressEntry; + +}; +#endif diff --git a/kword/mailmerge/tdeabc/Makefile.am b/kword/mailmerge/tdeabc/Makefile.am new file mode 100644 index 00000000..0856d2c6 --- /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/tdeabc/addresspicker.ui b/kword/mailmerge/tdeabc/addresspicker.ui new file mode 100644 index 00000000..44dc8c8f --- /dev/null +++ b/kword/mailmerge/tdeabc/addresspicker.ui @@ -0,0 +1,297 @@ + +AddressPickerUI + + + AddressPickerUI + + + + 0 + 0 + 617 + 434 + + + + Address Selection + + + + unnamed + + + + layout10 + + + + unnamed + + + + spacer1 + + + Vertical + + + Expanding + + + + 20 + 16 + + + + + + mAddButton + + + true + + + &Add >> + + + + + mRemoveButton + + + true + + + << &Remove + + + + + spacer2_2 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + + + mSaveList + + + true + + + Save as &Distribution List... + + + Save selected single entries to a new distribution list. + + + + + layout1 + + + + unnamed + + + + TextLabel2 + + + &Filter on: + + + mFilterEdit + + + + + mFilterEdit + + + + 1 + 0 + 1 + 0 + + + + + + + + + + + + Name + + + true + + + true + + + + + Distribution Lists + + + + + + + + Single Entries + + + + + + + mSelectedView + + + + 7 + 1 + 0 + 0 + + + + Extended + + + true + + + true + + + true + + + AllColumns + + + true + + + + + mAddressBook + + + Address B&ook + + + Launch KAddressbook + + + + + textLabel1 + + + + 1 + + + + &Address Book + + + WordBreak|AlignCenter + + + mAvailableView + + + + + textLabel2 + + + + 1 + + + + &Selected Addresses + + + WordBreak|AlignCenter + + + mSelectedView + + + + + + Name + + + true + + + true + + + + mAvailableView + + + + 7 + 7 + 0 + 0 + + + + Extended + + + true + + + true + + + true + + + AllColumns + + + true + + + + + + + kpushbutton.h + kpushbutton.h + tdelistview.h + tdelistview.h + + diff --git a/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop new file mode 100644 index 00000000..924d6516 --- /dev/null +++ b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop @@ -0,0 +1,105 @@ +[Desktop Entry] +Type=Service +ServiceTypes=KWord/MailMergePlugin + +Name=TDE Addressbook Plugin +Name[bg]=Приставка за адресника на TDE +Name[br]=Lugent Karned chomlec'hioù TDE +Name[ca]=Connector de llibreta d'adreces TDE +Name[cs]=Modul Knihy adres TDE +Name[cy]=Ategyn Llyfr Cyfeiriadau TDE +Name[da]=TDE's adressebog Plugin +Name[de]=TDE Adressbuch-Modul +Name[el]=Πρόσθετο βιβλίου διευθύνσεων του TDE +Name[eo]=TDE Adresaro-kromprogramo +Name[es]=Accesorio de la libreta de direcciones de TDE +Name[et]=TDE aadressiraamatu plugin +Name[eu]=TDE-ren helbide-liburuaren plugina +Name[fa]=وصلۀ کتاب نشانی TDE +Name[fi]=TDE:n osoitekirjan liitännäinen +Name[fr]=Module externe de carnet d'adresses de TDE +Name[fy]=Adresboekplugin foar TDE +Name[gl]=Plugin do Libro de Enderezos de TDE +Name[he]=תוסף של פנקס הכתובות של TDE +Name[hi]=केडीई पतापुस्तिका प्लगिन +Name[hr]=TDE dodatak adresara +Name[hu]=Illesztőmodul a TDE címjegyzékhez +Name[is]=TDE vistfanga íforrit +Name[it]=Plugin per la rubrica degli indirizzi TDE +Name[ja]=TDE アドレス帳プラグイン +Name[km]=កម្មវិធី​ជំនួយ​សៀវភៅ​អាសយដ្ឋាន TDE +Name[lv]=TDE adrešu grāmatiņas spraudnis +Name[ms]=Plugin Buku Alamat TDE +Name[nb]=Programtillegg for TDE-adresseboka +Name[nds]=Adressbook-Moduul för TDE +Name[ne]=TDE ठेगानापुस्तक प्लगइन +Name[nl]=Adresboekplugin voor TDE +Name[nn]=Programtillegg for TDE-adresseboka +Name[pl]=Wtyczka Książki adresowej TDE +Name[pt]='Plugin' do Livro de Endereços do TDE +Name[pt_BR]=Livro de Endereços do TDE +Name[ru]=Модуль адресной книги TDE +Name[se]=TDE:a čujuhusgirjemoduvla +Name[sk]=Modul pre TDE adresár +Name[sl]=Vstavek Adresar TDE +Name[sr]=Прикључак за TDE-ов адресар +Name[sr@Latn]=Priključak za TDE-ov adresar +Name[sv]=Insticksprogram för TDE:s adressbok +Name[ta]= TDE முகவரிப்புத்தகம் சொருகு +Name[tg]=Дарҷ кардани TDE Китоби Адресҳо +Name[tr]=TDE Adres Defteri Eklentisi +Name[uk]=Втулок адресної книги TDE +Name[uz]=TDE manzillar daftari plagini +Name[uz@cyrillic]=TDE манзиллар дафтари плагини +Name[wa]=Tchôke-divins calpin d' adresses TDE +Name[zh_CN]=TDE 地址簿插件 +Name[zh_TW]=TDE 通訊錄外掛程式 +Comment=This datasource type lets you use your TDE Address Book entries. +Comment[bg]=Този източник на данни се свързва директно с адресника на TDE и чете данните от там. +Comment[ca]=Aquest tipus de font de dades permet usar les entrades de la llibreta d'adreces del TDE. +Comment[cs]=Tento zdroj dat umožňuje využít položky z Knihy adres. +Comment[cy]=Mae'r math yma o ffynhonell ddata yn eich galluogi i ddefnyddio eich cofnodion Llyfr Cyfeiriadau TDE. +Comment[da]=Denne datakildetype lader dig bruge dine TDE adressebogsindgange. +Comment[de]=Dieser Quellentyp ermöglicht die Verwendung von TDE-Adressbucheinträgen. +Comment[el]=Αυτή η πηγή δεδομένων σας επιτρέπει να χρησιμοποιήσετε τις καταχωρήσεις σας από το βιβλίο διευθύνσεων του TDE. +Comment[es]=Este tipo de fuente de datos le permite usar las entradas de su libreta de direcciones de TDE. +Comment[et]=See andmeallika tüüp võimaldab kasutada TDE aadressiraamatu kirjeid. +Comment[eu]=Datu-iturburu honek zure TDE-ko helbide-liburuko sarrerak erabiltzeko aukera ematen dizu. +Comment[fa]=این نوع متن داده‌ به شما اجازۀ استفاده از مدخلهای کتاب نشانی TDE را می‌دهد. +Comment[fi]=Tämän tietolähteen avulla voit käyttää TDE:n osoitekirjan tietoja. +Comment[fr]=Ce type de source de données vous permet d'utiliser votre carnet d'adresses TDE. +Comment[fy]=Mei dizze plugin ha jo taging ta jo TDE adresboek. +Comment[gl]=Este tipo de fonte de datos armacena os datos directamente no Libro de Enderezos de TDE. +Comment[he]=טיפוס מקור נתונים זה מאפשר לך להשתמש ברשומות שלך מתוך פנקס הכתובות של TDE. +Comment[hi]=यह डाटा स्रोत क़िस्म आपको केडीई पता पुस्तिका प्रविष्टियों को इस्तेमाल करने देती है. +Comment[hu]=Ez az adatforrástípus a TDE címjegyzék adatait teszi hozzáférhetővé. +Comment[is]=Þessi auðlindategund gerir þér kleyft að nota færslur frá TDE vistfangaskránni þinni. +Comment[it]=Questo tipo di fonte di dati permette di usare le voci della rubrica degli indirizzi di TDE. +Comment[ja]=TDE アドレス帳のデータを使用できるようにします。 +Comment[km]=ប្រភេទ​ប្រភព​ទិន្នន័យ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ធាតុ​សៀវភៅ​អាសយដ្ឋាន TDE របស់​អ្នក ។ +Comment[ms]=Jenis sumber data ini membenarkan anda menggunakan entri Buku Alamat TDE anda. +Comment[nb]=Med denne datakildetypen kan du få tilgang til oppføringene i TDE-adresseboka. +Comment[nds]=Mit dissen Datenborntyp laat sik TDE-Adressbookindrääg bruken. +Comment[ne]=यो डेटासंसाधनले तपाईंलाई तपाईंको TDE ठेगाना पुस्तक प्रविष्टिहरू प्रयोग गर्न दिन्छ । +Comment[nl]=Via deze plugin hebt u toegang tot uw TDE-adresboek. +Comment[nn]=Med denne datakjeldetypen kan du få tilgang til oppføringane i TDE-adresseboka. +Comment[pl]=To źródło danych pozwala Ci używać Twoich wpisów z Książki adresowej TDE. +Comment[pt]=Este tipo de fonte de dados armazena os dados directamente no Livro de Endereços do TDE. +Comment[pt_BR]=Este tipo de fonte de dados permite-lhe usar suas entradas do Livro de Endereços do TDE. +Comment[ru]=Источник данных, работающий с записями адресной книги TDE +Comment[se]=Dát dáhtagáldu diktá du geavahit TDE-čujuhusgirjemerkošiid. +Comment[sk]=Tento typ zdroja dát umožňuje používať záznamy z TDE adresára. +Comment[sl]=Ta tip vira podatkov vam omogoča uporabljati vnose vašega Adresarja TDE. +Comment[sr]=Овај тип извора података омогућава вам да користите ставке из TDE-овог адресара. +Comment[sr@Latn]=Ovaj tip izvora podataka omogućava vam da koristite stavke iz TDE-ovog adresara. +Comment[sv]=Den här typen av datakälla låter dig använda information från TDE:s adressbok +Comment[ta]=பலகத்தின் தோற்றத்தை நீங்கள் இங்கே வடிவமைக்கலாம். +Comment[tg]=Ин намуди манбаъи маълумот гузоштани шумо истифода кардан шуморо воридҳои Китоби Адресҳои TDE. +Comment[tr]=Bu veri kaynağı biçimi TDE Adres Defteri girdilerini kullanmanızı sağlar. +Comment[uk]=Цей тип джерела даних дає доступ до записів адресної книги TDE. +Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。 +Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。 + +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 a5ccd80a..4c5c57c3 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 e438188d..c91de7e6 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 98a82233..ee4c09de 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 22349ce7..28ac2324 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 cef66f55..c74406d8 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 015bcce9..bc5912f4 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 706a8c03..3a899fc8 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 f617a19f..b9904d18 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 8bdfdbe1..81619f8e 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 5302f0ef..a509da52 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 6a0360aa..559375fd 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 fd7754b2..7080201b 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 b048c26e..848ecac7 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 37bee54f..e7a9164a 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 e1eb1402..2bd3d085 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 341d6af7..b923fa61 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 4bebc4b3..c0f9350d 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 4456d835..95d0acb4 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 7ffeef00..927c7245 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 -- cgit v1.2.1