From 7422cac1a18dca897d3830a267eb91683d05a95b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:10:41 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- Doxyfile.temp | 4 +- acinclude.m4 | 26 ++++---- chalk/chalkcolor/Makefile.am | 2 +- .../kis_colorspace_factory_registry.cc | 4 +- chalk/chalkcolor/tests/Makefile.am | 12 ++-- .../tests/kis_color_conversions_tester.cpp | 6 +- .../tests/kis_color_conversions_tester.h | 2 +- chalk/colorspaces/cmyk_u16/Makefile.am | 2 +- chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h | 2 +- chalk/colorspaces/cmyk_u8/Makefile.am | 2 +- chalk/colorspaces/cmyk_u8/cmyk_plugin.h | 2 +- chalk/colorspaces/gray_u16/Makefile.am | 2 +- chalk/colorspaces/gray_u16/gray_u16_plugin.h | 2 +- chalk/colorspaces/gray_u8/Makefile.am | 4 +- chalk/colorspaces/gray_u8/gray_plugin.h | 2 +- chalk/colorspaces/gray_u8/tests/Makefile.am | 12 ++-- ...s_strategy_colorspace_grayscale_tester.cpp | 6 +- ...kis_strategy_colorspace_grayscale_tester.h | 2 +- chalk/colorspaces/lms_f32/Makefile.am | 2 +- chalk/colorspaces/lms_f32/lms_f32_plugin.h | 2 +- chalk/colorspaces/rgb_f16half/Makefile.am | 4 +- .../rgb_f16half/rgb_f16half_plugin.h | 2 +- .../colorspaces/rgb_f16half/tests/Makefile.am | 12 ++-- .../kis_rgb_f16half_colorspace_tester.cc | 6 +- .../tests/kis_rgb_f16half_colorspace_tester.h | 2 +- chalk/colorspaces/rgb_f32/Makefile.am | 4 +- chalk/colorspaces/rgb_f32/rgb_f32_plugin.h | 2 +- chalk/colorspaces/rgb_f32/tests/Makefile.am | 12 ++-- .../kis_strategy_colorspace_rgb_f32_tester.cc | 6 +- .../kis_strategy_colorspace_rgb_f32_tester.h | 2 +- chalk/colorspaces/rgb_u16/Makefile.am | 4 +- chalk/colorspaces/rgb_u16/rgb_u16_plugin.h | 2 +- chalk/colorspaces/rgb_u16/tests/Makefile.am | 12 ++-- .../kis_strategy_colorspace_rgb_u16_tester.cc | 6 +- .../kis_strategy_colorspace_rgb_u16_tester.h | 2 +- chalk/colorspaces/rgb_u8/Makefile.am | 4 +- chalk/colorspaces/rgb_u8/rgb_plugin.h | 2 +- chalk/colorspaces/rgb_u8/tests/Makefile.am | 12 ++-- .../kis_strategy_colorspace_rgb_tester.cpp | 6 +- .../kis_strategy_colorspace_rgb_tester.h | 2 +- chalk/colorspaces/wet/Makefile.am | 2 +- chalk/colorspaces/wet/wet_plugin.h | 2 +- .../wetsticky/brushop/wsbrushpaintop_plugin.h | 2 +- .../colorspaces/wetsticky/wet_sticky_plugin.h | 2 +- chalk/colorspaces/ycbcr_u16/Makefile.am | 2 +- .../colorspaces/ycbcr_u16/ycbcr_u16_plugin.h | 2 +- chalk/colorspaces/ycbcr_u8/Makefile.am | 2 +- chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h | 2 +- chalk/configure.in.in | 10 +-- chalk/core/Makefile.am | 2 +- chalk/core/kis_filter_registry.cc | 4 +- chalk/core/kis_paintop_registry.cc | 4 +- chalk/core/tests/Makefile.am | 24 +++---- .../tests/kis_filter_configuration_tester.cc | 6 +- .../tests/kis_filter_configuration_tester.h | 2 +- chalk/core/tests/kis_image_tester.cpp | 6 +- chalk/core/tests/kis_image_tester.h | 2 +- chalk/core/tests/kis_integer_maths_tester.cpp | 6 +- chalk/core/tests/kis_integer_maths_tester.h | 2 +- chalk/core/tiles/Makefile.am | 2 +- chalk/core/tiles/tests/Makefile.am | 12 ++-- .../tiles/tests/kis_tiled_data_tester.cpp | 6 +- .../core/tiles/tests/kis_tiled_data_tester.h | 2 +- chalk/doc/DESIGN.obsolete | 2 +- chalk/doc/colorspaces.xmi | 10 +-- chalk/plugins/README | 2 +- chalk/plugins/filters/blur/Makefile.am | 2 +- chalk/plugins/filters/blur/blur.h | 2 +- chalk/plugins/filters/bumpmap/Makefile.am | 2 +- chalk/plugins/filters/bumpmap/bumpmap.h | 2 +- chalk/plugins/filters/cimg/Makefile.am | 2 +- chalk/plugins/filters/cimg/kis_cimg_plugin.h | 2 +- chalk/plugins/filters/colorify/Colorify.h | 2 +- chalk/plugins/filters/colorify/Makefile.am | 2 +- chalk/plugins/filters/colors/Makefile.am | 2 +- chalk/plugins/filters/colors/colors.h | 2 +- .../plugins/filters/colorsfilters/Makefile.am | 2 +- .../filters/colorsfilters/colorsfilters.h | 2 +- .../filters/convolutionfilters/Makefile.am | 2 +- .../convolutionfilters/convolutionfilters.h | 2 +- .../cubismfilter/kis_cubism_filter_plugin.h | 2 +- .../plugins/filters/embossfilter/Makefile.am | 2 +- .../embossfilter/kis_emboss_filter_plugin.h | 2 +- chalk/plugins/filters/example/Makefile.am | 2 +- chalk/plugins/filters/example/example.h | 2 +- .../filters/fastcolortransfer/Makefile.am | 2 +- .../fastcolortransfer/fastcolortransfer.h | 2 +- chalk/plugins/filters/halftone/kis_halftone.h | 2 +- .../filters/imageenhancement/Makefile.am | 2 +- .../imageenhancement/imageenhancement.h | 2 +- .../filters/lenscorrectionfilter/Makefile.am | 2 +- .../lenscorrectionfilter.h | 2 +- chalk/plugins/filters/levelfilter/Makefile.am | 2 +- .../plugins/filters/levelfilter/levelfilter.h | 2 +- chalk/plugins/filters/noisefilter/Makefile.am | 2 +- .../plugins/filters/noisefilter/noisefilter.h | 2 +- .../filters/oilpaintfilter/Makefile.am | 2 +- .../kis_oilpaint_filter_plugin.h | 2 +- .../filters/pixelizefilter/Makefile.am | 2 +- .../kis_pixelize_filter_plugin.h | 2 +- .../filters/raindropsfilter/Makefile.am | 2 +- .../kis_raindrops_filter_plugin.h | 2 +- .../filters/randompickfilter/Makefile.am | 2 +- .../randompickfilter/randompickfilter.h | 2 +- .../plugins/filters/roundcorners/Makefile.am | 2 +- .../kis_round_corners_filter_plugin.h | 2 +- .../filters/smalltilesfilter/Makefile.am | 2 +- .../kis_small_tiles_filter_plugin.h | 2 +- chalk/plugins/filters/sobelfilter/Makefile.am | 2 +- .../sobelfilter/kis_sobel_filter_plugin.h | 2 +- chalk/plugins/filters/threadtest/threadtest.h | 2 +- chalk/plugins/filters/unsharp/Makefile.am | 2 +- chalk/plugins/filters/unsharp/unsharp.h | 2 +- chalk/plugins/filters/wavefilter/Makefile.am | 2 +- chalk/plugins/filters/wavefilter/wavefilter.h | 2 +- .../paintops/defaultpaintops/Makefile.am | 2 +- .../defaultpaintops/defaultpaintops_plugin.h | 2 +- chalk/plugins/tools/defaulttools/Makefile.am | 2 +- .../tools/defaulttools/default_tools.h | 2 +- .../plugins/tools/selectiontools/Makefile.am | 2 +- .../tools/selectiontools/selection_tools.h | 2 +- chalk/plugins/tools/tool_crop/Makefile.am | 2 +- chalk/plugins/tools/tool_crop/tool_crop.h | 2 +- chalk/plugins/tools/tool_curves/Makefile.am | 2 +- chalk/plugins/tools/tool_curves/tool_curves.h | 2 +- chalk/plugins/tools/tool_filter/Makefile.am | 2 +- chalk/plugins/tools/tool_filter/tool_filter.h | 2 +- .../tools/tool_perspectivegrid/Makefile.am | 2 +- .../tool_perspectivegrid.h | 2 +- .../tool_perspectivetransform/Makefile.am | 2 +- .../tool_perspectivetransform.h | 2 +- chalk/plugins/tools/tool_polygon/Makefile.am | 2 +- .../plugins/tools/tool_polygon/tool_polygon.h | 2 +- chalk/plugins/tools/tool_polyline/Makefile.am | 2 +- .../tools/tool_polyline/tool_polyline.h | 2 +- .../tools/tool_selectsimilar/Makefile.am | 2 +- .../tools/tool_selectsimilar/selectsimilar.h | 2 +- chalk/plugins/tools/tool_star/Makefile.am | 2 +- chalk/plugins/tools/tool_star/tool_star.h | 2 +- .../plugins/tools/tool_transform/Makefile.am | 2 +- .../tools/tool_transform/tool_transform.h | 2 +- .../viewplugins/colorrange/Makefile.am | 2 +- .../viewplugins/colorrange/colorrange.h | 2 +- .../colorspaceconversion/Makefile.am | 2 +- .../colorspaceconversion.h | 2 +- .../viewplugins/dropshadow/Makefile.am | 2 +- .../dropshadow/kis_dropshadow_plugin.h | 2 +- .../viewplugins/filtersgallery/Makefile.am | 2 +- .../filtersgallery/filters_gallery.h | 2 +- .../plugins/viewplugins/histogram/Makefile.am | 2 +- .../plugins/viewplugins/histogram/histogram.h | 2 +- .../viewplugins/histogram_docker/Makefile.am | 2 +- .../histogram_docker/histogramdocker.h | 2 +- .../history_docker/historydocker.h | 2 +- .../plugins/viewplugins/imagesize/Makefile.am | 2 +- .../plugins/viewplugins/imagesize/imagesize.h | 2 +- .../viewplugins/modify_selection/Makefile.am | 2 +- .../modify_selection/modify_selection.h | 2 +- .../viewplugins/performancetest/Makefile.am | 2 +- .../viewplugins/performancetest/perftest.h | 2 +- .../viewplugins/rotateimage/Makefile.am | 2 +- .../viewplugins/rotateimage/rotateimage.h | 2 +- .../viewplugins/screenshot/Makefile.am | 2 +- .../viewplugins/screenshot/screenshot.h | 2 +- .../plugins/viewplugins/scripting/Makefile.am | 14 ++-- .../scripting/chalkcore/Makefile.am | 6 +- .../scripting/chalkcore/chalkcoremodule.cpp | 8 +-- .../scripting/chalkscripting/Makefile.am | 19 ------ ...pting.desktop => chaltdescripting.desktop} | 2 +- .../scripting/chaltdescripting/Makefile.am | 19 ++++++ .../kis_script_monitor.cpp | 0 .../kis_script_monitor.h | 0 .../kis_script_progress.cpp | 0 .../kis_script_progress.h | 0 .../viewplugins/scripting/scripting.cc | 6 +- .../plugins/viewplugins/scripting/scripting.h | 2 +- .../viewplugins/scripting/scripting.rc | 2 +- .../viewplugins/selectopaque/Makefile.am | 2 +- .../viewplugins/selectopaque/selectopaque.h | 2 +- .../viewplugins/separate_channels/Makefile.am | 2 +- .../kis_separate_channels_plugin.h | 2 +- .../viewplugins/shearimage/Makefile.am | 2 +- .../viewplugins/shearimage/shearimage.h | 2 +- .../plugins/viewplugins/substrate/Makefile.am | 2 +- .../plugins/viewplugins/substrate/substrate.h | 2 +- .../viewplugins/variations/Makefile.am | 2 +- .../viewplugins/variations/variations.h | 2 +- chalk/ui/kis_clipboard.cc | 2 +- chalk/ui/kis_dlg_preferences.cc | 2 +- chalk/ui/kis_factory.h | 2 +- chalk/ui/kis_tool_registry.cc | 4 +- chalk/ui/kis_view.cc | 6 +- changes-1.4 | 2 +- config.h.in | 4 +- configure.in | 42 ++++++------ doc/chalk/developers-plugins.docbook | 2 +- doc/koffice/index.docbook | 8 +-- doc/kword/index.docbook | 2 +- doc/kword/table.docbook | 2 +- .../{kparts.docbook => tdeparts.docbook} | 6 +- filters/chalk/gmagick/Makefile.am | 4 +- filters/chalk/jpeg/Makefile.am | 6 +- filters/chalk/libkisexif/Makefile.am | 2 +- filters/chalk/magick/Makefile.am | 4 +- filters/chalk/openexr/Makefile.am | 4 +- filters/chalk/pdf/Makefile.am | 2 +- filters/chalk/png/Makefile.am | 4 +- filters/chalk/raw/Makefile.am | 2 +- filters/chalk/tiff/Makefile.am | 6 +- filters/chalk/xcf/Makefile.am | 4 +- filters/karbon/eps/Makefile.am | 4 +- filters/karbon/kontour/Makefile.am | 2 +- filters/karbon/png/Makefile.am | 2 +- filters/karbon/svg/Makefile.am | 4 +- filters/karbon/wmf/Makefile.am | 4 +- filters/karbon/xcf/Makefile.am | 2 +- filters/kchart/bmp/Makefile.am | 2 +- filters/kchart/jpeg/Makefile.am | 2 +- filters/kchart/mng/Makefile.am | 2 +- filters/kchart/png/Makefile.am | 2 +- filters/kchart/svg/Makefile.am | 2 +- filters/kchart/xbm/Makefile.am | 2 +- filters/kchart/xpm/Makefile.am | 2 +- filters/kformula/latex/Makefile.am | 2 +- filters/kformula/png/Makefile.am | 2 +- filters/kformula/svg/Makefile.am | 2 +- filters/kivio/imageexport/Makefile.am | 2 +- filters/kpresenter/bmp/Makefile.am | 2 +- filters/kpresenter/jpeg/Makefile.am | 2 +- filters/kpresenter/mng/Makefile.am | 2 +- filters/kpresenter/png/Makefile.am | 2 +- filters/kpresenter/svg/Makefile.am | 2 +- filters/kpresenter/xbm/Makefile.am | 2 +- filters/kpresenter/xpm/Makefile.am | 2 +- filters/kspread/applixspread/Makefile.am | 2 +- filters/kspread/dbase/Makefile.am | 2 +- filters/kspread/excel/import/Makefile.am | 2 +- filters/kspread/latex/export/Makefile.am | 2 +- filters/kugar/kugarnop/Makefile.am | 2 +- filters/kword/hancomword/Makefile.am | 2 +- filters/kword/html/import/Makefile.am | 4 +- filters/kword/html/import/htmlimport.cpp | 2 +- .../{khtmlreader.cpp => tdehtmlreader.cpp} | 14 ++-- .../import/{khtmlreader.h => tdehtmlreader.h} | 4 +- filters/kword/html/status.html | 6 +- filters/kword/latex/export/Makefile.am | 2 +- filters/kword/latex/import/Makefile.am | 2 +- filters/kword/latex/import/parser/Makefile.am | 2 +- filters/kword/msword/Makefile.am | 2 +- filters/kword/mswrite/Makefile.am | 4 +- filters/kword/pdf/Makefile.am | 2 +- filters/xsltfilter/export/Makefile.am | 2 +- filters/xsltfilter/import/Makefile.am | 2 +- karbon/core/vkarbonplugin.h | 2 +- karbon/karbon_factory.cc | 4 +- .../plugins/flattenpath/flattenpathplugin.h | 2 +- karbon/plugins/imagetool/imagetoolplugin.h | 2 +- .../plugins/insertknots/insertknotsplugin.h | 2 +- .../plugins/roundcorners/roundcornersplugin.h | 2 +- .../plugins/shadoweffect/shadoweffectplugin.h | 2 +- karbon/plugins/whirlpinch/whirlpinchplugin.h | 2 +- karbon/plugins/zoomtool/zoomtoolplugin.h | 2 +- karbon/tools/vdefaulttools.h | 2 +- kexi/configure.in.in | 2 +- kexi/core/kexidialogbase.h | 2 +- kexi/core/kexiinternalpart.cpp | 2 +- kexi/core/keximainwindow.h | 2 +- kexi/core/kexipartmanager.cpp | 2 +- kexi/doc/dev/CHANGELOG-Kexi-js | 4 +- kexi/doc/dev/TODO-Kexi-js | 2 +- kexi/formeditor/factories/Makefile.am | 4 +- .../tdevelop_plugin/kfd_kdev_part.h | 2 +- kexi/formeditor/test/Makefile.am | 2 +- kexi/formeditor/test/kfd_mainwindow.h | 2 +- kexi/formeditor/test/kfd_part.h | 4 +- kexi/formeditor/widgetlibrary.cpp | 2 +- kexi/kexidb/drivermanager.cpp | 2 +- kexi/kexidb/drivers/mySQL/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/main/keximainwindowimpl.cpp | 12 ++-- kexi/main/kexistatusbar.cpp | 6 +- kexi/migration/Makefile.am | 2 +- kexi/migration/migratemanager.cpp | 2 +- kexi/migration/mysql/Makefile.am | 2 +- kexi/migration/pqxx/Makefile.am | 2 +- kexi/plugins/forms/Makefile.am | 6 +- kexi/plugins/importexport/csv/Makefile.am | 2 +- kexi/plugins/macros/Makefile.am | 2 +- kexi/plugins/macros/configure.in.in | 16 ++--- kexi/plugins/macros/tests/Makefile.am | 16 ++--- kexi/plugins/macros/tests/actiontests.cpp | 2 +- kexi/plugins/macros/tests/actiontests.h | 2 +- kexi/plugins/macros/tests/commontests.cpp | 2 +- kexi/plugins/macros/tests/commontests.h | 2 +- kexi/plugins/macros/tests/komacrotest.cpp | 2 +- kexi/plugins/macros/tests/komacrotestgui.cpp | 2 +- kexi/plugins/macros/tests/macroitemtests.cpp | 2 +- kexi/plugins/macros/tests/macroitemtests.h | 2 +- kexi/plugins/macros/tests/macrotests.cpp | 2 +- kexi/plugins/macros/tests/macrotests.h | 2 +- kexi/plugins/macros/tests/testobject.h | 2 +- kexi/plugins/macros/tests/variabletests.cpp | 2 +- kexi/plugins/macros/tests/variabletests.h | 2 +- kexi/plugins/macros/tests/xmlhandlertests.cpp | 2 +- kexi/plugins/macros/tests/xmlhandlertests.h | 2 +- .../plugins/macros/tests/xmlhandlertests2.cpp | 2 +- kexi/plugins/macros/tests/xmlhandlertests2.h | 2 +- kexi/plugins/migration/Makefile.am | 2 +- kexi/plugins/queries/Makefile.am | 2 +- kexi/plugins/relations/Makefile.am | 2 +- .../scripting/kexiscripting/Makefile.am | 2 +- .../kexiscripting/kexiscripteditor.cpp | 4 +- kexi/plugins/tables/Makefile.am | 2 +- kexi/tests/altertable/Makefile.am | 2 +- kexi/tests/newapi/Makefile.am | 6 +- .../newapi/mysqlcursortest_expectedoutput | 2 +- kexi/tests/widgets/Makefile.am | 2 +- kexi/widget/Makefile.am | 2 +- kexi/widget/kexieditor.cpp | 18 +++--- kformula/Makefile.am | 2 +- kivio/kiviopart/kivio_view.cpp | 2 +- .../kiviosdk/kivio_plugin_stencil_spawner.cpp | 4 +- kivio/kiviopart/tools/kivio_plugin.h | 2 +- kivio/kiviopart/tools/kivio_pluginmanager.cpp | 2 +- kivio/plugins/kivioconnectortool/Makefile.am | 2 +- kivio/plugins/kivioselecttool/Makefile.am | 2 +- kivio/plugins/kiviotargettool/Makefile.am | 2 +- kivio/plugins/kiviotexttool/Makefile.am | 2 +- kivio/plugins/kiviozoomtool/Makefile.am | 2 +- koshell/koshell_shell.cc | 2 +- kounavail/Makefile.am | 2 +- kplato/Makefile.am | 6 +- kplato/kptpertcanvas.cc | 2 +- kplato/kptrequestresourcespanel.h | 2 +- ...base.ui => kpttastderesourcespanelbase.ui} | 2 +- ....ui.h => kpttastderesourcespanelbase.ui.h} | 0 kplato/tests/CalendarTester.cpp | 6 +- kplato/tests/CalendarTester.h | 2 +- kplato/tests/DateTimeTester.cpp | 6 +- kplato/tests/DateTimeTester.h | 2 +- kplato/tests/DurationTester.cpp | 6 +- kplato/tests/DurationTester.h | 2 +- kplato/tests/Makefile.am | 32 +++++----- kpresenter/CHANGES | 2 +- kpresenter/KPrBgSpellCheck.cpp | 2 +- kpresenter/KPrCanvas.cpp | 2 +- kpresenter/KPrConfig.cpp | 6 +- kpresenter/KPrDocument.cpp | 2 +- kpresenter/KPrDocument.h | 2 +- kpresenter/KPrPartObject.cpp | 2 +- kpresenter/KPrTextObject.cpp | 2 +- kpresenter/KPrView.cpp | 10 +-- kpresenter/KPrView.h | 2 +- kpresenter/Makefile.am | 6 +- kpresenter/scripts/mkstandalone.sh | 2 +- kspread/Makefile.am | 8 +-- kspread/dialogs/kspread_dlg_preference.cc | 2 +- kspread/kspread_canvas.cc | 2 +- kspread/kspread_doc.cc | 14 ++-- kspread/kspread_doc.h | 4 +- kspread/kspread_events.h | 2 +- kspread/kspread_object.cc | 2 +- kspread/kspread_view.cc | 64 +++++++++---------- kspread/plugins/calculator/main.h | 2 +- .../kspread_plugininsertcalendar.h | 2 +- kspread/plugins/scripting/Makefile.am | 2 +- .../plugins/scripting/kspreadcore/Makefile.am | 2 +- kspread/plugins/scripting/scripting.h | 2 +- kugar/kudesigner/Makefile.am | 6 +- kugar/kudesigner/kudesigner_doc.cpp | 2 +- kugar/kudesigner/kudesigner_view.h | 2 +- kword/CHANGES | 2 +- kword/KWBgSpellCheck.cpp | 2 +- kword/KWCanvas.cpp | 6 +- kword/KWConfig.cpp | 6 +- kword/KWDocument.cpp | 6 +- kword/KWView.cpp | 8 +-- kword/KWView.h | 2 +- kword/KWordPartFrameSetIface.cpp | 2 +- kword/Makefile.am | 8 +-- kword/demos/framestest.kwd | 2 +- kword/mailmerge/Makefile.am | 2 +- kword/mailmerge/kabc/Makefile.am | 2 +- kword/mailmerge/kspread/Makefile.am | 2 +- kword/mailmerge/sql/Makefile.am | 4 +- kword/tests/FrameTester.cpp | 6 +- kword/tests/FrameTester.h | 2 +- kword/tests/FrameViewTester.cpp | 6 +- kword/tests/FrameViewTester.h | 2 +- kword/tests/KWPageManagerTester.cpp | 6 +- kword/tests/KWPageManagerTester.h | 2 +- kword/tests/Makefile.am | 28 ++++---- lib/Makefile.am | 2 +- lib/kdoc.rules | 2 +- lib/kofficecore/KoDocument.cpp | 2 +- lib/kofficecore/KoDocument.h | 2 +- lib/kofficecore/KoDocumentChild.cpp | 2 +- lib/kofficecore/KoDocument_p.h | 2 +- lib/kofficecore/KoFactory.h | 2 +- lib/kofficecore/KoFrame.cpp | 2 +- lib/kofficecore/KoMainWindow.cpp | 8 +-- lib/kofficecore/KoMainWindow.h | 2 +- lib/kofficecore/KoQueryTrader.cpp | 2 +- lib/kofficecore/KoQueryTrader.h | 2 +- lib/kofficecore/KoView.cpp | 4 +- lib/kofficecore/KoView.h | 2 +- lib/kofficeui/KoToolBox.cpp | 2 +- lib/kopalette/kopalettemanager.cc | 2 +- lib/koproperty/test/Makefile.am | 2 +- lib/kotext/KoBgSpellCheck.cpp | 10 +-- lib/kotext/KoBgSpellCheck.h | 2 +- lib/kotext/KoFontDia.h | 2 +- lib/kotext/KoLanguageTab.h | 2 +- lib/kotext/KoSpell.cpp | 4 +- lib/kotext/KoSpell.h | 2 +- lib/kotext/KoTextObject.cpp | 2 +- lib/kotext/Makefile.am | 2 +- lib/kotext/configure.in.bot | 2 +- lib/kotext/configure.in.in | 10 +-- lib/kotext/kohyphen/Makefile.am | 2 +- lib/kotext/tests/KoUserStyleTester.cpp | 6 +- lib/kotext/tests/KoUserStyleTester.h | 2 +- lib/kotext/tests/Makefile.am | 12 ++-- lib/kross/runner/Makefile.am | 2 +- lib/kross/test/Makefile.am | 2 +- plugins/scan/Makefile.am | 2 +- plugins/scan/scan.h | 2 +- tools/Makefile.am | 2 +- tools/converter/Makefile.am | 2 +- tools/kfile-plugins/abiword/Makefile.am | 2 +- tools/kfile-plugins/gnumeric/Makefile.am | 2 +- tools/kfile-plugins/koffice/Makefile.am | 2 +- tools/kfile-plugins/ooo/Makefile.am | 2 +- tools/spell/Makefile.am | 16 ++--- tools/spell/main.cc | 4 +- ...spelltool.desktop => tdespelltool.desktop} | 2 +- tools/thumbnail/Makefile.am | 4 +- tools/thumbnail/kofficecreator.cpp | 4 +- tools/thumbnail/kofficecreator.h | 2 +- 441 files changed, 788 insertions(+), 788 deletions(-) delete mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am rename chalk/plugins/viewplugins/scripting/{chalkscripting.desktop => chaltdescripting.desktop} (99%) create mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am rename chalk/plugins/viewplugins/scripting/{chalkscripting => chaltdescripting}/kis_script_monitor.cpp (100%) rename chalk/plugins/viewplugins/scripting/{chalkscripting => chaltdescripting}/kis_script_monitor.h (100%) rename chalk/plugins/viewplugins/scripting/{chalkscripting => chaltdescripting}/kis_script_progress.cpp (100%) rename chalk/plugins/viewplugins/scripting/{chalkscripting => chaltdescripting}/kis_script_progress.h (100%) rename doc/kword/{kparts.docbook => tdeparts.docbook} (94%) rename filters/kword/html/import/{khtmlreader.cpp => tdehtmlreader.cpp} (98%) rename filters/kword/html/import/{khtmlreader.h => tdehtmlreader.h} (95%) rename kplato/{kpttaskresourcespanelbase.ui => kpttastderesourcespanelbase.ui} (99%) rename kplato/{kpttaskresourcespanelbase.ui.h => kpttastderesourcespanelbase.ui.h} (100%) rename tools/spell/{kspelltool.desktop => tdespelltool.desktop} (99%) diff --git a/Doxyfile.temp b/Doxyfile.temp index 11c30f00c..3d582048e 100644 --- a/Doxyfile.temp +++ b/Doxyfile.temp @@ -66,8 +66,8 @@ INPUT = example \ FILE_PATTERNS = *.h RECURSIVE = YES #EXCLUDE = \ -#arts/tests tdeprint/tests khtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests kwallet/backend/tests \ -#tdecore/tests tdeui/tests kinit/tests kio/tests kparts/tests libkmid/tests +#arts/tests tdeprint/tests tdehtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests tdewallet/backend/tests \ +#tdecore/tests tdeui/tests kinit/tests kio/tests tdeparts/tests libtdemid/tests # */tests doesn't seem to work :( # If the value of the INPUT tag contains directories, you can use the diff --git a/acinclude.m4 b/acinclude.m4 index f7629e5f3..2ce29ad69 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2066,16 +2066,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2083,13 +2083,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2535,7 +2535,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3477,7 +3477,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am index 635fd6727..a8e240bf4 100644 --- a/chalk/chalkcolor/Makefile.am +++ b/chalk/chalkcolor/Makefile.am @@ -32,7 +32,7 @@ include_HEADERS = \ kis_colorspace_factory_registry.h kis_abstract_colorspace.h -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 32416c0c0..a193bb315 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -18,10 +18,10 @@ */ #include "kdebug.h" -#include +#include #include #include -#include +#include #include #include #include "kis_debug_areas.h" diff --git a/chalk/chalkcolor/tests/Makefile.am b/chalk/chalkcolor/tests/Makefile.am index e78141e78..d96949fec 100644 --- a/chalk/chalkcolor/tests/Makefile.am +++ b/chalk/chalkcolor/tests/Makefile.am @@ -5,12 +5,12 @@ AM_CPPFLAGS = \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_color_conversions_tester.la +check_LTLIBRARIES = tdeunittest_kis_color_conversions_tester.la -kunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp -kunittest_kis_color_conversions_tester_la_LIBADD = -lkunittest ../libchalkcolor.la ../../libchalkcommon.la -kunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp +tdeunittest_kis_color_conversions_tester_la_LIBADD = -ltdeunittest ../libchalkcolor.la ../../libchalkcommon.la +tdeunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_color_conversions_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_color_conversions_tester.la + tdeunittestmodrunner diff --git a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp index d244b5dd5..4c4462127 100644 --- a/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp +++ b/chalk/chalkcolor/tests/kis_color_conversions_tester.cpp @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_color_conversions_tester.h" #include "kis_color_conversions.h" using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_color_conversions_tester, "Color Conversions Tester"); +KUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester); void KisColorConversionsTester::allTests() diff --git a/chalk/chalkcolor/tests/kis_color_conversions_tester.h b/chalk/chalkcolor/tests/kis_color_conversions_tester.h index 1223abbb7..a7a4f6788 100644 --- a/chalk/chalkcolor/tests/kis_color_conversions_tester.h +++ b/chalk/chalkcolor/tests/kis_color_conversions_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_COLOR_CONVERSIONS_TESTER_H #define KIS_COLOR_CONVERSIONS_TESTER_H -#include +#include #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/cmyk_u16/Makefile.am b/chalk/colorspaces/cmyk_u16/Makefile.am index e84347a0f..f6dd8c87c 100644 --- a/chalk/colorspaces/cmyk_u16/Makefile.am +++ b/chalk/colorspaces/cmyk_u16/Makefile.am @@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h -chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_cmyk_u16_plugin_la_LIBADD = libchalk_cmyk_u16.la ../../chalkcolor/libchalkcolor.la chalk_cmyk_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h index c64daf464..e34951a59 100644 --- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h +++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef CMYK_U16_PLUGIN_H_ #define CMYK_U16_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the CMYK U16 colour space strategy. diff --git a/chalk/colorspaces/cmyk_u8/Makefile.am b/chalk/colorspaces/cmyk_u8/Makefile.am index dad6d3fe0..b93d840b3 100644 --- a/chalk/colorspaces/cmyk_u8/Makefile.am +++ b/chalk/colorspaces/cmyk_u8/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = chalkcmykplugin.la chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h -chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkcmykplugin_la_LIBADD = ../../chalkcolor/libchalkcolor.la chalkcmykplugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h index 7fa5e0ec4..c633a026f 100644 --- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h +++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h @@ -19,7 +19,7 @@ #ifndef CMYK_PLUGIN_H_ #define CMYK_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the CMYK colour space strategy. diff --git a/chalk/colorspaces/gray_u16/Makefile.am b/chalk/colorspaces/gray_u16/Makefile.am index eca6db2de..3ccbd0887 100644 --- a/chalk/colorspaces/gray_u16/Makefile.am +++ b/chalk/colorspaces/gray_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h -chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_gray_u16_plugin_la_LIBADD = libchalk_gray_u16.la ../../chalkcolor/libchalkcolor.la chalk_gray_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.h b/chalk/colorspaces/gray_u16/gray_u16_plugin.h index d1b2c938f..7fc9891d1 100644 --- a/chalk/colorspaces/gray_u16/gray_u16_plugin.h +++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef GRAY_U16_PLUGIN_H_ #define GRAY_U16_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the GRAY U16 colour space strategy. diff --git a/chalk/colorspaces/gray_u8/Makefile.am b/chalk/colorspaces/gray_u8/Makefile.am index 1488b5495..38b29fd85 100644 --- a/chalk/colorspaces/gray_u8/Makefile.am +++ b/chalk/colorspaces/gray_u8/Makefile.am @@ -18,12 +18,12 @@ kde_module_LTLIBRARIES = chalkgrayplugin.la chalkgrayplugin_la_SOURCES = gray_plugin.cc noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h -chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkgrayplugin_la_LIBADD = libchalkgrayscale.la ../../chalkcolor/libchalkcolor.la chalkgrayplugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/gray_u8/gray_plugin.h b/chalk/colorspaces/gray_u8/gray_plugin.h index d33778f05..7447ccd66 100644 --- a/chalk/colorspaces/gray_u8/gray_plugin.h +++ b/chalk/colorspaces/gray_u8/gray_plugin.h @@ -19,7 +19,7 @@ #ifndef GRAY_PLUGIN_H_ #define GRAY_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the GRAY colour space strategy. diff --git a/chalk/colorspaces/gray_u8/tests/Makefile.am b/chalk/colorspaces/gray_u8/tests/Makefile.am index 35e83689a..c9c658d7d 100644 --- a/chalk/colorspaces/gray_u8/tests/Makefile.am +++ b/chalk/colorspaces/gray_u8/tests/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_strategy_colorspace_grayscale_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_grayscale_tester.la -kunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp -kunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -lkunittest ../libchalkgrayscale.la -kunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -ltdeunittest ../libchalkgrayscale.la +tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_grayscale_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_grayscale_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp index 0374c0727..485b0a391 100644 --- a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp +++ b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_factory.h" #include "kis_strategy_colorspace_grayscale_tester.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester ); void KisGrayColorSpaceTester::allTests() diff --git a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h index 9b5f8d5e0..553242c99 100644 --- a/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h +++ b/chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H #define KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H -#include +#include class KisGrayColorSpaceTester : public KUnitTest::Tester { diff --git a/chalk/colorspaces/lms_f32/Makefile.am b/chalk/colorspaces/lms_f32/Makefile.am index db835606f..309f6d172 100644 --- a/chalk/colorspaces/lms_f32/Makefile.am +++ b/chalk/colorspaces/lms_f32/Makefile.am @@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h -chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_lms_f32_plugin_la_LIBADD = libchalk_lms_f32.la ../../chalkcolor/libchalkcolor.la chalk_lms_f32_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.h b/chalk/colorspaces/lms_f32/lms_f32_plugin.h index fe54f4eab..24e11ed5a 100644 --- a/chalk/colorspaces/lms_f32/lms_f32_plugin.h +++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.h @@ -21,7 +21,7 @@ #ifndef LMS_F32_PLUGIN_H_ #define LMS_F32_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the LMS F32 colour space strategy. diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am index 2419bb8ce..f93fbcbbc 100644 --- a/chalk/colorspaces/rgb_f16half/Makefile.am +++ b/chalk/colorspaces/rgb_f16half/Makefile.am @@ -22,12 +22,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h -chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_f16half_plugin_la_LIBADD = libchalk_rgb_f16half.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f16half_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h index 1c7818f03..699ba810e 100644 --- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h +++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h @@ -20,7 +20,7 @@ #ifndef RGB_F16HALF_PLUGIN_H_ #define RGB_F16HALF_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the RGB F16Half colour space strategy. diff --git a/chalk/colorspaces/rgb_f16half/tests/Makefile.am b/chalk/colorspaces/rgb_f16half/tests/Makefile.am index 284359ee1..cdb3f06c5 100644 --- a/chalk/colorspaces/rgb_f16half/tests/Makefile.am +++ b/chalk/colorspaces/rgb_f16half/tests/Makefile.am @@ -8,12 +8,12 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_rgb_f16half_colorspace_tester.la +check_LTLIBRARIES = tdeunittest_kis_rgb_f16half_colorspace_tester.la -kunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc -kunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f16half.la -kunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc +tdeunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f16half.la +tdeunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_rgb_f16half_colorspace_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_rgb_f16half_colorspace_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc index f5e39f84e..4fc4d847c 100644 --- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc +++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_factory.h" #include "kis_rgb_f16half_colorspace.h" @@ -29,7 +29,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h index 6547e35ba..fcae06d00 100644 --- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h +++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h @@ -21,7 +21,7 @@ #ifndef KIS_RGB_F16HALF_COLORSPACE_TESTER_H #define KIS_RGB_F16HALF_COLORSPACE_TESTER_H -#include +#include #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_f32/Makefile.am b/chalk/colorspaces/rgb_f32/Makefile.am index cb20ad1f3..ee184ef58 100644 --- a/chalk/colorspaces/rgb_f32/Makefile.am +++ b/chalk/colorspaces/rgb_f32/Makefile.am @@ -21,12 +21,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h -chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_f32_plugin_la_LIBADD = libchalk_rgb_f32.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f32_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h index 28e3e5a54..f43251fda 100644 --- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h +++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h @@ -20,7 +20,7 @@ #ifndef RGB_F32_PLUGIN_H_ #define RGB_F32_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the RGB F32 colour space strategy. diff --git a/chalk/colorspaces/rgb_f32/tests/Makefile.am b/chalk/colorspaces/rgb_f32/tests/Makefile.am index 5980c24ed..9ad10271b 100644 --- a/chalk/colorspaces/rgb_f32/tests/Makefile.am +++ b/chalk/colorspaces/rgb_f32/tests/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_strategy_colorspace_rgb_f32_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f32.la -kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f32.la +tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_f32_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc index eb9f9637b..48dd8ea47 100644 --- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc +++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_factory.h" #include "kis_strategy_colorspace_rgb_f32_tester.h" @@ -28,7 +28,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h index 1153f1473..30ac552c0 100644 --- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h +++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h @@ -21,7 +21,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H -#include +#include #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_u16/Makefile.am b/chalk/colorspaces/rgb_u16/Makefile.am index 7c4277f7d..f19e89acc 100644 --- a/chalk/colorspaces/rgb_u16/Makefile.am +++ b/chalk/colorspaces/rgb_u16/Makefile.am @@ -19,12 +19,12 @@ kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h -chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_rgb_u16_plugin_la_LIBADD = libchalk_rgb_u16.la ../../chalkcolor/libchalkcolor.la chalk_rgb_u16_plugin_la_METASOURCES = AUTO -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h index fd9f3ee86..29095bc8f 100644 --- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h +++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef RGB_U16_PLUGIN_H_ #define RGB_U16_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the RGB U16 colour space strategy. diff --git a/chalk/colorspaces/rgb_u16/tests/Makefile.am b/chalk/colorspaces/rgb_u16/tests/Makefile.am index dcf23893b..76c4d175b 100644 --- a/chalk/colorspaces/rgb_u16/tests/Makefile.am +++ b/chalk/colorspaces/rgb_u16/tests/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_strategy_colorspace_rgb_u16_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -lkunittest ../libchalk_rgb_u16.la -kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_u16.la +tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_u16_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc index e260b4d51..1a3a7539f 100644 --- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc +++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_factory.h" #include "kis_strategy_colorspace_rgb_u16_tester.h" @@ -27,7 +27,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester ); #define PIXEL_BLUE 0 diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h index 848cf1ac2..4c60c82fd 100644 --- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h +++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H -#include +#include #define CHECK_TOLERANCE( x, y, tolerance ) \ if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \ diff --git a/chalk/colorspaces/rgb_u8/Makefile.am b/chalk/colorspaces/rgb_u8/Makefile.am index 6938f85c9..16c23c01f 100644 --- a/chalk/colorspaces/rgb_u8/Makefile.am +++ b/chalk/colorspaces/rgb_u8/Makefile.am @@ -19,13 +19,13 @@ kde_module_LTLIBRARIES = chalkrgbplugin.la chalkrgbplugin_la_SOURCES = rgb_plugin.cc noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h -chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkrgbplugin_la_LIBADD = libchalkrgb.la ../../chalkcolor/libchalkcolor.la chalkrgbplugin_la_METASOURCES = AUTO #METASOURCES = AUTO # XXX: which of the two? -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.h b/chalk/colorspaces/rgb_u8/rgb_plugin.h index 00b34edec..ddfe3b740 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.h +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.h @@ -19,7 +19,7 @@ #ifndef RGB_PLUGIN_H_ #define RGB_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the RGB colour space strategy. diff --git a/chalk/colorspaces/rgb_u8/tests/Makefile.am b/chalk/colorspaces/rgb_u8/tests/Makefile.am index 5e9497a59..a5c654798 100644 --- a/chalk/colorspaces/rgb_u8/tests/Makefile.am +++ b/chalk/colorspaces/rgb_u8/tests/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/../../../sdk \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_strategy_colorspace_rgb_tester.la +check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_tester.la -kunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp -kunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -lkunittest ../libchalkrgb.la -kunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp +tdeunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -ltdeunittest ../libchalkrgb.la +tdeunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_strategy_colorspace_rgb_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_strategy_colorspace_rgb_tester.la + tdeunittestmodrunner diff --git a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp index 1d3526f41..ee0c4479a 100644 --- a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp +++ b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_factory.h" #include "kis_strategy_colorspace_rgb_tester.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester ); void KisRgbColorSpaceTester::allTests() diff --git a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h index 16fc4e837..ad362d745 100644 --- a/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h +++ b/chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_TESTER_H #define KIS_STRATEGY_COLORSPACE_RGB_TESTER_H -#include +#include class KisRgbColorSpaceTester : public KUnitTest::Tester { diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am index 8ad9b0dba..14639057b 100644 --- a/chalk/colorspaces/wet/Makefile.am +++ b/chalk/colorspaces/wet/Makefile.am @@ -20,7 +20,7 @@ kde_module_LTLIBRARIES = chalkwetplugin.la chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h -chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../chalk/chalkcolor/libchalkcolor.la \ ../../../chalk/core/libchalkimage.la \ diff --git a/chalk/colorspaces/wet/wet_plugin.h b/chalk/colorspaces/wet/wet_plugin.h index 615981b9a..dc1b35688 100644 --- a/chalk/colorspaces/wet/wet_plugin.h +++ b/chalk/colorspaces/wet/wet_plugin.h @@ -19,7 +19,7 @@ #ifndef WET_PLUGIN_H_ #define WET_PLUGIN_H_ -#include +#include #include "kis_types.h" diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h index 68b379eb5..0bc64e715 100644 --- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h +++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h @@ -19,7 +19,7 @@ #ifndef WSBRUSH_PAINTOP_PLUGIN_H_ #define WSBRUSH_PAINTOP_PLUGIN_H_ -#include +#include #include "kis_types.h" diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h index 9dfab1ce8..d93743654 100644 --- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h +++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h @@ -19,7 +19,7 @@ #ifndef WET_STICKY_PLUGIN_H_ #define WET_STICKY_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the Wet & Sticky colour space strategy. diff --git a/chalk/colorspaces/ycbcr_u16/Makefile.am b/chalk/colorspaces/ycbcr_u16/Makefile.am index 0174a9b35..eadf17b00 100644 --- a/chalk/colorspaces/ycbcr_u16/Makefile.am +++ b/chalk/colorspaces/ycbcr_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h -chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_ycbcr_u16_plugin_la_LIBADD = libchalk_ycbcr_u16.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h index 55c2b8ee0..c1373ae9f 100644 --- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h +++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h @@ -19,7 +19,7 @@ #ifndef YCBCR_U16_PLUGIN_H_ #define YCBCR_U16_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the YCbCr U16 colour space strategy. diff --git a/chalk/colorspaces/ycbcr_u8/Makefile.am b/chalk/colorspaces/ycbcr_u8/Makefile.am index b8d4bcf2f..8240f2cf2 100644 --- a/chalk/colorspaces/ycbcr_u8/Makefile.am +++ b/chalk/colorspaces/ycbcr_u8/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h -chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms +chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms chalk_ycbcr_u8_plugin_la_LIBADD = libchalk_ycbcr_u8.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h index 461b5fdb4..a94d81952 100644 --- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h +++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h @@ -19,7 +19,7 @@ #ifndef YCBCR_U8_PLUGIN_H_ #define YCBCR_U8_PLUGIN_H_ -#include +#include /** * A plugin wrapper around the YCbCr U8 colour space strategy. diff --git a/chalk/configure.in.in b/chalk/configure.in.in index c7c81d2ab..78702ad13 100644 --- a/chalk/configure.in.in +++ b/chalk/configure.in.in @@ -91,12 +91,12 @@ else AC_MSG_RESULT(no) fi -# Check for kunittest -AC_MSG_CHECKING([for kunittest]) +# Check for tdeunittest +AC_MSG_CHECKING([for tdeunittest]) -have_kunittest_header="no" -KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) -AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes") +have_tdeunittest_header="no" +KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , ) +AM_CONDITIONAL(include_tdeunittest_tests, test "$have_tdeunittest_header" = "yes") # --- OpenGL check --- diff --git a/chalk/core/Makefile.am b/chalk/core/Makefile.am index 8dff83b23..ca7829f83 100644 --- a/chalk/core/Makefile.am +++ b/chalk/core/Makefile.am @@ -47,7 +47,7 @@ include_HEADERS = kis_adjustment_layer.h kis_alpha_mask.h \ libchalkimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries) libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index 53f17ea8e..8cf324e1b 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -22,10 +22,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include "kis_debug_areas.h" #include #include "kis_types.h" diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 0ae94f719..7b5787501 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -23,10 +23,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include "kis_generic_registry.h" #include "kis_types.h" diff --git a/chalk/core/tests/Makefile.am b/chalk/core/tests/Makefile.am index 239c1ba66..973166855 100644 --- a/chalk/core/tests/Makefile.am +++ b/chalk/core/tests/Makefile.am @@ -10,21 +10,21 @@ AM_CPPFLAGS = \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la +check_LTLIBRARIES = tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la -kunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp -kunittest_kis_integer_maths_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp +tdeunittest_kis_integer_maths_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp -kunittest_kis_image_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp +tdeunittest_kis_image_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc -kunittest_kis_filter_configuration_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc +tdeunittest_kis_filter_configuration_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la + tdeunittestmodrunner diff --git a/chalk/core/tests/kis_filter_configuration_tester.cc b/chalk/core/tests/kis_filter_configuration_tester.cc index 6a4a26313..83d6b522a 100644 --- a/chalk/core/tests/kis_filter_configuration_tester.cc +++ b/chalk/core/tests/kis_filter_configuration_tester.cc @@ -19,15 +19,15 @@ #include #include -#include -#include +#include +#include #include "kis_filter_configuration_tester.h" #include "../kis_filter_configuration.h" using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); +KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester); void KisFilterConfigurationTester::allTests() diff --git a/chalk/core/tests/kis_filter_configuration_tester.h b/chalk/core/tests/kis_filter_configuration_tester.h index 6e1ca2e58..0dffee339 100644 --- a/chalk/core/tests/kis_filter_configuration_tester.h +++ b/chalk/core/tests/kis_filter_configuration_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_FILTER_CONFIGURATION_TESTER_H #define KIS_FILTER_CONFIGURATION_TESTER_H -#include +#include class KisFilterConfigurationTester : public KUnitTest::Tester { diff --git a/chalk/core/tests/kis_image_tester.cpp b/chalk/core/tests/kis_image_tester.cpp index f660f3945..be125c947 100644 --- a/chalk/core/tests/kis_image_tester.cpp +++ b/chalk/core/tests/kis_image_tester.cpp @@ -18,8 +18,8 @@ #include -#include -#include +#include +#include #include "kis_image_tester.h" #include "kis_image.h" @@ -32,7 +32,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_image_tester, "KisImage Tester"); +KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester); void KisImageTester::allTests() diff --git a/chalk/core/tests/kis_image_tester.h b/chalk/core/tests/kis_image_tester.h index 4e6768386..06ee65b74 100644 --- a/chalk/core/tests/kis_image_tester.h +++ b/chalk/core/tests/kis_image_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_TESTER_H #define KIS_IMAGE_TESTER_H -#include +#include class KisImageTester : public KUnitTest::Tester { diff --git a/chalk/core/tests/kis_integer_maths_tester.cpp b/chalk/core/tests/kis_integer_maths_tester.cpp index 1878731b5..eb9d76ae0 100644 --- a/chalk/core/tests/kis_integer_maths_tester.cpp +++ b/chalk/core/tests/kis_integer_maths_tester.cpp @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_integer_maths_tester.h" #include "kis_integer_maths.h" using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_integer_maths_tester, "Integer Maths Tester"); +KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester); void KisIntegerMathsTester::allTests() diff --git a/chalk/core/tests/kis_integer_maths_tester.h b/chalk/core/tests/kis_integer_maths_tester.h index 2a9a9a20f..9e91f0305 100644 --- a/chalk/core/tests/kis_integer_maths_tester.h +++ b/chalk/core/tests/kis_integer_maths_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_INTEGER_MATHS_TESTER_H #define KIS_INTEGER_MATHS_TESTER_H -#include +#include class KisIntegerMathsTester : public KUnitTest::Tester { diff --git a/chalk/core/tiles/Makefile.am b/chalk/core/tiles/Makefile.am index 1e334ab47..7fad1ab90 100644 --- a/chalk/core/tiles/Makefile.am +++ b/chalk/core/tiles/Makefile.am @@ -1,4 +1,4 @@ -if include_kunittest_tests +if include_tdeunittest_tests TESTSDIR = tests endif diff --git a/chalk/core/tiles/tests/Makefile.am b/chalk/core/tiles/tests/Makefile.am index c546d7f51..c6821483c 100644 --- a/chalk/core/tiles/tests/Makefile.am +++ b/chalk/core/tiles/tests/Makefile.am @@ -5,11 +5,11 @@ AM_CPPFLAGS = -I$(srcdir)/../ \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_tiled_data_tester.la -kunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp -kunittest_kis_tiled_data_tester_la_LIBADD = -lkunittest ../../../libchalkcommon.la -kunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +check_LTLIBRARIES = tdeunittest_kis_tiled_data_tester.la +tdeunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp +tdeunittest_kis_tiled_data_tester_la_LIBADD = -ltdeunittest ../../../libchalkcommon.la +tdeunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_tiled_data_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_tiled_data_tester.la + tdeunittestmodrunner diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp index 15d3e50b5..be09579c2 100644 --- a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp +++ b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_tiled_data_tester.h" #include "kis_datamanager.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_tiled_data_tester, "Tiled Data Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester ); #define TEST_PIXEL_SIZE 4 diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.h b/chalk/core/tiles/tests/kis_tiled_data_tester.h index 8a569d23b..64c04bd7f 100644 --- a/chalk/core/tiles/tests/kis_tiled_data_tester.h +++ b/chalk/core/tiles/tests/kis_tiled_data_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_TILED_DATA_TESTER_H #define KIS_TILED_DATA_TESTER_H -#include +#include class KisTiledDataTester : public KUnitTest::Tester { diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index f702d9206..a1b8e58d4 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -39,7 +39,7 @@ Design Patterns * Tools are created by a Factory pattern (but it isn't dynamic yet): kis_tool_factory. Tools are intended to - become kparts. + become tdeparts. * There's the start of a Memento pattern for tools, but it doesn't seem to be used (kis_tool_memento). It was an diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index 8fe4081b1..51523e7a8 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -21005,9 +21005,9 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - + - +
@@ -21030,7 +21030,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35127,7 +35127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35333,7 +35333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
diff --git a/chalk/plugins/README b/chalk/plugins/README index 33af951e7..31f2974d1 100644 --- a/chalk/plugins/README +++ b/chalk/plugins/README @@ -38,5 +38,5 @@ There are several kinds of plugins for Chalk: elements such as dialog boxes and wizards. Their parent is KisView and they provide an .rc file to merge their gui with the view gui. Extensions have the servicetype Chalk/Plugin. They are not loaded automatically by - the KParts mechanism; please do not create ordinary kparts that are to + the KParts mechanism; please do not create ordinary tdeparts that are to be loaded by the Chalk view since KParts are not versioned. diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am index d54d65be7..9718d26ca 100644 --- a/chalk/plugins/filters/blur/Makefile.am +++ b/chalk/plugins/filters/blur/Makefile.am @@ -14,7 +14,7 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur. kde_module_LTLIBRARIES = chalkblurfilter.la noinst_HEADERS = blur.h kis_blur_filter.h -chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/blur/blur.h b/chalk/plugins/filters/blur/blur.h index 239d05d0b..e9d411cfd 100644 --- a/chalk/plugins/filters/blur/blur.h +++ b/chalk/plugins/filters/blur/blur.h @@ -25,7 +25,7 @@ #define LCMS_HEADER // TODO: remove it ! -#include +#include class BlurFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am index 156a60a3a..a1d4754df 100644 --- a/chalk/plugins/filters/bumpmap/Makefile.am +++ b/chalk/plugins/filters/bumpmap/Makefile.am @@ -12,7 +12,7 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui kde_module_LTLIBRARIES = chalkbumpmap.la noinst_HEADERS = bumpmap.h -chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/bumpmap/bumpmap.h b/chalk/plugins/filters/bumpmap/bumpmap.h index 653b49fef..4896bb05c 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.h +++ b/chalk/plugins/filters/bumpmap/bumpmap.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am index 25537737f..b8d8a62e0 100644 --- a/chalk/plugins/filters/cimg/Makefile.am +++ b/chalk/plugins/filters/cimg/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = \ kis_cimg_plugin.h\ kis_cimgconfig_widget.h -chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcimg_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.h b/chalk/plugins/filters/cimg/kis_cimg_plugin.h index d016abf15..1ce69e66a 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.h +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_CIMG_PLUGIN_H_ #define _KIS_CIMG_PLUGIN_H_ -#include +#include class KisCImgPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/colorify/Colorify.h b/chalk/plugins/filters/colorify/Colorify.h index 6a984134b..2eb1994dc 100644 --- a/chalk/plugins/filters/colorify/Colorify.h +++ b/chalk/plugins/filters/colorify/Colorify.h @@ -25,7 +25,7 @@ #define LCMS_HEADER // TODO: remove it ! -#include +#include #include "kis_filter.h" diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am index 65e7243ec..efd37befb 100644 --- a/chalk/plugins/filters/colorify/Makefile.am +++ b/chalk/plugins/filters/colorify/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \ kde_module_LTLIBRARIES = chalkcolorify.la -chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorify_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am index 0da38c002..04811a8da 100644 --- a/chalk/plugins/filters/colors/Makefile.am +++ b/chalk/plugins/filters/colors/Makefile.am @@ -14,7 +14,7 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la noinst_HEADERS = colors.h -chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colors/colors.h b/chalk/plugins/filters/colors/colors.h index dd27cc91b..73a7e4a2e 100644 --- a/chalk/plugins/filters/colors/colors.h +++ b/chalk/plugins/filters/colors/colors.h @@ -25,7 +25,7 @@ #define LCMS_HEADER // TODO: remove it ! -#include +#include class ChalkExtensionsColors : public KParts::Plugin { diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am index 6aeaaee50..91e63d5b5 100644 --- a/chalk/plugins/filters/colorsfilters/Makefile.am +++ b/chalk/plugins/filters/colorsfilters/Makefile.am @@ -17,7 +17,7 @@ noinst_HEADERS = colorsfilters.h \ kis_perchannel_filter.h \ kis_brightness_contrast_filter.h -chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorsfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.h b/chalk/plugins/filters/colorsfilters/colorsfilters.h index 40dc8d747..fe4339952 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.h +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.h @@ -20,7 +20,7 @@ #ifndef BRIGHTNESSCONTRAST_H #define BRIGHTNESSCONTRAST_H -#include +#include #include "kis_perchannel_filter.h" class KisColorSpace; diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am index 32f5cbd12..6b5072757 100644 --- a/chalk/plugins/filters/convolutionfilters/Makefile.am +++ b/chalk/plugins/filters/convolutionfilters/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = convolutionfilters.h \ kis_custom_convolution_filter_configuration_widget.h \ kis_convolution_filter.h -chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkconvolutionfilters_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h index aa8dc7491..6c92888a6 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h @@ -21,7 +21,7 @@ #ifndef CONVOLUTIONFILTERS_H #define CONVOLUTIONFILTERS_H -#include +#include #include "kis_convolution_filter.h" class KisGaussianBlurFilter : public KisConvolutionConstFilter { diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h index 064c55e3c..649fd5758 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_CUBISM_FILTER_PLUGIN_H_ #define _KIS_CUBISM_FILTER_PLUGIN_H_ -#include +#include class KisCubismFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am index 19b54e40d..8057cfae7 100644 --- a/chalk/plugins/filters/embossfilter/Makefile.am +++ b/chalk/plugins/filters/embossfilter/Makefile.am @@ -17,7 +17,7 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \ noinst_HEADERS = kis_emboss_filter_plugin.h \ kis_emboss_filter.h -chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkembossfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h index 81312b014..d052cd610 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h @@ -19,7 +19,7 @@ #ifndef _KIS_EMBOSS_FILTER_PLUGIN_H_ #define _KIS_EMBOSS_FILTER_PLUGIN_H_ -#include +#include class KisEmbossFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am index 5dcd34911..bb4e697f6 100644 --- a/chalk/plugins/filters/example/Makefile.am +++ b/chalk/plugins/filters/example/Makefile.am @@ -15,7 +15,7 @@ chalkexample_la_SOURCES = example.cc kde_module_LTLIBRARIES = chalkexample.la noinst_HEADERS = example.h -chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkexample_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/example/example.h b/chalk/plugins/filters/example/example.h index 4df6705c7..4a13b63d5 100644 --- a/chalk/plugins/filters/example/example.h +++ b/chalk/plugins/filters/example/example.h @@ -21,7 +21,7 @@ #ifndef EXAMPLE_H #define EXAMPLE_H -#include +#include #include "kis_filter.h" class ChalkExample : public KParts::Plugin diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am index 24b9f381c..964d84379 100644 --- a/chalk/plugins/filters/fastcolortransfer/Makefile.am +++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am @@ -16,7 +16,7 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc kde_module_LTLIBRARIES = chalkfastcolortransfer.la noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h -chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h index dbaee9f8d..c677d1994 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h @@ -25,7 +25,7 @@ #define LCMS_HEADER // TODO: remove it ! -#include +#include #include class FastColorTransferPlugin : public KParts::Plugin diff --git a/chalk/plugins/filters/halftone/kis_halftone.h b/chalk/plugins/filters/halftone/kis_halftone.h index 96f22e8f0..b717f8b4c 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.h +++ b/chalk/plugins/filters/halftone/kis_halftone.h @@ -27,7 +27,7 @@ #define BEST_WAVELET_FREQUENCY_VALUE 2 -#include +#include class ChalkHalftone : public KParts::Plugin { diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am index 32b9bd701..e84e2a521 100644 --- a/chalk/plugins/filters/imageenhancement/Makefile.am +++ b/chalk/plugins/filters/imageenhancement/Makefile.am @@ -15,7 +15,7 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \ kde_module_LTLIBRARIES = chalkimageenhancement.la -chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.h b/chalk/plugins/filters/imageenhancement/imageenhancement.h index 7a00f3526..5f3accf58 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.h +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.h @@ -22,7 +22,7 @@ #ifndef EXAMPLE_H #define EXAMPLE_H -#include +#include class ChalkImageEnhancement : public KParts::Plugin { diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am index c794fee33..bda49eb11 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am +++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am @@ -16,7 +16,7 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \ kde_module_LTLIBRARIES = chalklenscorrectionfilter.la noinst_HEADERS = lenscorrectionfilter.h -chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalklenscorrectionfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h index a54f11a99..b944d8cf1 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h @@ -21,7 +21,7 @@ #ifndef LENS_CORRECTIONFILTER_H #define LENS_CORRECTIONFILTER_H -#include +#include #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am index 314c44256..18f44d4ed 100644 --- a/chalk/plugins/filters/levelfilter/Makefile.am +++ b/chalk/plugins/filters/levelfilter/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = levelfilter.h \ kis_level_filter.h \ kgradientslider.h -chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalklevelfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/levelfilter/levelfilter.h b/chalk/plugins/filters/levelfilter/levelfilter.h index 433a8d8ac..3d9aeb969 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.h +++ b/chalk/plugins/filters/levelfilter/levelfilter.h @@ -20,7 +20,7 @@ #ifndef LEVEL_H #define LEVEL_H -#include +#include class KisColorSpace; class KisColorAdjustment; diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am index aea0c059c..61456dd5a 100644 --- a/chalk/plugins/filters/noisefilter/Makefile.am +++ b/chalk/plugins/filters/noisefilter/Makefile.am @@ -16,7 +16,7 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \ kde_module_LTLIBRARIES = chalknoisefilter.la noinst_HEADERS = noisefilter.h kis_wdg_noise.h -chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalknoisefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/noisefilter/noisefilter.h b/chalk/plugins/filters/noisefilter/noisefilter.h index c630e71fb..b122f41c5 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.h +++ b/chalk/plugins/filters/noisefilter/noisefilter.h @@ -21,7 +21,7 @@ #ifndef NOISEFILTER_H #define NOISEFILTER_H -#include +#include #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am index 60878f64d..f3ee59877 100644 --- a/chalk/plugins/filters/oilpaintfilter/Makefile.am +++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am @@ -17,7 +17,7 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \ noinst_HEADERS = kis_oilpaint_filter_plugin.h \ kis_oilpaint_filter.h -chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkoilpaintfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h index 2900f59f1..bddf947fe 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_OILPAINT_FILTER_PLUGIN_H_ #define _KIS_OILPAINT_FILTER_PLUGIN_H_ -#include +#include class KisOilPaintFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am index e46e0ead6..d1f7ea561 100644 --- a/chalk/plugins/filters/pixelizefilter/Makefile.am +++ b/chalk/plugins/filters/pixelizefilter/Makefile.am @@ -17,7 +17,7 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \ noinst_HEADERS = kis_pixelize_filter_plugin.h \ kis_pixelize_filter.h -chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkpixelizefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h index f662cf9d4..7a0fb36bc 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_PIXELIZE_FILTER_PLUGIN_H_ #define _KIS_PIXELIZE_FILTER_PLUGIN_H_ -#include +#include class KisPixelizeFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am index 584ef9602..508f24628 100644 --- a/chalk/plugins/filters/raindropsfilter/Makefile.am +++ b/chalk/plugins/filters/raindropsfilter/Makefile.am @@ -17,7 +17,7 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \ noinst_HEADERS = kis_raindrops_filter_plugin.h \ kis_raindrops_filter.h -chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkraindropsfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h index edbf33bff..44cb6fcd8 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h @@ -21,7 +21,7 @@ #ifndef _KIS_RAINDROPS_FILTER_PLUGIN_H_ #define _KIS_RAINDROPS_FILTER_PLUGIN_H_ -#include +#include class KisRainDropsFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am index b7a16572f..6686fc550 100644 --- a/chalk/plugins/filters/randompickfilter/Makefile.am +++ b/chalk/plugins/filters/randompickfilter/Makefile.am @@ -16,7 +16,7 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \ kde_module_LTLIBRARIES = chalkrandompickfilter.la noinst_HEADERS = randompickfilter.h -chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrandompickfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.h b/chalk/plugins/filters/randompickfilter/randompickfilter.h index a4fa1da88..9c360e3f8 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.h +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.h @@ -21,7 +21,7 @@ #ifndef RANDOMPICKFILTER_H #define RANDOMPICKFILTER_H -#include +#include #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am index ee9f141e0..ad0df5f47 100644 --- a/chalk/plugins/filters/roundcorners/Makefile.am +++ b/chalk/plugins/filters/roundcorners/Makefile.am @@ -16,7 +16,7 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \ noinst_HEADERS = kis_round_corners_filter_plugin.h \ kis_round_corners_filter.h -chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkroundcornersfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h index cbf871081..879a067f8 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_ROUND_CORNERS_FILTER_PLUGIN_H_ #define _KIS_ROUND_CORNERS_FILTER_PLUGIN_H_ -#include +#include class KisRoundCornersFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am index ae28ed1d5..0284f5f89 100644 --- a/chalk/plugins/filters/smalltilesfilter/Makefile.am +++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am @@ -16,7 +16,7 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \ noinst_HEADERS = kis_small_tiles_filter_plugin.h \ kis_small_tiles_filter.h -chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksmalltilesfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h index 26c300128..bdf34acd9 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SMALL_TILES_FILTER_PLUGIN_H_ #define _KIS_SMALL_TILES_FILTER_PLUGIN_H_ -#include +#include class KisSmallTilesFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am index da3fd164f..e7e9c86f0 100644 --- a/chalk/plugins/filters/sobelfilter/Makefile.am +++ b/chalk/plugins/filters/sobelfilter/Makefile.am @@ -16,7 +16,7 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \ noinst_HEADERS = kis_sobel_filter_plugin.h \ kis_sobel_filter.h -chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksobelfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h index a4cc323a0..27b39d745 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SOBEL_FILTER_PLUGIN_H_ #define _KIS_SOBEL_FILTER_PLUGIN_H_ -#include +#include class KisSobelFilterPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/threadtest/threadtest.h b/chalk/plugins/filters/threadtest/threadtest.h index d7ebae7f6..89b041549 100644 --- a/chalk/plugins/filters/threadtest/threadtest.h +++ b/chalk/plugins/filters/threadtest/threadtest.h @@ -21,7 +21,7 @@ #ifndef THREADTEST_H #define THREADTESt_H -#include +#include #include "kis_filter.h" class ChalkThreadTest : public KParts::Plugin diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am index 1c1289ff4..14f73347b 100644 --- a/chalk/plugins/filters/unsharp/Makefile.am +++ b/chalk/plugins/filters/unsharp/Makefile.am @@ -13,7 +13,7 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_ kde_module_LTLIBRARIES = chalkunsharpfilter.la -chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/unsharp/unsharp.h b/chalk/plugins/filters/unsharp/unsharp.h index 5717cccc3..04ef60ca7 100644 --- a/chalk/plugins/filters/unsharp/unsharp.h +++ b/chalk/plugins/filters/unsharp/unsharp.h @@ -25,7 +25,7 @@ #define LCMS_HEADER // TODO: remove it ! -#include +#include class UnsharpPlugin : public KParts::Plugin { diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am index 65b047c4b..4f7fc1277 100644 --- a/chalk/plugins/filters/wavefilter/Makefile.am +++ b/chalk/plugins/filters/wavefilter/Makefile.am @@ -16,7 +16,7 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \ kde_module_LTLIBRARIES = chalkwavefilter.la noinst_HEADERS = wavefilter.h kis_wdg_wave.h -chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkwavefilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/filters/wavefilter/wavefilter.h b/chalk/plugins/filters/wavefilter/wavefilter.h index 8493c4f83..eebf3d92e 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.h +++ b/chalk/plugins/filters/wavefilter/wavefilter.h @@ -21,7 +21,7 @@ #ifndef WAVEFILTER_H #define WAVEFILTER_H -#include +#include #include "kis_filter.h" class KisFilterConfigWidget; diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am index 186d501f2..b7760318e 100644 --- a/chalk/plugins/paintops/defaultpaintops/Makefile.am +++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = defaultpaintops_plugin.h kis_airbrushop.h kis_brushop.h \ kde_module_LTLIBRARIES = chalkdefaultpaintops.la -chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index 647b22e83..a4f584237 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_PAINTOPS_PLUGIN_H_ #define DEFAULT_PAINTOPS_PLUGIN_H_ -#include +#include /** * A plugin wrapper that adds the paintop factories to the paintop registry. diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am index 329e9bb73..95358bcfc 100644 --- a/chalk/plugins/tools/defaulttools/Makefile.am +++ b/chalk/plugins/tools/defaulttools/Makefile.am @@ -44,7 +44,7 @@ noinst_HEADERS = \ kis_tool_pan.h -chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h index fc5b72c67..dbf60d938 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.h +++ b/chalk/plugins/tools/defaulttools/default_tools.h @@ -19,7 +19,7 @@ #ifndef DEFAULT_TOOLS_H_ #define DEFAULT_TOOLS_H_ -#include +#include /** * A module wrapper around Chalk's default tools. diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am index 7f6c08997..f8ebee60e 100644 --- a/chalk/plugins/tools/selectiontools/Makefile.am +++ b/chalk/plugins/tools/selectiontools/Makefile.am @@ -28,7 +28,7 @@ noinst_HEADERS = \ kis_tool_select_elliptical.h -chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h index 900174c87..825e06abe 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.h +++ b/chalk/plugins/tools/selectiontools/selection_tools.h @@ -19,7 +19,7 @@ #ifndef SELECTION_TOOLS_H_ #define SELECTION_TOOLS_H_ -#include +#include /** * A module wrapper around Chalk's selection tools. diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am index 9091a5213..1cbe70134 100644 --- a/chalk/plugins/tools/tool_crop/Makefile.am +++ b/chalk/plugins/tools/tool_crop/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_crop.h \ kis_tool_crop.h -chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h index 41d9523f1..0db28073e 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.h +++ b/chalk/plugins/tools/tool_crop/tool_crop.h @@ -19,7 +19,7 @@ #ifndef TOOL_CROP_H_ #define TOOL_CROP_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am index 03d3395b6..21628f842 100644 --- a/chalk/plugins/tools/tool_curves/Makefile.am +++ b/chalk/plugins/tools/tool_curves/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = \ kis_tool_bezier_select.h \ kis_tool_moutline.h -chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h index 779873cfd..854a81658 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.h +++ b/chalk/plugins/tools/tool_curves/tool_curves.h @@ -21,7 +21,7 @@ #ifndef TOOL_BEZIER_H_ #define TOOL_BEZIER_H_ -#include +#include class ToolCurves : public KParts::Plugin { diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am index 35c23811e..faaea42e2 100644 --- a/chalk/plugins/tools/tool_filter/Makefile.am +++ b/chalk/plugins/tools/tool_filter/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = \ kis_tool_filter.h \ tool_filter.h -chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h index 3211d7024..6255b907d 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.h +++ b/chalk/plugins/tools/tool_filter/tool_filter.h @@ -19,7 +19,7 @@ #ifndef TOOL_FILTER_H_ #define TOOL_FILTER_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am index ffa083203..688b77a01 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivegrid.h \ kis_tool_perspectivegrid.h -chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h index 3e0abc4fb..47fd0f405 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h @@ -19,7 +19,7 @@ #ifndef TOOL_PERSPECTIVE_GRID_H_ #define TOOL_PERSPECTIVE_GRID_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am index 249161885..e971e02bc 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivetransform.h \ kis_tool_perspectivetransform.h -chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h index 2422eaa28..e43174e4c 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h @@ -19,7 +19,7 @@ #ifndef TOOL_PERSPECTIVE_TRANSFORM_H_ #define TOOL_PERSPECTIVE_TRANSFORM_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index 2155322a7..99b1bc966 100644 --- a/chalk/plugins/tools/tool_polygon/Makefile.am +++ b/chalk/plugins/tools/tool_polygon/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polygon.h \ kis_tool_polygon.h -chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h index 5286d008d..3f9f22ae1 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.h +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h @@ -19,7 +19,7 @@ #ifndef TOOL_POLYGON_H_ #define TOOL_POLYGON_H_ -#include +#include /** * A module that provides a polygon tool. diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am index 2beb65095..edd71f92f 100644 --- a/chalk/plugins/tools/tool_polyline/Makefile.am +++ b/chalk/plugins/tools/tool_polyline/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polyline.h \ kis_tool_polyline.h -chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h index 2adfb05e0..c8b95ed96 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.h +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h @@ -19,7 +19,7 @@ #ifndef TOOL_POLYLINE_H_ #define TOOL_POLYLINE_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am index 70d588553..9cb083f36 100644 --- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am +++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h kde_module_LTLIBRARIES = chalktoolselectsimilar.la -chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h index 5d163d086..124c126bb 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h @@ -19,7 +19,7 @@ #ifndef SELECTSIMILAR_H #define SELECTSIMILAR_H -#include +#include class SelectSimilar : public KParts::Plugin { diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am index a6b9a47b7..bada5a78d 100644 --- a/chalk/plugins/tools/tool_star/Makefile.am +++ b/chalk/plugins/tools/tool_star/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_star.h \ kis_tool_star.h -chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktoolstar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h index 00f48957d..648b5cc69 100644 --- a/chalk/plugins/tools/tool_star/tool_star.h +++ b/chalk/plugins/tools/tool_star/tool_star.h @@ -19,7 +19,7 @@ #ifndef TOOL_STAR_H_ #define TOOL_STAR_H_ -#include +#include class KisView; diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am index b606e1773..860ea7534 100644 --- a/chalk/plugins/tools/tool_transform/Makefile.am +++ b/chalk/plugins/tools/tool_transform/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_transform.h \ kis_tool_transform.h -chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalktooltransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h index 1ed2cdb3f..0bcff2ddc 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.h +++ b/chalk/plugins/tools/tool_transform/tool_transform.h @@ -19,7 +19,7 @@ #ifndef TOOL_TRANSFORM_H_ #define TOOL_TRANSFORM_H_ -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am index 57abd956f..f7856a508 100644 --- a/chalk/plugins/viewplugins/colorrange/Makefile.am +++ b/chalk/plugins/viewplugins/colorrange/Makefile.am @@ -14,7 +14,7 @@ chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = colorrange.rc diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.h b/chalk/plugins/viewplugins/colorrange/colorrange.h index ebe54dc82..7ee2bc41d 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/colorrange.h @@ -21,7 +21,7 @@ #ifndef COLORRANGE_H #define COLORRANGE_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am index a6da50632..4186fb934 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am +++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h -chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index ea5d9e157..1cdc0fd5f 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -21,7 +21,7 @@ #ifndef COLORSPACECONVERSION_H #define COLORSPACECONVERSION_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am index 137b57d7b..6d8e42633 100644 --- a/chalk/plugins/viewplugins/dropshadow/Makefile.am +++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am @@ -20,7 +20,7 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \ noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \ kis_dropshadow.h dlg_dropshadow.h -chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index d835c7498..0ee970a2a 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_DROPSHADOW_PLUGIN_H_ #define _KIS_DROPSHADOW_PLUGIN_H_ -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am index b20096741..640080344 100644 --- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am +++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h kde_services_DATA = chalkfiltersgallery.desktop -chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h index 8ad1e809a..7f9b312e3 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -22,7 +22,7 @@ #ifndef _KRITA_FILTERS_PREVIEW_H_ #define _KRITA_FILTERS_PREVIEW_H_ -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am index a5c5e3d77..1c8725305 100644 --- a/chalk/plugins/viewplugins/histogram/Makefile.am +++ b/chalk/plugins/viewplugins/histogram/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget kde_services_DATA = chalkhistogram.desktop -chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h index 2e7b3bb13..abba15a22 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.h +++ b/chalk/plugins/viewplugins/histogram/histogram.h @@ -21,7 +21,7 @@ #ifndef HISTOGRAM_H #define HISTOGRAM_H -#include +#include class KisView; class KAction; diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am index d63edff07..66f8e477d 100644 --- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am +++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am @@ -15,7 +15,7 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc kis_imagerasteredcache.cc kde_module_LTLIBRARIES = chalkhistogramdocker.la noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h -chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h index c37c9afd9..6e2e325b9 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.h b/chalk/plugins/viewplugins/history_docker/historydocker.h index 217b882d3..9b1832562 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.h +++ b/chalk/plugins/viewplugins/history_docker/historydocker.h @@ -21,7 +21,7 @@ #ifndef _HISTORYDOCKER_H #define _HISTORYDOCKER_H -#include +#include class ChalkHistoryDocker : public KParts::Plugin { diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am index 73a096be3..fc2fbd0d9 100644 --- a/chalk/plugins/viewplugins/imagesize/Makefile.am +++ b/chalk/plugins/viewplugins/imagesize/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h kde_module_LTLIBRARIES = chalkimagesize.la -chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h index f69759a01..c91c79051 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/imagesize.h @@ -20,7 +20,7 @@ #ifndef IMAGESIZE_H #define IMAGESIZE_H -#include +#include class KisView; class KisPainter; diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am index c19b29869..f5dc9bdbf 100644 --- a/chalk/plugins/viewplugins/modify_selection/Makefile.am +++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am @@ -20,7 +20,7 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h kde_module_LTLIBRARIES = chalkmodifyselection.la -chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.h b/chalk/plugins/viewplugins/modify_selection/modify_selection.h index da438f4b7..aa0eb749e 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.h @@ -20,7 +20,7 @@ #ifndef MODIFY_SELECTION_H #define MODIFY_SELECTION_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am index 32da2ec3f..d52913a72 100644 --- a/chalk/plugins/viewplugins/performancetest/Makefile.am +++ b/chalk/plugins/viewplugins/performancetest/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkperftest.la chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h -chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index 68931004a..4401dd33f 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -21,7 +21,7 @@ #ifndef PERFTEST_H_ #define PERFTEST_H_ -#include +#include #include #include diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am index 61d729bf0..f140a4b9c 100644 --- a/chalk/plugins/viewplugins/rotateimage/Makefile.am +++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkrotateimage.la chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h -chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.h b/chalk/plugins/viewplugins/rotateimage/rotateimage.h index 7e3712089..c566ad915 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.h @@ -20,7 +20,7 @@ #ifndef ROTATEIMAGE_H #define ROTATEIMAGE_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am index 5394cf76f..a0b443fb4 100644 --- a/chalk/plugins/viewplugins/screenshot/Makefile.am +++ b/chalk/plugins/viewplugins/screenshot/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = chalkscreenshot.la chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h -chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -ltdeprint +chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -ltdeprint chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.h b/chalk/plugins/viewplugins/screenshot/screenshot.h index 51914fbd5..8a00a8fb7 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.h +++ b/chalk/plugins/viewplugins/screenshot/screenshot.h @@ -20,7 +20,7 @@ #ifndef SCREENSHOT_H #define SCREENSHOT_H -#include +#include class KSnapshot; diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am index 5757c06db..abb558ca0 100644 --- a/chalk/plugins/viewplugins/scripting/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/Makefile.am @@ -1,9 +1,9 @@ -SUBDIRS = chalkscripting chalkcore samples +SUBDIRS = chaltdescripting chalkcore samples chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = scripting.rc -kde_services_DATA = chalkscripting.desktop +kde_services_DATA = chaltdescripting.desktop INCLUDES = -I$(top_srcdir)/chalk/sdk \ @@ -15,17 +15,17 @@ INCLUDES = -I$(top_srcdir)/chalk/sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalkscripting_la_SOURCES = scripting.cc +chaltdescripting_la_SOURCES = scripting.cc -kde_module_LTLIBRARIES = chalkscripting.la +kde_module_LTLIBRARIES = chaltdescripting.la noinst_HEADERS = scripting.h -chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \ +chaltdescripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts +chaltdescripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chaltdescripting/libchaltdescripting.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) -chalkscripting_la_METASOURCES = AUTO +chaltdescripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am index e3eee8928..cef0a96a7 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \ +INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chaltdescripting \ -I$(top_srcdir)/chalk $(KOFFICECORE_INCLUDES) $(KROSS_INCLUDES) \ -I$(top_srcdir)/chalk/ui -I$(top_srcdir)/chalk/core -I$(top_srcdir)/chalk/sdk \ -I$(top_srcdir)/chalk/chalkcolor $(all_includes) @@ -11,7 +11,7 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \ krs_wavelet.cpp -krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts krosschalkcore_la_LIBADD = \ $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \ $(LIB_QT) \ @@ -19,7 +19,7 @@ krosschalkcore_la_LIBADD = \ $(top_builddir)/lib/kross/api/libkrossapi.la \ $(top_builddir)/lib/kross/main/libkrossmain.la \ $(top_builddir)/chalk/libchalkcommon.la \ - $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \ + $(top_builddir)/chalk/plugins/viewplugins/scripting/chaltdescripting/libchaltdescripting.la \ ../../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../../chalk/core/libchalkimage.la \ ../../../../../chalk/ui/libchalkui.la diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 45c1705af..d137ab8c2 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -247,11 +247,11 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) } // Wrap ChalkScriptProgress TQString packagePath; - Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress"); + Kross::Api::Object::Ptr chaltdescriptprogress = manager->getChild("ChalkScriptProgress"); if(chalkdocument) { - Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() ); - if(chalkscriptprogressqt) { - ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() ); + Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() ); + if(chaltdescriptprogressqt) { + ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); packagePath = scriptprogress->packagePath(); if(scriptprogress) { diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am deleted file mode 100644 index b805ef184..000000000 --- a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = -I$(top_srcdir)/chalk/sdk \ - -I$(top_srcdir)/chalk/core \ - -I$(top_srcdir)/chalk/chalkcolor/ \ - -I$(top_srcdir)/chalk/ui \ - $(KROSS_INCLUDES) \ - $(KOFFICE_INCLUDES) \ - $(all_includes) - - -lib_LTLIBRARIES = libchalkscripting.la -libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp -noinst_HEADERS = kis_script_progress.h - -libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries) -libchalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -libchalkscripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop similarity index 99% rename from chalk/plugins/viewplugins/scripting/chalkscripting.desktop rename to chalk/plugins/viewplugins/scripting/chaltdescripting.desktop index eba3ea370..c42670979 100644 --- a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop @@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本 Comment[zh_TW]=允許執行命令稿 ServiceTypes=Chalk/ViewPlugin Type=Service -X-TDE-Library=chalkscripting +X-TDE-Library=chaltdescripting X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am new file mode 100644 index 000000000..a38d8df0f --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = -I$(top_srcdir)/chalk/sdk \ + -I$(top_srcdir)/chalk/core \ + -I$(top_srcdir)/chalk/chalkcolor/ \ + -I$(top_srcdir)/chalk/ui \ + $(KROSS_INCLUDES) \ + $(KOFFICE_INCLUDES) \ + $(all_includes) + + +lib_LTLIBRARIES = libchaltdescripting.la +libchaltdescripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp +noinst_HEADERS = kis_script_progress.h + +libchaltdescripting_la_LDFLAGS = -no-undefined $(all_libraries) +libchaltdescripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la + +KDE_CXXFLAGS = $(USE_EXCEPTIONS) + +libchaltdescripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp similarity index 100% rename from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp rename to chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h similarity index 100% rename from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h rename to chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp similarity index 100% rename from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp rename to chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h similarity index 100% rename from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h rename to chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 31e9897aa..5cbbb85d1 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -48,11 +48,11 @@ #include #include -#include "chalkscripting/kis_script_progress.h" -#include "chalkscripting/kis_script_monitor.h" +#include "chaltdescripting/kis_script_progress.h" +#include "chaltdescripting/kis_script_monitor.h" typedef KGenericFactory ChalkScriptingFactory; -K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdescripting, ChalkScriptingFactory( "chalk" ) ) Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h index ad9f60593..a2353d7a3 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.h +++ b/chalk/plugins/viewplugins/scripting/scripting.h @@ -21,7 +21,7 @@ #ifndef SCRIPTING_H #define SCRIPTING_H -#include +#include class KisView; class KisScript; diff --git a/chalk/plugins/viewplugins/scripting/scripting.rc b/chalk/plugins/viewplugins/scripting/scripting.rc index 1b4999df4..b4978b4c2 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.rc +++ b/chalk/plugins/viewplugins/scripting/scripting.rc @@ -1,5 +1,5 @@ - + S&cripts diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am index 80ef39283..fde60fbbb 100644 --- a/chalk/plugins/viewplugins/selectopaque/Makefile.am +++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am @@ -14,7 +14,7 @@ chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = selectopaque.rc diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.h b/chalk/plugins/viewplugins/selectopaque/selectopaque.h index 110240143..ac85e8c8a 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.h +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.h @@ -21,7 +21,7 @@ #ifndef SELECTOPAQUE_H #define SELECTOPAQUE_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am index ce279a135..5237ce413 100644 --- a/chalk/plugins/viewplugins/separate_channels/Makefile.am +++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \ kde_services_DATA = chalkseparatechannels.desktop -chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index cd0e9a778..2190957df 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -20,7 +20,7 @@ #ifndef _KIS_SEPARATE_CHANNELS_PLUGIN_H_ #define _KIS_SEPARATE_CHANNELS_PLUGIN_H_ -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am index 5d3bd01ac..a552b0a2a 100644 --- a/chalk/plugins/viewplugins/shearimage/Makefile.am +++ b/chalk/plugins/viewplugins/shearimage/Makefile.am @@ -18,7 +18,7 @@ kde_services_DATA = chalkshearimage.desktop chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h -chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.h b/chalk/plugins/viewplugins/shearimage/shearimage.h index 8bc5ae0ab..9f9c1c31a 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/shearimage.h @@ -20,7 +20,7 @@ #ifndef SHEARIMAGE_H #define SHEARIMAGE_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am index 0d5e27584..a1262ab13 100644 --- a/chalk/plugins/viewplugins/substrate/Makefile.am +++ b/chalk/plugins/viewplugins/substrate/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalksubstrate.la chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h -chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/substrate/substrate.h b/chalk/plugins/viewplugins/substrate/substrate.h index 19e83f95e..54e26d0c8 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.h +++ b/chalk/plugins/viewplugins/substrate/substrate.h @@ -21,7 +21,7 @@ #ifndef SUBSTATE_H #define SUBSTATE_H -#include +#include class KisView; diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am index 26b01aa8d..5a3162f3e 100644 --- a/chalk/plugins/viewplugins/variations/Makefile.am +++ b/chalk/plugins/viewplugins/variations/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkvariations.la chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui noinst_HEADERS = wdg_variations.h -chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts +chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ diff --git a/chalk/plugins/viewplugins/variations/variations.h b/chalk/plugins/viewplugins/variations/variations.h index e61ed196b..cac1e1aaa 100644 --- a/chalk/plugins/viewplugins/variations/variations.h +++ b/chalk/plugins/viewplugins/variations/variations.h @@ -21,7 +21,7 @@ #ifndef VARIATIONS_H #define VARIATIONS_H -#include +#include class KisView; diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index 3c16049cc..4dc0ed1b9 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "kdebug.h" diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 8e053eaf6..c876ab77e 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -731,7 +731,7 @@ PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", KIcon::SizeMedium )); m_general = new GeneralTab( vbox ); #ifdef HAVE_GL - vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "kscreensaver", KIcon::SizeMedium )); + vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", KIcon::SizeMedium )); m_displaySettings = new DisplaySettingsTab( vbox ); #endif vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", KIcon::SizeMedium )); diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index cddf4c081..fccd3e09a 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index 045b43f9a..2469a3280 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -18,10 +18,10 @@ #include "kdebug.h" #include -#include +#include #include #include -#include +#include #include "kis_generic_registry.h" #include "kis_types.h" diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index cf3542b24..de34e26a6 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -62,11 +62,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include // KOffice #include diff --git a/changes-1.4 b/changes-1.4 index a5a176721..7a5b1c73b 100644 --- a/changes-1.4 +++ b/changes-1.4 @@ -84,7 +84,7 @@ kotext (shared by KWord and KPresenter): * Word completion with tooltip * Open links by clicking on them, use hand pointer, show link target in statusbar. * Tab/Shift+Tab for changing indentation in lists -* Rewritten spell-checking support (based on kspell2, the main reason for the tdelibs >= 3.3 requirement) +* Rewritten spell-checking support (based on tdespell2, the main reason for the tdelibs >= 3.3 requirement) which is much faster and solves many problems (e.g. KOffice-1.3's hanging right-click-menu) * Improved autocorrection (better URL detection among other things) diff --git a/config.h.in b/config.h.in index 84789ce52..626a3929f 100644 --- a/config.h.in +++ b/config.h.in @@ -68,7 +68,7 @@ /* Defines if your system has the fontconfig and freetype libraries */ #undef HAVE_KARBONTEXT -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_KSPELL2_BROKER_H /* Defines if your system has the libart library */ @@ -77,7 +77,7 @@ /* Define if you have libjpeg */ #undef HAVE_LIBJPEG -/* If we are going to use libkspell2 for spell-checking */ +/* If we are going to use libtdespell2 for spell-checking */ #undef HAVE_LIBKSPELL2 /* Define if you have libpng */ diff --git a/configure.in b/configure.in index 1d7585a36..1cbe7208d 100644 --- a/configure.in +++ b/configure.in @@ -827,7 +827,7 @@ dnl ======================================================= #KEXI_VERSION= -AC_SUBST(LIB_KEXI_KMDI, '-lkmdi') +AC_SUBST(LIB_KEXI_KMDI, '-ltdemdi') AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '') dnl ======================================================= @@ -1223,18 +1223,18 @@ dnl ======================================================= dnl FILE: ./kexi/plugins/macros/configure.in.in dnl ======================================================= -# Check for kunittest -AC_MSG_CHECKING([for kunittest]) +# Check for tdeunittest +AC_MSG_CHECKING([for tdeunittest]) # First we check if the console unittester could be compiled -have_kunittest_header="no" -KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) -AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes") +have_tdeunittest_header="no" +KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , ) +AM_CONDITIONAL(include_tdeunittest, test "$have_tdeunittest_header" = "yes") # Second we check if the GUI-unittester could be compiled -have_kunittestgui_header="no" -KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , ) -AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes") +have_tdeunittestgui_header="no" +KDE_CHECK_HEADER(tdeunittest/runnergui.h, have_tdeunittestgui_header="yes", , ) +AM_CONDITIONAL(include_tdeunittestgui, test "$have_tdeunittestgui_header" = "yes") dnl ======================================================= dnl FILE: ./kivio/configure.in.in @@ -1333,12 +1333,12 @@ else AC_MSG_RESULT(no) fi -# Check for kunittest -AC_MSG_CHECKING([for kunittest]) +# Check for tdeunittest +AC_MSG_CHECKING([for tdeunittest]) -have_kunittest_header="no" -KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) -AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes") +have_tdeunittest_header="no" +KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , ) +AM_CONDITIONAL(include_tdeunittest_tests, test "$have_tdeunittest_header" = "yes") # --- OpenGL check --- @@ -1499,13 +1499,13 @@ dnl ======================================================= AC_LANG_SAVE AC_LANG_C dnl Check for aspell library - KDE_CHECK_HEADERS([kspell2/broker.h]) - if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then + KDE_CHECK_HEADERS([tdespell2/broker.h]) + if test "x$ac_cv_header_tdespell2_broker_h" = "xyes"; then dnl the header and the lib exist -> ok dnl this is for config.h - AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking]) - LIBKSPELL2="-lkspell2" - AC_MSG_RESULT([found in $ac_kspell2_includes]) + AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libtdespell2 for spell-checking]) + LIBKSPELL2="-ltdespell2" + AC_MSG_RESULT([found in $ac_tdespell2_includes]) else LIBKSPELL2="" AC_MSG_RESULT([not found -- spell-checking will be disabled]) @@ -2120,7 +2120,7 @@ AC_CONFIG_FILES([ chalk/plugins/viewplugins/rotateimage/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/screenshot/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkcore/Makefile ]) -AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkscripting/Makefile ]) +AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/python/Makefile ]) AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/ruby/Makefile ]) @@ -2634,7 +2634,7 @@ fi if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (tdespell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook index 9c0ace373..6c78c8ce2 100644 --- a/doc/chalk/developers-plugins.docbook +++ b/doc/chalk/developers-plugins.docbook @@ -275,7 +275,7 @@ A header file: #ifndef TOOL_STAR_H_ #define TOOL_STAR_H_ -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * A module that provides a star tool. diff --git a/doc/koffice/index.docbook b/doc/koffice/index.docbook index 4d63ce4f5..e39d28150 100644 --- a/doc/koffice/index.docbook +++ b/doc/koffice/index.docbook @@ -101,7 +101,7 @@ about the different components, have a look at the respective manual. &koffice; provides a framework that all components build on. Through this framework high integration is achieved. It is possible to develop your own component that integrates as well. The technology of this is -described in more depth in the chapter on +described in more depth in the chapter on KParts. @@ -165,10 +165,10 @@ desktop environment, thus allowing seamless workflows. &koffice; Technology - + KParts - the building blocks of &koffice; - + @@ -227,7 +227,7 @@ application in another is called embedding. - + Using KParts in your document diff --git a/doc/kword/index.docbook b/doc/kword/index.docbook index 778f5908b..c5cfe6230 100644 --- a/doc/kword/index.docbook +++ b/doc/kword/index.docbook @@ -26,7 +26,7 @@ - + diff --git a/doc/kword/table.docbook b/doc/kword/table.docbook index 55faf3295..7244a3059 100644 --- a/doc/kword/table.docbook +++ b/doc/kword/table.docbook @@ -20,7 +20,7 @@ table and cells are resized (if specified by the user) automatically to fit comf Tables in &kword; are for the display of data only. No calculations can be performed. Remember, if you need the functions of a spreadsheet, you can embed a &kspread; Table in your +linkend="tdeparts">embed a &kspread; Table in your document. This section of the document will cover the formatting of tables diff --git a/doc/kword/kparts.docbook b/doc/kword/tdeparts.docbook similarity index 94% rename from doc/kword/kparts.docbook rename to doc/kword/tdeparts.docbook index 67ac3357e..30307f643 100644 --- a/doc/kword/kparts.docbook +++ b/doc/kword/tdeparts.docbook @@ -1,4 +1,4 @@ - + @@ -17,7 +17,7 @@ every step of the process. You will need to be familiar with the basics of using the other application in order to correctly insert a component from that application Refer to the help files of the other applications for more specific information. -General instructions +General instructions There are two ways to insert a component (spreadsheet, presentation, graph, etc) from another application in &koffice;: @@ -46,7 +46,7 @@ application are different. Please see the application manuals for the specific application. (In other words, from this point on, if you insert a spreadsheet from &kspread;, then the windows will act the same as &kspread;.) -Working with the inserted component +Working with the inserted component To edit the data within the component, simply double click with the mouse pointer and &kword; will change the toolbars, menuitems and application structure to match the &koffice; application. This way, you can use the application specific tools to refine your component. The frame that contains the embedded data, can be manipulated diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am index dc567042f..d8867c1d9 100644 --- a/filters/chalk/gmagick/Makefile.am +++ b/filters/chalk/gmagick/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libchalkgmagickimport.la libchalkgmagickexport.la -libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkgmagickexport_la_LIBADD = \ $(KOFFICE_LIBS) \ @@ -10,7 +10,7 @@ libchalkgmagickexport_la_LIBADD = \ ../../../chalk/ui/libchalkui.la \ ../../../chalk/chalkcolor/libchalkcolor.la -libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkgmagickimport_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am index 7cefb8a24..3270eaa93 100644 --- a/filters/chalk/jpeg/Makefile.am +++ b/filters/chalk/jpeg/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libchalkconverter.la kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la -libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \ @@ -10,7 +10,7 @@ libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libk ../../../chalk/chalkcolor/libchalkcolor.la libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalkconverter.la $(KOFFICE_LIBS) \ @@ -20,7 +20,7 @@ libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -ljpeg -lexif libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalkconverter.la $(KOFFICE_LIBS) \ diff --git a/filters/chalk/libkisexif/Makefile.am b/filters/chalk/libkisexif/Makefile.am index d8f40fa35..b248468b0 100644 --- a/filters/chalk/libkisexif/Makefile.am +++ b/filters/chalk/libkisexif/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = \ $(KOPAINTER_INCLUDES) \ $(all_includes) METASOURCES = AUTO -libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libkisexif_la_LIBADD = $(KOFFICE_LIBS) \ ../../../chalk/core/libchalkimage.la \ diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am index 745ad6b1a..8c03b55ce 100644 --- a/filters/chalk/magick/Makefile.am +++ b/filters/chalk/magick/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libchalkmagickimport.la libchalkmagickexport.la -libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkmagickexport_la_LIBADD = \ $(KOFFICE_LIBS) \ @@ -10,7 +10,7 @@ libchalkmagickexport_la_LIBADD = \ ../../../chalk/ui/libchalkui.la \ ../../../chalk/chalkcolor/libchalkcolor.la -libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkmagickimport_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/chalk/openexr/Makefile.am b/filters/chalk/openexr/Makefile.am index 4c3ff9e2b..a73e64f9b 100644 --- a/filters/chalk/openexr/Makefile.am +++ b/filters/chalk/openexr/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS= \ kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la -libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libchalk_openexr_export_la_LIBADD = \ $(KOFFICE_LIBS) \ $(OPENEXR_LIBS) \ @@ -27,7 +27,7 @@ libchalk_openexr_export_la_LIBADD = \ ../../../chalk/chalkcolor/libchalkcolor.la -libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libchalk_openexr_import_la_LIBADD = \ $(KOFFICE_LIBS) \ $(OPENEXR_LIBS) \ diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am index 89d028119..10a309dd9 100644 --- a/filters/chalk/pdf/Makefile.am +++ b/filters/chalk/pdf/Makefile.am @@ -17,7 +17,7 @@ kdelnkdir = $(kde_appsdir)/.hidden METASOURCES = AUTO kde_module_LTLIBRARIES = libchalkpdfimport.la -libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) \ diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am index 857c368be..6a94f3256 100644 --- a/filters/chalk/png/Makefile.am +++ b/filters/chalk/png/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libchalkpngimport.la libchalkpngexport.la -libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkpngexport_la_LIBADD = \ $(KOFFICE_LIBS) \ @@ -10,7 +10,7 @@ libchalkpngexport_la_LIBADD = \ ../../../chalk/chalkcolor/libchalkcolor.la \ -lpng -libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkpngimport_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/chalk/raw/Makefile.am b/filters/chalk/raw/Makefile.am index f48bb9404..01b971893 100644 --- a/filters/chalk/raw/Makefile.am +++ b/filters/chalk/raw/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS= \ kde_module_LTLIBRARIES = libchalk_raw_import.la -libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalk_raw_import_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am index c16e7f1e2..553db2bd8 100644 --- a/filters/chalk/tiff/Makefile.am +++ b/filters/chalk/tiff/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalktiffconverter.la $(KOFFICE_LIBS) \ @@ -11,7 +11,7 @@ libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ -ltiff libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalktiffconverter.la $(KOFFICE_LIBS) \ @@ -53,7 +53,7 @@ service_DATA = chalk_tiff_export.desktop chalk_tiff_import.desktop kdelnk_DATA = chalk_tiff.desktop noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \ kis_tiff_ycbcr_reader.h -libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \ ../../../chalk/core/libchalkimage.la \ diff --git a/filters/chalk/xcf/Makefile.am b/filters/chalk/xcf/Makefile.am index 5415f09f9..9ee67fd02 100644 --- a/filters/chalk/xcf/Makefile.am +++ b/filters/chalk/xcf/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libchalkxcfimport.la libchalkxcfexport.la -libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkxcfexport_la_LIBADD = \ $(KOFFICE_LIBS) \ @@ -10,7 +10,7 @@ libchalkxcfexport_la_LIBADD = \ ../../../chalk/ui/libchalkui.la \ ../../../chalk/chalkcolor/libchalkcolor.la -libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ +libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \ -llcms libchalkxcfimport_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am index 47b01351d..e48d7b9c3 100644 --- a/filters/karbon/eps/Makefile.am +++ b/filters/karbon/eps/Makefile.am @@ -6,11 +6,11 @@ libkarbonepsexport_la_SOURCES = \ epsexport.cc \ epsexportdlg.cc -libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonepsexport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc -libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonepsimport_la_LIBADD = $(KOFFICE_LIBS) INCLUDES = \ diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am index 29202e83b..c39e77481 100644 --- a/filters/karbon/kontour/Makefile.am +++ b/filters/karbon/kontour/Makefile.am @@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/ kde_module_LTLIBRARIES = libkarbonkontourimport.la libkarbonkontourimport_la_SOURCES = kontourimport.cpp -libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la METASOURCES = AUTO diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am index d997484ed..e7df2e38f 100644 --- a/filters/karbon/png/Makefile.am +++ b/filters/karbon/png/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libkarbonpngexport.la -libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonpngexport_la_LIBADD = \ $(KOFFICE_LIBS) \ ../../../karbon/libkarboncommon.la diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am index 72eaf15e8..115c0afc2 100644 --- a/filters/karbon/svg/Makefile.am +++ b/filters/karbon/svg/Makefile.am @@ -1,11 +1,11 @@ kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la -libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonsvgexport_la_LIBADD = \ $(KOFFICE_LIBS) \ ../../../karbon/libkarboncommon.la -libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonsvgimport_la_LIBADD = \ $(KOFFICE_LIBS) \ ../../../karbon/libkarboncommon.la diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am index 82d0c0a08..ade8bf3e8 100644 --- a/filters/karbon/wmf/Makefile.am +++ b/filters/karbon/wmf/Makefile.am @@ -11,11 +11,11 @@ INCLUDES= \ kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la -libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc -libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la libwmfexport_la_SOURCES = wmfexport.cc diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am index 49e519372..1de9ce76d 100644 --- a/filters/karbon/xcf/Makefile.am +++ b/filters/karbon/xcf/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libkarbonxcfexport.la -libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkarbonxcfexport_la_LIBADD = \ $(KOFFICE_LIBS) \ ../../../karbon/libkarboncommon.la diff --git a/filters/kchart/bmp/Makefile.am b/filters/kchart/bmp/Makefile.am index 260601f09..4fcbae2b3 100644 --- a/filters/kchart/bmp/Makefile.am +++ b/filters/kchart/bmp/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartbmpexport.la libkchartbmpexport_la_SOURCES = bmpexport.cpp -libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ bmpexport.h diff --git a/filters/kchart/jpeg/Makefile.am b/filters/kchart/jpeg/Makefile.am index 3907a5d6a..6710e0756 100644 --- a/filters/kchart/jpeg/Makefile.am +++ b/filters/kchart/jpeg/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartjpegexport.la libkchartjpegexport_la_SOURCES = jpegexport.cpp -libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ diff --git a/filters/kchart/mng/Makefile.am b/filters/kchart/mng/Makefile.am index 22d611f99..9bfe1de7f 100644 --- a/filters/kchart/mng/Makefile.am +++ b/filters/kchart/mng/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartmngexport.la libkchartmngexport_la_SOURCES = mngexport.cpp -libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ mngexport.h diff --git a/filters/kchart/png/Makefile.am b/filters/kchart/png/Makefile.am index 7af0f1631..a41554e84 100644 --- a/filters/kchart/png/Makefile.am +++ b/filters/kchart/png/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartpngexport.la libkchartpngexport_la_SOURCES = pngexport.cpp -libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ pngexport.h diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am index c5025f377..54e0e07db 100644 --- a/filters/kchart/svg/Makefile.am +++ b/filters/kchart/svg/Makefile.am @@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartsvgexport.la libkchartsvgexport_la_SOURCES = svgexport.cc -libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS) noinst_HEADERS = \ svgexport.h diff --git a/filters/kchart/xbm/Makefile.am b/filters/kchart/xbm/Makefile.am index 7a1a859bf..647d257dd 100644 --- a/filters/kchart/xbm/Makefile.am +++ b/filters/kchart/xbm/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartxbmexport.la libkchartxbmexport_la_SOURCES = xbmexport.cpp -libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ xbmexport.h diff --git a/filters/kchart/xpm/Makefile.am b/filters/kchart/xpm/Makefile.am index 3cb421d25..09143efd5 100644 --- a/filters/kchart/xpm/Makefile.am +++ b/filters/kchart/xpm/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartxpmexport.la libkchartxpmexport_la_SOURCES = xpmexport.cpp -libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ xpmexport.h diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am index 8e2168de8..e00b285d1 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am index cf35f8f38..29bcceb53 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am index ee606211c..e1edf7735 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kivio/imageexport/Makefile.am b/filters/kivio/imageexport/Makefile.am index 04d03c53f..d6f22eebd 100644 --- a/filters/kivio/imageexport/Makefile.am +++ b/filters/kivio/imageexport/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \ kivio_imageexportwidget.ui kivio_imageexportdialog.cpp -libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS) service_DATA = kivio_image_export.desktop diff --git a/filters/kpresenter/bmp/Makefile.am b/filters/kpresenter/bmp/Makefile.am index 2d85478eb..f2edb1508 100644 --- a/filters/kpresenter/bmp/Makefile.am +++ b/filters/kpresenter/bmp/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterbmpexport.la libkpresenterbmpexport_la_SOURCES = bmpexport.cpp -libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ bmpexport.h diff --git a/filters/kpresenter/jpeg/Makefile.am b/filters/kpresenter/jpeg/Makefile.am index 40a3109e1..c3ea71e92 100644 --- a/filters/kpresenter/jpeg/Makefile.am +++ b/filters/kpresenter/jpeg/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterjpegexport.la libkpresenterjpegexport_la_SOURCES = jpegexport.cpp -libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ jpegexport.h diff --git a/filters/kpresenter/mng/Makefile.am b/filters/kpresenter/mng/Makefile.am index e51e80007..bd32a949c 100644 --- a/filters/kpresenter/mng/Makefile.am +++ b/filters/kpresenter/mng/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresentermngexport.la libkpresentermngexport_la_SOURCES = mngexport.cpp -libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ mngexport.h diff --git a/filters/kpresenter/png/Makefile.am b/filters/kpresenter/png/Makefile.am index 0872168a7..bbe350bfc 100644 --- a/filters/kpresenter/png/Makefile.am +++ b/filters/kpresenter/png/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterpngexport.la libkpresenterpngexport_la_SOURCES = pngexport.cpp -libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ pngexport.h diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am index d4b0b8543..205470324 100644 --- a/filters/kpresenter/svg/Makefile.am +++ b/filters/kpresenter/svg/Makefile.am @@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresentersvgexport.la libkpresentersvgexport_la_SOURCES = svgexport.cc -libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS) noinst_HEADERS = \ svgexport.h diff --git a/filters/kpresenter/xbm/Makefile.am b/filters/kpresenter/xbm/Makefile.am index b57ad5fc3..ee2f8ff42 100644 --- a/filters/kpresenter/xbm/Makefile.am +++ b/filters/kpresenter/xbm/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterxbmexport.la libkpresenterxbmexport_la_SOURCES = xbmexport.cpp -libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ xbmexport.h diff --git a/filters/kpresenter/xpm/Makefile.am b/filters/kpresenter/xpm/Makefile.am index 5ce1efaf4..c09b6b2c0 100644 --- a/filters/kpresenter/xpm/Makefile.am +++ b/filters/kpresenter/xpm/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterxpmexport.la libkpresenterxpmexport_la_SOURCES = xpmexport.cpp -libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ xpmexport.h diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am index f85c2ac41..e1b886015 100644 --- a/filters/kspread/applixspread/Makefile.am +++ b/filters/kspread/applixspread/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la libapplixspreadimport_la_SOURCES = applixspreadimport.cc libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS) -libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = applixspreadimport.h METASOURCES = AUTO diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am index cea95e516..30914190e 100644 --- a/filters/kspread/dbase/Makefile.am +++ b/filters/kspread/dbase/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp libdbaseimport_la_LIBADD = $(KOFFICE_LIBS) -libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = dbaseimport.h dbase.h METASOURCES = AUTO diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am index fffd45e9b..9af3bab7c 100644 --- a/filters/kspread/excel/import/Makefile.am +++ b/filters/kspread/excel/import/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la libexcelimport_la_SOURCES = excelimport.cc libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la -libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = excelimport.h METASOURCES = AUTO diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am index f16a130b0..2a968628c 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kugar/kugarnop/Makefile.am b/filters/kugar/kugarnop/Makefile.am index bf5bac0e6..c0870cf62 100644 --- a/filters/kugar/kugarnop/Makefile.am +++ b/filters/kugar/kugarnop/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = libkugarnopimport.la libkugarnopimport_la_SOURCES = kugarnopimport.cpp -libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS) noinst_HEADERS = kugarnopimport.h diff --git a/filters/kword/hancomword/Makefile.am b/filters/kword/hancomword/Makefile.am index 535abf088..b66898667 100644 --- a/filters/kword/hancomword/Makefile.am +++ b/filters/kword/hancomword/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) -libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts noinst_HEADERS = pole.h hancomwordimport.h METASOURCES = AUTO diff --git a/filters/kword/html/import/Makefile.am b/filters/kword/html/import/Makefile.am index 6bed13c60..692815815 100644 --- a/filters/kword/html/import/Makefile.am +++ b/filters/kword/html/import/Makefile.am @@ -10,9 +10,9 @@ libhtmlimport_la_LIBADD = $(LIB_KHTML) $(KOFFICE_LIBS) $(LIB_KOTEXT) kde_module_LTLIBRARIES = libhtmlimport.la -libhtmlimport_la_SOURCES = htmlimport.cpp khtmlreader.cpp kwdwriter.cpp +libhtmlimport_la_SOURCES = htmlimport.cpp tdehtmlreader.cpp kwdwriter.cpp -noinst_HEADERS = htmlimport.h khtmlreader.h kwdwriter.h +noinst_HEADERS = htmlimport.h tdehtmlreader.h kwdwriter.h METASOURCES = AUTO diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index 9b29320d1..f5d9d08cf 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -27,7 +27,7 @@ #include -#include +#include #include typedef KGenericFactory HTMLImportFactory; diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/tdehtmlreader.cpp similarity index 98% rename from filters/kword/html/import/khtmlreader.cpp rename to filters/kword/html/import/tdehtmlreader.cpp index ab68e9f3b..06aa69eaf 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/tdehtmlreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - khtmlreader.cpp - description + tdehtmlreader.cpp - description ------------------- begin : Sun Sep 9 2001 copyright : (C) 2001 by Frank Dekervel @@ -16,9 +16,9 @@ * * ***************************************************************************/ -#include "khtmlreader.h" +#include "tdehtmlreader.h" -#include "khtmlreader.moc" +#include "tdehtmlreader.moc" #include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -256,7 +256,7 @@ bool KHTMLReader::parseTag(DOM::Element e) if (e.tagName().lower()=="table") { return parse_table(e); } // FIXME we can get rid of these, make things tons more simple - // when khtml finally implements getComputedStyle + // when tdehtml finally implements getComputedStyle _PF(b,WEIGHT,value,75); _PF(strong,WEIGHT,value,75); _PF(u,UNDERLINE,value,1); @@ -470,7 +470,7 @@ void KHTMLReader::parseStyle(DOM::Element e) { // styles are broken broken broken broken broken broken. //FIXME: wait until getComputedStyle is more than - // 'return 0' in khtml + // 'return 0' in tdehtml kdDebug(30503) << "entering parseStyle" << endl; DOM::CSSStyleDeclaration s1=e.style(); DOM::Document doc=_html->document(); @@ -562,7 +562,7 @@ bool KHTMLReader::parse_table(DOM::Element e) has_borders=true; // fixme rewrite this proper - //(maybe using computed sizes from khtml if thats once exported) + //(maybe using computed sizes from tdehtml if thats once exported) for (DOM::Node rowsnode=table_body.firstChild();!rowsnode.isNull();rowsnode=rowsnode.nextSibling()) { DOM::Element rows = rowsnode; if (!rows.isNull() && rows.tagName().string().lower() == "tr") { diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/tdehtmlreader.h similarity index 95% rename from filters/kword/html/import/khtmlreader.h rename to filters/kword/html/import/tdehtmlreader.h index dbca8a878..bee84c606 100644 --- a/filters/kword/html/import/khtmlreader.h +++ b/filters/kword/html/import/tdehtmlreader.h @@ -1,5 +1,5 @@ /*************************************************************************** - khtmlreader.h - description + tdehtmlreader.h - description ------------------- begin : Sun Sep 9 2001 copyright : (C) 2001 by Frank Dekervel @@ -19,7 +19,7 @@ #ifndef KHTMLREADER_H #define KHTMLREADER_H -#include // fixme speedup compile time by moving these into the cpp file. +#include // fixme speedup compile time by moving these into the cpp file. #include #include #include diff --git a/filters/kword/html/status.html b/filters/kword/html/status.html index b2587f2f1..96fdfb1fa 100644 --- a/filters/kword/html/status.html +++ b/filters/kword/html/status.html @@ -52,7 +52,7 @@ - Crude!
- HTML: basic formatting, simple tables.
- No stylesheets yet, no table size calculating yet
- - uses khtml
+ - uses tdehtml
@@ -62,7 +62,7 @@ - <font>
- table size calculation
- images
- - implement CSS2, integrate with khtml's css implementation
+ - implement CSS2, integrate with tdehtml's css implementation
- many other tags
@@ -91,7 +91,7 @@ HTML 4.01
XHTML 1.0
Cascaded Style Sheets Level 2 (CSS2)
- KHTML Documentation
+ KHTML Documentation
diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am index 83ec06833..213289672 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am index 6f91f004d..34d0d8a49 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) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am index b6352c75e..01fcec66c 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) -lktexteditor +texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am index deb88875a..c0b7be5d5 100644 --- a/filters/kword/msword/Makefile.am +++ b/filters/kword/msword/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libmswordimport.la libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \ texthandler.cpp tablehandler.cpp graphicshandler.cpp -libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) METASOURCES = AUTO diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am index 596315fe2..cb42ef9d3 100644 --- a/filters/kword/mswrite/Makefile.am +++ b/filters/kword/mswrite/Makefile.am @@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la libmswriteimport_la_SOURCES = mswriteimport.cc \ libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc -libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libmswriteimport_la_LIBADD = $(KOFFICE_LIBS) libmswriteexport_la_SOURCES = mswriteexport.cc \ libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp -libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la noinst_HEADERS = mswriteimport.h mswriteexport.h \ diff --git a/filters/kword/pdf/Makefile.am b/filters/kword/pdf/Makefile.am index afcf44318..73e838cf9 100644 --- a/filters/kword/pdf/Makefile.am +++ b/filters/kword/pdf/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libpdfimport.la libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \ FilterPage.cpp FilterDevice.cpp \ pdfdocument.cpp dialog.cpp pdfimport.cpp -libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libpdfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la METASOURCES = dialog.moc pdfimport.moc diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am index d5bb41e16..ee6caaa5a 100644 --- a/filters/xsltfilter/export/Makefile.am +++ b/filters/xsltfilter/export/Makefile.am @@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIB kde_module_LTLIBRARIES = libxsltexport.la libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui -libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libxsltexport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am index c1e58a4cd..01f902293 100644 --- a/filters/xsltfilter/import/Makefile.am +++ b/filters/xsltfilter/import/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LI kde_module_LTLIBRARIES = libxsltimport.la libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui -libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libxsltimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h diff --git a/karbon/core/vkarbonplugin.h b/karbon/core/vkarbonplugin.h index 84fed9c6f..60caafa4a 100644 --- a/karbon/core/vkarbonplugin.h +++ b/karbon/core/vkarbonplugin.h @@ -20,7 +20,7 @@ #ifndef __VKARBONPLUGIN_H__ #define __VKARBONPLUGIN_H__ -#include +#include #include class KARBONBASE_EXPORT VKarbonPlugin : public KParts::Plugin diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 6206926a0..67ffb0bd9 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "karbon_factory.h" #include "karbon_part.h" diff --git a/karbon/plugins/flattenpath/flattenpathplugin.h b/karbon/plugins/flattenpath/flattenpathplugin.h index 6384d0012..3633480c9 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.h +++ b/karbon/plugins/flattenpath/flattenpathplugin.h @@ -20,7 +20,7 @@ #ifndef __FLATTENPATHPLUGIN_H__ #define __FLATTENPATHPLUGIN_H__ -#include +#include #include class KarbonView; diff --git a/karbon/plugins/imagetool/imagetoolplugin.h b/karbon/plugins/imagetool/imagetoolplugin.h index 4258f6dc6..e9e2ed132 100644 --- a/karbon/plugins/imagetool/imagetoolplugin.h +++ b/karbon/plugins/imagetool/imagetoolplugin.h @@ -23,7 +23,7 @@ #include -#include +#include /** */ diff --git a/karbon/plugins/insertknots/insertknotsplugin.h b/karbon/plugins/insertknots/insertknotsplugin.h index 84cd4e1fd..3feb1877c 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.h +++ b/karbon/plugins/insertknots/insertknotsplugin.h @@ -20,7 +20,7 @@ #ifndef __INSERTKNOTSPLUGIN_H__ #define __INSERTKNOTSPLUGIN_H__ -#include +#include #include #include diff --git a/karbon/plugins/roundcorners/roundcornersplugin.h b/karbon/plugins/roundcorners/roundcornersplugin.h index 858871a99..3a7c544f4 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.h +++ b/karbon/plugins/roundcorners/roundcornersplugin.h @@ -20,7 +20,7 @@ #ifndef __ROUNDCORNERSPLUGIN_H__ #define __ROUNDCORNERSPLUGIN_H__ -#include +#include #include #include #include diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.h b/karbon/plugins/shadoweffect/shadoweffectplugin.h index c1085581a..6c05d8297 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.h +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.h @@ -20,7 +20,7 @@ #ifndef __SHADOWEFFECTPLUGIN_H__ #define __SHADOWEFFECTPLUGIN_H__ -#include +#include #include #include diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.h b/karbon/plugins/whirlpinch/whirlpinchplugin.h index b2d68c343..81cd40035 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.h +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.h @@ -21,7 +21,7 @@ #define __WHIRLPINCHPLUGIN_H__ #include -#include +#include #include class KarbonView; diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.h b/karbon/plugins/zoomtool/zoomtoolplugin.h index 3de6231d8..97a5a752d 100644 --- a/karbon/plugins/zoomtool/zoomtoolplugin.h +++ b/karbon/plugins/zoomtool/zoomtoolplugin.h @@ -23,7 +23,7 @@ #include -#include +#include /** * A module that provides a zoom tool. diff --git a/karbon/tools/vdefaulttools.h b/karbon/tools/vdefaulttools.h index a9d0f7bf0..43125e438 100644 --- a/karbon/tools/vdefaulttools.h +++ b/karbon/tools/vdefaulttools.h @@ -23,7 +23,7 @@ #include -#include +#include /** * A module that provides the default tools diff --git a/kexi/configure.in.in b/kexi/configure.in.in index 9e74cf350..4930b78d7 100644 --- a/kexi/configure.in.in +++ b/kexi/configure.in.in @@ -1,5 +1,5 @@ #KEXI_VERSION= -AC_SUBST(LIB_KEXI_KMDI, '-lkmdi') +AC_SUBST(LIB_KEXI_KMDI, '-ltdemdi') AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '') diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index e9bc8018d..cf455885c 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -28,7 +28,7 @@ #include -#include +#include #include class TQWidgetStack; diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 49b3c46d4..0cfce53be 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include //! @internal diff --git a/kexi/core/keximainwindow.h b/kexi/core/keximainwindow.h index e03fa3280..4dbb6b18e 100644 --- a/kexi/core/keximainwindow.h +++ b/kexi/core/keximainwindow.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "kexisharedactionhost.h" diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index 1247c9c04..ce9dcbe17 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "kexipartmanager.h" #include "kexipart.h" diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index 8654e1451..301da9259 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -4653,7 +4653,7 @@ Property Editor: ===================== Kexi 0.1 Beta 2 "Warsaw By Night" ===================== 2004-01-20 -- kmdi captions fix backported to kexi_compat +- tdemdi captions fix backported to kexi_compat - kexistartupfiledialog: we're using paths unstead urls now for better compat. 2004-01-19 @@ -4994,7 +4994,7 @@ doesn't work) 2003-12-10 - KexiMainWindow: - * "show navigator" action is auto-handled by kmdi + * "show navigator" action is auto-handled by tdemdi * fixed : pointer to current xmlgui is now cleared before closing kexidialog - KexiTableView::paintRow() fixed crash when col number was ==-1 diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 4a07191d0..90cdebc71 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -723,7 +723,7 @@ TODO::::::: jstaniek dipesh: it's only within your example project... dipesh therefore column( col )->readOnly() crashes... -reuse KWallet http://events.kde.org/info/kastle/presentations/kwallet-kastle-2003.ps +reuse KWallet http://events.kde.org/info/kastle/presentations/tdewallet-kastle-2003.ps === Interesting features === - Add random names/surnames generator: http://www.ruf.rice.edu/~pound/ diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am index dd87e8bb0..ee96575bb 100644 --- a/kexi/formeditor/factories/Makefile.am +++ b/kexi/formeditor/factories/Makefile.am @@ -4,12 +4,12 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la -kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kformdesigner_containers_la_SOURCES = containerfactory.cpp kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ ../../../lib/koproperty/libkoproperty.la -kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kformdesigner_stdwidgets_la_SOURCES = stdwidgetfactory.cpp kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ ../../../lib/koproperty/libkoproperty.la diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h index f98990438..397afd267 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "form.h" diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am index 53348ac63..1c022c2d3 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) -lktexteditor +kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la diff --git a/kexi/formeditor/test/kfd_mainwindow.h b/kexi/formeditor/test/kfd_mainwindow.h index 4d0e2f5fc..5ce138dff 100644 --- a/kexi/formeditor/test/kfd_mainwindow.h +++ b/kexi/formeditor/test/kfd_mainwindow.h @@ -20,7 +20,7 @@ #ifndef KFORMDESIGNER_MAINWINDOW_H #define KFORMDESIGNER_MAINWINDOW_H -#include +#include class KFDMainWindow : public KParts::MainWindow { diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h index b0d358ed9..5ed8c8e93 100644 --- a/kexi/formeditor/test/kfd_part.h +++ b/kexi/formeditor/test/kfd_part.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include "form.h" diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 559b72ffc..ddbc17188 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 512bf8ad0..c8c432e24 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am index 1678d52b3..664e52b2d 100644 --- a/kexi/kexidb/drivers/mySQL/Makefile.am +++ b/kexi/kexidb/drivers/mySQL/Makefile.am @@ -22,7 +22,7 @@ kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \ -lmysqlclient \ ../../libkexidb.la -kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_mysqldriver.desktop diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am index 38fef647f..19141edfa 100644 --- a/kexi/kexidb/drivers/pqxx/Makefile.am +++ b/kexi/kexidb/drivers/pqxx/Makefile.am @@ -13,7 +13,7 @@ kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \ -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \ - -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts + -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_pqxxsqldriver.desktop diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am index 2722ea1c3..6b0e48753 100644 --- a/kexi/kexidb/drivers/sqlite/Makefile.am +++ b/kexi/kexidb/drivers/sqlite/Makefile.am @@ -17,7 +17,7 @@ kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ ../../../../kexi/kexiutils/libkexiutils.la -kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_sqlite3driver.desktop diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am index 7484a2782..89dd91235 100644 --- a/kexi/kexidb/drivers/sqlite2/Makefile.am +++ b/kexi/kexidb/drivers/sqlite2/Makefile.am @@ -21,7 +21,7 @@ kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ ../../../../kexi/kexiutils/libkexiutils.la -kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_sqlite2driver.desktop diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4135421d2..b3d362403 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -250,7 +250,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } - setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in kmdi :) + setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in tdemdi :) manager()->setSplitterHighResolution(true); manager()->setSplitterKeepSize(true); setStandardMDIMenuEnabled(false); @@ -316,9 +316,9 @@ KexiMainWindowImpl::KexiMainWindowImpl() //disabled (possible crash) d->hideMenuItem("file", i18n("&Import"), true); //disabled (possible crash) d->hideMenuItem("help", i18n( "&Report Bug..." ), true); #endif - KAction *kmdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("kmdi_tooldock_menu") : 0; - if (kmdi_tooldock_menu_action) { - kmdi_tooldock_menu_action->setEnabled(false); + KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; + if (tdemdi_tooldock_menu_action) { + tdemdi_tooldock_menu_action->setEnabled(false); } if (!isFakingSDIApplication()/* && !userMode()*/) { @@ -2235,7 +2235,7 @@ KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) } kdDebug() << "KexiMainWindowImpl::registerChild() ID = " << dlg->id() << endl; - if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//kmdi fix + if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//tdemdi fix //js TODO: check if taskbar is switched in menu if (m_pTaskBar && !m_pTaskBar->isSwitchedOn()) m_pTaskBar->switchOn(true); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 2245f23c7..85468e1d8 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -31,11 +31,11 @@ #include #include #include -#include +#include #if KexitStatusBar_KTEXTEDITOR_USED -#include -#include +#include +#include #endif KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name) diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am index b122af834..9f8f386db 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) -lktexteditor +keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 0cd52b4bf..876a96315 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -24,7 +24,7 @@ #include "keximigrate.h" #include -#include +#include #include #include #include diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am index 63b96268e..9a5e38a81 100644 --- a/kexi/migration/mysql/Makefile.am +++ b/kexi/migration/mysql/Makefile.am @@ -12,7 +12,7 @@ keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkexi ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la -keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = keximigrate_mysql.desktop diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am index bdf76305e..109ac6873 100644 --- a/kexi/migration/pqxx/Makefile.am +++ b/kexi/migration/pqxx/Makefile.am @@ -14,7 +14,7 @@ keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../l ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la -keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = keximigrate_pqxx.desktop diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am index 7d6d07771..c9db70008 100644 --- a/kexi/plugins/forms/Makefile.am +++ b/kexi/plugins/forms/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la kexihandler_form_la_SOURCES = kexiforms.cpp -kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ @@ -18,7 +18,7 @@ kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexico ../../../kexi/widget/utils/libkexiguiutils.la -kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ @@ -34,7 +34,7 @@ libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgeti kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am index dba9018b0..d9c73cd38 100644 --- a/kexi/plugins/importexport/csv/Makefile.am +++ b/kexi/plugins/importexport/csv/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \ kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp -kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \ ../../../migration/libkeximigrate.la \ ../../../../kexi/kexidb/libkexidb.la \ diff --git a/kexi/plugins/macros/Makefile.am b/kexi/plugins/macros/Makefile.am index cf5fb0d46..b8fcc25d1 100644 --- a/kexi/plugins/macros/Makefile.am +++ b/kexi/plugins/macros/Makefile.am @@ -1,4 +1,4 @@ -if include_kunittest +if include_tdeunittest # Unittest is disabled per default. # TESTSDIR = tests diff --git a/kexi/plugins/macros/configure.in.in b/kexi/plugins/macros/configure.in.in index 52fb9f5a0..44d348b87 100644 --- a/kexi/plugins/macros/configure.in.in +++ b/kexi/plugins/macros/configure.in.in @@ -1,13 +1,13 @@ -# Check for kunittest -AC_MSG_CHECKING([for kunittest]) +# Check for tdeunittest +AC_MSG_CHECKING([for tdeunittest]) # First we check if the console unittester could be compiled -have_kunittest_header="no" -KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , ) -AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes") +have_tdeunittest_header="no" +KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , ) +AM_CONDITIONAL(include_tdeunittest, test "$have_tdeunittest_header" = "yes") # Second we check if the GUI-unittester could be compiled -have_kunittestgui_header="no" -KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , ) -AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes") +have_tdeunittestgui_header="no" +KDE_CHECK_HEADER(tdeunittest/runnergui.h, have_tdeunittestgui_header="yes", , ) +AM_CONDITIONAL(include_tdeunittestgui, test "$have_tdeunittestgui_header" = "yes") diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am index adb6a4d3e..0206386a8 100644 --- a/kexi/plugins/macros/tests/Makefile.am +++ b/kexi/plugins/macros/tests/Makefile.am @@ -1,4 +1,4 @@ -if include_kunittestgui +if include_tdeunittestgui GUIBINPROGRAM = komacrotestgui else GUIBINPROGRAM = @@ -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) -lktexteditor -komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS) +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) -if include_kunittestgui +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) -lktexteditor - komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS) + 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) endif KDE_CXXFLAGS = $(USE_EXCEPTIONS) @@ -21,8 +21,8 @@ INCLUDES = -I$(srcdir)/tests -I$(srcdir)../ $(all_includes) METASOURCES = AUTO guicheck: komacrotestgui - kunittest ./komacrotestgui + tdeunittest ./komacrotestgui check: komacrotest echo $(srcdir) - kunittest ./komacrotest + tdeunittest ./komacrotest diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp index 65bebe663..26e38b325 100644 --- a/kexi/plugins/macros/tests/actiontests.cpp +++ b/kexi/plugins/macros/tests/actiontests.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/actiontests.h b/kexi/plugins/macros/tests/actiontests.h index fe3fb21d4..91576ea31 100644 --- a/kexi/plugins/macros/tests/actiontests.h +++ b/kexi/plugins/macros/tests/actiontests.h @@ -20,7 +20,7 @@ #ifndef KOMACROTEST_ACTIONTESTS_H #define KOMACROTEST_ACTIONTESTS_H -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp index bdc2e6ad6..41234ecaf 100644 --- a/kexi/plugins/macros/tests/commontests.cpp +++ b/kexi/plugins/macros/tests/commontests.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/commontests.h b/kexi/plugins/macros/tests/commontests.h index e72408b7c..170974bc4 100644 --- a/kexi/plugins/macros/tests/commontests.h +++ b/kexi/plugins/macros/tests/commontests.h @@ -20,7 +20,7 @@ #ifndef KOMACROTEST_COMMONTESTS_H #define KOMACROTEST_COMMONTESTS_H -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp index 33e53eb84..15fc9db13 100644 --- a/kexi/plugins/macros/tests/komacrotest.cpp +++ b/kexi/plugins/macros/tests/komacrotest.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include static const char description[] = I18N_NOOP("KoMacroTester"); diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp index 95c019f85..d651aa01b 100644 --- a/kexi/plugins/macros/tests/komacrotestgui.cpp +++ b/kexi/plugins/macros/tests/komacrotestgui.cpp @@ -21,7 +21,7 @@ #include #include -#include "kunittest/runnergui.h" +#include "tdeunittest/runnergui.h" static const char description[] = I18N_NOOP("KoMacroTestgui."); diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp index 47b93b0fc..0ac780b0a 100644 --- a/kexi/plugins/macros/tests/macroitemtests.cpp +++ b/kexi/plugins/macros/tests/macroitemtests.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/macroitemtests.h b/kexi/plugins/macros/tests/macroitemtests.h index 902ef91ef..6cd6cf8f7 100644 --- a/kexi/plugins/macros/tests/macroitemtests.h +++ b/kexi/plugins/macros/tests/macroitemtests.h @@ -20,7 +20,7 @@ #ifndef KOMACROTEST_ACTIONTESTS_H #define KOMACROTEST_ACTIONTESTS_H -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp index 45f77efd6..d5d2c2af9 100644 --- a/kexi/plugins/macros/tests/macrotests.cpp +++ b/kexi/plugins/macros/tests/macrotests.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/macrotests.h b/kexi/plugins/macros/tests/macrotests.h index 49d50ad5f..e1a61ba52 100644 --- a/kexi/plugins/macros/tests/macrotests.h +++ b/kexi/plugins/macros/tests/macrotests.h @@ -20,7 +20,7 @@ #ifndef KOMACROTEST_MACROTESTS_H #define KOMACROTEST_MACROTESTS_H -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/testobject.h b/kexi/plugins/macros/tests/testobject.h index 99b59da23..81309d99a 100644 --- a/kexi/plugins/macros/tests/testobject.h +++ b/kexi/plugins/macros/tests/testobject.h @@ -21,7 +21,7 @@ #define KOMACROTEST_TESTOBJECT_H #include -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp index 5035f9294..c97246399 100644 --- a/kexi/plugins/macros/tests/variabletests.cpp +++ b/kexi/plugins/macros/tests/variabletests.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/variabletests.h b/kexi/plugins/macros/tests/variabletests.h index e6474a5a1..65c07f77a 100644 --- a/kexi/plugins/macros/tests/variabletests.h +++ b/kexi/plugins/macros/tests/variabletests.h @@ -20,7 +20,7 @@ #ifndef KOMACROTEST_VARIABLETESTS_H #define KOMACROTEST_VARIABLETESTS_H -#include +#include namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index 90454d354..9627a00b5 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/xmlhandlertests.h b/kexi/plugins/macros/tests/xmlhandlertests.h index 12d2d0570..521f9ee5b 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.h +++ b/kexi/plugins/macros/tests/xmlhandlertests.h @@ -19,7 +19,7 @@ #ifndef KOMACROTEST_XMLHandlerTests_H #define KOMACROTEST_XMLHandlerTests_H -#include +#include #include "../lib/macro.h" namespace KoMacroTest { diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp index f32416c03..cc38c0774 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include using namespace KUnitTest; diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.h b/kexi/plugins/macros/tests/xmlhandlertests2.h index 49431b735..376d7b082 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.h +++ b/kexi/plugins/macros/tests/xmlhandlertests2.h @@ -19,7 +19,7 @@ #ifndef KOMACROTEST_XMLHandlerTests2_H #define KOMACROTEST_XMLHandlerTests2_H -#include +#include #include "../lib/macro.h" namespace KoMacroTest { diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am index 2d92873d5..525b59256 100644 --- a/kexi/plugins/migration/Makefile.am +++ b/kexi/plugins/migration/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_migration.la kexihandler_migration_la_SOURCES = keximigrationpart.cpp -kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ ../../migration/libkeximigrate.la \ ../../../kexi/kexidb/libkexidb.la \ diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am index 5dbb14f6c..48328f08d 100644 --- a/kexi/plugins/queries/Makefile.am +++ b/kexi/plugins/queries/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_query.la kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \ kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \ kexiqueryview.cpp -kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am index 779b47e33..f39f43b31 100644 --- a/kexi/plugins/relations/Makefile.am +++ b/kexi/plugins/relations/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kexihandler_relation.la kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \ kexirelationmaindlg.cpp -kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \ ../../widget/relations/libkexirelationsview.la \ ../../../kexi/kexidb/libkexidb.la \ diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am index 6b857e741..79fadf347 100644 --- a/kexi/plugins/scripting/kexiscripting/Makefile.am +++ b/kexi/plugins/scripting/kexiscripting/Makefile.am @@ -7,7 +7,7 @@ kexihandler_script_la_SOURCES = \ kexihandler_script_la_LDFLAGS = \ $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \ - -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts + -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \ $(top_builddir)/lib/kross/main/libkrossmain.la \ diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 088205222..110000aa0 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -25,9 +25,9 @@ #include #include -//#include +//#include //#include -//#include +//#include //#include #include diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am index eb3883973..4fdedb340 100644 --- a/kexi/plugins/tables/Makefile.am +++ b/kexi/plugins/tables/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_table.la kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \ kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp -kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkmdi +kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdemdi kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am index 6f3d47df8..4de0b3967 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) -lktexteditor +kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am index 85eeab327..75b0c615f 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) -lktexteditor +kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/tests/newapi/mysqlcursortest_expectedoutput b/kexi/tests/newapi/mysqlcursortest_expectedoutput index 2bd29b7a7..dbdfef2d9 100644 --- a/kexi/tests/newapi/mysqlcursortest_expectedoutput +++ b/kexi/tests/newapi/mysqlcursortest_expectedoutput @@ -1,6 +1,6 @@ KexiDB: DriverManagerInternal::incRefCount(): 1 kio (KTrader): KServiceTypeProfile::offers( Kexi/DBDriver, ) -kio (KSycoca): Trying to open ksycoca from /var/tmp/tdecache-jowenn/ksycoca +kio (KSycoca): Trying to open tdesycoca from /var/tmp/tdecache-jowenn/tdesycoca kio (KTrader): Returning 2 offers KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: mySQL(kexidb_mysqldriver) KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: SQLite(kexidb_sqlitedriver) diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am index bfdd4f6ba..6c15c5cde 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) -lktexteditor +kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/kexi/widget/Makefile.am b/kexi/widget/Makefile.am index 70c752032..9d4856fdb 100644 --- a/kexi/widget/Makefile.am +++ b/kexi/widget/Makefile.am @@ -15,7 +15,7 @@ libkexiextendedwidgets_la_SOURCES = kexidataawareview.cpp \ kexiprjtypeselectorbase.ui kexiprjtypeselector.cpp libkexiextendedwidgets_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -lktexteditor +libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -ltdetexteditor SUBDIRS = utils tableview . relations diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 121ee8ddf..05115b699 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -34,15 +34,15 @@ #ifdef KTEXTEDIT_BASED_SQL_EDITOR # include #else -# include -# include -# include -# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif /** Used for the shared action framework to redirect shared actions like diff --git a/kformula/Makefile.am b/kformula/Makefile.am index fa49a753b..1fdb41b4a 100644 --- a/kformula/Makefile.am +++ b/kformula/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libkformulapart.la libkformulapart_la_SOURCES = kformula_doc.cc \ kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \ kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc -libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts +libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio $(KDE_PLUGIN) -lDCOP -ltdeparts libkformulapart_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIB_KOTEXT) libkformulapart_la_METASOURCES = AUTO diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 35b32e569..ad378bf0b 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -64,7 +64,7 @@ #include #include -#include +#include #include #include #include diff --git a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp index a70227c1a..4379c199f 100644 --- a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp @@ -19,8 +19,8 @@ #include #include "kivio_plugin_stencil_spawner.h" -#include -#include +#include +#include #include "kiviostencilfactory.h" #include "kivio_intra_stencil_data.h" #include "kivio_common.h" diff --git a/kivio/kiviopart/tools/kivio_plugin.h b/kivio/kiviopart/tools/kivio_plugin.h index 3acb7287e..430d08d6a 100644 --- a/kivio/kiviopart/tools/kivio_plugin.h +++ b/kivio/kiviopart/tools/kivio_plugin.h @@ -19,7 +19,7 @@ #ifndef KIVIO_PLUGIN_H #define KIVIO_PLUGIN_H -#include +#include #include #include diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.cpp b/kivio/kiviopart/tools/kivio_pluginmanager.cpp index 9b99904e5..b631bedf3 100644 --- a/kivio/kiviopart/tools/kivio_pluginmanager.cpp +++ b/kivio/kiviopart/tools/kivio_pluginmanager.cpp @@ -19,7 +19,7 @@ #include "kivio_pluginmanager.h" #include -#include +#include #include "kivio_plugin.h" diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am index d5ca3fe27..7384a9185 100644 --- a/kivio/plugins/kivioconnectortool/Makefile.am +++ b/kivio/plugins/kivioconnectortool/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = \ kivio_connector_cursor2.xpm\ kivio_connector_cursor1.xpm -libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioconnectortool.rc diff --git a/kivio/plugins/kivioselecttool/Makefile.am b/kivio/plugins/kivioselecttool/Makefile.am index 3cbe78a84..74619bc98 100644 --- a/kivio/plugins/kivioselecttool/Makefile.am +++ b/kivio/plugins/kivioselecttool/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ tool_select.cpp\ tool_select.h\ kivioselecttool.rc -libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkivioselecttool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioselecttool.rc diff --git a/kivio/plugins/kiviotargettool/Makefile.am b/kivio/plugins/kiviotargettool/Makefile.am index 888b11fcc..d37a86598 100644 --- a/kivio/plugins/kiviotargettool/Makefile.am +++ b/kivio/plugins/kiviotargettool/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \ METASOURCES = AUTO kde_module_LTLIBRARIES = libkiviotargettool.la -libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkiviotargettool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp diff --git a/kivio/plugins/kiviotexttool/Makefile.am b/kivio/plugins/kiviotexttool/Makefile.am index 8b3183fdd..7d4983cfb 100644 --- a/kivio/plugins/kiviotexttool/Makefile.am +++ b/kivio/plugins/kiviotexttool/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = \ kivio_text_cursor.xpm\ Text.sml\ Text.xpm -libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviotexttool.rc diff --git a/kivio/plugins/kiviozoomtool/Makefile.am b/kivio/plugins/kiviozoomtool/Makefile.am index 5ff1c2238..6ddc6713a 100644 --- a/kivio/plugins/kiviozoomtool/Makefile.am +++ b/kivio/plugins/kiviozoomtool/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ kiviozoomtool.rc\ tool_zoom.cpp\ tool_zoom.h -libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkiviozoomtool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviozoomtool.rc diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 0cd40399a..3c8640eed 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kounavail/Makefile.am b/kounavail/Makefile.am index d79392ec8..031f7edfe 100644 --- a/kounavail/Makefile.am +++ b/kounavail/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) ## The part kde_module_LTLIBRARIES = libkounavailpart.la libkounavailpart_la_SOURCES = kounavail.cc -libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkounavailpart_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kplato/Makefile.am b/kplato/Makefile.am index 865920a41..d421804fd 100644 --- a/kplato/Makefile.am +++ b/kplato/Makefile.am @@ -34,7 +34,7 @@ libkplatopart_la_SOURCES = \ kptcanvasitem.cc kptprojectdialogbase.ui \ resourcespanelbase.ui \ kptresourceview.cc \ - kpttaskresourcespanelbase.ui kptrequestresourcespanel.cc \ + kpttastderesourcespanelbase.ui kptrequestresourcespanel.cc \ resourcedialogbase.ui kptresourcedialog.cc \ kpttaskgeneralpanelbase.ui \ kpttasknotespanelbase.ui \ @@ -102,7 +102,7 @@ noinst_HEADERS = \ ## The part lib_LTLIBRARIES = kde_module_LTLIBRARIES = libkplatopart.la -libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -ltdeprint +libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeprint libkplatopart_la_LIBADD = $(LIB_KABC) $(KOFFICE_LIBS) -lDCOP \ $(top_builddir)/kdgantt/libkdgantt.la ## $(top_builddir)/kugar/lib/libkugarlib.la @@ -113,7 +113,7 @@ libkplatopart_la_METASOURCES = AUTO tdeinit_LTLIBRARIES = kplato.la bin_PROGRAMS = kplato_la_SOURCES = main.cc -kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -ltdeprint +kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeprint kplato_la_LIBADD = $(KOFFICE_LIBS) xdg_apps_DATA = kplato.desktop diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index efa57f2e1..04274dce2 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include namespace KPlato diff --git a/kplato/kptrequestresourcespanel.h b/kplato/kptrequestresourcespanel.h index 86e7dc65a..973c82424 100644 --- a/kplato/kptrequestresourcespanel.h +++ b/kplato/kptrequestresourcespanel.h @@ -20,7 +20,7 @@ #ifndef KPTREQUESTRESOURCESPANEL_H #define KPTREQUESTRESOURCESPANEL_H -#include "kpttaskresourcespanelbase.h" +#include "kpttastderesourcespanelbase.h" #include "kptduration.h" #include diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttastderesourcespanelbase.ui similarity index 99% rename from kplato/kpttaskresourcespanelbase.ui rename to kplato/kpttastderesourcespanelbase.ui index 934448942..5d2b82b0a 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttastderesourcespanelbase.ui @@ -105,7 +105,7 @@ - kpttaskresourcespanelbase.ui.h + kpttastderesourcespanelbase.ui.h diff --git a/kplato/kpttaskresourcespanelbase.ui.h b/kplato/kpttastderesourcespanelbase.ui.h similarity index 100% rename from kplato/kpttaskresourcespanelbase.ui.h rename to kplato/kpttastderesourcespanelbase.ui.h diff --git a/kplato/tests/CalendarTester.cpp b/kplato/tests/CalendarTester.cpp index bf0f299f5..d5a3956b7 100644 --- a/kplato/tests/CalendarTester.cpp +++ b/kplato/tests/CalendarTester.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_CalendarTester, "Calendar Tester"); +KUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester"); KUNITTEST_MODULE_REGISTER_TESTER(CalendarTester); void CalendarTester::allTests() { diff --git a/kplato/tests/CalendarTester.h b/kplato/tests/CalendarTester.h index d9f422e3d..970dbd135 100644 --- a/kplato/tests/CalendarTester.h +++ b/kplato/tests/CalendarTester.h @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include class KoXmlWriter; diff --git a/kplato/tests/DateTimeTester.cpp b/kplato/tests/DateTimeTester.cpp index c1c18de91..e3558a326 100644 --- a/kplato/tests/DateTimeTester.cpp +++ b/kplato/tests/DateTimeTester.cpp @@ -19,14 +19,14 @@ #include "DateTimeTester.h" #include #include -#include -#include +#include +#include #include using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_DateTimeTester, "DateTime Tester"); +KUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester"); KUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester); void DateTimeTester::allTests() { diff --git a/kplato/tests/DateTimeTester.h b/kplato/tests/DateTimeTester.h index aac3e13d0..3653cecc3 100644 --- a/kplato/tests/DateTimeTester.h +++ b/kplato/tests/DateTimeTester.h @@ -20,7 +20,7 @@ #ifndef DATETIMETESTER_H #define DATETIMETESTER_H -#include +#include #include class KoXmlWriter; diff --git a/kplato/tests/DurationTester.cpp b/kplato/tests/DurationTester.cpp index 2d84986d2..b6ac6d725 100644 --- a/kplato/tests/DurationTester.cpp +++ b/kplato/tests/DurationTester.cpp @@ -18,12 +18,12 @@ */ #include "DurationTester.h" #include -#include -#include +#include +#include using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_DurationTester, "Duration Tester"); +KUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester"); KUNITTEST_MODULE_REGISTER_TESTER(DurationTester); void DurationTester::allTests() { diff --git a/kplato/tests/DurationTester.h b/kplato/tests/DurationTester.h index bdcc48667..13781bed9 100644 --- a/kplato/tests/DurationTester.h +++ b/kplato/tests/DurationTester.h @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include class KoXmlWriter; diff --git a/kplato/tests/Makefile.am b/kplato/tests/Makefile.am index e9b7ec22d..6bb02e104 100644 --- a/kplato/tests/Makefile.am +++ b/kplato/tests/Makefile.am @@ -4,26 +4,26 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_DateTimeTester.la \ - kunittest_DurationTester.la \ - kunittest_CalendarTester.la +check_LTLIBRARIES = tdeunittest_DateTimeTester.la \ + tdeunittest_DurationTester.la \ + tdeunittest_CalendarTester.la -kunittest_DateTimeTester_la_SOURCES = DateTimeTester.cpp -kunittest_DateTimeTester_la_LIBADD = -lkunittest ../libkplatopart.la -kunittest_DateTimeTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_DateTimeTester_la_SOURCES = DateTimeTester.cpp +tdeunittest_DateTimeTester_la_LIBADD = -ltdeunittest ../libkplatopart.la +tdeunittest_DateTimeTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_DurationTester_la_SOURCES = DurationTester.cpp -kunittest_DurationTester_la_LIBADD = -lkunittest ../libkplatopart.la -kunittest_DurationTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_DurationTester_la_SOURCES = DurationTester.cpp +tdeunittest_DurationTester_la_LIBADD = -ltdeunittest ../libkplatopart.la +tdeunittest_DurationTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_CalendarTester_la_SOURCES = CalendarTester.cpp -kunittest_CalendarTester_la_LIBADD = -lkunittest ../libkplatopart.la -kunittest_CalendarTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_CalendarTester_la_SOURCES = CalendarTester.cpp +tdeunittest_CalendarTester_la_LIBADD = -ltdeunittest ../libkplatopart.la +tdeunittest_CalendarTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_DateTimeTester.la \ - kunittest_DurationTester.la \ - kunittest_CalendarTester.la +check-local: tdeunittest_DateTimeTester.la \ + tdeunittest_DurationTester.la \ + tdeunittest_CalendarTester.la check: - kunittestmodrunner + tdeunittestmodrunner diff --git a/kpresenter/CHANGES b/kpresenter/CHANGES index 651081cf6..53c0ab750 100644 --- a/kpresenter/CHANGES +++ b/kpresenter/CHANGES @@ -39,7 +39,7 @@ Changes: was and no longer on top. - If a page is shown more than once during a presentation add the time for the duration instead of showing only the last duration. -- Use kspell2 +- Use tdespell2 - Now PresSpeed is into each page - Now PageUp/PageDown during presentation go to beginning of the next/previous slide - Each object effect can have it's own speed now diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp index add16a4b1..b48d5b432 100644 --- a/kpresenter/KPrBgSpellCheck.cpp +++ b/kpresenter/KPrBgSpellCheck.cpp @@ -27,7 +27,7 @@ #include "KoTextIterator.h" #include "KoTextObject.h" -#include +#include using namespace KSpell2; #include diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index f14cad8de..dff09c73b 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 731759d9d..5ef69958a 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -74,9 +74,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace KSpell2; KPrConfig::KPrConfig( KPrView* parent ) diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index c08ab6922..4a8083a95 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -90,7 +90,7 @@ #include #include "KPrDocumentIface.h" -#include +#include #include #include diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index ed66b54ae..f84bc3d8b 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -313,7 +313,7 @@ class KPrDocument : public KoDocument } /** - * get custom kspell config + * get custom tdespell config */ bool showStatusBar() const { return m_bShowStatusBar;} diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index 42054ded4..4f1b1afcb 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -26,7 +26,7 @@ #include #include #include "KoOasisContext.h" -#include +#include #include #include diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 9a3d3a01d..6ae9bec00 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 907aaf438..a59b7a1a5 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -82,7 +82,7 @@ #include #include #include -#include +#include #include #include #include @@ -126,7 +126,7 @@ #include #include -#include +#include #include #include "KPrTextDocument.h" @@ -153,9 +153,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "KoSpell.h" #include "KPrPrinterDlg.h" using namespace KSpell2; diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index f1e26d1f3..8c199bad2 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -97,7 +97,7 @@ class KoTextIterator; class KStatusBarLabel; class KoSpell; -#include +#include namespace KSpell2 { class Dialog; } diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am index e24036b2f..b46c71982 100644 --- a/kpresenter/Makefile.am +++ b/kpresenter/Makefile.am @@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \ slidetransitionwidget.ui KPrSlideTransitionDia.cpp \ KPrPrinterDlg.cpp -libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts $(LIBKSPELL2) +libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts $(LIBKSPELL2) if include_ARTS ARTSKDE = -lartskde endif @@ -77,14 +77,14 @@ libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KO ## The part kde_module_LTLIBRARIES = libkpresenterpart.la libkpresenterpart_la_SOURCES = KPrFactoryInit.cpp -libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkpresenterpart_la_LIBADD = libkpresenterprivate.la ## The tdeinit loadable module and the executable tdeinit_LTLIBRARIES = kpresenter.la bin_PROGRAMS = kpresenter_la_SOURCES = main.cpp -kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kpresenter_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kpresenter/scripts/mkstandalone.sh b/kpresenter/scripts/mkstandalone.sh index fa99fe69d..be7314ca6 100755 --- a/kpresenter/scripts/mkstandalone.sh +++ b/kpresenter/scripts/mkstandalone.sh @@ -71,7 +71,7 @@ else mkdir -p $out/bin cp $TDEDIR/bin/kpresenter $out/bin/ cp $TDEDIR/bin/dcopserver $out/bin/ - # Take kded as well - we could copy the ksycoca file but we would have + # Take kded as well - we could copy the tdesycoca file but we would have # to install it in ~/.trinity ... cp $TDEDIR/bin/kded $out/bin/ diff --git a/kspread/Makefile.am b/kspread/Makefile.am index d65764f92..3ba5c1177 100644 --- a/kspread/Makefile.am +++ b/kspread/Makefile.am @@ -28,12 +28,12 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ kspread_generalProperty.cpp kspread_propertyEditor.cpp -libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkutils +libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeutils libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ dialogs/libdialogs.la tests/libtests.la \ - $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell + $(LIB_KOFFICEUI) $(LIB_KOTEXT) -ltdespell -libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkspreadpart_la_LIBADD = libkspreadcommon.la libkspreadpart_la_SOURCES = kspread_factory_init.cc @@ -44,7 +44,7 @@ METASOURCES = AUTO tdeinit_LTLIBRARIES = kspread.la bin_PROGRAMS = kspread_la_SOURCES = main.cc -kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kspread_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kspread.desktop diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 4895cac2a..a64f2d69a 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 51d561cdf..780dd5af8 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index ad28bb78a..f3c78e9fc 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -1459,17 +1459,17 @@ MethodOfCalc Doc::getTypeOfCalc() const return d->calcMethod; } -void Doc::setKSpellConfig(KSpellConfig _kspell) +void Doc::setKSpellConfig(KSpellConfig _tdespell) { if (d->spellConfig == 0 ) d->spellConfig = new KSpellConfig(); - d->spellConfig->setNoRootAffix(_kspell.noRootAffix ()); - d->spellConfig->setRunTogether(_kspell.runTogether ()); - d->spellConfig->setDictionary(_kspell.dictionary ()); - d->spellConfig->setDictFromList(_kspell.dictFromList()); - d->spellConfig->setEncoding(_kspell.encoding()); - d->spellConfig->setClient(_kspell.client()); + d->spellConfig->setNoRootAffix(_tdespell.noRootAffix ()); + d->spellConfig->setRunTogether(_tdespell.runTogether ()); + d->spellConfig->setDictionary(_tdespell.dictionary ()); + d->spellConfig->setDictFromList(_tdespell.dictFromList()); + d->spellConfig->setEncoding(_tdespell.encoding()); + d->spellConfig->setClient(_tdespell.client()); } KSpellConfig * Doc::getKSpellConfig() diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h index e04552785..40a6e48c7 100644 --- a/kspread/kspread_doc.h +++ b/kspread/kspread_doc.h @@ -391,9 +391,9 @@ public: /** - * get custom kspell config + * get custom tdespell config */ - void setKSpellConfig(KSpellConfig _kspell); + void setKSpellConfig(KSpellConfig _tdespell); KSpellConfig * getKSpellConfig(); bool dontCheckUpperWord() const; diff --git a/kspread/kspread_events.h b/kspread/kspread_events.h index 1a240fdb8..b89fa98e8 100644 --- a/kspread/kspread_events.h +++ b/kspread/kspread_events.h @@ -7,7 +7,7 @@ #include -#include +#include #include #include "region.h" diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc index 8c273700c..2a3bffb0e 100644 --- a/kspread/kspread_object.cc +++ b/kspread/kspread_object.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index a76bd3d89..664edf4e9 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -62,13 +62,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -246,7 +246,7 @@ public: // spell-check context struct { - KSpell * kspell; + KSpell * tdespell; Sheet * firstSpellSheet; Sheet * currentSpellSheet; Cell * currentCell; @@ -1774,7 +1774,7 @@ View::View( TQWidget *_parent, const char *_name, d->searchInSheets.firstSheet = 0; // spell-check context - d->spell.kspell = 0; + d->spell.tdespell = 0; d->spell.macroCmdSpellCheck = 0; d->spell.firstSpellSheet = 0; d->spell.currentSpellSheet = 0; @@ -1873,7 +1873,7 @@ View::~View() }*/ - delete d->spell.kspell; + delete d->spell.tdespell; d->canvas->endChoose(); d->activeSheet = 0; // set the active sheet to 0L so that when during destruction @@ -2248,7 +2248,7 @@ void View::recalcWorkSheet() void View::extraSpelling() { - if ( d->spell.kspell ) + if ( d->spell.tdespell ) return; // Already in progress if (d->activeSheet == 0L) @@ -2296,33 +2296,33 @@ void View::startKSpell() doc()->getKSpellConfig()->setReplaceAllList( d->spell.replaceAll ); } - d->spell.kspell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), + d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( spellCheckerReady() ), doc()->getKSpellConfig() ); - d->spell.kspell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); - d->spell.kspell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); + d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); + d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( death() ), + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( misspelling( const TQString &, + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int) ), this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( corrected( const TQString &, + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int) ), this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( done( const TQString & ) ), + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( spellCheckerDone( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( ignoreall (const TQString & ) ), + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); + TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); } @@ -2354,7 +2354,7 @@ void View::spellCheckerReady() // check text only if ( d->spell.currentCell->value().isString() ) { - d->spell.kspell->check( d->spell.currentCell->text(), true ); + d->spell.tdespell->check( d->spell.currentCell->text(), true ); return; } @@ -2397,7 +2397,7 @@ void View::spellCheckerReady() d->spell.spellCurrCellX = x; d->spell.spellCurrCellY = y; - d->spell.kspell->check( cell->text(), true ); + d->spell.tdespell->check( cell->text(), true ); return; } @@ -2426,9 +2426,9 @@ void View::spellCleanup() if ( d->canvas ) d->canvas->setCursor( ArrowCursor ); - d->spell.kspell->cleanUp(); - delete d->spell.kspell; - d->spell.kspell = 0L; + d->spell.tdespell->cleanUp(); + delete d->spell.tdespell; + d->spell.tdespell = 0L; d->spell.firstSpellSheet = 0L; d->spell.currentSpellSheet = 0L; d->spell.currentCell = 0L; @@ -2548,11 +2548,11 @@ void View::spellCheckerCorrected( const TQString & old, const TQString & corr, void View::spellCheckerDone( const TQString & ) { - int result = d->spell.kspell->dlgResult(); + int result = d->spell.tdespell->dlgResult(); - d->spell.kspell->cleanUp(); - delete d->spell.kspell; - d->spell.kspell = 0L; + d->spell.tdespell->cleanUp(); + delete d->spell.tdespell; + d->spell.tdespell = 0L; if ( result != KS_CANCEL && result != KS_STOP ) { @@ -2591,19 +2591,19 @@ void View::spellCheckerFinished() if (d->canvas) d->canvas->setCursor( ArrowCursor ); - KSpell::spellStatus status = d->spell.kspell->status(); - d->spell.kspell->cleanUp(); - delete d->spell.kspell; - d->spell.kspell = 0L; + KSpell::spellStatus status = d->spell.tdespell->status(); + d->spell.tdespell->cleanUp(); + delete d->spell.tdespell; + d->spell.tdespell = 0L; d->spell.replaceAll.clear(); - bool kspellNotConfigured=false; + bool tdespellNotConfigured=false; if (status == KSpell::Error) { KMessageBox::sorry(this, i18n("ISpell could not be started.\n" "Please make sure you have ISpell properly configured and in your PATH.")); - kspellNotConfigured=true; + tdespellNotConfigured=true; } else if (status == KSpell::Crashed) { @@ -2617,7 +2617,7 @@ void View::spellCheckerFinished() d->spell.macroCmdSpellCheck=0L; - if (kspellNotConfigured) + if (tdespellNotConfigured) { PreferenceDialog configDlg( this, 0 ); configDlg.openPage( PreferenceDialog::KS_SPELLING); diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h index f44a1a01d..dd4d456fc 100644 --- a/kspread/plugins/calculator/main.h +++ b/kspread/plugins/calculator/main.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h index b8f681837..0dde5dba4 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h @@ -25,7 +25,7 @@ #ifndef KSPREAD_PLUGININSERTCALENDAR_H #define KSPREAD_PLUGININSERTCALENDAR_H -#include +#include #include diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index dc1e7ff20..1f490468e 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h kspreadscripting_la_METASOURCES = AUTO -kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la kde_services_DATA = kspreadscripting.desktop diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index c9f1f55c0..fcd552f05 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts krosskspreadcore_la_LIBADD = \ $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_QT) \ diff --git a/kspread/plugins/scripting/scripting.h b/kspread/plugins/scripting/scripting.h index 29fa66814..52ffadd16 100644 --- a/kspread/plugins/scripting/scripting.h +++ b/kspread/plugins/scripting/scripting.h @@ -22,7 +22,7 @@ #ifndef SCRIPTING_H #define SCRIPTING_H -#include +#include #include namespace Kross { diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am index 753db18f7..951de07b0 100644 --- a/kugar/kudesigner/Makefile.am +++ b/kugar/kudesigner/Makefile.am @@ -8,19 +8,19 @@ bin_PROGRAMS = 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 -lkio -lkparts +libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(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 -lkio -lkparts +libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) ## The tdeinit loadable module tdeinit_LTLIBRARIES = kudesigner.la kudesigner_la_SOURCES = main.cpp -kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kudesigner_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kudesigner.desktop diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 0e7355b2f..8e85bae62 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -21,7 +21,7 @@ #include "kudesigner_view.h" #include -#include +#include #include #include #include diff --git a/kugar/kudesigner/kudesigner_view.h b/kugar/kudesigner/kudesigner_view.h index 139bdec84..387996f55 100644 --- a/kugar/kudesigner/kudesigner_view.h +++ b/kugar/kudesigner/kudesigner_view.h @@ -20,7 +20,7 @@ #define KUDESIGNER_VIEW_H #include -#include +#include #include diff --git a/kword/CHANGES b/kword/CHANGES index 2b974a22d..d39ef9f31 100644 --- a/kword/CHANGES +++ b/kword/CHANGES @@ -40,7 +40,7 @@ Changes after KWord-1.3 - Reorganized and simplified GUI of the configuration dialog - Support for "protect content" in all types of framesets - Support for different run-around-gaps on every side of the frame -- Use kspell2 +- Use tdespell2 - Copy/paste between kword/kpresenter - Add statistic variable diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp index e1f0cf8ed..53e74d028 100644 --- a/kword/KWBgSpellCheck.cpp +++ b/kword/KWBgSpellCheck.cpp @@ -27,7 +27,7 @@ #include "KoTextIterator.h" #include "KoTextObject.h" -#include +#include using namespace KSpell2; #include diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 7dc7b96a2..3bf00e2bd 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -1516,7 +1516,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e ) } else if ( KURLDrag::canDecode( e ) ) { // TODO ask (with a popupmenu) between inserting a link and inserting the contents - // TODO fix khtml to export images when dragging an image+link (as it does when using "Copy") + // TODO fix tdehtml to export images when dragging an image+link (as it does when using "Copy") KURL::List lst; KURLDrag::decode( e, lst ); @@ -1590,7 +1590,7 @@ void KWCanvas::doAutoScroll() return; } - // This code comes from khtml + // This code comes from tdehtml TQPoint pos( mapFromGlobal( TQCursor::pos() ) ); pos = TQPoint(pos.x() - viewport()->x(), pos.y() - viewport()->y()); diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 5959d39da..e7aaff949 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -54,9 +54,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace KSpell2; #include diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 01236753e..ece87a9a9 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -76,13 +76,13 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 4197b9039..0b7f6c645 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -100,7 +100,7 @@ #include #include -#include +#include #include #include #include @@ -109,7 +109,7 @@ #include #include #include -#include +#include #include #include #include @@ -131,8 +131,8 @@ #include -#include -#include +#include +#include #include "KoSpell.h" using namespace KSpell2; diff --git a/kword/KWView.h b/kword/KWView.h index 117dafdb9..70d921aa3 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -82,7 +82,7 @@ class KFontAction; class TQResizeEvent; class TQSplitter; -#include +#include namespace KSpell2 { class Dialog; } diff --git a/kword/KWordPartFrameSetIface.cpp b/kword/KWordPartFrameSetIface.cpp index fa2acefe5..ea88e8bb6 100644 --- a/kword/KWordPartFrameSetIface.cpp +++ b/kword/KWordPartFrameSetIface.cpp @@ -24,7 +24,7 @@ #include "KWCanvas.h" #include -#include +#include #include KWordPartFrameSetIface::KWordPartFrameSetIface( KWPartFrameSet *fs ) diff --git a/kword/Makefile.am b/kword/Makefile.am index 1b89a714a..58f3bf4c3 100644 --- a/kword/Makefile.am +++ b/kword/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la ## The part libkwordpart_la_SOURCES = KWFactoryInit.cpp -libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la ## A lib with all the code @@ -54,14 +54,14 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm KWLoadingInfo.cpp -libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts $(LIBKSPELL2) +libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts $(LIBKSPELL2) libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la METASOURCES = AUTO ## The mailmerge interface library libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel -libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP twincludedir = $(includedir)/kword twinclude_HEADERS = KWMailMergeDataSource.h @@ -73,7 +73,7 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir) tdeinit_LTLIBRARIES = kword.la bin_PROGRAMS = kword_la_SOURCES = main.cpp -kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kword_la_LIBADD = $(KOFFICE_LIBS) xdg_apps_DATA = kword.desktop diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd index c9e7fb034..c766448a3 100644 --- a/kword/demos/framestest.kwd +++ b/kword/demos/framestest.kwd @@ -279,7 +279,7 @@ - kparts: found Plugin ::(formatting): KWTextFrameSet::formatMore finished + tdeparts: found Plugin ::(formatting): KWTextFrameSet::formatMore finished diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am index ccc86c55e..4f4e1cb80 100644 --- a/kword/mailmerge/Makefile.am +++ b/kword/mailmerge/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la ## Plugin encapsulating the (old) internally stored style kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp -kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT) METASOURCES = AUTO diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am index d5a8535a2..95b126b1c 100644 --- a/kword/mailmerge/kabc/Makefile.am +++ b/kword/mailmerge/kabc/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui -kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KABC) METASOURCES = AUTO diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am index 04bb0b156..651077070 100644 --- a/kword/mailmerge/kspread/Makefile.am +++ b/kword/mailmerge/kspread/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \ kde_module_LTLIBRARIES = kwmailmerge_kspread.la kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp -kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \ $(top_builddir)/kspread/libkspreadcommon.la $(LIB_TDEUI) diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am index 082ddc389..effde7382 100644 --- a/kword/mailmerge/sql/Makefile.am +++ b/kword/mailmerge/sql/Makefile.am @@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \ KWQtSqlEasyFilter.cpp -kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI) kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h ## 2. Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel -kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI) kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp index 9486f05dd..808487168 100644 --- a/kword/tests/FrameTester.cpp +++ b/kword/tests/FrameTester.cpp @@ -19,13 +19,13 @@ #include #include #include -#include -#include +#include +#include #include using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_FrameTester, "Frame Tester"); +KUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester); void KWFrameTester::allTests() { diff --git a/kword/tests/FrameTester.h b/kword/tests/FrameTester.h index 5f9432f92..2861200a8 100644 --- a/kword/tests/FrameTester.h +++ b/kword/tests/FrameTester.h @@ -15,7 +15,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp index e3444bd5b..e438188df 100644 --- a/kword/tests/FrameViewTester.cpp +++ b/kword/tests/FrameViewTester.cpp @@ -15,8 +15,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include "FrameViewTester.h" @@ -30,7 +30,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_FrameViewTester, "FrameView Tester"); +KUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester); void KWFrameViewTester::allTests() { diff --git a/kword/tests/FrameViewTester.h b/kword/tests/FrameViewTester.h index dceb3835e..beff23960 100644 --- a/kword/tests/FrameViewTester.h +++ b/kword/tests/FrameViewTester.h @@ -15,7 +15,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include +#include class KWFrameViewTester : public KUnitTest::Tester { public: diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp index 9b261d90b..98a82233c 100644 --- a/kword/tests/KWPageManagerTester.cpp +++ b/kword/tests/KWPageManagerTester.cpp @@ -15,8 +15,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include "KWPageManagerTester.h" @@ -26,7 +26,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_KWPageManagerTester, "PageManager Tester"); +KUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester); void KWPageManagerTester::allTests() { diff --git a/kword/tests/KWPageManagerTester.h b/kword/tests/KWPageManagerTester.h index 2136bdc44..3b52bf5e3 100644 --- a/kword/tests/KWPageManagerTester.h +++ b/kword/tests/KWPageManagerTester.h @@ -15,7 +15,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include +#include class KWPageManagerTester : public KUnitTest::Tester { public: diff --git a/kword/tests/Makefile.am b/kword/tests/Makefile.am index 5b316ce77..3a362b3bb 100644 --- a/kword/tests/Makefile.am +++ b/kword/tests/Makefile.am @@ -4,22 +4,22 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes) # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_KWPageManagerTester.la \ - kunittest_FrameTester.la \ - kunittest_FrameViewTester.la +check_LTLIBRARIES = tdeunittest_KWPageManagerTester.la \ + tdeunittest_FrameTester.la \ + tdeunittest_FrameViewTester.la -kunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp -kunittest_KWPageManagerTester_la_LIBADD = -lkunittest ../libkwordprivate.la -kunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp +tdeunittest_KWPageManagerTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la +tdeunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_FrameTester_la_SOURCES = FrameTester.cpp -kunittest_FrameTester_la_LIBADD = -lkunittest ../libkwordprivate.la -kunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_FrameTester_la_SOURCES = FrameTester.cpp +tdeunittest_FrameTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la +tdeunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp -kunittest_FrameViewTester_la_LIBADD = -lkunittest ../libkwordprivate.la -kunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp +tdeunittest_FrameViewTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la +tdeunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_KWPageManagerTester.la kunittest_FrameTester.la kunittest_FrameViewTester.la - kunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl +check-local: tdeunittest_KWPageManagerTester.la tdeunittest_FrameTester.la tdeunittest_FrameViewTester.la + tdeunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl diff --git a/lib/Makefile.am b/lib/Makefile.am index 4907df59e..6a0eab165 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,5 +24,5 @@ messages: # $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot # rm -f kformula/symbolnames.cc -DOXYGEN_REFERENCES = dcop kprint tdeui kparts +DOXYGEN_REFERENCES = dcop kprint tdeui tdeparts include ../admin/Doxyfile.am diff --git a/lib/kdoc.rules b/lib/kdoc.rules index ec43dc052..30a995afa 100644 --- a/lib/kdoc.rules +++ b/lib/kdoc.rules @@ -10,7 +10,7 @@ store_FILES = *.h store_LIBS = -ltdecore -lqt kofficecore_FILES = *.h -kofficecore_LIBS = -lkparts -ltdecore -lqt +kofficecore_LIBS = -ltdeparts -ltdecore -lqt kofficeui_FILES = *.h kofficeui_LIBS = -lkofficecore -ltdeui -ltdecore -lqt diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 8bc8f88cb..b3e9a7b6a 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4dc192b7d..4947506d1 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -27,7 +27,7 @@ namespace std { } using namespace std; #include -#include +#include #include #include #include diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index c71c76094..882ccadfc 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficecore/KoDocument_p.h b/lib/kofficecore/KoDocument_p.h index e3ab46cf2..a6437d3d4 100644 --- a/lib/kofficecore/KoDocument_p.h +++ b/lib/kofficecore/KoDocument_p.h @@ -19,7 +19,7 @@ #ifndef __koDocument_p_h__ #define __koDocument_p_h__ -#include +#include class KoDocument; diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h index db9e12ad4..212873158 100644 --- a/lib/kofficecore/KoFactory.h +++ b/lib/kofficecore/KoFactory.h @@ -20,7 +20,7 @@ #ifndef __koFactory_h__ #define __koFactory_h__ -#include +#include #include class TDEInstance; diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index f9b3930ef..b1262ce58 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index f06d2c46a..ccb258284 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -47,9 +47,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -567,7 +567,7 @@ bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url ) TQString mime = KMimeType::findByURL(url)->name(); if ( mime.isEmpty() || mime == KMimeType::defaultMimeType() ) mime = newdoc->nativeFormatMimeType(); - if ( url.isLocalFile() ) // workaround for kde<=3.3 kparts bug, fixed for 3.4 + if ( url.isLocalFile() ) // workaround for kde<=3.3 tdeparts bug, fixed for 3.4 newdoc->setFile(url.path()); newdoc->setMimeTypeAfterLoading( mime ); updateCaption(); diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 293d7722c..d7727025d 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -21,7 +21,7 @@ #ifndef __ko_main_window_h__ #define __ko_main_window_h__ -#include +#include #include #include #include "KoDocument.h" diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 7b1618c11..54699ca1a 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index c945d5a68..8f81e3237 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -73,7 +73,7 @@ public: KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const; /** - * This function will query ksycoca to find all available components. + * This function will query tdesycoca to find all available components. * The result will only contain parts, which are embeddable into a document * * @param _constr is a constraint expression as used by KTrader. diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 3688de4e8..7e4045a8e 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index 549296da1..a0113e072 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index ba3c3a9be..d266aaaae 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index cf2151206..2a9d1f5c0 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am index 22bacaa60..8bdfdbe13 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) -lktexteditor +propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor propertytest_LDADD = $(LIB_KOPROPERTY) # this is where the shell's XML-GUI resource file goes diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 604a62376..3df928a13 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -31,11 +31,11 @@ #include "KoTextDocument.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace KSpell2; #include diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h index 0872dee02..3cb2f35ba 100644 --- a/lib/kotext/KoBgSpellCheck.h +++ b/lib/kotext/KoBgSpellCheck.h @@ -20,7 +20,7 @@ #ifndef KOBGSPELLCHECK_H #define KOBGSPELLCHECK_H -#include +#include #include #include #include diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index 556a23211..a3e35b1d3 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -34,7 +34,7 @@ #include "KoFontDiaPreview.h" -#include +#include class TQComboBox; diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h index fbcbb5dfb..ea8f08b88 100644 --- a/lib/kotext/KoLanguageTab.h +++ b/lib/kotext/KoLanguageTab.h @@ -22,7 +22,7 @@ #include -#include +#include class KoLanguageTab : public KoLanguageTabBase { diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index d0361b4c4..2a9e5476c 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -26,8 +26,8 @@ #include "KoTextParag.h" #include "KoTextIterator.h" -#include -#include +#include +#include #include #include diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h index 2430bb691..685b7348e 100644 --- a/lib/kotext/KoSpell.h +++ b/lib/kotext/KoSpell.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include class KoTextIterator; class KoTextParag; diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index afd18909f..2ce575cad 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -44,7 +44,7 @@ //#define DEBUG_FORMATS //#define DEBUG_FORMAT_MORE -const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to kspell but still be saved (not space) +const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to tdespell but still be saved (not space) struct KoTextObject::KoTextObjectPrivate { diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am index bb55e8a18..160c689c3 100644 --- a/lib/kotext/Makefile.am +++ b/lib/kotext/Makefile.am @@ -23,7 +23,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \ libkotext_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -lkutils +libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -ltdeutils METASOURCES = AUTO diff --git a/lib/kotext/configure.in.bot b/lib/kotext/configure.in.bot index 509b061a9..6cc24b815 100644 --- a/lib/kotext/configure.in.bot +++ b/lib/kotext/configure.in.bot @@ -1,6 +1,6 @@ if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (tdespell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/lib/kotext/configure.in.in b/lib/kotext/configure.in.in index 2132a5cb0..c8f96e0a4 100644 --- a/lib/kotext/configure.in.in +++ b/lib/kotext/configure.in.in @@ -1,13 +1,13 @@ AC_LANG_SAVE AC_LANG_C dnl Check for aspell library - KDE_CHECK_HEADERS([kspell2/broker.h]) - if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then + KDE_CHECK_HEADERS([tdespell2/broker.h]) + if test "x$ac_cv_header_tdespell2_broker_h" = "xyes"; then dnl the header and the lib exist -> ok dnl this is for config.h - AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking]) - LIBKSPELL2="-lkspell2" - AC_MSG_RESULT([found in $ac_kspell2_includes]) + AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libtdespell2 for spell-checking]) + LIBKSPELL2="-ltdespell2" + AC_MSG_RESULT([found in $ac_tdespell2_includes]) else LIBKSPELL2="" AC_MSG_RESULT([not found -- spell-checking will be disabled]) diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am index 724b0257e..5302f0ef8 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) -lktexteditor +kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 7eac38815..72e5081ce 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -18,8 +18,8 @@ // KoUserStyle/KoUserStyleCollection test -#include -#include +#include +#include #include #include @@ -29,7 +29,7 @@ #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" -KUNITTEST_MODULE(kunittest_KoUserStyleTester, "KoUserStyle Tester"); +KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester); #undef COMPARE diff --git a/lib/kotext/tests/KoUserStyleTester.h b/lib/kotext/tests/KoUserStyleTester.h index c53b84153..4be17d4cb 100644 --- a/lib/kotext/tests/KoUserStyleTester.h +++ b/lib/kotext/tests/KoUserStyleTester.h @@ -19,7 +19,7 @@ #ifndef KOUSERSTYLETESTER_H #define KOUSERSTYLETESTER_H -#include +#include class KoUserStyleTester : public KUnitTest::SlotTester { Q_OBJECT diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index d5cf50a20..fd7754b26 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,17 +8,17 @@ 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) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp kovariabletest_SOURCES = kovariabletest.cpp -check_LTLIBRARIES = kunittest_KoUserStyleTester.la +check_LTLIBRARIES = tdeunittest_KoUserStyleTester.la -kunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp -kunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -lkunittest -kunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp +tdeunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -ltdeunittest +tdeunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) check-local: - kunittestmodrunner + tdeunittestmodrunner diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am index 1b2c9357f..b048c26e6 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) -lktexteditor +krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am index 09e51e747..37bee54fe 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) -lktexteditor +krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/plugins/scan/Makefile.am b/plugins/scan/Makefile.am index 0af404c96..84d816c89 100644 --- a/plugins/scan/Makefile.am +++ b/plugins/scan/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kofficescan.la kofficescan_la_SOURCES = scan.cpp noinst_HEADERS = scan.h -kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE) kofficescan_la_METASOURCES = AUTO diff --git a/plugins/scan/scan.h b/plugins/scan/scan.h index c872f6d34..29b100bee 100644 --- a/plugins/scan/scan.h +++ b/plugins/scan/scan.h @@ -20,7 +20,7 @@ #ifndef SCAN_H #define SCAN_H -#include +#include #include class KScanDialog; diff --git a/tools/Makefile.am b/tools/Makefile.am index d891a8362..91a9b7081 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = converter thumbnail thesaurus kthesaurus kfile-plugins quickprint -# Not ported to kspell2: spell. But do we really want a separate tool for this? +# Not ported to tdespell2: spell. But do we really want a separate tool for this? diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am index fe65dec11..4bebc4b31 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) -lktexteditor +koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la METASOURCES = AUTO diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am index 81e8a65ca..1242f21bc 100644 --- a/tools/kfile-plugins/abiword/Makefile.am +++ b/tools/kfile-plugins/abiword/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_abiword.h kde_module_LTLIBRARIES = kfile_abiword.la kfile_abiword_la_SOURCES = kfile_abiword.cpp -kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kfile_abiword_la_LIBADD = $(KOFFICE_LIBS) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am index c5d970424..85ca467be 100644 --- a/tools/kfile-plugins/gnumeric/Makefile.am +++ b/tools/kfile-plugins/gnumeric/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_gnumeric.h kde_module_LTLIBRARIES = kfile_gnumeric.la kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp -kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am index 6d81afa92..dfbd4080d 100644 --- a/tools/kfile-plugins/koffice/Makefile.am +++ b/tools/kfile-plugins/koffice/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_koffice.h kde_module_LTLIBRARIES = kfile_koffice.la kfile_koffice_la_SOURCES = kfile_koffice.cpp -kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kfile_koffice_la_LIBADD = $(KOFFICE_LIBS) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am index 1e47978f2..d72dd7051 100644 --- a/tools/kfile-plugins/ooo/Makefile.am +++ b/tools/kfile-plugins/ooo/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ooo.h kde_module_LTLIBRARIES = kfile_ooo.la kfile_ooo_la_SOURCES = kfile_ooo.cpp -kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kfile_ooo_la_LIBADD = $(KOFFICE_LIBS) # let automoc handle all of the meta source files (moc) diff --git a/tools/spell/Makefile.am b/tools/spell/Makefile.am index 80f2f78ac..7c90d34b9 100644 --- a/tools/spell/Makefile.am +++ b/tools/spell/Makefile.am @@ -1,24 +1,24 @@ -# This tool is disabled. Not useful and not ported to kspell2. +# This tool is disabled. Not useful and not ported to tdespell2. #INCLUDES = -I$(srcdir)/../../lib/kofficecore $(all_includes) -#libkspelltool_la_LIBADD = ../../lib/kofficecore/libkofficecore.la +#libtdespelltool_la_LIBADD = ../../lib/kofficecore/libkofficecore.la ####### Files -#kde_module_LTLIBRARIES = libkspelltool.la +#kde_module_LTLIBRARIES = libtdespelltool.la -#libkspelltool_la_SOURCES = main.cc +#libtdespelltool_la_SOURCES = main.cc -#libkspelltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined +#libtdespelltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined #noinst_HEADERS = main.h -#libkspelltool_la_METASOURCES = main.moc +#libtdespelltool_la_METASOURCES = main.moc -#service_DATA = kspelltool.desktop +#service_DATA = tdespelltool.desktop #servicedir = $(kde_servicesdir) install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir) - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kspelltool.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tdespelltool.desktop diff --git a/tools/spell/main.cc b/tools/spell/main.cc index 290d63020..6f152f032 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -37,7 +37,7 @@ * ***************************************************/ -K_EXPORT_COMPONENT_FACTORY( libkspelltool, KGenericFactory ) +K_EXPORT_COMPONENT_FACTORY( libtdespelltool, KGenericFactory ) /*************************************************** * @@ -107,7 +107,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat #endif } } -#if 0 //PORT to kspell2 +#if 0 //PORT to tdespell2 // Call the spell checker KOSpell::modalCheck( buffer, &kosconfig ); *((TQString*)data) = buffer; diff --git a/tools/spell/kspelltool.desktop b/tools/spell/tdespelltool.desktop similarity index 99% rename from tools/spell/kspelltool.desktop rename to tools/spell/tdespelltool.desktop index 676dc298b..8770c87af 100644 --- a/tools/spell/kspelltool.desktop +++ b/tools/spell/tdespelltool.desktop @@ -66,7 +66,7 @@ Name[xh]=Isixhobo Sokukhangela Upelo Name[zh_CN]=拼写检查工具 Name[zh_TW]=拼字檢查工具 Name[zu]=Ithuluzi Lokubhekisisa Kokubhalwa Kwamagama -X-TDE-Library=libkspelltool +X-TDE-Library=libtdespelltool Type=Service Commands=spellcheck Comment=Check this Word's Spelling diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am index cf41afd13..a98b6fe44 100644 --- a/tools/thumbnail/Makefile.am +++ b/tools/thumbnail/Makefile.am @@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la clipartthumbnail_la_SOURCES = clipartcreator.cpp clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection -clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kofficethumbnail_la_SOURCES = kofficecreator.cpp kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS) -kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts # otherofficethumbnail.desktop is currently not installed, as it gives too many problems kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp index 4e820eb1e..60eef551d 100644 --- a/tools/thumbnail/kofficecreator.cpp +++ b/tools/thumbnail/kofficecreator.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include "kofficecreator.h" #include diff --git a/tools/thumbnail/kofficecreator.h b/tools/thumbnail/kofficecreator.h index c6a274267..3188cff9e 100644 --- a/tools/thumbnail/kofficecreator.h +++ b/tools/thumbnail/kofficecreator.h @@ -21,7 +21,7 @@ #define _KWORDCREATOR_H_ "$Id: kofficecreator.h 508787 2006-02-12 18:28:12Z ingwa $" #include -#include +#include #include "../../lib/kofficecore/KoDocument.h" class KoDocument;