From 94844816550ad672ccfcdc25659c625546239998 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:11 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- chalk/HACKING | 2 +- chalk/IMAGE_LIBRARIES | 2 +- .../kis_basic_histogram_producers.cc | 12 +- .../kis_basic_histogram_producers.h | 2 +- .../kis_colorspace_factory_registry.cc | 4 +- chalk/chalkcolor/kis_profile.cc | 4 +- .../colorspaces/wet/kis_wet_palette_widget.cc | 6 +- chalk/colorspaces/wet/wet_plugin.cc | 2 +- chalk/colorspaces/wetsticky/ws/canvas.c | 24 +- chalk/colorspaces/wetsticky/ws/canvas.h | 4 +- chalk/colorspaces/wetsticky/ws/engine.c | 2 +- chalk/colorspaces/wetsticky/ws/engine3.c | 2 +- .../colorspaces/wetsticky/ws/ogl_interface.c | 2 +- chalk/colorspaces/wetsticky/ws/x_interface.c | 2 +- chalk/core/kis_brush.cc | 4 +- chalk/core/kis_convolution_painter.cc | 2 +- chalk/core/kis_exif_value.cc | 74 ++-- chalk/core/kis_fill_painter.cc | 8 +- chalk/core/kis_filter_registry.cc | 4 +- chalk/core/kis_gradient.cc | 2 +- chalk/core/kis_gradient_painter.cc | 28 +- chalk/core/kis_gradient_painter.h | 2 +- chalk/core/kis_group_layer.cc | 4 +- chalk/core/kis_group_layer.h | 2 +- chalk/core/kis_imagepipe_brush.cc | 2 +- chalk/core/kis_nameserver.cc | 2 +- chalk/core/kis_painter.cc | 2 +- chalk/core/kis_paintop_registry.cc | 4 +- chalk/core/kis_palette.cc | 2 +- chalk/core/kis_selection.cc | 2 +- chalk/doc/DESIGN.obsolete | 2 +- chalk/doc/background_paper.txt | 2 +- chalk/doc/chalk-features | 6 +- chalk/doc/chalk.xmi | 64 +-- chalk/doc/controller.xmi | 44 +-- chalk/doc/doc-outline | 4 +- chalk/doc/selections | 2 +- chalk/doc/the preview widget | 2 +- chalk/plugins/filters/blur/kis_blur_filter.cc | 6 +- chalk/plugins/filters/blur/kis_wdg_blur.cc | 4 +- chalk/plugins/filters/blur/wdgblur.ui | 10 +- chalk/plugins/filters/bumpmap/bumpmap.cc | 2 +- chalk/plugins/filters/bumpmap/wdgbumpmap.ui | 6 +- chalk/plugins/filters/cimg/CImg.h | 22 +- chalk/plugins/filters/cimg/kis_cimg_filter.cc | 4 +- .../filters/cimg/kis_cimgconfig_widget.cc | 2 +- chalk/plugins/filters/cimg/wdg_cimg.ui | 2 +- .../filters/colorify/KisWdgColorify.cpp | 2 +- .../filters/colorify/WdgColorifyBase.ui | 6 +- .../filters/colors/kis_wdg_color_to_alpha.cc | 2 +- .../filters/colors/wdgcolortoalphabase.ui | 6 +- .../kis_brightness_contrast_filter.cc | 4 +- .../colorsfilters/kis_perchannel_filter.cc | 2 +- .../colorsfilters/wdg_brightness_contrast.ui | 26 +- .../filters/colorsfilters/wdg_perchannel.ui | 12 +- ...lution_filter_configuration_base_widget.ui | 14 +- ...convolution_filter_configuration_widget.cc | 2 +- .../kis_wdg_fastcolortransfer.cpp | 2 +- .../fastcolortransfer/wdgfastcolortransfer.ui | 4 +- .../kis_wdg_lens_correction.cpp | 2 +- .../wdglenscorrectionoptions.ui | 8 +- .../filters/levelfilter/kgradientslider.cc | 16 +- .../filters/levelfilter/kis_level_filter.cc | 2 +- .../plugins/filters/levelfilter/wdg_level.ui | 34 +- .../filters/noisefilter/kis_wdg_noise.cpp | 2 +- .../filters/noisefilter/wdgnoiseoptions.ui | 4 +- .../raindropsfilter/kis_raindrops_filter.cc | 2 +- .../randompickfilter/kis_wdg_random_pick.cpp | 2 +- .../randompickfilter/wdgrandompickoptions.ui | 4 +- .../filters/unsharp/kis_wdg_unsharp.cc | 2 +- chalk/plugins/filters/unsharp/wdgunsharp.ui | 4 +- .../filters/wavefilter/kis_wdg_wave.cpp | 6 +- .../plugins/filters/wavefilter/wavefilter.cc | 12 +- .../filters/wavefilter/wdgwaveoptions.ui | 4 +- .../defaultpaintops/kis_airbrushop.cc | 8 +- .../paintops/defaultpaintops/kis_brushop.cc | 4 +- .../kis_dlgbrushcurvecontrol.ui | 8 +- .../paintops/defaultpaintops/kis_smudgeop.cc | 4 +- .../tools/defaulttools/kis_tool_brush.cc | 2 +- .../defaulttools/kis_tool_colorpicker.cc | 6 +- .../tools/defaulttools/kis_tool_fill.cc | 2 +- .../tools/defaulttools/kis_tool_gradient.cc | 12 +- .../tools/defaulttools/kis_tool_gradient.h | 2 +- .../tools/defaulttools/kis_tool_line.cc | 2 +- .../tools/defaulttools/kis_tool_text.cc | 6 +- .../tools/defaulttools/wdgcolorpicker.ui | 8 +- .../selectiontools/kis_tool_select_brush.cc | 4 +- .../selectiontools/kis_tool_select_brush.h | 2 +- .../kis_tool_select_contiguous.cc | 4 +- .../kis_tool_select_elliptical.cc | 8 +- .../selectiontools/kis_tool_select_eraser.cc | 4 +- .../selectiontools/kis_tool_select_eraser.h | 2 +- .../selectiontools/kis_tool_select_outline.cc | 4 +- .../kis_tool_select_polygonal.cc | 4 +- .../kis_tool_select_rectangular.cc | 4 +- .../plugins/tools/tool_crop/kis_tool_crop.cc | 2 +- .../plugins/tools/tool_crop/wdg_tool_crop.ui | 6 +- .../tools/tool_curves/kis_tool_bezier.cc | 2 +- .../tool_curves/kis_tool_bezier_paint.cc | 2 +- .../tools/tool_curves/kis_tool_bezier_paint.h | 2 +- .../tool_curves/kis_tool_bezier_select.cc | 2 +- .../tools/tool_curves/kis_tool_curve.cc | 4 +- .../tools/tool_curves/kis_tool_example.cc | 2 +- .../tools/tool_curves/kis_tool_example.h | 2 +- .../tools/tool_curves/kis_tool_moutline.cc | 4 +- .../tools/tool_curves/wdg_tool_example.ui | 4 +- .../tools/tool_filter/kis_tool_filter.cc | 2 +- .../kis_tool_perspectivegrid.cc | 2 +- .../kis_tool_selectsimilar.cc | 2 +- .../plugins/tools/tool_star/kis_tool_star.cc | 2 +- chalk/plugins/tools/tool_star/kis_tool_star.h | 2 +- .../plugins/tools/tool_star/wdg_tool_star.ui | 4 +- .../tool_transform/wdg_tool_transform.ui | 18 +- .../viewplugins/colorrange/dlg_colorrange.cc | 2 +- .../viewplugins/colorrange/wdg_colorrange.ui | 12 +- .../colorspaceconversion.cc | 4 +- .../dlg_colorspaceconversion.cc | 2 +- .../viewplugins/dropshadow/dlg_dropshadow.cc | 2 +- .../viewplugins/dropshadow/wdg_dropshadow.ui | 8 +- .../filtersgallery/kis_dlg_filtersgallery.cc | 16 +- .../filtersgallery/kis_wdg_filtersgallery.ui | 2 +- .../viewplugins/histogram/dlg_histogram.cc | 2 +- .../viewplugins/histogram/wdghistogram.ui | 10 +- .../viewplugins/imagesize/dlg_imagesize.cc | 2 +- .../viewplugins/imagesize/dlg_layersize.cc | 2 +- .../viewplugins/imagesize/wdg_imagesize.ui | 12 +- .../viewplugins/imagesize/wdg_layersize.ui | 4 +- .../viewplugins/imagesize/wdg_resolution.ui | 2 +- .../modify_selection/dlg_border_selection.cc | 2 +- .../modify_selection/dlg_grow_selection.cc | 2 +- .../modify_selection/dlg_shrink_selection.cc | 2 +- .../performancetest/dlg_perftest.cc | 2 +- .../viewplugins/performancetest/perftest.cc | 114 +++--- .../viewplugins/performancetest/perftest.h | 2 +- .../performancetest/wdg_perftest.ui | 2 +- .../rotateimage/dlg_rotateimage.cc | 2 +- .../rotateimage/wdg_rotateimage.ui | 16 +- .../viewplugins/screenshot/ksnapshot.cpp | 32 +- .../viewplugins/screenshot/ksnapshot.h | 2 +- .../viewplugins/screenshot/ksnapshotwidget.ui | 8 +- .../viewplugins/screenshot/regiongrabber.cpp | 14 +- .../scripting/chalkcore/chalkcoremodule.cpp | 8 +- .../scripting/chalkcore/chalkcoremodule.h | 4 +- .../scripting/chalkcore/krs_filter.cpp | 2 +- .../scripting/chalkcore/krs_image.cpp | 2 +- .../scripting/chalkcore/krs_iterator.h | 4 +- .../scripting/chalkcore/krs_paint_layer.cpp | 4 +- .../scripting/chalkcore/krs_painter.cpp | 6 +- .../scripting/chalkcore/krs_wavelet.cpp | 8 +- .../scripting/samples/ruby/randompaint.rb | 16 +- .../samples/ruby/torture-painting.rb | 16 +- .../separate_channels/dlg_separate.cc | 2 +- .../separate_channels/wdg_separations.ui | 2 +- .../viewplugins/shearimage/dlg_shearimage.cc | 6 +- .../viewplugins/shearimage/wdg_shearimage.ui | 2 +- .../viewplugins/substrate/wdgsubstrate.ui | 4 +- .../viewplugins/variations/wdg_variations.ui | 82 ++-- chalk/sdk/kis_canvas_controller.h | 6 +- chalk/ui/imageviewer.cc | 2 +- chalk/ui/kcurve.cc | 18 +- chalk/ui/kis_autogradient.cc | 6 +- chalk/ui/kis_birdeye_box.cc | 4 +- chalk/ui/kis_brush_chooser.cc | 6 +- chalk/ui/kis_canvas.cc | 20 +- chalk/ui/kis_canvas.h | 10 +- chalk/ui/kis_canvas_painter.cc | 18 +- chalk/ui/kis_canvas_painter.h | 12 +- chalk/ui/kis_clipboard.cc | 16 +- chalk/ui/kis_color_cup.cc | 16 +- chalk/ui/kis_color_cup.h | 2 +- chalk/ui/kis_controlframe.cc | 8 +- chalk/ui/kis_custom_image_widget.cc | 2 +- chalk/ui/kis_custom_palette.cc | 2 +- chalk/ui/kis_dlg_adj_layer_props.cc | 10 +- chalk/ui/kis_dlg_adjustment_layer.cc | 10 +- chalk/ui/kis_dlg_apply_profile.cc | 2 +- chalk/ui/kis_dlg_image_properties.cc | 6 +- chalk/ui/kis_dlg_layer_properties.cc | 4 +- chalk/ui/kis_dlg_new_layer.cc | 4 +- chalk/ui/kis_dlg_preferences.cc | 12 +- chalk/ui/kis_doc.cc | 2 +- chalk/ui/kis_double_widget.cc | 4 +- chalk/ui/kis_filter_manager.cc | 14 +- chalk/ui/kis_filters_listview.cc | 2 +- chalk/ui/kis_gradient_chooser.cc | 4 +- chalk/ui/kis_gradient_slider_widget.cc | 10 +- chalk/ui/kis_int_spinbox.cc | 8 +- chalk/ui/kis_label_progress.cc | 2 +- chalk/ui/kis_layerbox.cc | 12 +- chalk/ui/kis_layerlist.cc | 12 +- chalk/ui/kis_matrix_widget.ui | 4 +- chalk/ui/kis_multi_bool_filter_widget.cc | 2 +- chalk/ui/kis_multi_double_filter_widget.cc | 2 +- chalk/ui/kis_multi_integer_filter_widget.cc | 2 +- chalk/ui/kis_opengl_canvas_painter.cc | 6 +- chalk/ui/kis_opengl_canvas_painter.h | 6 +- chalk/ui/kis_paintop_box.cc | 4 +- chalk/ui/kis_palette_view.cc | 4 +- chalk/ui/kis_palette_widget.cc | 10 +- chalk/ui/kis_part_layer.cc | 12 +- chalk/ui/kis_part_layer.h | 10 +- chalk/ui/kis_pattern_chooser.cc | 6 +- chalk/ui/kis_previewdialog.cc | 12 +- chalk/ui/kis_previewwidget.cc | 2 +- chalk/ui/kis_previewwidgetbase.ui | 12 +- chalk/ui/kis_qpaintdevice_canvas_painter.cc | 22 +- chalk/ui/kis_qpaintdevice_canvas_painter.h | 6 +- chalk/ui/kis_ruler.cc | 8 +- chalk/ui/kis_save_visitor.h | 10 +- chalk/ui/kis_savexml_visitor.h | 4 +- chalk/ui/kis_selection_manager.cc | 4 +- chalk/ui/kis_selection_options.cc | 2 +- chalk/ui/kis_text_brush.cc | 2 +- chalk/ui/kis_tool.cc | 4 +- chalk/ui/kis_tool.h | 2 +- chalk/ui/kis_tool_dummy.cc | 2 +- chalk/ui/kis_tool_freehand.cc | 4 +- chalk/ui/kis_tool_paint.cc | 6 +- chalk/ui/kis_tool_paint.h | 6 +- chalk/ui/kis_tool_registry.cc | 4 +- chalk/ui/kis_tool_shape.cc | 18 +- chalk/ui/kis_tool_shape.h | 2 +- chalk/ui/kis_view.cc | 46 +-- chalk/ui/kobirdeyepanel.cpp | 10 +- chalk/ui/layerlist.cpp | 22 +- chalk/ui/squeezedcombobox.cpp | 4 +- chalk/ui/squeezedcombobox.h | 4 +- chalk/ui/wdgapplyprofile.ui | 2 +- chalk/ui/wdgautobrush.ui | 20 +- chalk/ui/wdgautogradient.ui | 18 +- chalk/ui/wdgbirdeye.ui | 22 +- chalk/ui/wdgcolorsettings.ui | 10 +- chalk/ui/wdgcustombrush.ui | 12 +- chalk/ui/wdgcustompattern.ui | 12 +- chalk/ui/wdgdisplaysettings.ui | 6 +- chalk/ui/wdggeneralsettings.ui | 16 +- chalk/ui/wdggridsettings.ui | 20 +- chalk/ui/wdglayerbox.ui | 28 +- chalk/ui/wdgnewimage.ui | 10 +- chalk/ui/wdgpalettechooser.ui | 4 +- chalk/ui/wdgperformancesettings.ui | 10 +- chalk/ui/wdgpressuresettings.ui | 2 +- chalk/ui/wdgselectionoptions.ui | 2 +- chalk/ui/wdgshapeoptions.ui | 4 +- chalk/ui/wdgtabletdevicesettings.ui | 14 +- chalk/ui/wdgtabletsettings.ui | 6 +- chalk/ui/wdgtextbrush.ui | 12 +- .../gmagick/kis_image_magick_converter.cc | 4 +- filters/chalk/gmagick/magickexport.cpp | 2 +- filters/chalk/gmagick/magickexport.h | 2 +- filters/chalk/gmagick/magickimport.cpp | 2 +- filters/chalk/gmagick/magickimport.h | 2 +- filters/chalk/jpeg/kis_jpeg_converter.cc | 2 +- filters/chalk/jpeg/kis_jpeg_export.cc | 2 +- filters/chalk/jpeg/kis_jpeg_export.h | 2 +- filters/chalk/jpeg/kis_jpeg_import.cc | 2 +- filters/chalk/jpeg/kis_jpeg_import.h | 2 +- filters/chalk/jpeg/kis_wdg_options_jpeg.ui | 12 +- .../magick/kis_image_magick_converter.cc | 2 +- filters/chalk/magick/magickexport.cpp | 2 +- filters/chalk/magick/magickexport.h | 2 +- filters/chalk/magick/magickimport.cpp | 2 +- filters/chalk/magick/magickimport.h | 2 +- filters/chalk/openexr/kis_openexr_export.cpp | 2 +- filters/chalk/openexr/kis_openexr_export.h | 2 +- filters/chalk/openexr/kis_openexr_import.cpp | 2 +- filters/chalk/openexr/kis_openexr_import.h | 2 +- filters/chalk/pdf/kis_pdf_import.cpp | 4 +- filters/chalk/pdf/kis_pdf_import.h | 2 +- filters/chalk/pdf/pdfimportwidgetbase.ui | 16 +- filters/chalk/png/kis_png_converter.cc | 2 +- filters/chalk/png/kis_png_export.cc | 2 +- filters/chalk/png/kis_png_export.h | 2 +- filters/chalk/png/kis_png_import.cc | 2 +- filters/chalk/png/kis_png_import.h | 2 +- filters/chalk/png/kis_wdg_options_png.ui | 12 +- filters/chalk/raw/kis_raw_import.cpp | 4 +- filters/chalk/raw/kis_raw_import.h | 2 +- filters/chalk/raw/wdgrawimport.ui | 14 +- filters/chalk/tiff/kis_dlg_options_tiff.cpp | 2 +- filters/chalk/tiff/kis_tiff_export.cc | 2 +- filters/chalk/tiff/kis_tiff_export.h | 2 +- filters/chalk/tiff/kis_tiff_import.cc | 2 +- filters/chalk/tiff/kis_tiff_import.h | 2 +- .../chalk/tiff/kis_tiff_writer_visitor.cpp | 2 +- filters/chalk/tiff/kis_wdg_options_tiff.ui | 30 +- filters/chalk/xcf/xcf/xcf-load.cc | 6 +- filters/chalk/xcf/xcf/xcf-save.cc | 10 +- filters/chalk/xcf/xcfexport.cpp | 2 +- filters/chalk/xcf/xcfexport.h | 2 +- filters/chalk/xcf/xcfimport.cpp | 2 +- filters/chalk/xcf/xcfimport.h | 2 +- filters/generic_wrapper/generic_filter.cc | 8 +- filters/generic_wrapper/generic_filter.h | 6 +- filters/karbon/ai/aielement.cc | 2 +- filters/karbon/ai/aiimport.cc | 2 +- filters/karbon/ai/aiimport.h | 2 +- .../applixgraphics/applixgraphicimport.cc | 10 +- .../applixgraphics/applixgraphicimport.h | 2 +- filters/karbon/eps/epsexport.cc | 6 +- filters/karbon/eps/epsexport.h | 2 +- filters/karbon/eps/epsimport.cc | 4 +- filters/karbon/eps/epsimport.h | 2 +- filters/karbon/kontour/kontourimport.cpp | 6 +- filters/karbon/kontour/kontourimport.h | 2 +- filters/karbon/msod/msod.cc | 78 ++-- filters/karbon/msod/msod.h | 12 +- filters/karbon/msod/msodimport.cc | 18 +- filters/karbon/msod/msodimport.h | 4 +- filters/karbon/oodraw/oodrawimport.cc | 14 +- filters/karbon/oodraw/oodrawimport.h | 6 +- filters/karbon/png/pngexport.cc | 2 +- filters/karbon/png/pngexport.h | 2 +- filters/karbon/svg/svgexport.cc | 8 +- filters/karbon/svg/svgexport.h | 2 +- filters/karbon/svg/svgimport.cc | 20 +- filters/karbon/svg/svgimport.h | 2 +- filters/karbon/wmf/wmfexport.cc | 2 +- filters/karbon/wmf/wmfexport.h | 4 +- filters/karbon/wmf/wmfimport.cc | 2 +- filters/karbon/wmf/wmfimport.h | 2 +- filters/karbon/xaml/xamlexport.cc | 4 +- filters/karbon/xaml/xamlexport.h | 2 +- filters/karbon/xaml/xamlimport.cc | 20 +- filters/karbon/xaml/xamlimport.h | 2 +- filters/karbon/xcf/xcfexport.cc | 60 +-- filters/karbon/xcf/xcfexport.h | 2 +- filters/karbon/xfig/xfigimport.cc | 12 +- filters/kchart/libimageexport/imageexport.cpp | 2 +- filters/kchart/libimageexport/imageexport.h | 2 +- filters/kchart/svg/svgexport.cc | 2 +- filters/kchart/svg/svgexport.h | 2 +- filters/kformula/latex/latexexport.cc | 4 +- filters/kformula/latex/latexexport.h | 2 +- filters/kformula/mathml/mathmlexport.cc | 4 +- filters/kformula/mathml/mathmlexport.h | 2 +- filters/kformula/mathml/mathmlimport.cc | 8 +- filters/kformula/mathml/mathmlimport.h | 4 +- filters/kformula/png/pngexport.cc | 4 +- filters/kformula/png/pngexport.h | 2 +- filters/kformula/png/pngexportdia.cc | 28 +- filters/kformula/svg/svgexport.cc | 2 +- filters/kformula/svg/svgexport.h | 2 +- .../kivio/imageexport/kivio_imageexport.cpp | 2 +- filters/kivio/imageexport/kivio_imageexport.h | 2 +- .../imageexport/kivio_imageexportwidget.ui | 6 +- filters/kpresenter/kword/kprkword.cc | 2 +- filters/kpresenter/kword/kprkword.h | 2 +- .../kpresenter/libimageexport/imageexport.cpp | 2 +- .../kpresenter/libimageexport/imageexport.h | 2 +- filters/kpresenter/magicpoint/mgp2kpr.py | 18 +- .../kpresenter/ooimpress/ooimpressexport.cc | 58 +-- .../kpresenter/ooimpress/ooimpressexport.h | 4 +- .../kpresenter/ooimpress/ooimpressimport.cc | 46 +-- .../kpresenter/ooimpress/ooimpressimport.h | 6 +- filters/kpresenter/ooimpress/status.html | 4 +- filters/kpresenter/ooimpress/stylefactory.cc | 48 +-- .../powerpoint/import/powerpointimport.cc | 352 ++++++++--------- .../powerpoint/import/powerpointimport.h | 2 +- .../kpresenter/powerpoint/libppt/objects.cpp | 10 +- .../kpresenter/powerpoint/libppt/objects.h | 4 +- filters/kpresenter/powerpoint/libppt/pole.cpp | 24 +- .../powerpoint/libppt/powerpoint.cpp | 14 +- .../kpresenter/powerpoint/libppt/powerpoint.h | 12 +- .../kpresenter/powerpoint/libppt/ustring.cpp | 6 +- .../kpresenter/powerpoint/libppt/ustring.h | 4 +- filters/kpresenter/svg/svgexport.cc | 2 +- filters/kpresenter/svg/svgexport.h | 2 +- .../applixspread/applixspreadimport.cc | 8 +- .../kspread/applixspread/applixspreadimport.h | 4 +- filters/kspread/applixspread/status.html | 20 +- filters/kspread/csv/csvdialog.cpp | 18 +- filters/kspread/csv/csvexport.cc | 4 +- filters/kspread/csv/csvexport.h | 2 +- filters/kspread/csv/csvexportdialog.cpp | 16 +- filters/kspread/csv/csvimport.cc | 2 +- filters/kspread/csv/csvimport.h | 2 +- filters/kspread/csv/dialogui.ui | 24 +- filters/kspread/csv/exportdialogui.ui | 12 +- filters/kspread/csv/xmltree.h | 2 +- filters/kspread/dbase/dbase.cpp | 4 +- filters/kspread/dbase/dbaseimport.cc | 2 +- filters/kspread/dbase/dbaseimport.h | 2 +- filters/kspread/excel/excelexport.cc | 16 +- filters/kspread/excel/excelexport.h | 16 +- filters/kspread/excel/import/excelimport.cc | 28 +- filters/kspread/excel/import/excelimport.h | 2 +- filters/kspread/excel/sidewinder/excel.cpp | 64 +-- filters/kspread/excel/sidewinder/excel.h | 16 +- filters/kspread/excel/sidewinder/format.cpp | 28 +- filters/kspread/excel/sidewinder/format.h | 36 +- filters/kspread/excel/sidewinder/pole.cpp | 24 +- filters/kspread/excel/sidewinder/ustring.cpp | 4 +- filters/kspread/excel/sidewinder/ustring.h | 4 +- filters/kspread/gnumeric/gnumeric.xsd | 10 +- filters/kspread/gnumeric/gnumericexport.cc | 8 +- filters/kspread/gnumeric/gnumericexport.h | 2 +- filters/kspread/gnumeric/gnumericimport.cc | 2 +- filters/kspread/gnumeric/gnumericimport.h | 2 +- filters/kspread/gnumeric/status.html | 2 +- filters/kspread/html/exportdialog.cc | 4 +- filters/kspread/html/exportwidget.ui | 14 +- filters/kspread/html/htmlexport.cc | 14 +- filters/kspread/html/htmlexport.h | 2 +- filters/kspread/kexi/kspread_kexiimport.cc | 2 +- filters/kspread/kexi/kspread_kexiimport.h | 2 +- .../kspread/kexi/kspread_kexiimportdialog.cc | 2 +- .../kexi/kspread_kexiimportdialogbase.ui | 8 +- filters/kspread/latex/export/config.h | 6 +- filters/kspread/latex/export/document.h | 2 +- filters/kspread/latex/export/fileheader.cc | 4 +- filters/kspread/latex/export/fileheader.h | 2 +- filters/kspread/latex/export/format.h | 2 +- filters/kspread/latex/export/formula.h | 2 +- .../latex/export/kspreadlatexexportdiaImpl.cc | 4 +- filters/kspread/latex/export/latexexport.cc | 4 +- filters/kspread/latex/export/latexexport.h | 4 +- .../kspread/latex/export/latexexportdia.ui | 2 +- filters/kspread/latex/export/map.cc | 2 +- filters/kspread/latex/export/pen.h | 2 +- filters/kspread/latex/export/spreadsheet.h | 2 +- filters/kspread/latex/export/xmlparser.cc | 12 +- .../libkspreadexport/KSpreadBaseWorker.cc | 14 +- .../libkspreadexport/KSpreadBaseWorker.h | 14 +- .../kspread/libkspreadexport/KSpreadLeader.cc | 14 +- .../kspread/libkspreadexport/KSpreadLeader.h | 10 +- filters/kspread/opencalc/opencalcexport.cc | 14 +- filters/kspread/opencalc/opencalcexport.h | 2 +- filters/kspread/opencalc/opencalcimport.cc | 204 +++++----- filters/kspread/opencalc/opencalcimport.h | 14 +- .../kspread/opencalc/opencalcstyleexport.cc | 18 +- filters/kspread/opencalc/status.html | 8 +- filters/kspread/qpro/qproimport.cc | 2 +- filters/kspread/qpro/qproimport.h | 2 +- filters/kugar/kugarnop/kugarnopimport.cpp | 2 +- filters/kugar/kugarnop/kugarnopimport.h | 2 +- filters/kword/abiword/ImportField.cc | 2 +- filters/kword/abiword/ImportFormatting.cc | 2 +- filters/kword/abiword/ImportStyle.cc | 2 +- filters/kword/abiword/abiwordexport.cc | 124 +++--- filters/kword/abiword/abiwordexport.h | 2 +- filters/kword/abiword/abiwordimport.cc | 22 +- filters/kword/abiword/abiwordimport.h | 2 +- filters/kword/amipro/FileFormat.txt | 10 +- filters/kword/amipro/amiproexport.cc | 14 +- filters/kword/amipro/amiproexport.h | 2 +- filters/kword/amipro/amiproimport.cc | 60 +-- filters/kword/amipro/amiproimport.h | 2 +- filters/kword/amipro/amiproparser.cpp | 10 +- filters/kword/amipro/amiproparser.h | 4 +- filters/kword/applixword/applixwordimport.cc | 6 +- filters/kword/applixword/applixwordimport.h | 4 +- filters/kword/ascii/ExportDialog.cc | 14 +- filters/kword/ascii/ExportDialogUI.ui | 6 +- filters/kword/ascii/ImportDialog.cc | 14 +- filters/kword/ascii/ImportDialogUI.ui | 6 +- filters/kword/ascii/asciiexport.cc | 36 +- filters/kword/ascii/asciiexport.h | 2 +- filters/kword/ascii/asciiimport.cc | 10 +- filters/kword/ascii/asciiimport.h | 2 +- filters/kword/docbook/docbookexport.cc | 20 +- filters/kword/docbook/docbookexport.h | 2 +- filters/kword/hancomword/hancomwordimport.cpp | 4 +- filters/kword/hancomword/hancomwordimport.h | 2 +- filters/kword/hancomword/pole.cpp | 24 +- filters/kword/html/export/ExportBasic.cc | 20 +- filters/kword/html/export/ExportBasic.h | 4 +- filters/kword/html/export/ExportCss.cc | 114 +++--- filters/kword/html/export/ExportCss.h | 8 +- filters/kword/html/export/ExportDialog.cc | 10 +- filters/kword/html/export/ExportDialogUI.ui | 12 +- filters/kword/html/export/ExportDocStruct.cc | 10 +- filters/kword/html/export/ExportDocStruct.h | 4 +- filters/kword/html/export/ExportFilter.cc | 44 +-- filters/kword/html/export/ExportFilter.h | 8 +- filters/kword/html/export/htmlexport.cc | 6 +- filters/kword/html/export/htmlexport.h | 4 +- filters/kword/html/import/htmlimport.cpp | 2 +- filters/kword/html/import/htmlimport.h | 2 +- filters/kword/html/import/khtmlreader.cpp | 60 +-- filters/kword/html/import/khtmlreader.h | 6 +- filters/kword/html/import/kwdwriter.cpp | 34 +- filters/kword/html/import/kwdwriter.h | 12 +- .../kword1.3/import/kword13formatone.cpp | 2 +- .../kword/kword1.3/import/kword13formatone.h | 6 +- .../kword/kword1.3/import/kword13import.cpp | 4 +- filters/kword/kword1.3/import/kword13import.h | 2 +- .../kword/kword1.3/import/kword13layout.cpp | 6 +- .../kword1.3/import/kword13oasisgenerator.cpp | 50 +-- .../kword1.3/import/kword13oasisgenerator.h | 8 +- .../kword/kword1.3/import/kword13parser.cpp | 12 +- filters/kword/kword1.3/import/kword13parser.h | 8 +- .../kword/kword1.3/import/kword13utils.cpp | 2 +- filters/kword/latex/export/config.h | 6 +- filters/kword/latex/export/document.h | 2 +- filters/kword/latex/export/element.h | 2 +- filters/kword/latex/export/fileheader.cc | 4 +- filters/kword/latex/export/fileheader.h | 2 +- filters/kword/latex/export/format.h | 2 +- filters/kword/latex/export/formula.h | 2 +- .../kword/latex/export/kwordlatexexportdia.cc | 4 +- filters/kword/latex/export/latexexport.cc | 4 +- filters/kword/latex/export/latexexport.h | 4 +- filters/kword/latex/export/latexexportdia.ui | 2 +- filters/kword/latex/export/layout.cc | 4 +- filters/kword/latex/export/layout.h | 4 +- filters/kword/latex/export/para.cc | 6 +- filters/kword/latex/export/para.h | 2 +- filters/kword/latex/export/texlauncher.cc | 2 +- filters/kword/latex/export/textFrame.cc | 2 +- filters/kword/latex/export/textzone.cc | 14 +- filters/kword/latex/export/textzone.h | 4 +- filters/kword/latex/export/variablezone.cc | 2 +- filters/kword/latex/export/variablezone.h | 2 +- filters/kword/latex/export/xml2latexparser.h | 2 +- filters/kword/latex/export/xmlparser.cc | 12 +- .../kword/latex/import/generator/document.cc | 2 +- filters/kword/latex/import/lateximport.cc | 4 +- filters/kword/latex/import/lateximport.h | 4 +- filters/kword/latex/import/lateximportdia.cc | 8 +- filters/kword/latex/import/lateximportdia.h | 4 +- filters/kword/latex/import/parser/env.cc | 8 +- filters/kword/latex/import/parser/env.h | 2 +- filters/kword/latex/status.html | 8 +- filters/kword/libexport/KWEFBaseWorker.cc | 2 +- filters/kword/libexport/KWEFBaseWorker.h | 4 +- filters/kword/libexport/KWEFKWordLeader.cc | 22 +- filters/kword/libexport/KWEFKWordLeader.h | 4 +- filters/kword/libexport/KWEFStructures.h | 6 +- filters/kword/libexport/KWEFUtil.cc | 6 +- filters/kword/libexport/ProcessDocument.cc | 130 +++---- filters/kword/msword/conversion.cpp | 2 +- filters/kword/msword/conversion.h | 4 +- filters/kword/msword/document.cpp | 6 +- filters/kword/msword/mswordimport.cpp | 2 +- filters/kword/msword/mswordimport.h | 2 +- filters/kword/msword/texthandler.cpp | 22 +- filters/kword/msword/texthandler.h | 2 +- filters/kword/mswrite/ImportDialog.cc | 4 +- filters/kword/mswrite/ImportDialogUI.ui | 10 +- filters/kword/mswrite/mswriteexport.cc | 68 ++-- filters/kword/mswrite/mswriteexport.h | 2 +- filters/kword/mswrite/mswriteimport.cc | 6 +- filters/kword/mswrite/mswriteimport.h | 2 +- filters/kword/mswrite/status.html | 4 +- filters/kword/mswrite/structures.h | 2 +- .../kword/mswrite/structures_generated.cpp | 14 +- filters/kword/mswrite/structures_generated.h | 8 +- filters/kword/oowriter/ExportFilter.cc | 130 +++---- filters/kword/oowriter/ExportFilter.h | 6 +- filters/kword/oowriter/conversion.cc | 8 +- filters/kword/oowriter/conversion.h | 2 +- filters/kword/oowriter/oowriterexport.cc | 4 +- filters/kword/oowriter/oowriterexport.h | 2 +- filters/kword/oowriter/oowriterimport.cc | 50 +-- filters/kword/oowriter/oowriterimport.h | 6 +- filters/kword/palmdoc/palmdb.cpp | 20 +- filters/kword/palmdoc/palmdoc.cpp | 4 +- filters/kword/palmdoc/palmdocexport.cc | 10 +- filters/kword/palmdoc/palmdocexport.h | 2 +- filters/kword/palmdoc/palmdocimport.cc | 52 +-- filters/kword/palmdoc/palmdocimport.h | 2 +- filters/kword/pdf/FilterDevice.cpp | 4 +- filters/kword/pdf/FilterPage.cpp | 22 +- filters/kword/pdf/data.cpp | 12 +- filters/kword/pdf/dialog.cpp | 10 +- filters/kword/pdf/fstring.cpp | 4 +- filters/kword/pdf/fstring.h | 4 +- filters/kword/pdf/misc.cpp | 6 +- filters/kword/pdf/pdfdocument.cpp | 2 +- filters/kword/pdf/pdfdocument.h | 2 +- filters/kword/pdf/pdfimport.cpp | 6 +- filters/kword/pdf/pdfimport.h | 2 +- filters/kword/pdf/xpdf/xpdf/FTFont.cc | 10 +- filters/kword/pdf/xpdf/xpdf/FontFile.cc | 10 +- filters/kword/pdf/xpdf/xpdf/GlobalParams.cc | 20 +- filters/kword/pdf/xpdf/xpdf/GlobalParams.h | 6 +- filters/kword/pdf/xpdf/xpdf/TTFont.cc | 10 +- filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc | 38 +- filters/kword/pdf/xpdf/xpdf/UnicodeMap.h | 18 +- filters/kword/pdf/xpdf/xpdf/XPDFApp.cc | 14 +- filters/kword/pdf/xpdf/xpdf/XPDFApp.h | 4 +- filters/kword/pdf/xpdf/xpdf/XPDFTree.cc | 134 +++---- filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h | 6 +- filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc | 8 +- filters/kword/pdf/xpdf/xpdf/xpdf.cc | 6 +- filters/kword/rtf/export/ExportFilter.cc | 202 +++++----- filters/kword/rtf/export/ExportFilter.h | 8 +- filters/kword/rtf/export/rtfexport.cc | 4 +- filters/kword/rtf/export/rtfexport.h | 4 +- filters/kword/rtf/import/rtfimport.cpp | 250 ++++++------ filters/kword/rtf/import/rtfimport.h | 22 +- filters/kword/rtf/import/rtfimport_dom.cpp | 4 +- filters/kword/rtf/status.html | 8 +- filters/kword/starwriter/pole.cpp | 24 +- filters/kword/starwriter/starwriterimport.cc | 10 +- filters/kword/starwriter/starwriterimport.h | 2 +- filters/kword/starwriter/status.html | 2 +- filters/kword/wml/wmlexport.cc | 14 +- filters/kword/wml/wmlexport.h | 2 +- filters/kword/wml/wmlimport.cc | 14 +- filters/kword/wml/wmlimport.h | 2 +- filters/kword/wml/wmlparser.cpp | 2 +- filters/kword/wordperfect/export/wp5.cc | 10 +- filters/kword/wordperfect/export/wp5.h | 2 +- filters/kword/wordperfect/export/wp6.cc | 20 +- filters/kword/wordperfect/export/wp6.h | 2 +- filters/kword/wordperfect/export/wpexport.cc | 8 +- filters/kword/wordperfect/export/wpexport.h | 2 +- .../kword/wordperfect/import/kwordfilter.cpp | 48 +-- filters/kword/wordperfect/import/parser.cpp | 2 +- filters/kword/wordperfect/import/wpimport.cc | 2 +- filters/kword/wordperfect/import/wpimport.h | 2 +- filters/kword/wordperfect/status_old.html | 2 +- filters/libdialogfilter/exportsizedia.cpp | 4 +- filters/liboofilter/ooutils.cc | 22 +- filters/liboofilter/ooutils.h | 8 +- filters/olefilters/olefilter.cc | 10 +- filters/olefilters/olefilter.h | 6 +- filters/olefilters/powerpoint97/powerpoint.cc | 8 +- filters/olefilters/powerpoint97/pptSlide.h | 2 +- filters/olefilters/powerpoint97/pptxml.cc | 2 +- .../export/xsl/kword/xslfo/main.xsl | 4 +- filters/xsltfilter/export/xsltdialog.ui | 6 +- filters/xsltfilter/export/xsltexport.cc | 2 +- filters/xsltfilter/export/xsltexport.h | 2 +- filters/xsltfilter/export/xsltexportdia.cc | 6 +- filters/xsltfilter/import/xsltdialog.ui | 6 +- filters/xsltfilter/import/xsltimport.cc | 4 +- filters/xsltfilter/import/xsltimport.h | 4 +- filters/xsltfilter/import/xsltimportdia.cc | 6 +- filters/xsltfilter/kword2xslfo.xsl | 4 +- karbon/commands/vbooleancmd.h | 4 +- karbon/commands/vreplacingcmd.cc | 6 +- karbon/commands/vshapecmd.cc | 28 +- karbon/commands/vshapecmd.h | 8 +- karbon/commands/vtextcmd.h | 2 +- karbon/commands/vtransformcmd.cc | 2 +- karbon/core/vcomposite.cc | 30 +- karbon/core/vdocument.h | 2 +- karbon/core/vfill.cc | 4 +- karbon/core/vfill.h | 4 +- karbon/core/vgradient.cc | 4 +- karbon/core/vgroup.cc | 2 +- karbon/core/vobject.h | 2 +- karbon/core/vpath.cc | 4 +- karbon/core/vstroke.cc | 2 +- karbon/core/vtext.cc | 22 +- karbon/core/vtext.h | 10 +- karbon/dialogs/vcolortab.cc | 2 +- karbon/dialogs/vconfiguredlg.cc | 8 +- karbon/dialogs/vstrokedlg.cc | 2 +- karbon/dockers/vcolordocker.cc | 2 +- karbon/dockers/vdocumentdocker.cc | 98 ++--- karbon/dockers/vstrokedocker.cc | 2 +- karbon/dockers/vstyledocker.cc | 12 +- karbon/dockers/vtransformdocker.cc | 2 +- karbon/karbon_drag.cpp | 6 +- karbon/karbon_drag.h | 2 +- karbon/karbon_factory.cc | 4 +- karbon/karbon_part.cc | 30 +- karbon/karbon_part.h | 8 +- karbon/karbon_part_iface.cc | 4 +- karbon/karbon_view.cc | 30 +- karbon/karbon_view.h | 2 +- karbon/karbon_view_iface.cc | 2 +- karbon/karbon_view_iface.h | 2 +- .../shadoweffect/shadoweffectplugin.cc | 6 +- .../plugins/shadoweffect/vshadowdecorator.cc | 2 +- karbon/render/art_rgb.c | 6 +- karbon/render/art_rgb_svp.c | 4 +- karbon/render/vkopainter.h | 2 +- karbon/render/vpainter.h | 2 +- karbon/render/vqpainter.cc | 10 +- karbon/render/vqpainter.h | 2 +- .../xrgbrender/gdk-pixbuf-xlib-drawable.c | 10 +- karbon/shapes/vellipse.cc | 2 +- karbon/shapes/vpolygon.cc | 4 +- karbon/shapes/vpolyline.cc | 2 +- karbon/shapes/vrectangle.cc | 4 +- karbon/shapes/vstar.h | 6 +- karbon/tools/vellipsetool.cc | 4 +- karbon/tools/vellipsetool.h | 2 +- karbon/tools/vpatterntool.cc | 10 +- karbon/tools/vpolygontool.cc | 4 +- karbon/tools/vpolygontool.h | 2 +- karbon/tools/vrectangletool.cc | 4 +- karbon/tools/vrectangletool.h | 2 +- karbon/tools/vroundrecttool.cc | 6 +- karbon/tools/vroundrecttool.h | 2 +- karbon/tools/vselecttool.cc | 4 +- karbon/tools/vshapetool.cc | 10 +- karbon/tools/vshapetool.h | 2 +- karbon/tools/vsinustool.cc | 6 +- karbon/tools/vsinustool.h | 2 +- karbon/tools/vspiraltool.cc | 4 +- karbon/tools/vspiraltool.h | 2 +- karbon/tools/vstartool.cc | 4 +- karbon/tools/vstartool.h | 2 +- karbon/tools/vtexttool.cc | 84 ++-- karbon/tools/vtexttool.h | 4 +- karbon/usablity-review.txt | 2 +- karbon/vtool.h | 2 +- karbon/widgets/vcanvas.cc | 6 +- karbon/widgets/vcolorslider.cc | 12 +- karbon/widgets/vgradienttabwidget.cc | 10 +- karbon/widgets/vgradientwidget.cc | 10 +- karbon/widgets/vreference.cc | 8 +- karbon/widgets/vruler.cc | 12 +- karbon/widgets/vsmallpreview.cc | 16 +- karbon/widgets/vstrokefillpreview.cc | 2 +- karbon/widgets/vstrokefillpreview.h | 4 +- karbon/widgets/vtranslate.cc | 40 +- kchart/csvimportdialog.cc | 18 +- kchart/csvimportdialogui.ui | 26 +- kchart/kchartBackgroundPixmapConfigPage.cc | 2 +- kchart/kchartColorConfigPage.cc | 20 +- kchart/kchartComboConfigPage.cc | 12 +- kchart/kchartDataConfigPage.cc | 8 +- kchart/kchartDataEditor.cc | 14 +- kchart/kchartFontConfigPage.cc | 8 +- kchart/kchartHeaderFooterConfigPage.cc | 36 +- kchart/kchartLegendConfigPage.cc | 48 +-- kchart/kchartLegendConfigPage.h | 4 +- kchart/kchartLine3dConfigPage.cc | 12 +- kchart/kchartPageLayout.cc | 6 +- kchart/kchartParameter3dConfigPage.cc | 24 +- kchart/kchartParameterConfigPage.cc | 24 +- kchart/kchartParameterPieConfigPage.cc | 2 +- kchart/kchartParameterPolarConfigPage.cc | 2 +- kchart/kchartPieConfigPage.cc | 16 +- kchart/kchartPrinterDlg.cc | 20 +- kchart/kchartSubTypeChartPage.cc | 24 +- kchart/kchartWizardLabelsLegendPage.cc | 2 +- kchart/kchartWizardSelectChartSubTypePage.cc | 4 +- kchart/kchartWizardSelectChartTypePage.cc | 4 +- kchart/kchartWizardSelectChartTypePage.h | 2 +- kchart/kchartWizardSelectDataFormatPage.cc | 6 +- kchart/kchartWizardSetupAxesPage.cc | 2 +- kchart/kchartWizardSetupDataPage.cc | 6 +- kchart/kchart_params.cc | 4 +- kchart/kchart_part.cc | 8 +- kchart/kchart_view.cc | 2 +- kchart/kdchart/KDChart.cpp | 26 +- kchart/kdchart/KDChartAreaPainter.cpp | 2 +- kchart/kdchart/KDChartAxesPainter.cpp | 14 +- kchart/kdchart/KDChartAxisParams.cpp | 2 +- kchart/kdchart/KDChartAxisParams.h | 2 +- kchart/kdchart/KDChartBWPainter.cpp | 4 +- kchart/kdchart/KDChartBarPainter.cpp | 4 +- kchart/kdchart/KDChartCustomBox.cpp | 2 +- kchart/kdchart/KDChartCustomBox.h | 14 +- kchart/kdchart/KDChartDataIntern.h | 4 +- kchart/kdchart/KDChartEnums.h | 24 +- kchart/kdchart/KDChartHiLoPainter.cpp | 2 +- kchart/kdchart/KDChartLinesPainter.cpp | 2 +- kchart/kdchart/KDChartObjectFactory.cpp | 72 ++-- kchart/kdchart/KDChartPainter.cpp | 20 +- kchart/kdchart/KDChartParams.cpp | 48 +-- kchart/kdchart/KDChartParams.h | 6 +- kchart/kdchart/KDChartParams_io.cpp | 10 +- kchart/kdchart/KDChartPiePainter.cpp | 4 +- kchart/kdchart/KDChartPolarPainter.cpp | 10 +- kchart/kdchart/KDChartPropertySet.h | 8 +- kchart/kdchart/KDChartRingPainter.cpp | 4 +- kchart/kdchart/KDChartTableBase.cpp | 2 +- kchart/kdchart/KDChartTextPiece.cpp | 2 +- kchart/kdchart/KDChartTextPiece.h | 2 +- kchart/kdchart/KDChartWidget.cpp | 6 +- kchart/kdchart/KDChartWrapperFactory.cpp | 8 +- kchart/kdchart/KDDrawText.cpp | 2 +- kchart/kdchart/KDDrawText.h | 4 +- kchart/kdchart/KDFrame.cpp | 2 +- kchart/kdchart/KDFrame.h | 2 +- kchart/kdchart/KDFrameProfileSection.h | 2 +- kchart/kdchart/KDXMLTools.h | 2 +- kdgantt/KDGanttMinimizeSplitter.cpp | 164 ++++---- kdgantt/KDGanttMinimizeSplitter.h | 6 +- kdgantt/KDGanttSemiSizingControl.cpp | 6 +- kdgantt/KDGanttSemiSizingControl.h | 2 +- kdgantt/KDGanttView.cpp | 172 ++++---- kdgantt/KDGanttView.h | 12 +- kdgantt/KDGanttViewItem.cpp | 168 ++++---- kdgantt/KDGanttViewItem.h | 6 +- kdgantt/KDGanttViewItemDrag.cpp | 6 +- kdgantt/KDGanttViewItemDrag.h | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 58 +-- kdgantt/KDGanttViewSubwidgets.h | 6 +- kdgantt/KDGanttViewTaskItem.cpp | 2 +- kdgantt/KDGanttXMLTools.cpp | 2 +- kdgantt/itemAttributeDialog.ui | 6 +- kdgantt/itemAttributeDialog.ui.h | 22 +- kdgantt/qlayoutengine_p.h | 12 +- kexi/3rdparty/kexisql/src/btree.c | 16 +- kexi/3rdparty/kexisql/src/btree_rb.c | 10 +- kexi/3rdparty/kexisql/src/os.c | 10 +- kexi/3rdparty/kexisql3/src/btree.c | 32 +- kexi/3rdparty/kexisql3/src/build.c | 2 +- kexi/3rdparty/kexisql3/src/expr.c | 4 +- kexi/3rdparty/kexisql3/src/main.c | 6 +- kexi/3rdparty/kexisql3/src/os_mac.c | 10 +- kexi/3rdparty/kexisql3/src/os_win.c | 6 +- kexi/3rdparty/kexisql3/src/pager.c | 2 +- kexi/3rdparty/kexisql3/src/prepare.c | 2 +- kexi/3rdparty/kexisql3/src/sqlite3.h | 2 +- kexi/3rdparty/kexisql3/src/utf.c | 14 +- kexi/3rdparty/kexisql3/src/vdbeInt.h | 2 +- kexi/3rdparty/kexisql3/src/where.c | 2 +- kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp | 12 +- kexi/3rdparty/kolibs/KoPageLayoutColumns.h | 10 +- .../kolibs/KoPageLayoutColumnsBase.ui | 2 +- kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp | 2 +- .../3rdparty/kolibs/KoPageLayoutHeaderBase.ui | 10 +- kexi/3rdparty/kolibs/KoPageLayoutSize.cpp | 14 +- kexi/3rdparty/kolibs/KoPageLayoutSize.h | 8 +- kexi/3rdparty/kolibs/koGlobal.cc | 2 +- kexi/3rdparty/kolibs/koPageLayout.cpp | 32 +- kexi/3rdparty/kolibs/koPageLayout.h | 8 +- kexi/3rdparty/kolibs/koPageLayoutDia.cc | 86 ++-- kexi/3rdparty/kolibs/koPageLayoutDia.h | 26 +- kexi/3rdparty/kolibs/koUnit.cc | 34 +- kexi/3rdparty/kolibs/koUnitWidgets.cc | 32 +- kexi/core/kexi.cpp | 66 ++-- kexi/core/kexi.h | 26 +- kexi/core/kexiactionproxy.cpp | 6 +- kexi/core/kexiactionproxy.h | 2 +- kexi/core/kexiblobbuffer.cpp | 2 +- kexi/core/kexicontexthelp.cpp | 2 +- kexi/core/kexidbshortcutfile.cpp | 6 +- kexi/core/kexidialogbase.cpp | 26 +- kexi/core/kexidialogbase.h | 6 +- kexi/core/kexiguimsghandler.cpp | 6 +- kexi/core/kexiguimsghandler.h | 4 +- kexi/core/kexiinternalpart.cpp | 6 +- kexi/core/kexipart.cpp | 24 +- kexi/core/kexipart.h | 4 +- kexi/core/kexipartmanager.cpp | 4 +- kexi/core/kexiproject.cpp | 30 +- kexi/core/kexiprojectdata.cpp | 6 +- kexi/core/kexisharedactionhost.cpp | 8 +- kexi/core/kexisharedactionhost.h | 2 +- kexi/core/kexiviewbase.cpp | 22 +- kexi/core/kexiviewbase.h | 4 +- kexi/doc/common/kde-default.css | 4 +- kexi/doc/common/kde-web.css | 4 +- kexi/doc/dev/kexi_guidelines.txt | 2 +- .../html.tmp/01_02_00_db_spreadsheet.html | 2 +- .../html.tmp/05_01_00_table_designing.html | 2 +- .../html.tmp/05_04_00_form_designing.html | 64 +-- kexi/doc/handbook/translation-status.txt | 2 +- kexi/examples/Simple_Database.kexi.sql | 6 +- kexi/formeditor/commands.cpp | 78 ++-- kexi/formeditor/commands.h | 6 +- kexi/formeditor/connectiondialog.cpp | 28 +- kexi/formeditor/container.cpp | 78 ++-- kexi/formeditor/container.h | 16 +- kexi/formeditor/editlistviewdialog.cpp | 20 +- .../formeditor/factories/containerfactory.cpp | 28 +- kexi/formeditor/factories/containerfactory.h | 6 +- .../formeditor/factories/stdwidgetfactory.cpp | 20 +- kexi/formeditor/form.cpp | 10 +- kexi/formeditor/form.h | 10 +- kexi/formeditor/formIO.cpp | 152 ++++---- kexi/formeditor/formmanager.cpp | 46 +-- kexi/formeditor/formmanager.h | 20 +- kexi/formeditor/kfdpixmapedit.cpp | 2 +- kexi/formeditor/objecttree.cpp | 14 +- kexi/formeditor/objecttree.h | 6 +- kexi/formeditor/objecttreeview.cpp | 6 +- kexi/formeditor/objecttreeview.h | 2 +- kexi/formeditor/richtextdialog.cpp | 12 +- kexi/formeditor/richtextdialog.h | 2 +- kexi/formeditor/scripting/formscript.cpp | 2 +- kexi/formeditor/spring.cpp | 16 +- kexi/formeditor/tabstopdialog.cpp | 2 +- .../tdevelop_plugin/kfd_kdev_part.cpp | 14 +- kexi/formeditor/test/kfd_part.cpp | 20 +- kexi/formeditor/utils.cpp | 26 +- kexi/formeditor/utils.h | 14 +- kexi/formeditor/widgetfactory.cpp | 24 +- kexi/formeditor/widgetfactory.h | 6 +- kexi/formeditor/widgetlibrary.cpp | 14 +- kexi/formeditor/widgetpropertyset.cpp | 68 ++-- kexi/formeditor/widgetpropertyset.h | 12 +- .../widgetwithsubpropertiesinterface.cpp | 12 +- kexi/kexidb/alter.cpp | 32 +- kexi/kexidb/connection.cpp | 246 ++++++------ kexi/kexidb/cursor.cpp | 2 +- kexi/kexidb/dbobjectnamevalidator.cpp | 2 +- kexi/kexidb/dbproperties.cpp | 56 +-- kexi/kexidb/driver.cpp | 14 +- kexi/kexidb/driver_p.cpp | 2 +- kexi/kexidb/drivermanager.cpp | 18 +- kexi/kexidb/drivers/mySQL/mysqlconnection.cpp | 2 +- kexi/kexidb/drivers/mySQL/mysqldriver.cpp | 6 +- kexi/kexidb/drivers/pqxx/pqxxconnection.cpp | 12 +- kexi/kexidb/drivers/pqxx/pqxxcursor.h | 2 +- kexi/kexidb/drivers/pqxx/pqxxdriver.cpp | 6 +- kexi/kexidb/drivers/sqlite/sqliteadmin.cpp | 2 +- .../drivers/sqlite/sqliteconnection.cpp | 16 +- kexi/kexidb/drivers/sqlite/sqlitecursor.cpp | 14 +- kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp | 4 +- kexi/kexidb/expression.cpp | 44 +-- kexi/kexidb/field.cpp | 22 +- kexi/kexidb/fieldlist.cpp | 6 +- kexi/kexidb/fieldlist.h | 4 +- kexi/kexidb/lookupfieldschema.cpp | 12 +- kexi/kexidb/parser/parser_p.cpp | 36 +- kexi/kexidb/parser/sqlparser.cpp | 2 +- kexi/kexidb/parser/sqlparser.y | 4 +- kexi/kexidb/queryschema.cpp | 42 +- kexi/kexidb/queryschemaparameter.cpp | 4 +- kexi/kexidb/schemadata.cpp | 2 +- kexi/kexidb/simplecommandlineapp.cpp | 2 +- kexi/kexidb/utils.cpp | 40 +- kexi/kexidb/utils.h | 6 +- kexi/kexiutils/debuggui.cpp | 2 +- kexi/kexiutils/identifier.cpp | 12 +- kexi/kexiutils/longlongvalidator.cpp | 2 +- kexi/kexiutils/styleproxy.h | 28 +- kexi/kexiutils/transliteration_table.h | 2 +- kexi/kexiutils/tristate.h | 4 +- kexi/kexiutils/utils.cpp | 28 +- kexi/kexiutils/utils.h | 4 +- kexi/kexiutils/validator.cpp | 2 +- kexi/main/kexifinddialog.cpp | 12 +- kexi/main/kexifinddialogbase.ui | 6 +- kexi/main/keximainwindowimpl.cpp | 116 +++--- kexi/main/keximainwindowimpl.h | 4 +- kexi/main/keximainwindowimpl_p.h | 6 +- kexi/main/kexinamedialog.cpp | 8 +- kexi/main/kexinamewidget.cpp | 12 +- kexi/main/kexinamewidget.h | 2 +- kexi/main/kexinewstuff.cpp | 2 +- kexi/main/kexistatusbar.cpp | 14 +- kexi/main/kexistatusbar.h | 4 +- .../printing/kexisimpleprintingengine.cpp | 8 +- .../printing/kexisimpleprintingpagesetup.cpp | 8 +- .../kexisimpleprintingpagesetupbase.ui | 24 +- .../printing/kexisimpleprintpreviewwindow.cpp | 16 +- kexi/main/startup/KexiConnSelector.cpp | 20 +- kexi/main/startup/KexiConnSelectorBase.ui | 14 +- kexi/main/startup/KexiDBTitlePage.h | 2 +- kexi/main/startup/KexiDBTitlePageBase.ui | 6 +- kexi/main/startup/KexiNewPrjTypeSelector.ui | 4 +- kexi/main/startup/KexiNewProjectWizard.cpp | 14 +- kexi/main/startup/KexiOpenExistingFile.ui | 12 +- kexi/main/startup/KexiProjectSelector.cpp | 4 +- kexi/main/startup/KexiProjectSelectorBase.ui | 4 +- kexi/main/startup/KexiServerDBNamePage.ui | 10 +- kexi/main/startup/KexiStartup.cpp | 68 ++-- kexi/main/startup/KexiStartup.h | 2 +- kexi/main/startup/KexiStartupDialog.cpp | 8 +- .../KexiStartupDialogTemplatesPage.cpp | 4 +- kexi/main/startup/KexiStartupFileDialog.cpp | 14 +- .../startup/KexiStartupFileDialog_win.cpp | 14 +- kexi/main/startup/KexiStartup_p.cpp | 2 +- kexi/migration/importoptionsdlg.cpp | 12 +- kexi/migration/importwizard.cpp | 54 +-- kexi/migration/importwizard.h | 4 +- kexi/migration/keximigrate.cpp | 80 ++-- kexi/migration/keximigrate.h | 8 +- kexi/migration/migratemanager.cpp | 22 +- kexi/migration/mysql/mysqlmigrate.cpp | 4 +- kexi/migration/pqxx/pqxxmigrate.cpp | 18 +- .../forms/kexiactionselectiondialog.cpp | 58 +-- .../plugins/forms/kexiactionselectiondialog.h | 2 +- kexi/plugins/forms/kexidataprovider.cpp | 8 +- kexi/plugins/forms/kexidatasourcepage.cpp | 20 +- kexi/plugins/forms/kexidbfactory.cpp | 22 +- .../forms/kexidbtextwidgetinterface.cpp | 8 +- .../plugins/forms/kexidbtextwidgetinterface.h | 2 +- kexi/plugins/forms/kexiformeventhandler.cpp | 4 +- kexi/plugins/forms/kexiformmanager.cpp | 2 +- kexi/plugins/forms/kexiformpart.cpp | 4 +- kexi/plugins/forms/kexiformscrollview.cpp | 16 +- kexi/plugins/forms/kexiformscrollview.h | 14 +- kexi/plugins/forms/kexiformview.cpp | 44 +-- kexi/plugins/forms/kexiformview.h | 2 +- .../plugins/forms/widgets/kexidbautofield.cpp | 72 ++-- kexi/plugins/forms/widgets/kexidbautofield.h | 2 +- kexi/plugins/forms/widgets/kexidbcombobox.cpp | 40 +- kexi/plugins/forms/widgets/kexidbcombobox.h | 4 +- kexi/plugins/forms/widgets/kexidbdateedit.cpp | 12 +- .../forms/widgets/kexidbdatetimeedit.cpp | 18 +- kexi/plugins/forms/widgets/kexidbform.cpp | 36 +- kexi/plugins/forms/widgets/kexidbform.h | 2 +- kexi/plugins/forms/widgets/kexidbimagebox.cpp | 62 +-- kexi/plugins/forms/widgets/kexidbimagebox.h | 10 +- kexi/plugins/forms/widgets/kexidblabel.cpp | 24 +- kexi/plugins/forms/widgets/kexidblineedit.cpp | 4 +- kexi/plugins/forms/widgets/kexidbsubform.cpp | 2 +- kexi/plugins/forms/widgets/kexidbtextedit.cpp | 2 +- kexi/plugins/forms/widgets/kexidbtimeedit.cpp | 2 +- kexi/plugins/forms/widgets/kexiframe.cpp | 2 +- kexi/plugins/forms/widgets/kexiframe.h | 2 +- .../forms/widgets/kexiframeutils_p.cpp | 20 +- .../importexport/csv/kexicsvexport.cpp | 4 +- .../importexport/csv/kexicsvexportwizard.cpp | 28 +- .../importexport/csv/kexicsvexportwizard.h | 2 +- .../importexport/csv/kexicsvimportdialog.cpp | 78 ++-- .../csv/kexicsvimportoptionsdlg.cpp | 6 +- .../importexport/csv/kexicsvwidgets.cpp | 20 +- .../plugins/importexport/csv/kexicsvwidgets.h | 2 +- .../macros/kexiactions/datatableaction.cpp | 6 +- .../macros/kexiactions/executeaction.cpp | 6 +- .../macros/kexiactions/navigateaction.cpp | 6 +- .../macros/kexiactions/objectnamevariable.h | 4 +- .../macros/kexiactions/objectvariable.h | 4 +- .../plugins/macros/kexiactions/openaction.cpp | 12 +- .../macros/kexipart/keximacrodesignview.cpp | 10 +- .../macros/kexipart/keximacrodesignview.h | 2 +- .../macros/kexipart/keximacroerror.cpp | 8 +- .../macros/kexipart/keximacroerrorbase.ui | 12 +- .../macros/kexipart/keximacroproperty.cpp | 42 +- .../macros/kexipart/keximacrotextview.cpp | 8 +- .../plugins/macros/kexipart/keximacroview.cpp | 6 +- kexi/plugins/macros/lib/action.cpp | 4 +- kexi/plugins/macros/lib/context.cpp | 14 +- kexi/plugins/macros/lib/context.h | 2 +- kexi/plugins/macros/lib/exception.cpp | 2 +- kexi/plugins/macros/lib/macro.cpp | 2 +- kexi/plugins/macros/lib/macro.h | 2 +- kexi/plugins/macros/lib/metamethod.cpp | 12 +- kexi/plugins/macros/lib/metaobject.cpp | 18 +- kexi/plugins/macros/lib/variable.cpp | 18 +- kexi/plugins/macros/lib/variable.h | 12 +- kexi/plugins/macros/lib/xmlhandler.cpp | 10 +- kexi/plugins/macros/tests/commontests.cpp | 32 +- kexi/plugins/macros/tests/komacrotestbase.h | 4 +- kexi/plugins/macros/tests/testobject.cpp | 2 +- kexi/plugins/macros/tests/xmlhandlertests.cpp | 10 +- .../plugins/macros/tests/xmlhandlertests2.cpp | 8 +- kexi/plugins/queries/kexiaddparamwidget.ui | 12 +- .../queries/kexiparameterlisteditor.ui | 2 +- .../queries/kexiquerydesignerguieditor.cpp | 42 +- .../queries/kexiquerydesignerguieditor.h | 8 +- kexi/plugins/queries/kexiquerydesignersql.cpp | 44 +-- .../queries/kexiquerydesignersqlhistory.cpp | 50 +-- .../queries/kexiquerydesignersqlhistory.h | 2 +- kexi/plugins/queries/kexiqueryview.cpp | 2 +- .../plugins/relations/kexirelationmaindlg.cpp | 4 +- kexi/plugins/relations/kexirelationmaindlg.h | 2 +- kexi/plugins/reports/kexireportfactory.cpp | 8 +- kexi/plugins/reports/kexireportform.cpp | 8 +- kexi/plugins/reports/kexireportform.h | 2 +- .../scripting/kexidb/kexidbconnection.cpp | 6 +- .../scripting/kexidb/kexidbdrivermanager.cpp | 6 +- .../plugins/scripting/kexidb/kexidbschema.cpp | 4 +- .../kexiscripting/kexiscriptdesignview.cpp | 18 +- .../kexiscripting/kexiscripteditor.cpp | 2 +- .../kexiscripting/kexiscriptpart.cpp | 2 +- .../scripts/copycenter/CopyCenter.py | 32 +- .../copycenter/CopyCenterPluginQtSQL.py | 6 +- .../scripts/exportxhtml/ExportXHTML.py | 2 +- .../scripts/importxhtml/ImportXHTML.py | 4 +- kexi/plugins/tables/kexilookupcolumnpage.cpp | 14 +- .../tables/kexitabledesignercommands.cpp | 32 +- kexi/plugins/tables/kexitabledesignerview.cpp | 58 +-- kexi/plugins/tables/kexitabledesignerview.h | 4 +- .../tables/kexitabledesignerview_p.cpp | 2 +- kexi/plugins/tables/kexitablepart.cpp | 4 +- kexi/tests/altertable/1.kexi | Bin 49206 -> 49204 bytes kexi/tests/altertable/altertable.cpp | 66 ++-- .../gui/finddialog/kexifinddialogbase.ui | 8 +- kexi/tests/newapi/dr_prop_test.h | 2 +- kexi/tests/newapi/main.cpp | 4 +- kexi/tests/newapi/parser_test.h | 4 +- kexi/tests/widgets/kexidbdrivercombotest.cpp | 2 +- kexi/widget/kexibrowser.cpp | 8 +- kexi/widget/kexicharencodingcombobox.cpp | 10 +- kexi/widget/kexicustompropertyfactory_p.cpp | 4 +- kexi/widget/kexidataawareview.cpp | 18 +- kexi/widget/kexidataawareview.h | 4 +- kexi/widget/kexidatatable.cpp | 6 +- kexi/widget/kexidbconnectionwidget.cpp | 8 +- kexi/widget/kexidbconnectionwidgetbase.ui | 20 +- .../kexidbconnectionwidgetdetailsbase.ui | 10 +- kexi/widget/kexidswelcome.cpp | 4 +- kexi/widget/kexieditor.cpp | 12 +- kexi/widget/kexifieldcombobox.cpp | 6 +- kexi/widget/kexifieldlistview.cpp | 4 +- kexi/widget/kexifieldlistview.h | 2 +- kexi/widget/kexifilterdlg.cpp | 2 +- kexi/widget/kexiprjtypeselectorbase.ui | 4 +- kexi/widget/kexipropertyeditorview.cpp | 16 +- kexi/widget/kexipropertyeditorview.h | 4 +- kexi/widget/kexiscrollview.cpp | 18 +- kexi/widget/kexisectionheader.cpp | 20 +- kexi/widget/kexisectionheader.h | 2 +- kexi/widget/kexismalltoolbutton.cpp | 6 +- kexi/widget/pixmapcollection.cpp | 22 +- kexi/widget/relations/kexirelationview.cpp | 16 +- kexi/widget/relations/kexirelationview.h | 4 +- .../relations/kexirelationviewconnection.cpp | 6 +- .../relations/kexirelationviewtable.cpp | 28 +- kexi/widget/relations/kexirelationviewtable.h | 2 +- kexi/widget/relations/kexirelationwidget.cpp | 8 +- kexi/widget/relations/kexirelationwidget.h | 4 +- kexi/widget/tableview/kexiblobtableedit.cpp | 12 +- kexi/widget/tableview/kexibooltableedit.cpp | 6 +- kexi/widget/tableview/kexicomboboxbase.cpp | 2 +- kexi/widget/tableview/kexicomboboxpopup.cpp | 8 +- .../tableview/kexicomboboxtableedit.cpp | 14 +- .../tableview/kexidataawareobjectiface.cpp | 64 +-- .../tableview/kexidataawareobjectiface.h | 22 +- .../tableview/kexidataawarepropertyset.cpp | 6 +- .../tableview/kexidataawarepropertyset.h | 4 +- kexi/widget/tableview/kexidatetableedit.cpp | 8 +- .../tableview/kexidatetimetableedit.cpp | 6 +- kexi/widget/tableview/kexiinputtableedit.cpp | 10 +- kexi/widget/tableview/kexitableedit.cpp | 4 +- kexi/widget/tableview/kexitableitem.cpp | 2 +- kexi/widget/tableview/kexitableview.cpp | 144 +++---- kexi/widget/tableview/kexitableview.h | 30 +- kexi/widget/tableview/kexitableview_p.cpp | 2 +- kexi/widget/tableview/kexitableviewdata.cpp | 52 +-- kexi/widget/tableview/kexitableviewdata.h | 26 +- kexi/widget/tableview/kexitableviewheader.cpp | 10 +- kexi/widget/tableview/kexitimetableedit.cpp | 6 +- kexi/widget/utils/kexiarrowtip.cpp | 4 +- .../utils/kexicomboboxdropdownbutton.cpp | 10 +- .../widget/utils/kexicomboboxdropdownbutton.h | 2 +- kexi/widget/utils/kexicontextmenuutils.cpp | 16 +- kexi/widget/utils/kexidatetimeformatter.cpp | 16 +- kexi/widget/utils/kexidisplayutils.cpp | 6 +- kexi/widget/utils/kexidropdownbutton.cpp | 6 +- kexi/widget/utils/kexidropdownbutton.h | 2 +- kexi/widget/utils/kexiflowlayout.cpp | 88 ++--- kexi/widget/utils/kexiflowlayout.h | 18 +- kexi/widget/utils/kexigradientwidget.cpp | 8 +- kexi/widget/utils/kexigradientwidget.h | 4 +- kexi/widget/utils/kexirecordmarker.cpp | 10 +- kexi/widget/utils/kexirecordnavigator.cpp | 22 +- kexi/widget/utils/kexirecordnavigator.h | 2 +- kexi/widget/utils/kexitooltip.cpp | 4 +- kexi/widget/utils/kexitooltip.h | 2 +- kformula/DESIGN | 48 +-- kformula/formulastring.cc | 6 +- kformula/fsparser.cc | 32 +- kformula/kformula_view.cc | 2 +- kformula/kformulawidget.cc | 6 +- kivio/kiviopart/config/kivio_config.cpp | 38 +- kivio/kiviopart/config/kivio_config.h | 6 +- kivio/kiviopart/kivio_canvas.cpp | 8 +- kivio/kiviopart/kivio_dlg_pageshow.cpp | 2 +- kivio/kiviopart/kivio_doc.cpp | 10 +- kivio/kiviopart/kivio_icon_view.cpp | 4 +- kivio/kiviopart/kivio_icon_view.h | 2 +- kivio/kiviopart/kivio_page.cpp | 18 +- kivio/kiviopart/kivio_page.h | 2 +- kivio/kiviopart/kivio_spawner_drag.cpp | 4 +- kivio/kiviopart/kivio_spawner_drag.h | 2 +- kivio/kiviopart/kivio_stackbar.cpp | 6 +- .../kivio_stencil_geometry_panel.cpp | 2 +- kivio/kiviopart/kivio_view.cpp | 46 +-- kivio/kiviopart/kivio_zoomaction.cpp | 30 +- kivio/kiviopart/kiviodragobject.cpp | 8 +- kivio/kiviopart/kiviodragobject.h | 2 +- kivio/kiviopart/kivioglobal.cpp | 76 ++-- kivio/kiviopart/kivioglobal.h | 10 +- kivio/kiviopart/kiviosdk/diapathparser.cpp | 16 +- kivio/kiviopart/kiviosdk/diapathparser.h | 4 +- kivio/kiviopart/kiviosdk/kivio_1d_stencil.h | 2 +- .../kiviosdk/kivio_base_connector_stencil.h | 2 +- .../kiviosdk/kivio_base_target_stencil.cpp | 2 +- kivio/kiviopart/kiviosdk/kivio_common.cpp | 4 +- .../kiviosdk/kivio_connector_point.cpp | 12 +- .../kiviosdk/kivio_dia_stencil_spawner.cpp | 18 +- kivio/kiviopart/kiviosdk/kivio_fill_style.h | 2 +- kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp | 50 +-- .../kiviosdk/kivio_screen_painter.cpp | 8 +- kivio/kiviopart/kiviosdk/kivio_shape.cpp | 178 ++++----- kivio/kiviopart/kiviosdk/kivio_shape.h | 6 +- kivio/kiviopart/kiviosdk/kivio_shape_data.cpp | 40 +- kivio/kiviopart/kiviosdk/kivio_shape_data.h | 14 +- .../kiviosdk/kivio_shape_painter.cpp | 4 +- .../kiviopart/kiviosdk/kivio_sml_stencil.cpp | 216 +++++------ kivio/kiviopart/kiviosdk/kivio_sml_stencil.h | 2 +- .../kiviosdk/kivio_sml_stencil_spawner.cpp | 32 +- .../kiviosdk/kivio_stencil_spawner_set.cpp | 4 +- kivio/kiviopart/kiviosdk/kivio_text_style.h | 4 +- kivio/kiviopart/kiviostencilsetinstaller.cpp | 4 +- kivio/kiviopart/stencilbarbutton.cpp | 24 +- kivio/kiviopart/stencilbarbutton.h | 2 +- kivio/kiviopart/stencilbardockmanager.cpp | 16 +- kivio/kiviopart/stencilbardockmanager.h | 2 +- .../stencils/Dia/Assorted/arrow-chevron.shape | 4 +- .../stencils/Dia/Assorted/arrow-down.shape | 4 +- .../Dia/Assorted/arrow-left-notched.shape | 4 +- .../Dia/Assorted/arrow-left-right-up.shape | 4 +- .../Dia/Assorted/arrow-left-right.shape | 4 +- .../stencils/Dia/Assorted/arrow-left-up.shape | 4 +- .../stencils/Dia/Assorted/arrow-left.shape | 4 +- .../Dia/Assorted/arrow-pentagon.shape | 4 +- .../stencils/Dia/Assorted/arrow-quad.shape | 4 +- .../Dia/Assorted/arrow-right-notched.shape | 4 +- .../stencils/Dia/Assorted/arrow-right.shape | 4 +- .../Dia/Assorted/arrow-up-down-left.shape | 4 +- .../stencils/Dia/Assorted/arrow-up-down.shape | 4 +- .../stencils/Dia/Assorted/arrow-up.shape | 4 +- .../stencils/Dia/Assorted/circle.shape | 4 +- .../stencils/Dia/Assorted/cross-maltese.shape | 4 +- .../stencils/Dia/Assorted/cross-swiss.shape | 4 +- .../stencils/Dia/Assorted/diamond.shape | 4 +- .../stencils/Dia/Assorted/heptagon.shape | 4 +- .../stencils/Dia/Assorted/hexagon.shape | 4 +- .../stencils/Dia/Assorted/octagon.shape | 4 +- .../Assorted/parallelogram-horizontal.shape | 4 +- .../Dia/Assorted/parallelogram-vertical.shape | 4 +- .../stencils/Dia/Assorted/pentagon.shape | 4 +- .../stencils/Dia/Assorted/square.shape | 4 +- .../stencils/Dia/Assorted/star4.shape | 4 +- .../stencils/Dia/Assorted/star5.shape | 4 +- .../stencils/Dia/Assorted/star6.shape | 4 +- .../stencils/Dia/Assorted/star7.shape | 4 +- .../stencils/Dia/Assorted/star8.shape | 4 +- .../stencils/Dia/Assorted/star8sharp.shape | 4 +- .../kiviopart/stencils/Dia/Assorted/sun.shape | 6 +- .../stencils/Dia/Assorted/trapezoid.shape | 4 +- .../Dia/Assorted/triangle-isoceles.shape | 4 +- .../Dia/Assorted/triangle-rightangle.shape | 4 +- .../kiviopart/stencils/Dia/Circuit/npn.shape | 4 +- .../stencils/Dia/Circuit/opamp.shape | 4 +- .../kiviopart/stencils/Dia/Circuit/pnp.shape | 4 +- .../Dia/Civil/civil_arrow_right.shape | 4 +- .../stencils/Dia/Civil/civil_arrow_up.shape | 4 +- .../Dia/Civil/civil_backflow_preventer.shape | 4 +- .../stencils/Dia/Civil/civil_basin.shape | 4 +- .../Civil/civil_final-settling_basin.shape | 4 +- .../Dia/Civil/civil_frequency_converter.shape | 4 +- .../Dia/Civil/civil_horizontal_valve.shape | 4 +- .../stencils/Dia/Civil/civil_motor.shape | 4 +- ...civil_preliminary_clarification_tank.shape | 4 +- .../stencils/Dia/Civil/civil_rotor.shape | 4 +- .../stencils/Dia/Civil/civil_soil.shape | 4 +- .../kiviopart/stencils/Dia/Contact/c_if.shape | 4 +- .../stencils/Dia/Contact/c_ifnot.shape | 4 +- .../stencils/Dia/Contact/c_lamp.shape | 4 +- .../stencils/Dia/Contact/c_relay.shape | 4 +- .../stencils/Dia/Contact/l_ifnot.shape | 4 +- .../stencils/Dia/Contact/l_out.shape | 4 +- .../stencils/Dia/Contact/l_outj.shape | 4 +- .../stencils/Dia/Contact/l_outnot.shape | 4 +- .../stencils/Dia/Contact/l_outr.shape | 4 +- .../stencils/Dia/Contact/l_outs.shape | 4 +- .../stencils/Dia/Contact/l_sout.shape | 4 +- .../stencils/Dia/Contact/l_soutnot.shape | 4 +- .../stencils/Dia/Contact/l_soutr.shape | 4 +- .../stencils/Dia/Contact/l_souts.shape | 4 +- .../stencils/Dia/Electric/command.shape | 4 +- .../stencils/Dia/Electric/contact_f.shape | 4 +- .../stencils/Dia/Electric/contact_o.shape | 4 +- .../stencils/Dia/Electric/intpos_f.shape | 4 +- .../stencils/Dia/Electric/intpos_o.shape | 4 +- .../stencils/Dia/Electric/relay.shape | 4 +- .../stencils/Dia/MSE/demultiplexer.shape | 4 +- .../Dia/MSE/large_extension_node.shape | 4 +- .../stencils/Dia/MSE/multiplexer.shape | 4 +- .../stencils/Dia/MSE/node_center.shape | 4 +- .../Dia/MSE/small_extension_node.shape | 4 +- kivio/kiviopart/stencils/Dia/MSE/tacsat.shape | 4 +- .../stencils/Dia/Network/dat_external.shape | 4 +- .../Dia/Network/digitizing_board.shape | 4 +- .../stencils/Dia/Network/diskette.shape | 4 +- .../stencils/Dia/Network/firewall.shape | 4 +- .../kiviopart/stencils/Dia/Network/hub.shape | 4 +- .../stencils/Dia/Network/mobile_phone.shape | 4 +- .../stencils/Dia/Network/monitor.shape | 4 +- .../stencils/Dia/Network/pc_bigtower.shape | 4 +- .../stencils/Dia/Network/pc_desktop.shape | 4 +- .../stencils/Dia/Network/pc_miditower.shape | 4 +- .../stencils/Dia/Network/pc_minitower.shape | 4 +- .../stencils/Dia/Network/plotter.shape | 4 +- .../stencils/Dia/Network/workstation.shape | 4 +- .../stencils/Dia/Network/zip-disk.shape | 4 +- .../stencils/Dia/Pneumatic/dejack.shape | 4 +- .../stencils/Dia/Pneumatic/dist32.shape | 4 +- .../stencils/Dia/Pneumatic/dist42.shape | 4 +- .../stencils/Dia/Pneumatic/dist52.shape | 4 +- kivio/kiviopart/stencils/Dia/SDL/block.shape | 4 +- .../kiviopart/stencils/Dia/SDL/decision.shape | 4 +- .../kiviopart/stencils/Dia/SDL/process.shape | 4 +- .../kiviopart/stencils/Dia/SDL/service.shape | 4 +- .../stencils/Dia/Sybase/client.shape | 4 +- .../stencils/Dia/Sybase/dataserver.shape | 4 +- kivio/kiviopart/stencils/Dia/Sybase/ltm.shape | 4 +- .../stencils/Dia/Sybase/repserver.shape | 4 +- .../Flowcharting/BasicFlowcharting/Card.sml | 2 +- .../Flowcharting/BasicFlowcharting/Data.sml | 2 +- .../BasicFlowcharting/Decision.sml | 2 +- .../BasicFlowcharting/DirectData.sml | 2 +- .../BasicFlowcharting/Display.sml | 2 +- .../BasicFlowcharting/InternalStorage.sml | 2 +- .../BasicFlowcharting/LoopLimit.sml | 2 +- .../BasicFlowcharting/ManualInput.sml | 2 +- .../BasicFlowcharting/ManualOperation.sml | 2 +- .../BasicFlowcharting/PredefinedProcess.sml | 2 +- .../BasicFlowcharting/Preperation.sml | 2 +- .../BasicFlowcharting/Process.sml | 2 +- .../BasicFlowcharting/PyStencil.spy | 14 +- .../BasicFlowcharting/StoredData.sml | 2 +- .../BasicFlowcharting/Terminator.sml | 2 +- .../Flowcharting/Extended/Data_Store.sml | 2 +- .../Flowcharting/Extended/Database.sml | 2 +- .../Flowcharting/Extended/Process.sml | 2 +- .../Flowcharting/Extended/Source_or_Sink.sml | 2 +- .../Hardware/Computer/3FloppyDisk.sml | 2 +- .../stencils/Hardware/Miscellaneous/key.sml | 2 +- .../stencils/Miscellaneous/Arrows/Arrow.sml | 2 +- .../Miscellaneous/Arrows/Multiple_Arrow_1.sml | 2 +- .../Miscellaneous/Arrows/Multiple_Arrow_2.sml | 2 +- .../Miscellaneous/Arrows/Multiple_Arrow_3.sml | 2 +- .../Miscellaneous/Arrows/Sun_Arrow.sml | 2 +- .../Miscellaneous/Buildings/Factory.sml | 2 +- .../Miscellaneous/Buildings/House.sml | 2 +- .../stencils/Miscellaneous/ER/attribute.sml | 2 +- .../Miscellaneous/ER/derivedattribute.sml | 2 +- .../stencils/Miscellaneous/ER/entity.sml | 2 +- .../Miscellaneous/ER/multivaluedattribute.sml | 2 +- .../Miscellaneous/ER/relationship.sml | 2 +- .../stencils/Miscellaneous/ER/weakentity.sml | 2 +- .../Miscellaneous/ER/weakrelationship.sml | 2 +- .../stencils/Miscellaneous/People/Bad.sml | 2 +- .../stencils/Miscellaneous/People/Good.sml | 2 +- .../stencils/Miscellaneous/People/Man.sml | 2 +- .../stencils/Miscellaneous/People/Woman.sml | 2 +- .../Miscellaneous/People/Woman_Shape.sml | 2 +- .../Miscellaneous/Transport/Truck.sml | 2 +- kivio/kiviopart/ui/aligndialog.ui | 16 +- kivio/kiviopart/ui/kivio_birdeye_panel.cpp | 2 +- kivio/kiviopart/ui/kivio_layer_panel.cpp | 4 +- .../ui/kivio_protection_panel_base.ui | 6 +- .../kiviopart/ui/kivioaddstencilsetpanel.cpp | 2 +- .../kiviopart/ui/kivioarrowheadformatdlg.cpp | 2 +- kivio/kiviopart/ui/kiviooptionsdialog.cpp | 18 +- kivio/kiviopart/ui/kiviostencilformatdlg.cpp | 2 +- kivio/kiviopart/ui/kiviotextformatdlg.cpp | 12 +- kivio/kiviopart/ui/layerlisttooltip.cpp | 4 +- kivio/kiviopart/ui/objectlistpalette.cpp | 6 +- .../kivioconnectortool/tool_connector.cpp | 8 +- kivio/plugins/kivioselecttool/tool_select.cpp | 24 +- .../sml_connector/sml_connector.cpp | 16 +- .../sml_connector/sml_connector.h | 2 +- .../kiviosmlconnector/tool_connector.cpp | 4 +- .../kivio_stenciltexteditorui.ui | 2 +- .../kiviotexttool/stenciltexteditor.cpp | 6 +- kivio/plugins/kiviotexttool/tool_text.cpp | 40 +- koshell/iconsidepane.cpp | 20 +- koshell/iconsidepane.h | 10 +- koshell/koshell_shell.cc | 10 +- kplato/intervalitem.h | 2 +- kplato/kptaccountspanelbase.ui | 6 +- kplato/kptaccountsview.cc | 22 +- kplato/kptcalendar.cc | 8 +- kplato/kptcalendaredit.cc | 4 +- kplato/kptcalendareditbase.cc | 52 +-- kplato/kptcalendareditbase.h | 8 +- kplato/kptcalendarlistdialog.cc | 8 +- kplato/kptcalendarlistdialogbase.cc | 2 +- kplato/kptcalendarlistpanel.ui | 6 +- kplato/kptcalendarpanel.cc | 40 +- kplato/kptcalendarpanel.h | 8 +- kplato/kptcanvasitem.cc | 28 +- kplato/kptcommand.cc | 2 +- kplato/kptconfigbehaviorpanel.cc | 2 +- kplato/kptconfigdialog.cc | 2 +- kplato/kptconfigtaskpanelbase.ui | 4 +- kplato/kptdatetable.cc | 26 +- kplato/kptdatetable.h | 12 +- kplato/kptdoublelistviewbase.cc | 16 +- kplato/kptdoublelistviewbase.h | 4 +- kplato/kptduration.cc | 8 +- kplato/kptdurationwidget.ui | 30 +- kplato/kptganttview.cc | 36 +- kplato/kptintervaleditbase.ui | 6 +- kplato/kptmainprojectdialog.cc | 2 +- kplato/kptmainprojectpanel.cc | 2 +- kplato/kptmainprojectpanelbase.ui | 8 +- kplato/kptmilestoneprogresspanel.cc | 2 +- kplato/kptmilestoneprogresspanelbase.ui | 2 +- kplato/kptnode.cc | 8 +- kplato/kptnode.h | 6 +- kplato/kptpart.cc | 4 +- kplato/kptpertcanvas.cc | 6 +- kplato/kptpertview.cc | 8 +- kplato/kptpertview.h | 4 +- kplato/kptproject.cc | 32 +- kplato/kptproject.h | 6 +- kplato/kptprojectdialog.cc | 24 +- kplato/kptprojectdialogbase.ui | 6 +- kplato/kptrelationdialog.cc | 2 +- kplato/kptreportview.cc | 22 +- kplato/kptrequestresourcespanel.cc | 2 +- kplato/kptresource.cc | 2 +- kplato/kptresourceappointmentsview.cc | 2 +- kplato/kptresourceview.cc | 10 +- kplato/kptresourceview.h | 2 +- kplato/kptstandardworktimedialog.cc | 2 +- kplato/kptsummarytaskgeneralpanel.cc | 2 +- kplato/kptsummarytaskgeneralpanelbase.ui | 14 +- kplato/kpttask.cc | 18 +- kplato/kpttask.h | 4 +- kplato/kpttaskappointmentsview.cc | 2 +- kplato/kpttaskappointmentsview.ui.h | 6 +- kplato/kpttaskcostpanelbase.ui | 8 +- kplato/kpttaskdefaultpanel.cc | 4 +- kplato/kpttaskgeneralpanel.cc | 4 +- kplato/kpttaskgeneralpanelbase.ui | 14 +- kplato/kpttasknotespanelbase.ui | 2 +- kplato/kpttaskprogresspanel.cc | 4 +- kplato/kpttaskprogresspanelbase.ui | 22 +- kplato/kpttaskresourcespanelbase.ui | 4 +- kplato/kptview.cc | 12 +- kplato/kptview.h | 4 +- kplato/kptwbsdefinition.cc | 12 +- kplato/kptwbsdefinitionpanel.cc | 6 +- kplato/kptwbsdefinitionpanelbase.ui | 8 +- kplato/kptxmlloaderobject.h | 10 +- kplato/relationpanel.ui | 18 +- kplato/resourcedialogbase.ui | 14 +- kplato/resourcespanelbase.ui | 12 +- kplato/standardworktimedialogbase.ui | 4 +- kpresenter/KPrAutoformObject.cpp | 16 +- kpresenter/KPrBackDia.cpp | 16 +- kpresenter/KPrBackground.cpp | 4 +- kpresenter/KPrBezierCurveObject.cpp | 24 +- kpresenter/KPrBrush.cpp | 4 +- kpresenter/KPrBrush.h | 2 +- kpresenter/KPrBrushProperty.cpp | 26 +- kpresenter/KPrBrushProperty.h | 2 +- kpresenter/KPrCanvas.cpp | 138 +++---- kpresenter/KPrCanvas.h | 16 +- kpresenter/KPrClosedLineObject.cpp | 4 +- kpresenter/KPrCommand.cpp | 130 +++---- kpresenter/KPrCommand.h | 4 +- kpresenter/KPrConfig.cpp | 20 +- kpresenter/KPrCustomSlideShowDia.cpp | 8 +- kpresenter/KPrDocument.cpp | 128 +++--- kpresenter/KPrDocument.h | 20 +- kpresenter/KPrDocumentIface.cpp | 14 +- kpresenter/KPrDocumentIface.h | 2 +- kpresenter/KPrDuplicateObjDia.cpp | 2 +- kpresenter/KPrEffectDia.cpp | 38 +- kpresenter/KPrFindReplace.cpp | 4 +- kpresenter/KPrFreehandObject.cpp | 12 +- kpresenter/KPrFreehandObjectIface.cpp | 4 +- kpresenter/KPrGeneralProperty.cpp | 8 +- kpresenter/KPrGotoPage.cpp | 4 +- kpresenter/KPrImageEffectDia.cpp | 2 +- kpresenter/KPrImportStyleDia.cpp | 2 +- kpresenter/KPrMSPresentationSetup.cpp | 20 +- kpresenter/KPrMarginWidget.cpp | 8 +- kpresenter/KPrMoveHelpLineDia.cpp | 4 +- kpresenter/KPrNoteBar.cpp | 6 +- kpresenter/KPrObject.cpp | 16 +- kpresenter/KPrObject.h | 2 +- kpresenter/KPrPBPreview.cpp | 8 +- kpresenter/KPrPBPreview.h | 24 +- kpresenter/KPrPage.cpp | 44 +-- kpresenter/KPrPageEffects.cpp | 40 +- kpresenter/KPrPartObject.cpp | 4 +- kpresenter/KPrPenStyleWidget.cpp | 8 +- kpresenter/KPrPgConfDia.cpp | 10 +- kpresenter/KPrPicturePreview.cpp | 30 +- kpresenter/KPrPictureProperty.cpp | 6 +- kpresenter/KPrPiePreview.h | 10 +- kpresenter/KPrPieProperty.cpp | 6 +- kpresenter/KPrPixmapObject.cpp | 2 +- kpresenter/KPrPointObject.cpp | 2 +- kpresenter/KPrPolyLineObjectIface.cpp | 4 +- kpresenter/KPrPolygonObject.cpp | 2 +- kpresenter/KPrPolygonPreview.cpp | 10 +- kpresenter/KPrPolygonPreview.h | 4 +- kpresenter/KPrPolygonProperty.cpp | 6 +- kpresenter/KPrPresDurationDia.cpp | 6 +- kpresenter/KPrPrinterDlg.cpp | 12 +- kpresenter/KPrRectPreview.h | 6 +- kpresenter/KPrRectProperty.cpp | 6 +- kpresenter/KPrRotationDialogImpl.cpp | 2 +- kpresenter/KPrShadowDialogImpl.cpp | 2 +- kpresenter/KPrSideBar.cpp | 6 +- kpresenter/KPrSideBar.h | 4 +- kpresenter/KPrSlideTransitionDia.cpp | 4 +- kpresenter/KPrTextObject.cpp | 218 +++++------ kpresenter/KPrTextObject.h | 8 +- kpresenter/KPrTextObjectIface.cpp | 8 +- kpresenter/KPrTextPreview.h | 8 +- kpresenter/KPrTextProperty.cpp | 10 +- kpresenter/KPrTransEffectDia.cpp | 18 +- kpresenter/KPrUtils.cpp | 2 +- kpresenter/KPrView.cpp | 168 ++++---- kpresenter/KPrView.h | 2 +- kpresenter/KPrViewIface.cpp | 4 +- kpresenter/KPrWebPresentation.cpp | 164 ++++---- kpresenter/autoformEdit/AFChoose.cpp | 8 +- kpresenter/autoformEdit/ATFInterpreter.cpp | 20 +- kpresenter/generalpropertyui.ui | 4 +- kpresenter/gradientpropertyui.ui | 4 +- kpresenter/imageEffectBase.ui | 50 +-- kpresenter/insertpagedia.ui | 2 +- kpresenter/kprconverter.pl | 6 +- kpresenter/marginui.ui | 4 +- kpresenter/penstyle.ui | 2 +- kpresenter/picturepropertyui.ui | 2 +- kpresenter/piepropertyui.ui | 2 +- kpresenter/polygonpropertyui.ui | 4 +- kpresenter/rectpropertyui.ui | 10 +- kpresenter/rotationpropertyui.ui | 8 +- kpresenter/shadowdialog.ui | 4 +- kpresenter/slidetransitionwidget.ui | 12 +- kspread/DESIGN.html | 28 +- kspread/KSpreadColumnIface.cc | 2 +- kspread/KSpreadLayoutIface.cc | 158 ++++---- kspread/KSpreadLayoutIface.h | 2 +- kspread/KSpreadRowIface.cc | 2 +- kspread/OASIS.txt | 14 +- kspread/commands.cc | 78 ++-- kspread/commands.h | 8 +- kspread/dialogs/font_cell_format.ui | 6 +- kspread/dialogs/kspread_dlg_angle.cc | 4 +- kspread/dialogs/kspread_dlg_area.cc | 4 +- kspread/dialogs/kspread_dlg_comment.cc | 2 +- kspread/dialogs/kspread_dlg_conditional.cc | 28 +- kspread/dialogs/kspread_dlg_cons.cc | 12 +- kspread/dialogs/kspread_dlg_csv.cc | 42 +- kspread/dialogs/kspread_dlg_database.cc | 48 +-- kspread/dialogs/kspread_dlg_database.h | 6 +- kspread/dialogs/kspread_dlg_find.cc | 20 +- kspread/dialogs/kspread_dlg_format.cc | 10 +- kspread/dialogs/kspread_dlg_formula.cc | 10 +- kspread/dialogs/kspread_dlg_goalseek.cc | 8 +- kspread/dialogs/kspread_dlg_goto.cc | 2 +- kspread/dialogs/kspread_dlg_insert.cc | 4 +- kspread/dialogs/kspread_dlg_layout.cc | 110 +++--- kspread/dialogs/kspread_dlg_layout.h | 10 +- kspread/dialogs/kspread_dlg_list.cc | 2 +- kspread/dialogs/kspread_dlg_paperlayout.cc | 28 +- kspread/dialogs/kspread_dlg_paperlayout.h | 2 +- kspread/dialogs/kspread_dlg_pasteinsert.cc | 4 +- kspread/dialogs/kspread_dlg_preference.cc | 24 +- kspread/dialogs/kspread_dlg_reference.cc | 12 +- kspread/dialogs/kspread_dlg_resize2.cc | 2 +- kspread/dialogs/kspread_dlg_series.cc | 2 +- kspread/dialogs/kspread_dlg_show.cc | 2 +- kspread/dialogs/kspread_dlg_showColRow.cc | 8 +- kspread/dialogs/kspread_dlg_sort.cc | 64 +-- kspread/dialogs/kspread_dlg_special.cc | 8 +- kspread/dialogs/kspread_dlg_styles.cc | 14 +- kspread/dialogs/kspread_dlg_subtotal.cc | 2 +- kspread/dialogs/kspread_dlg_validity.cc | 26 +- kspread/dialogs/kspreadsubtotal.ui | 2 +- kspread/dialogs/link.cc | 4 +- kspread/dialogs/position_cell_format.ui | 10 +- kspread/dialogs/protection_cell_format.ui | 10 +- kspread/dialogs/sheet_properties.cc | 2 +- kspread/dialogs/sheet_properties_base.ui | 10 +- kspread/digest.cc | 2 +- kspread/doc/PAINTING.html | 8 +- kspread/formula.cc | 26 +- kspread/kspread_brush.cc | 4 +- kspread/kspread_brush.h | 2 +- kspread/kspread_canvas.cc | 130 +++---- kspread/kspread_canvas.h | 10 +- kspread/kspread_cell.cc | 128 +++--- kspread/kspread_cell.h | 10 +- kspread/kspread_cluster.cc | 4 +- kspread/kspread_doc.cc | 38 +- kspread/kspread_doc.h | 10 +- kspread/kspread_editors.cc | 12 +- kspread/kspread_format.cc | 6 +- kspread/kspread_format.h | 4 +- kspread/kspread_functions_conversion.cc | 4 +- kspread/kspread_functions_datetime.cc | 26 +- kspread/kspread_functions_information.cc | 4 +- kspread/kspread_functions_text.cc | 8 +- kspread/kspread_generalProperty.cpp | 8 +- kspread/kspread_map.cc | 4 +- kspread/kspread_object.cc | 124 +++--- kspread/kspread_object.h | 14 +- kspread/kspread_propertyEditor.cpp | 4 +- kspread/kspread_sheet.cc | 98 ++--- kspread/kspread_sheet.h | 34 +- kspread/kspread_sheetprint.cc | 34 +- kspread/kspread_sheetprint.h | 8 +- kspread/kspread_style.cc | 2 +- kspread/kspread_style.h | 2 +- kspread/kspread_toolbox.cc | 8 +- kspread/kspread_undo.cc | 168 ++++---- kspread/kspread_util.cc | 18 +- kspread/kspread_value.cc | 2 +- kspread/kspread_value.h | 2 +- kspread/kspread_view.cc | 76 ++-- kspread/kspread_view.h | 12 +- kspread/manipulator.cc | 100 ++--- kspread/plugins/calculator/configdlg.cpp | 8 +- kspread/plugins/calculator/kcalc.cpp | 48 +-- kspread/plugins/calculator/kcalc.h | 2 +- .../kspread_insertcalendardialog.cc | 2 +- .../kspread_insertcalendardialogbase.ui | 2 +- .../kspread_plugininsertcalendar.cc | 2 +- .../kspreadcore/kspreadcoremodule.cpp | 6 +- kspread/plugins/scripting/scripting.cc | 4 +- .../scripts/exporthtml/ExportHtml.py | 4 +- .../scripts/scripteditor/ScriptEditor.py | 8 +- kspread/tests/inspector.cc | 6 +- kspread/tests/tester.cc | 2 +- kspread/tests/testrunner.cc | 24 +- kspread/valueconverter.cc | 8 +- kspread/valueformatter.cc | 58 +-- kugar/kudesigner/kudesigner_doc.cpp | 4 +- kugar/kudesigner/kudesigner_view.cpp | 2 +- kugar/kudesigner_lib/canvas.cpp | 12 +- kugar/kudesigner_lib/detail.cpp | 2 +- kugar/kudesigner_lib/detailfooter.cpp | 2 +- kugar/kudesigner_lib/detailheader.cpp | 2 +- kugar/kudesigner_lib/propertyserializer.cpp | 4 +- kugar/kudesigner_lib/structurewidget.cpp | 14 +- kugar/lib/inputmask.cpp | 4 +- kugar/lib/mlabelobject.cpp | 10 +- kugar/lib/mlabelobject.h | 12 +- kugar/lib/mlineobject.cpp | 4 +- kugar/lib/mpagedisplay.cpp | 2 +- kugar/lib/mpagedisplay.h | 2 +- kugar/lib/mreportengine.cpp | 58 +-- kugar/lib/mreportengine.h | 20 +- kugar/lib/mreportobject.cpp | 4 +- kugar/lib/mreportsection.cpp | 6 +- kugar/lib/mreportviewer.cpp | 14 +- kugar/lib/mreportviewer.h | 2 +- kugar/lib/mutil.cpp | 24 +- kugar/part/kugar_part.cpp | 22 +- kugar/part/kugar_view.cpp | 6 +- kword/DESIGN | 10 +- kword/HACKING | 6 +- kword/KWAnchor.cpp | 4 +- kword/KWCanvas.cpp | 16 +- kword/KWCanvas.h | 6 +- kword/KWCommand.cpp | 70 ++-- kword/KWCommand.h | 4 +- kword/KWConfig.cpp | 10 +- kword/KWConfigFootNoteDia.cpp | 20 +- kword/KWCreateBookmarkDia.cpp | 2 +- kword/KWCreateBookmarkDiaBase.ui | 2 +- kword/KWDeleteDia.cpp | 10 +- kword/KWDocStruct.cpp | 12 +- kword/KWDocStruct.h | 2 +- kword/KWDocument.cpp | 130 +++---- kword/KWDocument.h | 24 +- kword/KWEditPersonnalExpression.cpp | 46 +-- kword/KWFindReplace.cpp | 4 +- kword/KWFootNoteDia.cpp | 2 +- kword/KWFormulaFrameSet.cpp | 2 +- kword/KWFrame.cpp | 2 +- kword/KWFrame.h | 4 +- kword/KWFrameDia.cpp | 96 ++--- kword/KWFrameLayout.cpp | 20 +- kword/KWFrameLayout.h | 10 +- kword/KWFrameSet.cpp | 20 +- kword/KWFrameSet.h | 16 +- kword/KWFrameStyle.cpp | 2 +- kword/KWFrameStyle.h | 4 +- kword/KWFrameStyleManager.cpp | 24 +- kword/KWFrameStyleManager.h | 10 +- kword/KWFrameViewManager.cpp | 6 +- kword/KWImportStyleDia.cpp | 6 +- kword/KWInsertDia.cpp | 2 +- kword/KWInsertPageDia.cpp | 4 +- kword/KWInsertPicDia.cpp | 4 +- kword/KWInsertTOCCommand.cpp | 10 +- kword/KWMailMergeDataBase.cpp | 66 ++-- kword/KWMailMergeDataBase.h | 2 +- kword/KWMailMergeLabelAction.cpp | 6 +- kword/KWOasisLoader.cpp | 2 +- kword/KWPageManager.cpp | 4 +- kword/KWPageManager.h | 2 +- kword/KWPartFrameSet.cpp | 10 +- kword/KWPartFrameSet.h | 4 +- kword/KWPictureFrameSet.cpp | 4 +- kword/KWResizeTableDia.cpp | 6 +- kword/KWSelectBookmarkDiaBase.ui | 2 +- kword/KWSortDia.cpp | 4 +- kword/KWSplitCellDia.cpp | 2 +- kword/KWStartupWidget.cpp | 8 +- kword/KWStartupWidget.h | 2 +- kword/KWStartupWidgetBase.ui | 4 +- kword/KWStatisticsDialog.cpp | 6 +- kword/KWTableDia.cpp | 2 +- kword/KWTableDia.h | 4 +- kword/KWTableFrameSet.cpp | 26 +- kword/KWTableFrameSet.h | 6 +- kword/KWTableStyle.cpp | 2 +- kword/KWTableStyle.h | 4 +- kword/KWTableStyleManager.cpp | 30 +- kword/KWTableTemplate.h | 2 +- kword/KWTableTemplateSelector.cpp | 20 +- kword/KWTableTemplateSelector.h | 4 +- kword/KWTextFrameSet.cpp | 80 ++-- kword/KWTextFrameSet.h | 20 +- kword/KWTextParag.cpp | 44 +-- kword/KWTextParag.h | 4 +- kword/KWVariable.cpp | 10 +- kword/KWView.cpp | 172 ++++---- kword/KWView.h | 8 +- kword/KWViewMode.cpp | 60 +-- kword/KWViewMode.h | 6 +- kword/KWordFrameSetIface.cpp | 8 +- kword/KWordFrameSetIface.h | 2 +- kword/KWordViewIface.cpp | 2 +- kword/KWordViewIface.h | 2 +- kword/OASIS | 4 +- kword/defs.h | 2 +- kword/demos/framestest.kwd | 2 +- kword/mailmerge/KWClassicSerialDataSource.cpp | 50 +-- kword/mailmerge/kabc/KWMailMergeKABC.cpp | 28 +- .../mailmerge/kabc/KWMailMergeKABCConfig.cpp | 4 +- kword/mailmerge/kabc/addresspicker.ui | 12 +- .../mailmerge/kspread/kwmailmerge_kspread.cpp | 8 +- .../kspread/kwmailmerge_kspread_config.cpp | 12 +- kword/mailmerge/sql/KWMySqlCursor.h | 6 +- kword/mailmerge/sql/KWQtSqlEasyFilter.cpp | 4 +- kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp | 2 +- .../sql/KWQtSqlPowerSerialDataSource.cpp | 48 +-- .../mailmerge/sql/KWQtSqlSerialDataSource.cpp | 28 +- .../sql/KWQtSqlSerialDataSourceBase.cpp | 4 +- kword/mailmerge/sql/kwqtsqlpower.ui | 8 +- kword/mailmerge/sql/qtsqlopenwidget.ui | 2 +- kword/tests/KWPageManagerTester.cpp | 28 +- lib/kformula/DESIGN | 46 +-- lib/kformula/MatrixDialog.cc | 2 +- lib/kformula/actionelement.cc | 2 +- lib/kformula/basicelement.h | 46 +-- lib/kformula/bracketelement.cc | 6 +- lib/kformula/bracketelement.h | 26 +- lib/kformula/config/esstixeight.font | 2 +- lib/kformula/config/esstixeleven.font | 2 +- lib/kformula/config/esstixfifteen.font | 2 +- lib/kformula/config/esstixfive.font | 2 +- lib/kformula/config/esstixfour.font | 2 +- lib/kformula/config/esstixfourteen.font | 2 +- lib/kformula/config/esstixnine.font | 2 +- lib/kformula/config/esstixone.font | 2 +- lib/kformula/config/esstixseven.font | 2 +- lib/kformula/config/esstixseventeen.font | 2 +- lib/kformula/config/esstixsix.font | 2 +- lib/kformula/config/esstixsixteen.font | 2 +- lib/kformula/config/esstixten.font | 2 +- lib/kformula/config/esstixthirteen.font | 2 +- lib/kformula/config/esstixthree.font | 2 +- lib/kformula/config/esstixtwelve.font | 2 +- lib/kformula/config/esstixtwo.font | 2 +- lib/kformula/config/unicode.tbl | 4 +- lib/kformula/contextstyle.h | 2 +- lib/kformula/elementtype.cc | 4 +- lib/kformula/entities.h | 2 +- lib/kformula/errorelement.cc | 2 +- lib/kformula/errorelement.h | 2 +- lib/kformula/fontstyle.cc | 2 +- lib/kformula/fontstyle.h | 2 +- lib/kformula/formulacursor.cc | 20 +- lib/kformula/formulacursor.h | 8 +- lib/kformula/formulaelement.h | 8 +- lib/kformula/fractionelement.cc | 18 +- lib/kformula/fractionelement.h | 16 +- lib/kformula/glyphelement.cc | 6 +- lib/kformula/glyphelement.h | 4 +- lib/kformula/indexelement.cc | 28 +- lib/kformula/indexelement.h | 20 +- lib/kformula/kformulacommand.cc | 16 +- lib/kformula/kformulacommand.h | 8 +- lib/kformula/kformulacompatibility.h | 4 +- lib/kformula/kformulaconfigpage.cc | 14 +- lib/kformula/kformulaconfigpage.h | 2 +- lib/kformula/kformulacontainer.cc | 8 +- lib/kformula/kformulacontainer.h | 4 +- lib/kformula/kformuladefs.h | 2 +- lib/kformula/kformuladocument.cc | 16 +- lib/kformula/kformuladocument.h | 2 +- lib/kformula/kformulamimesource.cc | 2 +- lib/kformula/kformulamimesource.h | 2 +- lib/kformula/kformulaview.h | 2 +- lib/kformula/kformulawidget.cc | 8 +- lib/kformula/main.cc | 6 +- lib/kformula/matrixelement.cc | 56 +-- lib/kformula/matrixelement.h | 24 +- lib/kformula/operatorelement.cc | 6 +- lib/kformula/paddedelement.cc | 12 +- lib/kformula/paddedelement.h | 2 +- lib/kformula/phantomelement.cc | 2 +- lib/kformula/phantomelement.h | 2 +- lib/kformula/prototype/engine.py | 106 ++--- lib/kformula/prototype/gensymbolfontmap.py | 60 +-- lib/kformula/prototype/unicode.py | 6 +- lib/kformula/rootelement.cc | 10 +- lib/kformula/rootelement.h | 14 +- lib/kformula/scripts/bycodes.py | 10 +- lib/kformula/scripts/bynames.py | 2 +- lib/kformula/sequenceelement.cc | 202 +++++----- lib/kformula/sequenceelement.h | 46 +-- lib/kformula/spaceelement.cc | 18 +- lib/kformula/spaceelement.h | 6 +- lib/kformula/styleelement.cc | 10 +- lib/kformula/symbolaction.cc | 6 +- lib/kformula/symbolelement.cc | 14 +- lib/kformula/symbolelement.h | 18 +- lib/kformula/symboltable.cc | 40 +- lib/kformula/symboltable.h | 16 +- lib/kformula/textelement.cc | 12 +- lib/kformula/textelement.h | 14 +- lib/kformula/tokenelement.cc | 4 +- lib/kformula/tokenstyleelement.cc | 12 +- lib/kformula/unicodetable.cc | 2 +- lib/kofficecore/KoApplication.cpp | 6 +- lib/kofficecore/KoApplicationIface.cc | 2 +- lib/kofficecore/KoChild.cpp | 50 +-- lib/kofficecore/KoChild.h | 18 +- lib/kofficecore/KoContainerHandler.cpp | 26 +- lib/kofficecore/KoContainerHandler.h | 2 +- lib/kofficecore/KoDetailsPane.cpp | 8 +- lib/kofficecore/KoDocument.cpp | 124 +++--- lib/kofficecore/KoDocument.h | 38 +- lib/kofficecore/KoDocumentChild.cpp | 30 +- lib/kofficecore/KoDocumentChild.h | 4 +- lib/kofficecore/KoDocumentInfo.cpp | 10 +- lib/kofficecore/KoDocumentInfoDlg.cpp | 4 +- lib/kofficecore/KoFileDialog.cpp | 6 +- lib/kofficecore/KoFilter.cpp | 4 +- lib/kofficecore/KoFilter.h | 10 +- lib/kofficecore/KoFilterChain.cpp | 14 +- lib/kofficecore/KoFilterChain.h | 4 +- lib/kofficecore/KoFilterManager.cpp | 16 +- lib/kofficecore/KoFilterManager.h | 4 +- lib/kofficecore/KoFrame.cpp | 2 +- lib/kofficecore/KoGenStyles.cpp | 2 +- lib/kofficecore/KoGenStyles.h | 2 +- lib/kofficecore/KoGlobal.cpp | 2 +- lib/kofficecore/KoMainWindow.cpp | 24 +- lib/kofficecore/KoOasisStore.cpp | 4 +- lib/kofficecore/KoOasisStyles.cpp | 6 +- lib/kofficecore/KoOasisStyles.h | 6 +- lib/kofficecore/KoOpenPane.cpp | 2 +- lib/kofficecore/KoPageLayout.cpp | 36 +- lib/kofficecore/KoPageLayout.h | 8 +- lib/kofficecore/KoPictureEps.cpp | 6 +- lib/kofficecore/KoPictureImage.cpp | 2 +- lib/kofficecore/KoPictureKey.cpp | 4 +- lib/kofficecore/KoQueryTrader.cpp | 4 +- lib/kofficecore/KoSpeaker.cpp | 6 +- lib/kofficecore/KoTemplates.h | 4 +- lib/kofficecore/KoUnit.cpp | 34 +- lib/kofficecore/KoView.cpp | 44 +-- lib/kofficecore/KoXmlReader.cpp | 4 +- lib/kofficecore/Koversiondialog.cpp | 4 +- lib/kofficecore/THOUGHTS | 4 +- lib/kofficecore/kkbdaccessextensions.cpp | 14 +- lib/kofficecore/koDetailsPaneBase.ui | 14 +- lib/kofficecore/koDocumentInfoAboutWidget.ui | 22 +- lib/kofficecore/koDocumentInfoAuthorWidget.ui | 10 +- .../koDocumentInfoUserMetadataWidget.ui | 6 +- lib/kofficecore/koOpenPaneBase.ui | 4 +- lib/kofficecore/tests/filter_graph.cpp | 2 +- lib/kofficecore/tests/koxmlreadertest.cpp | 24 +- lib/kofficeui/KoBrush.h | 2 +- lib/kofficeui/KoCharSelectDia.cpp | 4 +- lib/kofficeui/KoCommandHistory.cpp | 22 +- lib/kofficeui/KoCommandHistory.h | 2 +- lib/kofficeui/KoContextCelp.cpp | 82 ++-- lib/kofficeui/KoEditPath.cpp | 4 +- lib/kofficeui/KoGeneralPropertyUi.ui | 4 +- lib/kofficeui/KoGuideLineDia.cpp | 4 +- lib/kofficeui/KoGuides.cpp | 60 +-- lib/kofficeui/KoGuides.h | 28 +- lib/kofficeui/KoInsertLink.cpp | 4 +- lib/kofficeui/KoKoolBar.cpp | 2 +- lib/kofficeui/KoPageLayoutColumns.cpp | 12 +- lib/kofficeui/KoPageLayoutColumns.h | 10 +- lib/kofficeui/KoPageLayoutColumnsBase.ui | 2 +- lib/kofficeui/KoPageLayoutDia.cpp | 86 ++-- lib/kofficeui/KoPageLayoutDia.h | 26 +- lib/kofficeui/KoPageLayoutHeader.cpp | 2 +- lib/kofficeui/KoPageLayoutHeaderBase.ui | 10 +- lib/kofficeui/KoPageLayoutSize.cpp | 14 +- lib/kofficeui/KoPageLayoutSize.h | 8 +- lib/kofficeui/KoPartSelectAction.cpp | 2 +- lib/kofficeui/KoPartSelectDia.cpp | 2 +- lib/kofficeui/KoPictureFilePreview.cpp | 2 +- lib/kofficeui/KoRuler.cpp | 76 ++-- lib/kofficeui/KoRuler.h | 8 +- lib/kofficeui/KoTabBar.cpp | 22 +- lib/kofficeui/KoTabBar.h | 2 +- lib/kofficeui/KoTabChooser.cpp | 2 +- lib/kofficeui/KoTabChooser.h | 8 +- lib/kofficeui/KoTemplateChooseDia.cpp | 42 +- lib/kofficeui/KoTemplateChooseDia.h | 6 +- lib/kofficeui/KoTemplateCreateDia.cpp | 22 +- lib/kofficeui/KoToolBox.cpp | 2 +- lib/kofficeui/KoToolBox.h | 2 +- lib/kofficeui/KoTooluButton.cpp | 48 +-- lib/kofficeui/KoTooluButton.h | 10 +- lib/kofficeui/KoUnitWidgets.cpp | 32 +- lib/kofficeui/KoZoomAction.cpp | 30 +- lib/kofficeui/Kolinewidthaction.cpp | 2 +- lib/kofficeui/kcoloractions.cpp | 4 +- lib/kofficeui/tests/coloraction_test.cpp | 8 +- lib/kofficeui/tkaction.cpp | 26 +- lib/kofficeui/tkaction.h | 2 +- lib/kofficeui/tkcoloractions.cpp | 2 +- lib/kofficeui/tkcombobox.cpp | 6 +- lib/kofficeui/tktoolbarbutton.cpp | 40 +- lib/kofficeui/tktoolbarbutton.h | 4 +- lib/kopainter/koColorChooser.cc | 2 +- lib/kopainter/koColorSlider.cc | 4 +- lib/kopainter/koFrameButton.cc | 2 +- lib/kopainter/koIconChooser.cc | 6 +- lib/kopainter/ko_cmyk_widget.cc | 4 +- lib/kopainter/ko_color_wheel.cc | 2 +- lib/kopainter/ko_gray_widget.cc | 4 +- lib/kopainter/ko_hsv_widget.cc | 8 +- lib/kopainter/ko_rgb_widget.cc | 4 +- lib/kopainter/kogradientmanager.cc | 2 +- lib/kopalette/kopalette.cc | 10 +- lib/kopalette/kopalette.h | 2 +- lib/kopalette/kopalettemanager.cc | 4 +- lib/kopalette/kopalettemanager.h | 2 +- lib/koproperty/editor.cpp | 48 +-- lib/koproperty/editor.h | 2 +- lib/koproperty/editoritem.cpp | 20 +- lib/koproperty/editoritem.h | 2 +- lib/koproperty/editors/booledit.cpp | 6 +- lib/koproperty/editors/coloredit.cpp | 4 +- lib/koproperty/editors/combobox.cpp | 4 +- lib/koproperty/editors/cursoredit.cpp | 4 +- lib/koproperty/editors/dateedit.cpp | 4 +- lib/koproperty/editors/datetimeedit.cpp | 4 +- lib/koproperty/editors/fontedit.cpp | 12 +- lib/koproperty/editors/linestyledit.cpp | 4 +- lib/koproperty/editors/pixmapedit.cpp | 12 +- lib/koproperty/editors/pointedit.cpp | 14 +- lib/koproperty/editors/rectedit.cpp | 20 +- lib/koproperty/editors/sizeedit.cpp | 14 +- lib/koproperty/editors/sizepolicyedit.cpp | 16 +- lib/koproperty/editors/spinbox.cpp | 8 +- lib/koproperty/editors/stringedit.cpp | 4 +- lib/koproperty/editors/stringlistedit.cpp | 10 +- lib/koproperty/editors/symbolcombo.cpp | 10 +- lib/koproperty/editors/timeedit.cpp | 4 +- lib/koproperty/editors/urledit.cpp | 6 +- lib/koproperty/factory.h | 6 +- lib/koproperty/property.cpp | 44 +-- lib/koproperty/property.h | 10 +- lib/koproperty/test/test.cpp | 8 +- lib/koproperty/widget.cpp | 2 +- lib/koproperty/widgetproxy.cpp | 10 +- lib/kotext/DESIGN | 16 +- lib/kotext/DateFormatWidget.cpp | 2 +- lib/kotext/IsoDuration.h | 4 +- lib/kotext/KFontDialog_local.cpp | 24 +- lib/kotext/KFontDialog_local.h | 2 +- lib/kotext/KoAutoFormat.cpp | 16 +- lib/kotext/KoAutoFormatDia.cpp | 20 +- lib/kotext/KoBgSpellCheck.cpp | 4 +- lib/kotext/KoChangeCaseDia.cpp | 2 +- lib/kotext/KoCommentDia.cpp | 6 +- lib/kotext/KoCompletionBase.ui | 16 +- lib/kotext/KoCompletionDia.cpp | 12 +- lib/kotext/KoCompletionDia.h | 2 +- lib/kotext/KoComplexText.cpp | 98 ++--- lib/kotext/KoComplexText.h | 12 +- lib/kotext/KoCreateStyleDia.cpp | 2 +- lib/kotext/KoCustomVariablesDia.cpp | 12 +- lib/kotext/KoImportStyleDia.cpp | 6 +- lib/kotext/KoParagCounter.cpp | 48 +-- lib/kotext/KoParagCounter.h | 8 +- lib/kotext/KoParagDecorationTab.ui | 4 +- lib/kotext/KoParagDia.cpp | 96 ++--- lib/kotext/KoParagDia.h | 10 +- lib/kotext/KoParagDia_p.h | 22 +- lib/kotext/KoParagLayout.cpp | 366 +++++++++--------- lib/kotext/KoParagLayout.h | 30 +- lib/kotext/KoParagStyle.cpp | 32 +- lib/kotext/KoParagStyle.h | 6 +- lib/kotext/KoRichText.cpp | 26 +- lib/kotext/KoRichText.h | 28 +- lib/kotext/KoSearchDia.cpp | 18 +- lib/kotext/KoStyleCollection.cpp | 2 +- lib/kotext/KoStyleCollection.h | 2 +- lib/kotext/KoStyleManager.cpp | 20 +- lib/kotext/KoStyleManager.h | 4 +- lib/kotext/KoTextCommand.cpp | 4 +- lib/kotext/KoTextCustomItem.h | 4 +- lib/kotext/KoTextDocument.cpp | 26 +- lib/kotext/KoTextDocument.h | 10 +- lib/kotext/KoTextFormat.cpp | 14 +- lib/kotext/KoTextFormat.h | 4 +- lib/kotext/KoTextFormatter.cpp | 22 +- lib/kotext/KoTextObject.cpp | 72 ++-- lib/kotext/KoTextObject.h | 18 +- lib/kotext/KoTextParag.cpp | 134 +++---- lib/kotext/KoTextParag.h | 24 +- lib/kotext/KoTextView.cpp | 52 +-- lib/kotext/KoTextZoomHandler.h | 14 +- lib/kotext/KoVariable.cpp | 22 +- lib/kotext/KoVariable.h | 2 +- lib/kotext/kodecorationtabbase.ui | 6 +- lib/kotext/kohighlightingtabbase.ui | 2 +- lib/kotext/kohyphen/kohyphen.cpp | 10 +- lib/kotext/kolanguagetabbase.ui | 2 +- lib/kotext/kolayouttabbase.ui | 8 +- lib/kotext/tests/kobordertest.cpp | 8 +- lib/kotext/tests/kotextformattertest.cpp | 6 +- lib/kotext/timedateformatwidget.ui | 14 +- lib/kross/api/callable.cpp | 28 +- lib/kross/api/callable.h | 8 +- lib/kross/api/class.h | 2 +- lib/kross/api/event.h | 4 +- lib/kross/api/eventscript.cpp | 2 +- lib/kross/api/eventsignal.cpp | 6 +- lib/kross/api/eventslot.cpp | 26 +- lib/kross/api/exception.cpp | 6 +- lib/kross/api/interpreter.cpp | 6 +- lib/kross/api/list.cpp | 4 +- lib/kross/api/module.h | 4 +- lib/kross/api/object.cpp | 10 +- lib/kross/api/object.h | 2 +- lib/kross/api/qtobject.cpp | 38 +- lib/kross/api/variant.cpp | 18 +- lib/kross/main/mainmodule.cpp | 8 +- lib/kross/main/manager.cpp | 14 +- lib/kross/main/scriptaction.cpp | 10 +- lib/kross/main/scriptcontainer.cpp | 18 +- lib/kross/main/scriptguiclient.cpp | 24 +- lib/kross/main/wdgscriptsmanager.cpp | 10 +- lib/kross/main/wdgscriptsmanagerbase.ui | 16 +- lib/kross/python/cxx/Objects.hxx | 16 +- lib/kross/python/cxx/PyCXX.html | 12 +- lib/kross/python/cxx/cxxsupport.cxx | 2 +- lib/kross/python/pythonextension.cpp | 52 +-- lib/kross/python/pythoninterpreter.cpp | 18 +- lib/kross/python/pythonmodule.cpp | 8 +- lib/kross/python/pythonobject.cpp | 8 +- lib/kross/python/pythonscript.cpp | 40 +- lib/kross/python/pythonsecurity.cpp | 18 +- .../python/scripts/RestrictedPython/Guards.py | 2 +- lib/kross/python/scripts/gui.py | 8 +- lib/kross/ruby/rubyextension.cpp | 12 +- lib/kross/ruby/rubyinterpreter.cpp | 6 +- lib/kross/ruby/rubymodule.cpp | 4 +- lib/kross/ruby/rubyscript.cpp | 4 +- lib/kross/runner/main.cpp | 4 +- lib/kross/test/main.cpp | 8 +- lib/kross/test/testcase.py | 4 +- lib/kross/test/testgui.py | 18 +- lib/kross/test/testobject.cpp | 12 +- lib/kross/test/testwindow.cpp | 6 +- lib/kwmf/kowmfpaint.cc | 4 +- lib/kwmf/kowmfread.h | 2 +- lib/kwmf/kowmfreadprivate.h | 2 +- lib/kwmf/kowmfstack.h | 2 +- lib/kwmf/kowmfstruct.h | 2 +- lib/kwmf/kowmfwrite.h | 2 +- lib/kwmf/kwmf.cc | 12 +- lib/kwmf/qwmf.cc | 6 +- lib/kwmf/qwmf.h | 2 +- lib/kwmf/wmfstruct.h | 2 +- lib/store/KoDirectoryStore.cpp | 2 +- lib/store/KoStoreDrag.h | 2 +- lib/store/KoXmlWriter.cpp | 4 +- lib/store/KoXmlWriter.h | 2 +- lib/store/tests/storedroptest.cpp | 12 +- lib/store/tests/xmlwritertest.cpp | 16 +- lib/store/tests/xmlwritertest.h | 4 +- tools/converter/koconverter.cpp | 8 +- tools/kfile-plugins/ooo/kfile_ooo.cpp | 6 +- tools/kthesaurus/main.cc | 2 +- tools/spell/main.cc | 4 +- tools/thesaurus/main.cc | 22 +- tools/thesaurus/main.h | 4 +- tools/thesaurus/thesaurus.txt | 246 ++++++------ 2078 files changed, 13789 insertions(+), 13789 deletions(-) diff --git a/chalk/HACKING b/chalk/HACKING index c6f4ba66..a48526b0 100644 --- a/chalk/HACKING +++ b/chalk/HACKING @@ -62,7 +62,7 @@ Variable/Parameter names Designer - Chalk has started to use designer. All dialogs and all widgets that have a tqlayout + Chalk has started to use designer. All dialogs and all widgets that have a layout manager must be done in designer. We don't add code nor add signal/slot connections in designer diff --git a/chalk/IMAGE_LIBRARIES b/chalk/IMAGE_LIBRARIES index f2f0c1dc..1d26fb96 100644 --- a/chalk/IMAGE_LIBRARIES +++ b/chalk/IMAGE_LIBRARIES @@ -153,7 +153,7 @@ Disadvantages: Libart isn't really an image library, but rather a canvas that can be used to paint images on. It is optimized for vector graphics, and is -used by Karbon to render tqshapes before display. +used by Karbon to render shapes before display. Advantages: diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc index b769a3d3..a67652f7 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.cc +++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc @@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol } TQString KisBasicU8HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast(pos * UINT8_MAX)); } void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs) @@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC TQString KisBasicU16HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast(pos * UINT8_MAX)); } double KisBasicU16HistogramProducer::maximalZoom() const @@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC } TQString KisBasicF32HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos)); // XXX I doubt this is correct! + return TQString("%1").arg(static_cast(pos)); // XXX I doubt this is correct! } double KisBasicF32HistogramProducer::maximalZoom() const { @@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID& } TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos)); // XXX I doubt this is correct! + return TQString("%1").arg(static_cast(pos)); // XXX I doubt this is correct! } double KisBasicF16HalfHistogramProducer::maximalZoom() const { @@ -356,7 +356,7 @@ TQValueVector KisGenericRGBHistogramProducer::channels() { } TQString KisGenericRGBHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast(pos * UINT8_MAX)); } double KisGenericRGBHistogramProducer::maximalZoom() const { @@ -433,7 +433,7 @@ TQValueVector KisGenericLabHistogramProducer::channels() { } TQString KisGenericLabHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast(pos * UINT16_MAX)); + return TQString("%1").arg(static_cast(pos * UINT16_MAX)); } double KisGenericLabHistogramProducer::maximalZoom() const { diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h index 8b913ece..83222765 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.h +++ b/chalk/chalkcolor/kis_basic_histogram_producers.h @@ -60,7 +60,7 @@ protected: /** * The order in which channels() returns is not the same as the internal representation, * that of the pixel internally. This method converts external usage to internal usage. - * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_ + * This method uses some basic assumtpions about the layout of the pixel, so _extremely_ * exotic spaces might want to override this (see makeExternalToInternal source for * those assumptions) **/ diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 424e346d..c0219836 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF */ // Load all colorspace modules - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); if (offers.empty()) { diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cc index 2d0ad98f..ae4c07cb 100644 --- a/chalk/chalkcolor/kis_profile.cc +++ b/chalk/chalkcolor/kis_profile.cc @@ -25,7 +25,7 @@ #include LCMS_HEADER #include -#include +#include #include #include @@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile) // Make a raw data image ready for saving _cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size - if(m_rawData.tqresize(bytesNeeded)) + if(m_rawData.resize(bytesNeeded)) { _cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded); diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 901f2909..f8f3c6ac 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -21,12 +21,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s { m_subject = 0; - TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout"); + TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout"); TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid"); diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index df0666c4..42c3042b 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c index d6940294..d2e27cd1 100644 --- a/chalk/colorspaces/wetsticky/ws/canvas.c +++ b/chalk/colorspaces/wetsticky/ws/canvas.c @@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT]; /* This module maintains a list of the addresses of cells that have been modified since the last redraw and therefore need updating. - Points are added to this list by the need_to_tqrepaint() routine - and are removed by the next_cell_for_tqrepaint() function. The + Points are added to this list by the need_to_repaint() routine + and are removed by the next_cell_for_repaint() function. The pointer to the current tail of the list is updated by side-effect. */ static POINT need_repainting[REDRAW_LIMIT]; static int next_free = 0; -static int next_to_tqrepaint = 0; +static int next_to_repaint = 0; /* *********************************************************************** */ @@ -50,7 +50,7 @@ int number_of_repaints_needed() /* *********************************************************************** */ -void need_to_tqrepaint(point) +void need_to_repaint(point) /* The cell at this location needs to be redrawn since it has been altered. Scan the list to see if it is already scheduled for a repainting operation and only add it if @@ -62,7 +62,7 @@ POINT point; int k; - /* If the list is already full then simply ignore the tqrepaint + /* If the list is already full then simply ignore the repaint request - it will get done eventually anyway. */ if (next_free == REDRAW_LIMIT) return; @@ -85,7 +85,7 @@ POINT point; /* *********************************************************************** */ -void next_cell_for_tqrepaint(cell, locus) +void next_cell_for_repaint(cell, locus) /* This routine returns the next cell to be repainted, together with its location on the canvas. This is determined by taking the next point from the need_repainting list and accessing its cell. If the list is @@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus) POINT_PTR locus; { - if (next_to_tqrepaint >= next_free) { - next_to_tqrepaint = next_free = 0; + if (next_to_repaint >= next_free) { + next_to_repaint = next_free = 0; *(cell) = NIL; return; } - *(cell) = get_cell(need_repainting[next_to_tqrepaint]); - locus->x = need_repainting[next_to_tqrepaint].x; - locus->y = need_repainting[next_to_tqrepaint].y; - next_to_tqrepaint++; + *(cell) = get_cell(need_repainting[next_to_repaint]); + locus->x = need_repainting[next_to_repaint].x; + locus->y = need_repainting[next_to_repaint].y; + next_to_repaint++; } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h index 57453e7b..2df50140 100644 --- a/chalk/colorspaces/wetsticky/ws/canvas.h +++ b/chalk/colorspaces/wetsticky/ws/canvas.h @@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under extern int number_of_repaints_needed(); /* Returns the number of cells needing to repainted. */ -extern void need_to_tqrepaint (/* POINT */); +extern void need_to_repaint (/* POINT */); /* Requests that the cell at the given point be repainted at the next update as it has been modified. */ -extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR */); +extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR */); /* Returns a pointer to a cell that needs to be updated as well as the location of that cell on the canvas. If there are no more cells to be redrawn then the pointer will be NIL. */ diff --git a/chalk/colorspaces/wetsticky/ws/engine.c b/chalk/colorspaces/wetsticky/ws/engine.c index b3855bda..19097d9f 100644 --- a/chalk/colorspaces/wetsticky/ws/engine.c +++ b/chalk/colorspaces/wetsticky/ws/engine.c @@ -192,7 +192,7 @@ int amount; } - need_to_tqrepaint(destLocus); + need_to_repaint(destLocus); } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c index fceb0c05..03a7d4f3 100644 --- a/chalk/colorspaces/wetsticky/ws/engine3.c +++ b/chalk/colorspaces/wetsticky/ws/engine3.c @@ -191,7 +191,7 @@ int amount; } - need_to_tqrepaint(destLocus); + need_to_repaint(destLocus); } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c index 953b10c8..76a552a9 100644 --- a/chalk/colorspaces/wetsticky/ws/ogl_interface.c +++ b/chalk/colorspaces/wetsticky/ws/ogl_interface.c @@ -255,7 +255,7 @@ void evolve_paint() for (k=0; k < STEP_LIMIT; k++) single_step(); while (TRUE) { - next_cell_for_tqrepaint(&cell, &p); + next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); glFlush(); diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c index 7c36a303..f4cb4901 100644 --- a/chalk/colorspaces/wetsticky/ws/x_interface.c +++ b/chalk/colorspaces/wetsticky/ws/x_interface.c @@ -700,7 +700,7 @@ void evolve_paint() for (k=0; k < STEP_LIMIT; k++) single_step(); while (TRUE) { - next_cell_for_tqrepaint(&cell, &p); + next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); } diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 31ee9d18..247bc7df 100644 --- a/chalk/core/kis_brush.cc +++ b/chalk/core/kis_brush.cc @@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height) // or scaling it to less than half size. scaledImage = srcImage.smoothScale(width, height); - //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height); + //filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height); } else { scaledImage.create(width, height, 32); @@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height) } } - //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height); + //filename = TQString("bilinear_%1x%2.png").arg(width).arg(height); } //scaledImage.save(filename, "PNG"); diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc index ea0351df..32283ad3 100644 --- a/chalk/core/kis_convolution_painter.cc +++ b/chalk/core/kis_convolution_painter.cc @@ -20,7 +20,7 @@ #include #include -#include "tqbrush.h" +#include "brush.h" #include "tqcolor.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc index 043bf4e3..1981bd02 100644 --- a/chalk/core/kis_exif_value.cc +++ b/chalk/core/kis_exif_value.cc @@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_BYTE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT8)0); } else { @@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SHORT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT16)0); } else { @@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_LONG: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT32)0); } else { @@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt) for(uint i = 0; i < components(); i++) { KisExifRational r; - if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() ) { r.numerator = (TQ_UINT32)0; } else { r.numerator = (TQ_UINT32) attr.toUInt(); } - if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() ) { r.denominator = (TQ_UINT32)0; } else { @@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SBYTE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT8)0); } else { @@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SSHORT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT16)0); } else { @@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SLONG: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT32)0); } else { @@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt) for(uint i = 0; i < components(); i++) { KisExifSRational r; - if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() ) { r.numerator = (TQ_INT32)0; } else { r.numerator = (TQ_INT32) attr.toInt(); } - if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() ) { r.denominator = (TQ_UINT32)0; } else { @@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_FLOAT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (float)0); } else { @@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_DOUBLE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (double)0); } else { @@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc) { case EXIF_TYPE_BYTE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) ); break; case EXIF_TYPE_ASCII: elmt.setAttribute("value", asAscii() ); break; case EXIF_TYPE_SHORT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) ); break; case EXIF_TYPE_LONG: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) ); break; case EXIF_TYPE_RATIONAL: for(uint i = 0; i < components(); i++) { KisExifRational r = asRational(i); - elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator ); - elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator ); + elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator ); + elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator ); } break; case EXIF_TYPE_SBYTE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) ); break; case EXIF_TYPE_UNDEFINED: { UByteArray value = asUndefined(); TQByteArray data; data.setRawData((char*)value.data(), value.size()); - TQByteArray tqencodedData; - KCodecs::base64Encode( data, tqencodedData ); + TQByteArray encodedData; + KCodecs::base64Encode( data, encodedData ); data.resetRawData( (char*)value.data(), value.size()); - elmt.setAttribute("value", TQString(tqencodedData)); + elmt.setAttribute("value", TQString(encodedData)); } break; case EXIF_TYPE_SSHORT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) ); break; case EXIF_TYPE_SLONG: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) ); break; case EXIF_TYPE_SRATIONAL: for(uint i = 0; i < components(); i++) { KisExifSRational r = asSRational(i); - elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator ); - elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator ); + elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator ); + elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator ); } break; case EXIF_TYPE_FLOAT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) ); break; case EXIF_TYPE_DOUBLE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) ); break; case EXIF_TYPE_UNKNOW: break; @@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i) switch(type()) { case EXIF_TYPE_BYTE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_byte ); + return TQString("%1 ").arg( asExifNumber( i ).m_byte ); case EXIF_TYPE_SHORT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_short ); + return TQString("%1 ").arg( asExifNumber( i ).m_short ); case EXIF_TYPE_LONG: - return TQString("%1 ").tqarg( asExifNumber( i ).m_long ); + return TQString("%1 ").arg( asExifNumber( i ).m_long ); case EXIF_TYPE_RATIONAL: - return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator ); + return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator ); case EXIF_TYPE_SBYTE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte ); + return TQString("%1 ").arg( asExifNumber( i ).m_sbyte ); case EXIF_TYPE_SSHORT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort ); + return TQString("%1 ").arg( asExifNumber( i ).m_sshort ); case EXIF_TYPE_SLONG: - return TQString("%1 ").tqarg( asExifNumber( i ).m_slong ); + return TQString("%1 ").arg( asExifNumber( i ).m_slong ); case EXIF_TYPE_SRATIONAL: - return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator ); + return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator ); case EXIF_TYPE_FLOAT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_float ); + return TQString("%1 ").arg( asExifNumber( i ).m_float ); case EXIF_TYPE_DOUBLE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_double ); + return TQString("%1 ").arg( asExifNumber( i ).m_double ); default: return "unknow "; } diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc index 54e730a7..a025ce10 100644 --- a/chalk/core/kis_fill_painter.cc +++ b/chalk/core/kis_fill_painter.cc @@ -22,7 +22,7 @@ #include #include -#include "tqbrush.h" +#include "brush.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" #include "tqpen.h" @@ -209,7 +209,7 @@ struct FillSegment { // FillSegment* parent; }; -typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus; +typedef enum { None = 0, Added = 1, Checked = 2 } Status; KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { if (m_width < 0 || m_height < 0) { @@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { stack.push(new FillSegment(startX, startY/*, 0*/)); - tqStatus* map = new tqStatus[m_size]; + Status* map = new Status[m_size]; - memset(map, None, m_size * sizeof(tqStatus)); + memset(map, None, m_size * sizeof(Status)); int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0; emit notifyProgressStage(i18n("Making fill outline..."), 0); diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index b7c8383e..53f17ea8 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry() Q_ASSERT(KisFilterRegistry::m_singleton == 0); KisFilterRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc index efc370bb..6dffc087 100644 --- a/chalk/core/kis_gradient.cc +++ b/chalk/core/kis_gradient.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc index 2258d899..8d387e6f 100644 --- a/chalk/core/kis_gradient_painter.cc +++ b/chalk/core/kis_gradient_painter.cc @@ -20,7 +20,7 @@ #include #include -#include "tqbrush.h" +#include "brush.h" #include "tqcolor.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" @@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device), bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, const KisPoint& gradientVectorEnd, - enumGradientShape tqshape, + enumGradientShape shape, enumGradientRepeat repeat, double antiAliasThreshold, bool reverseGradient, @@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, if (!m_gradient) return false; - GradientShapeStrategy *tqshapeStrategy = 0; + GradientShapeStrategy *shapeStrategy = 0; - switch (tqshape) { + switch (shape) { case GradientShapeLinear: - tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeBiLinear: - tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeRadial: - tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeSquare: - tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeConical: - tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeConicalSymetric: - tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd); break; } - Q_CHECK_PTR(tqshapeStrategy); + Q_CHECK_PTR(shapeStrategy); GradientRepeatStrategy *repeatStrategy = 0; @@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, for (int y = starty; y <= endy; y++) { for (int x = startx; x <= endx; x++) { - double t = tqshapeStrategy->valueAt( x, y); + double t = shapeStrategy->valueAt( x, y); t = repeatStrategy->valueAt(t); if (reverseGradient) { @@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth; double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth; - double t = tqshapeStrategy->valueAt(sampleX, sampleY); + double t = shapeStrategy->valueAt(sampleX, sampleY); t = repeatStrategy->valueAt(t); if (reverseGradient) { @@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, dev->writeBytes(layer.bits(), startx, starty, width, height); bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height); } - delete tqshapeStrategy; + delete shapeStrategy; emit notifyProgressDone(); diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h index fc31b117..2c0e29c2 100644 --- a/chalk/core/kis_gradient_painter.h +++ b/chalk/core/kis_gradient_painter.h @@ -66,7 +66,7 @@ public: */ bool paintGradient(const KisPoint& gradientVectorStart, const KisPoint& gradientVectorEnd, - enumGradientShape tqshape, + enumGradientShape shape, enumGradientRepeat repeat, double antiAliasThreshold, bool reverseGradient, diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc index 1f08dbdd..0e2f90d2 100644 --- a/chalk/core/kis_group_layer.cc +++ b/chalk/core/kis_group_layer.cc @@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x) m_layers.erase(m_layers.begin() + reverseIndex(index)); setDirty(removedLayer->extent()); if (childCount() < 1) { - // No tqchildren, nothing to show for it. + // No children, nothing to show for it. m_projection->clear(); setDirty(); } @@ -308,7 +308,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc) // Get the first layer in this group to start compositing with KisLayerSP child = lastChild(); - // No child -- clear the projection. Without tqchildren, a group layer is empty. + // No child -- clear the projection. Without children, a group layer is empty. if (!child) m_projection->clear(); KisLayerSP startWith = 0; diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h index a516ac72..58a3ddab 100644 --- a/chalk/core/kis_group_layer.h +++ b/chalk/core/kis_group_layer.h @@ -80,7 +80,7 @@ public: { // kdDebug(41001) << "GROUP\t\t" << name() // << " dirty: " << dirty() -// << ", " << m_layers.count() << " tqchildren " +// << ", " << m_layers.count() << " children " // << ", projection: " << m_projection // << "\n"; return v.visit(this); diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc index 726d0295..ca470382 100644 --- a/chalk/core/kis_imagepipe_brush.cc +++ b/chalk/core/kis_imagepipe_brush.cc @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc index ff66144d..4cb51a98 100644 --- a/chalk/core/kis_nameserver.cc +++ b/chalk/core/kis_nameserver.cc @@ -29,7 +29,7 @@ KisNameServer::~KisNameServer() TQString KisNameServer::name() { - return m_prefix.tqarg(m_generator++); + return m_prefix.arg(m_generator++); } TQ_INT32 KisNameServer::currentSeed() const diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc index c64935fc..ed51587b 100644 --- a/chalk/core/kis_painter.cc +++ b/chalk/core/kis_painter.cc @@ -26,7 +26,7 @@ #include #include -#include "tqbrush.h" +#include "brush.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" #include "tqpen.h" diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 012f2027..7d5de556 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry() Q_ASSERT(KisPaintOpRegistry::m_singleton == 0); KisPaintOpRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc index 161a4ff8..c6f0c645 100644 --- a/chalk/core/kis_palette.cc +++ b/chalk/core/kis_palette.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index 03d76616..69b90fe3 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -215,7 +215,7 @@ void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageR TQRegion region = uniformRegion & TQRegion(imageRect); if (!region.isEmpty()) { - TQMemArray rects = region.tqrects(); + TQMemArray rects = region.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index 10ab8dbb..f702d920 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -21,7 +21,7 @@ Design Patterns changes: * Change brushes handling to a generic Mediator pattern - (kis_resource_mediator). Resources are brush tqshapes, + (kis_resource_mediator). Resources are brush shapes, patterns (and colours, too?) Patrick intended a Flyweight here. diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt index aa3bf87b..2b860773 100644 --- a/chalk/doc/background_paper.txt +++ b/chalk/doc/background_paper.txt @@ -79,6 +79,6 @@ We need perhaps to add a light source or two, in OpenGL mode... I think we do. On top of the layers are what Xara calls blobs: the temporary droppings of -tools, like rubber bands, vector paths, brush tqshape cursors. +tools, like rubber bands, vector paths, brush shape cursors. diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features index 1c737ce6..4bca9d00 100644 --- a/chalk/doc/chalk-features +++ b/chalk/doc/chalk-features @@ -201,10 +201,10 @@ of a tablet. Tilt and rotation is not yet supported. * Brushes -** gimp brush tqshapes. Support for colored and grayscale brushes and +** gimp brush shapes. Support for colored and grayscale brushes and pipe brushes. Support from Gimp parasites in brushes. -** custom brush tqshapes -** text brush tqshapes +** custom brush shapes +** text brush shapes ** brushes created from layers or images. These brushes can be saved ** colored brushes can also be used as masks diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 69c6edca..b209cfa9 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -473,15 +473,15 @@ managed by this KisTileMgr" visibility="public" xmi.id="354" type="Q_INT32" name - + - + - + @@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor - + @@ -1705,17 +1705,17 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - - + + - + - + @@ -1930,17 +1930,17 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - - + + - + - + @@ -2649,17 +2649,17 @@ in the constructor, you have to call loadAsync. - - + + - + - + @@ -3926,10 +3926,10 @@ in the constructor, you have to call loadAsync. - - - - + + + + @@ -4126,10 +4126,10 @@ in the constructor, you have to call loadAsync. - - - - + + + + @@ -4263,10 +4263,10 @@ in the constructor, you have to call loadAsync. - - - - + + + + @@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync. - + @@ -4535,9 +4535,9 @@ in the constructor, you have to call loadAsync. - - - + + + diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 7d242713..ceacf630 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -3219,12 +3219,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - + - + @@ -36138,7 +36138,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -36163,7 +36163,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -36382,14 +36382,14 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -36432,14 +36432,14 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -36982,19 +36982,19 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
- +
- +
- +
@@ -37082,19 +37082,19 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
- +
- +
- +
diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline index 081f9ed7..88722a45 100644 --- a/chalk/doc/doc-outline +++ b/chalk/doc/doc-outline @@ -85,7 +85,7 @@ The current outline (working towards 1.6): - [TODO] properties, usage, converting, ... - Commands - - General tqlayout + - General layout - Menus - Toolbars - Palettes @@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31): - Available colorspaces - Commands ([TODO] make up-to-date) - - General tqlayout + - General layout - Menus - Toolbars - Palettes diff --git a/chalk/doc/selections b/chalk/doc/selections index 32bffe49..37d78702 100644 --- a/chalk/doc/selections +++ b/chalk/doc/selections @@ -117,7 +117,7 @@ discarded. If a transform is applied to a image, all layers are transformed. The selection is transformed, too: in the new situation, the layer that has a -selection active still has a selection, but the tqshape of the selection is +selection active still has a selection, but the shape of the selection is transformed. If a layer is moved, the selection moves with the layer (this is not diff --git a/chalk/doc/the preview widget b/chalk/doc/the preview widget index cc06b9de..a403da86 100644 --- a/chalk/doc/the preview widget +++ b/chalk/doc/the preview widget @@ -2,7 +2,7 @@ On Tuesday 21 June 2005 14:16, Casper Boemann wrote: > Hi > -> As you might have noticed I have changed the tqlayout of the preview, to lo= +> As you might have noticed I have changed the layout of the preview, to lo= ok > more like digikam. > diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc index 0217b7e1..8d360497 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.cc +++ b/chalk/plugins/filters/blur/kis_blur_filter.cc @@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() ); config->setProperty("rotate", wCTA->widget()->intAngle->value() ); config->setProperty("strength", wCTA->widget()->intStrength->value() ); - config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem()); + config->setProperty("shape", wCTA->widget()->cbShape->currentItem()); } return config; } @@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if(!config) config = new KisFilterConfiguration(id().id(), 1); TQVariant value; - int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0; + int shape = (config->getProperty("shape", value)) ? value.toInt() : 0; uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5; uint width = 2 * halfWidth + 1; uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5; @@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte KisAutobrushShape* kas; kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl; - switch(tqshape) + switch(shape) { case 1: kas = new KisAutobrushRectShape(width, height , hFade, vFade); diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc index dc836971..b12e6b11 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cc +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc @@ -20,7 +20,7 @@ #include "kis_wdg_blur.h" -#include +#include #include #include @@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name void KisWdgBlur::setConfiguration(KisFilterConfiguration* config) { TQVariant value; - if (config->getProperty("tqshape", value)) + if (config->getProperty("shape", value)) { widget()->cbShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 3e381bbe..8cd89f63 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -32,7 +32,7 @@ Expanding - + 40 20 @@ -49,7 +49,7 @@ Expanding - + 20 16 @@ -58,7 +58,7 @@ - tqlayout17 + layout17 @@ -76,13 +76,13 @@ 0 - + 16 0 - + 16 32767 diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 4ae92469..38d31007 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 513912ea..2934623a 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -52,7 +52,7 @@ layer, the current layer will be used. RichText - + WordBreak|AlignVCenter @@ -66,7 +66,7 @@ layer, the current layer will be used. Expanding - + 20 40 @@ -82,7 +82,7 @@ layer, the current layer will be used. Settings - + AlignAuto diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index abd1bb66..23c7e221 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -3749,8 +3749,8 @@ namespace cimg_library { then this image is displayed in the current display window. \param list : The list of images to display. \param axe : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'. - \param align : Defines the relative tqalignment of images when displaying images of different sizes. - Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment). + \param align : Defines the relative alignment of images when displaying images of different sizes. + Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment). \see CImg::get_append() **/ @@ -7772,7 +7772,7 @@ namespace cimg_library { //! Return a resized image. /** - \param src = Image giving the tqgeometry of the resize. + \param src = Image giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7788,7 +7788,7 @@ namespace cimg_library { //! Return a resized image. /** - \param disp = Display giving the tqgeometry of the resize. + \param disp = Display giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7830,7 +7830,7 @@ namespace cimg_library { //! Resize the image. /** - \param src = Image giving the tqgeometry of the resize. + \param src = Image giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7846,7 +7846,7 @@ namespace cimg_library { //! Resize the image /** - \param disp = Display giving the tqgeometry of the resize. + \param disp = Display giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -12881,7 +12881,7 @@ namespace cimg_library { \param sharpness = define the contour preservation. \param anisotropy = define the smoothing anisotropy. \param alpha = image pre-blurring (gaussian). - \param sigma = regularity of the tensor-valued tqgeometry. + \param sigma = regularity of the tensor-valued geometry. \param dl = spatial discretization. \param da = angular discretization. \param gauss_prec = precision of the gaussian function. @@ -17550,7 +17550,7 @@ namespace cimg_library { //! Return a single image which is the concatenation of all images of the current CImgl instance. /** \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A CImg image corresponding to the concatenation is returned. **/ CImg get_append(const char axe='x',const char align='c') const { @@ -17740,7 +17740,7 @@ namespace cimg_library { The function returns immediately. \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgl instance is returned. **/ const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { @@ -17755,7 +17755,7 @@ namespace cimg_library { The function returns when a key is pressed or the display window is closed by the user. \param title : specify the title of the opening display window. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this @@ -17774,7 +17774,7 @@ namespace cimg_library { Images of the list are concatenated in a single temporarly image for visualization purposes. The function returns when a key is pressed or the display window is closed by the user. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index 665dfc09..9c3a7543 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint() bool KisCImgFilter::prepare_resize() { - const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry"); + const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry"); const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels"); if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)"); int w,h; get_geom(geom,w,h); @@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize() bool KisCImgFilter::prepare_visuflow() { - const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry"); + const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry"); //const char *file_i = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image"); const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow"); diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc index b65a435f..46df5cc6 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -19,7 +19,7 @@ * * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé. */ -#include "tqlayout.h" +#include "layout.h" #include "tqcheckbox.h" #include "tqpushbutton.h" diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 397e52e6..09d4e323 100644 --- a/chalk/plugins/filters/cimg/wdg_cimg.ui +++ b/chalk/plugins/filters/cimg/wdg_cimg.ui @@ -42,7 +42,7 @@ Expanding - + 51 20 diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 5b03ad70..75635c8c 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -21,7 +21,7 @@ #include "KisWdgColorify.h" #include -#include +#include #include #include diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index ad1c062e..90337f22 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -29,7 +29,7 @@ Expanding - + 61 20 @@ -38,7 +38,7 @@ - tqlayout1 + layout1 @@ -79,7 +79,7 @@ Expanding - + 20 50 diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc index 31b726bf..14d4c26d 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -21,7 +21,7 @@ #include "kis_wdg_color_to_alpha.h" #include -#include +#include #include #include diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 525b221c..70ff3071 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -29,7 +29,7 @@ Expanding - + 61 20 @@ -38,7 +38,7 @@ - tqlayout1 + layout1 @@ -95,7 +95,7 @@ Expanding - + 20 50 diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index a97f809b..c0fcee28 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s ) } n = n.nextSibling(); } - // If the adjustment was cached, it now has changed - tqinvalidate it + // If the adjustment was cached, it now has changed - invalidate it delete m_adjustment; m_adjustment = 0; } diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 928baded..8b6aa949 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 1e576f66..3382102c 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -32,7 +32,7 @@ - tqlayout4 + layout4 @@ -50,13 +50,13 @@ 0 - + 250 20 - + 250 20 @@ -84,13 +84,13 @@ 0 - + 254 254 - + 254 254 @@ -116,13 +116,13 @@ kCurve - + 250 250 - + 250 250 @@ -143,13 +143,13 @@ 0 - + 20 250 - + 20 250 @@ -169,7 +169,7 @@ - tqlayout7 + layout7 @@ -193,7 +193,7 @@ Contrast - + AlignCenter @@ -226,7 +226,7 @@ Brightness - + AlignCenter @@ -253,7 +253,7 @@ Expanding - + 131 20 diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 8d95814c..7f413abc 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -24,7 +24,7 @@ - tqlayout4 + layout4 @@ -47,7 +47,7 @@ - tqlayout8 + layout8 @@ -65,13 +65,13 @@ 0 - + 0 20 - + 32767 20 @@ -134,13 +134,13 @@ 0 - + 20 0 - + 20 32767 diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 03c0e336..860595e2 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -34,7 +34,7 @@ - tqlayout4 + layout4 @@ -69,7 +69,7 @@ Expanding - + 21 20 @@ -80,7 +80,7 @@ - tqlayout3 + layout3 @@ -115,7 +115,7 @@ Expanding - + 24 20 @@ -134,7 +134,7 @@ Expanding - + 20 40 @@ -153,7 +153,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 2c1c87d9..3db7389c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -18,7 +18,7 @@ #include "kis_custom_convolution_filter_configuration_widget.h" -#include +#include #include #include diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index 49826ccb..c20001d3 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_fastcolortransfer.h" -#include +#include #include diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index c14bd51a..97379cea 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -55,7 +55,7 @@ Expanding - + 20 101 diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index b83baa11..b4d0487a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_lens_correction.h" -#include +#include #include diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 6ee2631a..25705322 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -29,7 +29,7 @@ Expanding - + 20 90 @@ -46,7 +46,7 @@ Expanding - + 16 20 @@ -118,7 +118,7 @@ Expanding - + 16 20 @@ -135,7 +135,7 @@ Expanding - + 51 20 diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc index 7b836436..b36e5ce9 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cc +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc @@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *) /*if (!m_dragging) {*/ TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); pm.fill(); @@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e ) m_gamma = 1.0 / pow (10, tmp); break; } - tqrepaint(false); + repaint(false); } void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) @@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) return; m_dragging = false; - tqrepaint(false); + repaint(false); switch (m_grab_cursor) { case BlackCursor: @@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e ) } } - tqrepaint(false); + repaint(false); } void KGradientSlider::leaveEvent( TQEvent * ) @@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * ) void KGradientSlider::enableGamma(bool b) { m_gammaEnabled = b; - tqrepaint(false); + repaint(false); } double KGradientSlider::getGamma(void) @@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - tqrepaint(false); + repaint(false); } } void KGradientSlider::modifyWhite(int v) { @@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - tqrepaint(false); + repaint(false); } } void KGradientSlider::modifyGamma(double v) { @@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) { double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); - tqrepaint(false); + repaint(false); } #include "kgradientslider.moc" diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index b7c1cb00..2dbf8a44 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 841b78fb..f365e3d1 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 32767 @@ -60,7 +60,7 @@ - tqlayout7 + layout7 @@ -70,13 +70,13 @@ histview - + 256 256 - + 256 256 @@ -88,7 +88,7 @@ - tqlayout5 + layout5 @@ -98,7 +98,7 @@ ingradient - + 256 20 @@ -107,7 +107,7 @@ - tqlayout5 + layout5 @@ -134,7 +134,7 @@ MinimumExpanding - + 25 20 @@ -148,7 +148,7 @@ 1.0 - + AlignCenter @@ -162,7 +162,7 @@ MinimumExpanding - + 25 20 @@ -194,7 +194,7 @@ - tqlayout6 + layout6 @@ -204,7 +204,7 @@ outgradient - + 256 20 @@ -213,7 +213,7 @@ - tqlayout2 + layout2 @@ -240,7 +240,7 @@ MinimumExpanding - + 50 20 @@ -274,7 +274,7 @@ Expanding - + 21 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index c13db952..8692a50f 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_noise.h" -#include +#include #include diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 3bafae01..2741e116 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -73,7 +73,7 @@ Expanding - + 21 20 @@ -90,7 +90,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index 81ee1448..72c0675b 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c KisColorSpace * cs = src->colorSpace(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); srand ((uint) dt.secsTo(Y2000)); diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index ba157e14..9c8a44d8 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_random_pick.h" -#include +#include #include diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index c9ce3acf..934d465f 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -37,7 +37,7 @@ Expanding - + 20 50 @@ -98,7 +98,7 @@ Expanding - + 16 20 diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc index 627d105c..be233d70 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -20,7 +20,7 @@ #include "kis_wdg_unsharp.h" -#include +#include #include #include diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index faf74dd4..c2181eb8 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -84,7 +84,7 @@ Expanding - + 21 20 @@ -115,7 +115,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index e7537c27..fb6c59c5 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_wave.h" -#include +#include #include #include @@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intHAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("horizontaltqshape", value)) + if (config->getProperty("horizontalshape", value)) { widget()->cbHShape->setCurrentItem( value.toUInt() ); } @@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intVAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("verticaltqshape", value)) + if (config->getProperty("verticalshape", value)) { widget()->cbVShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index ddcfc4bd..a7a9264e 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() ); config->setProperty("horizontalshift", wN->widget()->intHShift->value() ); config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() ); - config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() ); + config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() ); config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() ); config->setProperty("verticalshift", wN->widget()->intVShift->value() ); config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() ); - config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() ); + config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() ); } return config; } @@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50; int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50; int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4; - int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0; + int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0; int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50; int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50; int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4; - int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0; + int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisWaveCurve* verticalcurve; - if(verticaltqshape == 1) + if(verticalshape == 1) verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift); else verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift); KisWaveCurve* horizontalcurve; - if(horizontaltqshape == 1) + if(horizontalshape == 1) horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); else horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index b8132262..e56f4760 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -29,7 +29,7 @@ Expanding - + 60 20 @@ -46,7 +46,7 @@ Expanding - + 20 60 diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index c5f93864..7338ef54 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info // // Most graphics apps -- especially the simple ones like Kolourpaint // and the previous version of this routine in Chalk took a brush -// tqshape -- often a simple ellipse -- and filled that tqshape with a +// shape -- often a simple ellipse -- and filled that shape with a // random 'spray' of single pixels. // // Other, more advanced graphics apps, like the Gimp or Photoshop, -// take the brush tqshape and paint just as with the brush paint op, +// take the brush shape and paint just as with the brush paint op, // only making the initial dab more transparent, and perhaps adding // extra transparence near the edges. Then, using a timer, when the // cursor stays in place, dab upon dab is positioned in the same // place, which makes the result less and less transparent. // // What I want to do here is create an airbrush that approaches a real -// one. It won't use brush tqshapes, instead going for the old-fashioned +// one. It won't use brush shapes, instead going for the old-fashioned // circle. Depending upon pressure, both the size of the dab and the // rate of paint deposition is determined. The edges of the dab are // more transparent than the center, with perhaps even some fully @@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info KisPaintDeviceSP device = m_painter->device(); - // For now: use the current brush tqshape -- it beats calculating + // For now: use the current brush shape -- it beats calculating // ellipes and cones, and it shows the working of the timer. if (!device) return; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index 1ec16561..c794c76a 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget); m_curveControl = new WdgBrushCurveControl(m_optionsWidget); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index 89207a50..e88ecbe3 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -39,7 +39,7 @@ - tqlayout4 + layout4 @@ -83,7 +83,7 @@ - tqlayout3 + layout3 @@ -127,7 +127,7 @@ - tqlayout5 + layout5 @@ -183,7 +183,7 @@ Expanding - + 20 20 diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index c5f4e6eb..69542a6e 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2), i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate.")); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); } else { diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 384e4e26..61e485a5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -19,7 +19,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 6aff68c8..c5c9d324 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) palette->add(ent); if (!palette->save()) { - KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette")); + KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette")); } } } @@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor() TQString channelValueText; if (m_normaliseValues) { - channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); + channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); } else { channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index f15bf778..4fcf642b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 6df9f8da..0f0305e5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient() m_endPos = KisPoint(0, 0); m_reverse = false; - m_tqshape = KisGradientPainter::GradientShapeLinear; + m_shape = KisGradientPainter::GradientShapeLinear; m_repeat = KisGradientPainter::GradientRepeatNone; m_antiAliasThreshold = 0.2; } @@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) progress->setSubject(&painter, true, true); } - bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if (painted) { // does whole thing at moment @@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); - m_cmbShape = new TQComboBox(false, widget, "tqshape_combo"); + m_cmbShape = new TQComboBox(false, widget, "shape_combo"); connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); @@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) return widget; } -void KisToolGradient::slotSetShape(int tqshape) +void KisToolGradient::slotSetShape(int shape) { - m_tqshape = static_cast(tqshape); + m_shape = static_cast(shape); } void KisToolGradient::slotSetRepeat(int repeat) diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 29df8bf7..08ab06ab 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -88,7 +88,7 @@ private: KisCanvasSubject *m_subject; - KisGradientPainter::enumGradientShape m_tqshape; + KisGradientPainter::enumGradientShape m_shape; KisGradientPainter::enumGradientRepeat m_repeat; bool m_reverse; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 243052cf..7b1df85b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index bf23b441..c624d30a 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) void KisToolText::setFont() { KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); - m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); + m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); } TQWidget* KisToolText::createOptionWidget(TQWidget* parent) @@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) TQHBox *fontBox = new TQHBox(widget); m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1") - .tqarg(m_font.pointSize()), fontBox); + .arg(m_font.pointSize()), fontBox); m_btnMoreFonts = new TQPushButton("...", fontBox); connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 7675b875..5463d3e3 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -47,13 +47,13 @@ 0 - + 200 0 - + 200 32767 @@ -70,7 +70,7 @@ - tqlayout2 + layout2 @@ -101,7 +101,7 @@ - tqlayout1 + layout1 diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 4a59c384..8f9eb202 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index faeb32d8..9fd07e6d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -32,7 +32,7 @@ class KisSelectionOptions; /** * The selection brush creates a selection by painting with the current - * brush tqshape. Not sure what kind of an icon could represent this... + * brush shape. Not sure what kind of an icon could represent this... * Depends a bit on how we're going to visualize selections. */ class KisToolSelectBrush : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index cc164680..0dfe1e1c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include #include @@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->setSpacing( 6 ); connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index d16ab740..cfce3704 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) rc = rc.normalize(); KisSelectionSP tmpSel = new KisSelection(dev); - KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1); + KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1); TQ_UINT8 value; for (int y = 0; y <= rc.height(); y++) for (int x = 0; x <= rc.width(); x++) { - value = MAX_SELECTED - tqshape.valueAt(x,y); + value = MAX_SELECTED - shape.valueAt(x,y); tmpSel->setSelected( x+rc.x(), y+rc.y(), value); } switch(m_selectAction) @@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 118281e1..a6f52abc 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index c796ec3c..cb8b82ed 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -30,7 +30,7 @@ class KisSelectionOptions; /** * The selection eraser makes a selection smaller by painting with the - * current eraser tqshape. Not sure what kind of an icon could represent + * current eraser shape. Not sure what kind of an icon could represent * this... Depends a bit on how we're going to visualize selections. */ class KisToolSelectEraser : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index 8bac379c..cf8bb81e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 85a53c94..f1a6436d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 54bfbdd6..f4e4743d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 8f5c9e5f..37107508 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&) gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height()); gc.drawLine(endx,0,endx,starty - m_handleSize / 2); gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty); - TQMemArray rects = m_handlesRegion.tqrects (); + TQMemArray rects = m_handlesRegion.rects (); for (TQMemArray ::ConstIterator it = rects.begin (); it != rects.end (); ++it) { gc.fillRect (*it, TQt::black); diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 8d3bf1d8..5cbcd476 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -27,7 +27,7 @@ - tqlayout3 + layout3 @@ -138,7 +138,7 @@ - tqlayout9 + layout9 @@ -185,7 +185,7 @@ Expanding - + 20 16 diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index e18b096c..69e7953e 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index 663e1324..9d47647d 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h index c2a3715b..582c89cd 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h @@ -57,7 +57,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); } + virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); } }; #endif //__KIS_TOOL_CURVE_PAINT_H_ diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index ed1200d4..2a8d1047 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index d4a8605d..463ef641 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index e14abcb5..b759c8f6 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -20,7 +20,7 @@ #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h index e7bfd89e..ad77204e 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h @@ -60,7 +60,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); } + virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); } }; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 42806771..b8d221ea 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist) TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { m_optWidget = super::createOptionWidget(parent); - TQVBoxLayout * l = dynamic_cast(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast(m_optWidget->layout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); box->setColStretch(1, 1); diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 035eff3b..1384ff58 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -24,7 +24,7 @@ - tqlayout8 + layout8 @@ -59,7 +59,7 @@ - tqlayout7 + layout7 diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index e53c96da..a23de04b 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index ae07e589..54dd393d 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 700efa4b..74274cdd 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 037f6bb5..53743ae1 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index 947dae25..8128dcdf 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -94,7 +94,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); } + virtual KisID id() { return KisID("starshape", i18n("Star Tool")); } }; diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index 3f4f30f5..a6395037 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -24,7 +24,7 @@ - tqlayout8 + layout8 @@ -59,7 +59,7 @@ - tqlayout7 + layout7 diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 2cf6806e..5375d564 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -27,7 +27,7 @@ - tqlayout11 + layout11 @@ -35,7 +35,7 @@ - tqlayout7 + layout7 @@ -43,7 +43,7 @@ - tqlayout1 + layout1 @@ -72,7 +72,7 @@ - tqlayout2 + layout2 @@ -103,7 +103,7 @@ - tqlayout8 + layout8 @@ -111,7 +111,7 @@ - tqlayout3 + layout3 @@ -140,7 +140,7 @@ - tqlayout4 + layout4 @@ -178,7 +178,7 @@ Filter: - + AlignVCenter|AlignRight @@ -197,7 +197,7 @@ Expanding - + 20 21 diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1d2c4d61..552e4c40 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * setCaption(i18n("Color Range")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev); diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 67c6028b..876f0319 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -21,7 +21,7 @@ - tqlayout10 + layout10 @@ -29,7 +29,7 @@ - tqlayout8 + layout8 @@ -37,7 +37,7 @@ - tqlayout7 + layout7 @@ -144,7 +144,7 @@ - tqlayout9 + layout9 @@ -176,7 +176,7 @@ Expanding - + 20 40 @@ -233,7 +233,7 @@ false - + AlignCenter diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 0498505d..00c0c820 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .tqarg(image->colorSpace()->id().name()), + .arg(image->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .tqarg(dev->colorSpace()->id().name()), + .arg(dev->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 6f9af1c6..31163eb7 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index fedb1fd1..ddb47f47 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); KConfig * cfg = KGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index 69aae624..2354cfbc 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -116,7 +116,7 @@ Expanding - + 200 20 @@ -144,7 +144,7 @@ Expanding - + 200 20 @@ -169,7 +169,7 @@ Expanding - + 190 20 @@ -194,7 +194,7 @@ Expanding - + 120 31 diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 60313cb2..f130a46b 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -22,7 +22,7 @@ #include "kis_dlg_filtersgallery.h" #include -#include +#include #include #include @@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); - //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) @@ -64,10 +64,10 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - resize( tqminimumSizeHint()); - m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + resize( minimumSizeHint()); + m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); + m_widget->configWidgetHolder->layout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -94,8 +94,8 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 4b812770..03972a16 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -49,7 +49,7 @@ 0 - + 0 0 diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 90acf130..0ceb3dd4 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget * parent, const char * name) setCaption(i18n("Histogram")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 320b7d7a..be6f9552 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -56,7 +56,7 @@ Preferred - + 20 20 @@ -75,7 +75,7 @@ 0 - + 200 0 @@ -103,7 +103,7 @@ Preferred - + 20 21 @@ -124,7 +124,7 @@ 0 - + 256 150 @@ -133,7 +133,7 @@ - tqlayout2 + layout2 diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 8a656752..6ee07f30 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 6d24d60a..d084060b 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 1686fe97..8e8ca43d 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -51,7 +51,7 @@ Expanding - + 65 20 @@ -68,7 +68,7 @@ Expanding - + 65 20 @@ -123,7 +123,7 @@ Expanding - + 121 20 @@ -197,7 +197,7 @@ - + AlignVCenter|AlignRight @@ -214,7 +214,7 @@ - + AlignVCenter|AlignRight @@ -307,7 +307,7 @@ Filter: - + AlignVCenter|AlignRight diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui index 13cd72a8..b9b3e400 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -76,7 +76,7 @@ - + AlignVCenter|AlignRight @@ -93,7 +93,7 @@ - + AlignVCenter|AlignRight diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui index d3a8326a..72a70c8a 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -96,7 +96,7 @@ 100 - + AlignVCenter|AlignRight diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index bb21f6f7..300161a8 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 5e327aa8..566dabc4 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : sup Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index b69b998f..5b4c8747 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index dafb6669..e4a3386d 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 8a137374..5b65a9e4 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -140,7 +140,7 @@ void PerfTest::slotPerfTest() } if (dlgPerfTest->page()->chkShape->isChecked()) { kdDebug() << "Shapetest\n"; - TQString s = tqshapeTest(testCount); + TQString s = shapeTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } @@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ // Small with varied source opacity @@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); return report; @@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); } - report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(50, 50, 500, 500); } - report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(-50, -50, 1100, 1100); } - report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Opaque Rect fill @@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Transparent rect fill @@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Colour fill @@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillColor(0,0); } - report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Pattern fill @@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillPattern(0,0); } - report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); @@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); c= TQt::black; t.restart(); @@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } -TQString PerfTest::tqshapeTest(TQ_UINT32 testCount) +TQString PerfTest::shapeTest(TQ_UINT32 testCount) { return TQString("Shape test\n"); } @@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount) delete img; } } - report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed())); } return report; } @@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount) img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,"")); delete img2; } - report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount) f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000)); f->disableProgress(); } - report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed())); // On tiles with data @@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed())); return report; } @@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount) l->writeBytes(data, 0, 0, 1000, 1000); } delete[] data; - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); return report; @@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) @@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); img->newLayer("layer 2", OPACITY_OPAQUE); l = img->activeDevice(); @@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } - report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); return report; } @@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest() CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted)); + report = report.append(TQString(" painted current view at %1 frames per second\n").arg(numViewsPainted)); return report; } diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index cbd8799f..959233e4 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -46,7 +46,7 @@ private: TQString fillTest(TQ_UINT32 testCount); TQString gradientTest(TQ_UINT32 testCount); TQString pixelTest(TQ_UINT32 testCount); - TQString tqshapeTest(TQ_UINT32 testCount); + TQString shapeTest(TQ_UINT32 testCount); TQString layerTest(TQ_UINT32 testCount); TQString scaleTest(TQ_UINT32 testCount); TQString rotateTest(TQ_UINT32 testCount); diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index 20f66825..b019e9e1 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -233,7 +233,7 @@ - tqlayout5 + layout5 diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 03bd6b52..9440a8fe 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index 884776f1..af18881a 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -32,7 +32,7 @@ - tqlayout6 + layout6 @@ -48,7 +48,7 @@ Expanding - + 20 20 @@ -65,7 +65,7 @@ false - + AlignCenter @@ -79,7 +79,7 @@ Expanding - + 41 20 @@ -96,7 +96,7 @@ false - + AlignCenter @@ -110,7 +110,7 @@ Expanding - + 31 20 @@ -177,7 +177,7 @@ - tqlayout1 + layout1 @@ -219,7 +219,7 @@ Expanding - + 20 91 diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 6e942c38..585290ae 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url ) TQString caption = i18n("Unable to Save Image"); TQString text = i18n("KSnapshot was unable to save the image to\n%1.") - .tqarg(url.prettyURL()); + .arg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } @@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 ) return w; } Window root, parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { for( unsigned int i = 0; - i < ntqchildren && ret == None; + i < nchildren && ret == None; ++i ) - ret = findRealWindow( tqchildren[ i ], depth + 1 ); - if( tqchildren != NULL ) - XFree( tqchildren ); + ret = findRealWindow( children[ i ], depth + 1 ); + if( children != NULL ) + XFree( children ); } return ret; } @@ -365,12 +365,12 @@ void KSnapshot::performGrab() h += 2 * border; Window parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &tqchildren, &ntqchildren ) != 0 ) { - if( tqchildren != NULL ) - XFree( tqchildren ); + &children, &nchildren ) != 0 ) { + if( children != NULL ) + XFree( children ); int newx, newy; Window dummy; if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), @@ -390,7 +390,7 @@ void KSnapshot::performGrab() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index eb8fa60a..5c0951a8 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -44,7 +44,7 @@ public: KSnapshotThumb(TQWidget *parent, const char *name = 0) : TQLabel(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 34643902..65ae3c99 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ lblImage - + 200 130 @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr Expanding - + 16 16 @@ -167,7 +167,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 156 16 @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 20 31 diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index ec5ba7cc..d7b7729d 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -21,7 +21,7 @@ #include "regiongrabber.h" #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) - .tqarg( rect.height() ); + TQString tip = TQString( "%1x%2" ).arg( rect.width() ) + .arg( rect.height() ); setText( tip ); adjustSize(); @@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = tqgeometry(); + TQRect tipRect = geometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect ) tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( tqgeometry().bottomRight() ); + tipRect.moveBottomRight( geometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -161,8 +161,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 04f7b653..45c1705a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args) KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), ""); if(!cs) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) ); return 0; } @@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0) { - TQMap tqchildren = manager->getChildren(); - kdDebug(41011) << " there are " << tqchildren.size() << endl; - for(TQMap::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) + TQMap children = manager->getChildren(); + kdDebug(41011) << " there are " << children.size() << endl; + for(TQMap::const_iterator it = children.begin(); it != children.end(); it++) { kdDebug(41011) << it.key() << " " << it.data() << endl; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h index d719edd6..5ddb004d 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h @@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a circular tqshape + * This function return a Brush with a circular shape * It takes at least two arguments : * - width * - height @@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a rectangular tqshape + * This function return a Brush with a rectangular shape * It takes at least two arguments : * - width * - height diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp index ecac5501..e2f09a58 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp @@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args) PaintLayer* src = (PaintLayer*)args->item(0).data(); if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace())) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) ); } TQRect rect; if( args->count() >1) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp index c93d6e88..1486d415 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp @@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args) KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), ""); if(!dstCS) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } m_image->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index b01ba0a8..0b22ebf5 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class >, private IteratorMem pixel.push_back( *((float*) data) ); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class >, private IteratorMem *((float*) data) = pixel[i].toDouble(); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp index 5f800f6a..9f27adc6 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp @@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { return new Histogram( paintLayer().data(), factory->generate() , type); } else { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) ); } return 0; } @@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar if(!dstCS) { // FIXME: inform user - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } paintLayer()->paintDevice()->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp index 44991303..5aee1431 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp @@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant firstlineVariant = *kernelH.begin(); if(firstlineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } TQValueList firstline = firstlineVariant.toList(); @@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant lineVariant = *kernelH.begin(); if(lineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } TQValueList line = firstlineVariant.toList(); if(line.size() != kernel.width) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } uint j = 0; for(TQValueList::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp index e166de7c..c8ef92c5 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp @@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args) TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + n )); } @@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(1)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); } *(m_wavelet->coeffs + n ) = v; return 0; @@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args) TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth )); } @@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(2)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") )); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") )); } *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v; return 0; diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb index 1ec25dcd..7f6a9b05 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb @@ -60,11 +60,11 @@ for i in 1..100 painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - tqshape = rand * 7 + shape = rand * 7 painter.setStrokeStyle(1) - if( tqshape < 1 ) + if( shape < 1 ) painter.paintAt(rand * width , rand * height,1.1) - elsif(tqshape < 2 ) + elsif(shape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -72,14 +72,14 @@ for i in 1..100 ys[i] = rand*height end painter.paintPolyline(xs,ys) - elsif(tqshape < 3) + elsif(shape < 3) painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1) - elsif(tqshape < 4) + elsif(shape < 4) painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1) - elsif(tqshape < 5) + elsif(shape < 5) randomizeStyle(painter) painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1) - elsif(tqshape < 6) + elsif(shape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -88,7 +88,7 @@ for i in 1..100 end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(tqshape < 7) + elsif(shape < 7) randomizeStyle(painter) painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1) end diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb index b7c784fc..68610cc5 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb @@ -91,11 +91,11 @@ class TorturePainting painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - tqshape = rand * 7 + shape = rand * 7 painter.setStrokeStyle(1) - if( tqshape < 1 ) + if( shape < 1 ) painter.paintAt(rand * @width , rand * @height,1.1) - elsif(tqshape < 2 ) + elsif(shape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -103,14 +103,14 @@ class TorturePainting ys[i] = rand*@height end painter.paintPolyline(xs,ys) - elsif(tqshape < 3) + elsif(shape < 3) painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1) - elsif(tqshape < 4) + elsif(shape < 4) painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1) - elsif(tqshape < 5) + elsif(shape < 5) randomizeStyle(painter) painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) - elsif(tqshape < 6) + elsif(shape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -119,7 +119,7 @@ class TorturePainting end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(tqshape < 7) + elsif(shape < 7) randomizeStyle(painter) painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) end diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index 99078d0f..3da5db51 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, m_page = new WdgSeparations(this, "separate_image"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui index f1eeeaa2..7e611f67 100644 --- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -82,7 +82,7 @@ Expanding - + 20 16 diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index a2c43aa9..26a05d84 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -29,7 +29,7 @@ using namespace std; #include #include #include -#include +#include #include #include @@ -46,11 +46,11 @@ DlgShearImage::DlgShearImage( TQWidget * parent, m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui index 848eb328..6facd42a 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -56,7 +56,7 @@ shearAngleY - + 32767 100 diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index 3382fe1f..de5850d6 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -29,7 +29,7 @@ - tqlayout3 + layout3 @@ -92,7 +92,7 @@ - tqlayout2 + layout2 diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 65f20e23..a9c7adea 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -64,13 +64,13 @@ 0 - + 150 150 - + 150 150 @@ -95,13 +95,13 @@ 0 - + 150 150 - + 150 150 @@ -121,7 +121,7 @@ Current Pick - + AlignCenter @@ -132,7 +132,7 @@ Original - + AlignCenter @@ -228,7 +228,7 @@ - tqlayout5 + layout5 @@ -268,7 +268,7 @@ Expanding - + 20 187 @@ -287,7 +287,7 @@ 0 - + 32767 556 @@ -322,13 +322,13 @@ 0 - + 150 150 - + 150 150 @@ -348,7 +348,7 @@ Lighter - + AlignCenter @@ -364,13 +364,13 @@ 0 - + 150 150 - + 150 150 @@ -390,7 +390,7 @@ Current Pick - + AlignCenter @@ -406,13 +406,13 @@ 0 - + 150 150 - + 150 150 @@ -432,7 +432,7 @@ Darker - + AlignCenter @@ -460,13 +460,13 @@ 0 - + 540 556 - + 540 556 @@ -497,13 +497,13 @@ 150 - + 150 150 - + 150 150 @@ -531,7 +531,7 @@ More Red - + AlignCenter @@ -550,7 +550,7 @@ More Cyan - + AlignCenter @@ -574,13 +574,13 @@ 0 - + 150 150 - + 150 150 @@ -608,7 +608,7 @@ More Green - + AlignCenter @@ -632,13 +632,13 @@ 0 - + 150 150 - + 150 150 @@ -671,13 +671,13 @@ 0 - + 150 150 - + 150 150 @@ -710,13 +710,13 @@ 0 - + 150 150 - + 150 150 @@ -744,7 +744,7 @@ Current Pick - + AlignCenter @@ -763,7 +763,7 @@ More Yellow - + AlignCenter @@ -787,13 +787,13 @@ 0 - + 150 150 - + 150 150 @@ -829,13 +829,13 @@ 0 - + 150 150 - + 150 150 @@ -863,7 +863,7 @@ More Magenta - + AlignCenter @@ -882,7 +882,7 @@ More Blue - + AlignCenter diff --git a/chalk/sdk/kis_canvas_controller.h b/chalk/sdk/kis_canvas_controller.h index 6ed8f1b9..bdcb3ab0 100644 --- a/chalk/sdk/kis_canvas_controller.h +++ b/chalk/sdk/kis_canvas_controller.h @@ -68,19 +68,19 @@ public: virtual void scrollTo(TQ_INT32 x, TQ_INT32 y) = 0; /** - * Tell all of the canvas to tqrepaint itself. + * Tell all of the canvas to repaint itself. */ virtual void updateCanvas() = 0; /** - * Tell the canvas to tqrepaint the rectangle defined by x, y, w and h. + * Tell the canvas to repaint the rectangle defined by x, y, w and h. * The coordinates are image coordinates. */ virtual void updateCanvas(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) = 0; /** - * Tell the canvas tqrepaint the specified rectangle. The coordinates + * Tell the canvas repaint the specified rectangle. The coordinates * are image coordinates, not view coordinates. */ virtual void updateCanvas(const TQRect& rc) = 0; diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc index cfe6905d..09955e9e 100644 --- a/chalk/ui/imageviewer.cc +++ b/chalk/ui/imageviewer.cc @@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name) , m_image(TQPixmap()) { m_label = new TQLabel( viewport()); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); setCursor(KisCursor::handCursor()); addChild(m_label); } diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index c7f9e0ad..1d7932cb 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -73,21 +73,21 @@ void KCurve::reset(void) { m_grab_point = NULL; m_guideVisible = false; - tqrepaint(false); + repaint(false); } void KCurve::setCurveGuide(TQColor color) { m_guideVisible = true; m_colorGuide = color; - tqrepaint(false); + repaint(false); } void KCurve::setPixmap(TQPixmap pix) { if (m_pix) delete m_pix; m_pix = new TQPixmap(pix); - tqrepaint(false); + repaint(false); } void KCurve::keyPressEvent(TQKeyEvent *e) @@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e) m_points.remove(m_grab_point); } m_grab_point = closest_point; - tqrepaint(false); + repaint(false); } else TQWidget::keyPressEvent(e); @@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); // draw background if(m_pix) @@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e ) } p = m_points.next(); } - tqrepaint(false); + repaint(false); } void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) @@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) setCursor( KCursor::arrowCursor() ); m_dragging = false; - tqrepaint(false); + repaint(false); emit modified(); } @@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) double x = e->pos().x() / (float)width(); double y = 1.0 - e->pos().y() / (float)height(); - if (m_dragging == false) // If no point is selected set the the cursor tqshape if on top + if (m_dragging == false) // If no point is selected set the the cursor shape if on top { double distance = 1000; double ydistance = 1000; @@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) emit modified(); } - tqrepaint(false); + repaint(false); } double KCurve::getCurveValue(double x) diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc index 318bf305..bd5b80fb 100644 --- a/chalk/ui/kis_autogradient.cc +++ b/chalk/ui/kis_autogradient.cc @@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( color, segment->endColor().alpha() ) ); - gradientSlider->tqrepaint(); + gradientSlider->repaint(); paramChanged(); } @@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } @@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 0bc9ae08..b1f9d724 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tqlayout.h" +#include "layout.h" #include "tqlabel.h" #include "tqpixmap.h" #include "tqpainter.h" @@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) hl->addWidget(m_exposureLabel); m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this); - m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); hl->addWidget(m_exposureDoubleWidget); TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images")); l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding)); diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 20de3c5b..d567b76a 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); @@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item) if (kisItem) { KisBrush *brush = static_cast(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height()); + TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height()); m_lbName->setText(text); m_slSpacing->setValue(brush->spacing()); diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 16872418..d38c7ea1 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height) dynamic_cast(m_canvasWidget)->update(x, y, width, height); } -void KisCanvas::tqrepaint() +void KisCanvas::repaint() { Q_ASSERT(m_canvasWidget); - dynamic_cast(m_canvasWidget)->tqrepaint(); + dynamic_cast(m_canvasWidget)->repaint(); } -void KisCanvas::tqrepaint(bool erase) +void KisCanvas::repaint(bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast(m_canvasWidget)->tqrepaint(erase); + dynamic_cast(m_canvasWidget)->repaint(erase); } -void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase) +void KisCanvas::repaint(int x, int y, int width, int height, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast(m_canvasWidget)->tqrepaint(x, y, width, height, erase); + dynamic_cast(m_canvasWidget)->repaint(x, y, width, height, erase); } -void KisCanvas::tqrepaint(const TQRect& r, bool erase) +void KisCanvas::repaint(const TQRect& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast(m_canvasWidget)->repaint(r, erase); } -void KisCanvas::tqrepaint(const TQRegion& r, bool erase) +void KisCanvas::repaint(const TQRegion& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast(m_canvasWidget)->repaint(r, erase); } bool KisCanvas::isUpdatesEnabled() const diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index 4d92a4ce..5f717468 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -313,11 +313,11 @@ public: void update(); void update(const TQRect& r); void update(int x, int y, int width, int height); - void tqrepaint(); - void tqrepaint(bool erase); - void tqrepaint(int x, int y, int width, int height, bool erase = true); - void tqrepaint(const TQRect& r, bool erase = true); - void tqrepaint(const TQRegion& r, bool erase = true); + void repaint(); + void repaint(bool erase); + void repaint(int x, int y, int width, int height, bool erase = true); + void repaint(const TQRect& r, bool erase = true); + void repaint(const TQRegion& r, bool erase = true); void updateGeometry(); diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc index ed5be01d..9b3666e8 100644 --- a/chalk/ui/kis_canvas_painter.cc +++ b/chalk/ui/kis_canvas_painter.cc @@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } @@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable) } } -const TQWMatrix& KisCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasPainter::worldMatrix() const { if (m_canvasWidgetPainter != 0) { - return m_canvasWidgetPainter->tqworldMatrix(); + return m_canvasWidgetPainter->worldMatrix(); } return m_defaultWorldMatrix; } @@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text } } -void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags); + m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags); } } -void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags); + m_canvasWidgetPainter->drawTextItem(p, ti, textflags); } } diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h index 9a719eea..a5ad2d84 100644 --- a/chalk/ui/kis_canvas_painter.h +++ b/chalk/ui/kis_canvas_painter.h @@ -78,7 +78,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -168,8 +168,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); @@ -241,7 +241,7 @@ public: void setViewport(int x, int y, int w, int h); void setWorldXForm(bool); - const TQWMatrix&tqworldMatrix() const; + const TQWMatrix&worldMatrix() const; void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); void saveWorldMatrix(); @@ -331,8 +331,8 @@ public: void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index d52f5ec9..7eb3607a 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ KisClipboard::KisClipboard() clipboardDataChanged(); // Make sure we are notified when clipboard changes - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); } @@ -132,20 +132,20 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) multiDrag->addDragObject( storeDrag ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setData(multiDrag); m_pushedClipboard = true; } KisPaintDeviceSP KisClipboard::clip() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; @@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged() { if (!m_pushedClipboard) { m_hasClip = false; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQImage qimg = cb->image(); TQMimeSource *cbData = cb->data(); TQCString mimeType("application/x-chalk-selection"); @@ -235,7 +235,7 @@ bool KisClipboard::hasClip() TQSize KisClipboard::clipSize() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); @@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize() if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index 4d2103d8..2a2c4b8d 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -21,12 +21,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ void KisColorCup::slotClicked() emit changed(m_color); } -TQSize KisColorCup::tqsizeHint() const +TQSize KisColorCup::sizeHint() const { return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); @@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } - qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); if ( m_color.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, m_color ); if ( hasFocus() ) { TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h index 2cf9ddef..8c7fd2b5 100644 --- a/chalk/ui/kis_color_cup.h +++ b/chalk/ui/kis_color_cup.h @@ -72,7 +72,7 @@ signals: public: - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index fab8c4bb..21debef1 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup"); - TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout"); + TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout"); TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(TQTabWidget::Triangular); @@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view) { m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout"); TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(TQTabWidget::Triangular); @@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) { m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout"); TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(TQTabWidget::Triangular); diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc index 93c82977..41263237 100644 --- a/chalk/ui/kis_custom_image_widget.cc +++ b/chalk/ui/kis_custom_image_widget.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index f84bf24d..ac762953 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() { if (!m_palette->save()) { KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.") - .tqarg(m_palette->filename()), i18n("Palette")); + .arg(m_palette->filename()), i18n("Palette")); return; } diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index 1cdd309c..5d09bf3b 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, } setCaption(caption); TQWidget * page = new TQWidget(this, "page widget"); - TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6); + TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6); setMainWidget(page); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( dev ); connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - tqlayout->addWidget(m_preview, 1, 1); + layout->addWidget(m_preview, 1, 1); - TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout ); + TQVBoxLayout *v1 = new TQVBoxLayout( layout ); TQHBoxLayout *hl = new TQHBoxLayout( v1 ); TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName"); @@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_layerName = new KLineEdit(page, "m_layerName"); m_layerName->setText(layerName); - m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); hl->addWidget(m_layerName, 0, 1); connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 13caff98..83893b0b 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -102,10 +102,10 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"), m_configWidgetHolder); - m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget); + m_configWidgetHolder->layout()->add(m_labelNoConfigWidget); m_labelNoConfigWidget->hide(); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); m_currentConfigWidget = 0; @@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if ( m_currentConfigWidget != 0 ) { - m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; @@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if (m_currentConfigWidget != 0) { - m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + m_configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } else { diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 5c136738..2d5e8a90 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name) m_page = new WdgApplyProfile(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); // XXX: This is BAD! (bsar) fillCmbProfiles(KisID("RGBA", "")); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index ca6a1b72..20fdac28 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -19,11 +19,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, m_image = image; setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->txtName->setText(image->name()); m_page->m_createButton->hide(); diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 7742969b..5dc65047 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -17,7 +17,7 @@ */ #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); opacity = int((opacity * 100.0) / 255 + 0.5); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index 154dbf2c..c762a3c5 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -20,7 +20,7 @@ */ #include #include -#include +#include #include #include @@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, : super(parent, name, true, "", Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); setCaption(i18n("New Layer")); diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index a19edebe..b9313fa9 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name ) KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle()); + m_cmbCursorShape->setCurrentItem(cfg.cursorStyle()); grpDockability->setButton(cfg.dockability()); numDockerFontSize->setValue((int)cfg.dockerFontSize()); } @@ -86,14 +86,14 @@ void GeneralTab::setDefault() { KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); + m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); grpDockability->setButton(cfg.getDefaultDockability()); numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize())); } enumCursorStyle GeneralTab::cursorStyle() { - return (enumCursorStyle)m_cmbtqCursorShape->currentItem(); + return (enumCursorStyle)m_cmbCursorShape->currentItem(); } enumKoDockability GeneralTab::dockability() @@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQWidget *parent, const char *name) : super(parent, name, true, "", Ok | Cancel) { - setCaption(i18n("Configure %1").tqarg(deviceName)); + setCaption(i18n("Configure %1").arg(deviceName)); m_page = new WdgTabletDeviceSettings(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) { TQString axisString; diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index 6bae7e78..70141dea 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc) } bool KisDoc::loadChildren(KoStore* store) { - TQPtrListIterator it(tqchildren()); + TQPtrListIterator it(children()); for( ; it.current(); ++it ) { if (!it.current()->loadDocument(store)) { return false; diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 6c03b3e9..8768e81a 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max) connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); - m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout"); m_layout->addWidget(m_slider); m_layout->addSpacing(5); diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index e8bf5ba8..a2775bc7 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -18,7 +18,7 @@ */ #include "tqsignalmapper.h" -#include +#include #include #include #include @@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac) // Create action KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, - TQString("chalk_filter_%1").tqarg((*it) . id()).ascii()); + TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu KActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); @@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i) if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i) else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "rgba8degradation") != KMessageBox::Continue) return; @@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i) widgetLayout->addWidget(m_lastWidget, 0 , 0); - m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize()); + m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize()); refreshPreview(); diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index f2d63cc3..0112ceb0 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -154,7 +154,7 @@ void KisFiltersListView::init() setCaption(i18n("Filters List")); setItemsMovable(false); setSelectionMode(TQIconView::Single); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); setMinimumWidth(160); } diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 203f0718..f66bb80a 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -17,7 +17,7 @@ */ #include #include -#include +#include #include #include @@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show())); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index cda77d68..a8fdf71e 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) { TQWidget::paintEvent( pe ); TQPixmap pixmap( width(), height() ); - pixmap.fill( tqcolorGroup().background() ); + pixmap.fill( colorGroup().background() ); TQPainter painter( &pixmap ); painter.setPen( TQt::black ); painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE ); @@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) height()- HANDLE_SIZE - MARGIN, tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ), HANDLE_SIZE ); - painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) ); + painter.fillRect( selection, TQBrush( colorGroup().highlight() ) ); } TQPointArray triangle(3); @@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e ) emit sigSelectedSegment( m_selectedSegment ); } } - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e ) @@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e ) if ( m_drag != NO_DRAG) emit sigChangedSegment( m_currentSegment ); - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e ) @@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id ) break; } emit sigSelectedSegment( m_selectedSegment ); - tqrepaint(false); + repaint(false); } #include "kis_gradient_slider_widget.moc" diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 1375cacc..2d704d86 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val) l->insertStretch(0, 1); d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox"); - d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); d->m_numinput->setSuffix("%"); l->addWidget( d->m_numinput ); @@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val) d->m_prevValue = val; setValue(val); setFocusProxy(d->m_numinput); - tqlayout(); + layout(); connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int))); connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); @@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/) lower = kMin(upper, lower); d->m_slider->setRange(lower, upper); - tqlayout(); + layout(); } void KisIntSpinbox::setMinValue(int min) diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc index c081111f..5920c3d0 100644 --- a/chalk/ui/kis_label_progress.cc +++ b/chalk/ui/kis_label_progress.cc @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 424c405d..31756d7c 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -21,11 +21,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char vbox->setAutoAdd(true); m_lst = new WdgLayerBox(this); - setMinimumSize(m_lst->tqminimumSizeHint()); + setMinimumSize(m_lst->minimumSizeHint()); TQToolTip::add(m_lst->bnAdd, i18n("Create new layer")); @@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader& TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size); if (pixmap.isNull()) - KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename), + KMessageBox::error(0, i18n("Cannot find %1").arg(filename), i18n("Canvas")); return pixmap; @@ -626,7 +626,7 @@ void KisLayerBox::printChalkLayers() const return; TQString s = root->name(); if( dynamic_cast( root ) ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( m_image->activeLayer().data() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; @@ -658,7 +658,7 @@ void KisLayerBox::printLayerboxLayers() const } TQString s = root->displayName(); if( root->isFolder() ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( list()->activeLayer() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 985bd0c6..24ae2738 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -181,16 +181,16 @@ TQString KisLayerItem::tooltip() const TQString text = super::tooltip(); text = text.left( text.length() - 8 ); //HACK -- strip the TQString row = "%1%2"; - text += row.tqarg( i18n( "Opacity:" ) ).tqarg( "%1%" ).tqarg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); - text += row.tqarg( i18n( "Composite mode:" ) ).tqarg( m_layer->compositeOp().id().name() ); + text += row.arg( i18n( "Opacity:" ) ).arg( "%1%" ).arg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); + text += row.arg( i18n( "Composite mode:" ) ).arg( m_layer->compositeOp().id().name() ); if( KisPaintLayer *player = dynamic_cast( m_layer ) ) { - text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() ); + text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() ); if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() ) - text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() ); + text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() ); } if( KisAdjustmentLayer *alayer = dynamic_cast( m_layer ) ) - text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); + text += row.arg( i18n( "Filter: " ) ).arg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); if( KisPartLayerImpl *player = dynamic_cast( m_layer ) ) { TQString type = player->docType(); @@ -198,7 +198,7 @@ TQString KisLayerItem::tooltip() const type = player->childDoc()->document()->instance()->aboutData()->programName(); } - text += row.tqarg( i18n( "Document type: " ) ).tqarg( type ); + text += row.arg( i18n( "Document type: " ) ).arg( type ); } text += ""; diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index ca238b60..2b866c2f 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -104,7 +104,7 @@ Expanding - + 20 41 @@ -121,7 +121,7 @@ Expanding - + 21 20 diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc index 806998bf..56d8265c 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cc +++ b/chalk/ui/kis_multi_bool_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_bool_filter_widget.h" #include -#include +#include #include #include diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc index 486bc770..5bccdcef 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cc +++ b/chalk/ui/kis_multi_double_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_double_filter_widget.h" #include -#include +#include #include #include diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc index 130a03d1..0cecabcc 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cc +++ b/chalk/ui/kis_multi_integer_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_integer_filter_widget.h" #include -#include +#include #include #include diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc index 6ae12305..e6551f81 100644 --- a/chalk/ui/kis_opengl_canvas_painter.cc +++ b/chalk/ui/kis_opengl_canvas_painter.cc @@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h index 47983ce2..24f2e2e2 100644 --- a/chalk/ui/kis_opengl_canvas_painter.h +++ b/chalk/ui/kis_opengl_canvas_painter.h @@ -85,7 +85,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -175,8 +175,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 20197dd2..6a5a3885 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget() if (m_optionWidget != 0) { m_layout->remove(m_optionWidget); m_optionWidget->hide(); - m_layout->tqinvalidate(); + m_layout->invalidate(); } const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice()); diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index a424d9ac..2bfe1985 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, minSize += TQSize(cellSize); setMinimumSize(minSize); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); } KisPaletteView::~KisPaletteView() diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 2feb74c8..3618e8ad 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,16 +67,16 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) m_currentPalette = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); combo->setFocusPolicy( TQ_ClickFocus ); - tqlayout->addWidget(combo); + layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); - tqlayout->addWidget( m_view ); + layout->addWidget( m_view ); - //setFixedSize(tqsizeHint()); + //setFixedSize(sizeHint()); connect(combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette(const TQString &))); diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index ace29965..5846a67b 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -94,19 +94,19 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) // Called when another layer is made inactive void KisPartLayerImpl::childDeactivated(bool activated) { - // We probably changed, notify the image that it needs to tqrepaint where we currently updated - // We use the original tqgeometry + // We probably changed, notify the image that it needs to repaint where we currently updated + // We use the original geometry if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { TQPtrList views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); m_activated = false; - setDirty(m_doc->tqgeometry()); + setDirty(m_doc->geometry()); } } void KisPartLayerImpl::setX(TQ_INT32 x) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -115,7 +115,7 @@ void KisPartLayerImpl::setX(TQ_INT32 x) { } void KisPartLayerImpl::setY(TQ_INT32 y) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -125,7 +125,7 @@ void KisPartLayerImpl::setY(TQ_INT32 y) { void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) { uchar *j = img.bits(); - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); for (int y2 = y; y2 < h + y; ++y2) { for (int x2 = x; x2 < w + x; ++x2) { diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h index d2ff10eb..377b37a0 100644 --- a/chalk/ui/kis_part_layer.h +++ b/chalk/ui/kis_part_layer.h @@ -95,10 +95,10 @@ public: virtual void setX(TQ_INT32 x); virtual void setY(TQ_INT32 y); - virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); } - virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); } - virtual TQRect extent() const { return m_doc->tqgeometry(); } - virtual TQRect exactBounds() const { return m_doc->tqgeometry(); } + virtual TQ_INT32 x() const { return m_doc->geometry() . x(); } + virtual TQ_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); } + virtual TQRect extent() const { return m_doc->geometry(); } + virtual TQRect exactBounds() const { return m_doc->geometry(); } virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h); @@ -113,7 +113,7 @@ public: virtual bool saveToXML(TQDomDocument doc, TQDomElement elem); private slots: /// Repaints our device with the data from the embedded part - //void tqrepaint(); + //void repaint(); /// When we activate the embedding, we clear ourselves void childActivated(KoDocumentChild* child); void childDeactivated(bool activated); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index 70484b0a..39ffe61e 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include @@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super { m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); @@ -47,7 +47,7 @@ void KisPatternChooser::update(KoIconItem *item) if (item) { KisPattern *pattern = static_cast(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height()); + TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height()); m_lbName->setText(text); } diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index e2857c19..e9fb8443 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "kis_previewwidget.h" #include "kis_previewdialog.h" @@ -28,14 +28,14 @@ KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption) : super (parent, name, modal, caption, Ok | Cancel, Ok) { - TQHBox* tqlayout = new TQHBox(this); - tqlayout->setSpacing( 6 ); + TQHBox* layout = new TQHBox(this); + layout->setSpacing( 6 ); - m_containerFrame = new TQFrame( tqlayout, "container" ); + m_containerFrame = new TQFrame( layout, "container" ); - m_preview = new KisPreviewWidget( tqlayout, "previewWidget" ); + m_preview = new KisPreviewWidget( layout, "previewWidget" ); - setMainWidget(tqlayout); + setMainWidget(layout); } KisPreviewDialog::~KisPreviewDialog() diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index 2598e79d..9bc7eb46 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index f1b52244..6ba86353 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -56,13 +56,13 @@ 0 - + 200 150 - + 1000 1000 @@ -73,7 +73,7 @@ - tqlayout4 + layout4 @@ -122,7 +122,7 @@ - tqlayout5 + layout5 @@ -130,7 +130,7 @@ - tqlayout4 + layout4 diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc index 4233bc11..5bf891ac 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc @@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un TQWidget *widget = dynamic_cast(canvasWidget); if (widget != 0) { - return m_painter.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped); + return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped); } else { return false; } @@ -46,7 +46,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un bool KisTQPaintDeviceCanvasPainter::begin(const TQPaintDevice* paintDevice, bool unclipped) { - return m_painter.tqbegin(const_cast(paintDevice), unclipped); + return m_painter.begin(const_cast(paintDevice), unclipped); } bool KisTQPaintDeviceCanvasPainter::end() @@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable) m_painter.setWorldXForm(enable); } -const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const { - return m_painter.tqworldMatrix(); + return m_painter.worldMatrix(); } void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine) @@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawPolyline(pointArray, index, npoints); + m_painter.drawPolyline(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints) { - m_painter.tqdrawPolygon(pointArray, winding, index, npoints); + m_painter.drawPolygon(pointArray, winding, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawConvexPolygon(pointArray, index, npoints); + m_painter.drawConvexPolygon(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index) @@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T #endif // USE_QT4 } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(x, y, ti, textflags); + m_painter.drawTextItem(x, y, ti, textflags); } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(p, ti, textflags); + m_painter.drawTextItem(p, ti, textflags); } TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern) diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h index 0dca7322..cef260b4 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.h +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h @@ -80,7 +80,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -170,8 +170,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 44e86cae..8a8929a7 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -131,7 +131,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) if (m_pixmapBuffer) { if (m_orientation == Qt::Horizontal) { if (m_currentPosition != -1) - tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); + repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); if (x != -1) { bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT); @@ -139,7 +139,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) } } else { if (m_currentPosition != -1) - tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); + repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); if (y != -1) { bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH); @@ -184,8 +184,8 @@ void KisRuler::drawRuler() return; p.begin(m_pixmapBuffer); - p.setPen(tqcolorGroup().text()); - p.setBackgroundColor(tqcolorGroup().base()); + p.setPen(colorGroup().text()); + p.setBackgroundColor(colorGroup().base()); p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height()); switch (m_unit) { diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index 1205632b..de98548c 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -50,7 +50,7 @@ public: //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count); + location += m_img->name() + TQString("/layers/layer%1").arg(m_count); // Layer data if (m_store->open(location)) { @@ -70,7 +70,7 @@ public: if (annotation) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".icc"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".icc"; if (m_store->open(location)) { m_store->write(annotation->annotation()); @@ -85,7 +85,7 @@ public: if (mask) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".mask"; if (m_store->open(location)) { if (!mask->write(m_store)) { @@ -130,7 +130,7 @@ public: if (layer->selection()) { TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".selection"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".selection"; // Layer data if (m_store->open(location)) { @@ -147,7 +147,7 @@ public: if (layer->filter()) { TQString location = m_external ? TQString() : m_uri; location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".filterconfig"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".filterconfig"; if (m_store->open(location)) { TQString s = layer->filter()->toString(); diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h index 15580752..b5e3d930 100644 --- a/chalk/ui/kis_savexml_visitor.h +++ b/chalk/ui/kis_savexml_visitor.h @@ -54,7 +54,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "paintlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id()); layerElement.setAttribute("hasmask", layer->hasMask()); m_elem.appendChild(layerElement); @@ -124,7 +124,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "adjustmentlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("x", layer->x()); layerElement.setAttribute("y", layer->y()); m_elem.appendChild(layerElement); diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 0655b834..60ab80c7 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection) // this, TQT_SLOT(save()), // collection, "save_selection"); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged())); } diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc index 32933b5a..17562722 100644 --- a/chalk/ui/kis_selection_options.cc +++ b/chalk/ui/kis_selection_options.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "kis_canvas_controller.h" #include "kis_canvas_subject.h" diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index ad681c75..b2ae9f36 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -63,7 +63,7 @@ void KisTextBrush::getFont() void KisTextBrush::rebuildTextBrush() { - lblFont->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); + lblFont->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); lblFont->setFont(m_font); m_textBrushResource->setFont(m_font); m_textBrushResource->setText(lineEdit->text()); diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index d6e600af..807b8ffc 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -56,9 +56,9 @@ KisTool::~KisTool() TQWidget* KisTool::createOptionWidget(TQWidget* parent) { - d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); + d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); - d->optionWidget->tqsetAlignment(TQt::AlignCenter); + d->optionWidget->setAlignment(TQt::AlignCenter); return d->optionWidget; } diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index b9abdc75..bda3b7e7 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -47,7 +47,7 @@ class KisMoveEvent; class KisCanvasPainter; enum enumToolType { - TOOL_SHAPE = 0, // Geometric tqshapes like ellipses and lines + TOOL_SHAPE = 0, // Geometric shapes like ellipses and lines TOOL_FREEHAND = 1, // Freehand drawing tools TOOL_TRANSFORM = 2, // Tools that transform the layer TOOL_FILL = 3, // Tools that fill parts of the canvas diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index 51eb1407..bc478d4e 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent) { m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent); m_optionWidget->setCaption(i18n("No Active Tool")); - m_optionWidget->tqsetAlignment(TQt::AlignCenter); + m_optionWidget->setAlignment(TQt::AlignCenter); return m_optionWidget; } diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index adbf9b8a..bb7dbc1e 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -20,7 +20,7 @@ */ #include #include -#include +#include #include #include @@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) { } KisCanvas *canvas = controller->kiscanvas(); - canvas->tqrepaint(); + canvas->repaint(); KisBrush *brush = m_subject->currentBrush(); // There may not be a brush present, and we shouldn't crash in that case diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index 9d37dae6..e3cf7152 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget() return m_optionWidget; } -void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout) +void KisToolPaint::addOptionWidgetLayout(TQLayout *layout) { Q_ASSERT(m_optionWidget != 0); Q_ASSERT(m_optionWidgetLayout != 0); int rowCount = m_optionWidgetLayout->numRows(); - m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1); + m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1); } void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label) diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 7fb4b819..05dbf450 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -20,7 +20,7 @@ #define KIS_TOOL_PAINT_H_ #include -#include +#include #include @@ -88,8 +88,8 @@ public slots: protected: void notifyModified() const; - // Add the tool-specific tqlayout to the default option widget's tqlayout. - void addOptionWidgetLayout(TQLayout *tqlayout); + // Add the tool-specific layout to the default option widget's layout. + void addOptionWidgetLayout(TQLayout *layout); private: void updateCompositeOpComboBox(); diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index e7696f0b..045b43f9 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0; KisToolRegistry::KisToolRegistry() { // Load all modules: color models, paintops, filters - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index 9e76f159..0c9ddc4a 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include @@ -29,7 +29,7 @@ KisToolShape::KisToolShape(const TQString& UIName) : super(UIName) { - m_tqshapeOptionsWidget = 0; + m_shapeOptionsWidget = 0; m_optionLayout = 0; } @@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent) { TQWidget *widget = super::createOptionWidget(parent); - m_tqshapeOptionsWidget = new WdgGeometryOptions(0); - Q_CHECK_PTR(m_tqshapeOptionsWidget); + m_shapeOptionsWidget = new WdgGeometryOptions(0); + Q_CHECK_PTR(m_shapeOptionsWidget); m_optionLayout = new TQGridLayout(widget, 2, 1); // super::addOptionWidgetLayout(m_optionLayout); - m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); - m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); - addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3); + m_shapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); + m_shapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); + addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3); return widget; } KisPainter::FillStyle KisToolShape::fillStyle(void) { - if (m_tqshapeOptionsWidget) { - return static_cast(m_tqshapeOptionsWidget->cmbFill->currentItem()); + if (m_shapeOptionsWidget) { + return static_cast(m_shapeOptionsWidget->cmbFill->currentItem()); } else { return KisPainter::FillStyleNone; } diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h index e8974c79..45767fe4 100644 --- a/chalk/ui/kis_tool_shape.h +++ b/chalk/ui/kis_tool_shape.h @@ -46,7 +46,7 @@ protected: private: TQGridLayout *m_optionLayout; - WdgGeometryOptions *m_tqshapeOptionsWidget; + WdgGeometryOptions *m_shapeOptionsWidget; }; #endif // KIS_TOOL_SHAPE_H_ diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 4455f17d..629072ff 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this); // Load all plugins - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) @@ -494,11 +494,11 @@ void KisView::setupRulers() void KisView::updateStatusBarZoomLabel () { if (zoom() < 1 - EPSILON) { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4)); } else { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0)); } - m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888 "))); + m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("0.8888 "))); } void KisView::updateStatusBarSelectionLabel() @@ -513,7 +513,7 @@ void KisView::updateStatusBarSelectionLabel() if (dev) { if (dev->hasSelection()) { TQRect r = dev->selection()->selectedExactRect(); - m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height())); + m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").arg(r.x()).arg(r.y()).arg( r.width()).arg( r.height())); return; } } @@ -682,7 +682,7 @@ void KisView::setupActions() new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); - // XXX: This triggers a tqrepaint of the image, but way too early + // XXX: This triggers a repaint of the image, but way too early //showRuler(); } @@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *) } KisImageSP img = currentImg(); - TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); TQ_INT32 drawH; TQ_INT32 drawW; TQ_INT32 docW; @@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *) if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) { - TQMemArray rects = exposedRegion.tqrects(); + TQMemArray rects = exposedRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -958,11 +958,11 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) TQRegion rg(vr); rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height()))); - TQMemArray rects = rg.tqrects(); + TQMemArray rects = rg.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect er = rects[i]; - gc.fillRect(er, tqcolorGroup().mid()); + gc.fillRect(er, colorGroup().mid()); } wr &= TQRect(0, 0, img->width(), img->height()); } @@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) } // paintGuides(); } else { - gc.fillRect(vr, tqcolorGroup().mid()); + gc.fillRect(vr, colorGroup().mid()); } } } @@ -1025,7 +1025,7 @@ void KisView::paintTQPaintDeviceView(const TQRegion& canvasRegion) Q_ASSERT(m_canvas->TQPaintDeviceWidget() != 0); if (m_canvas->TQPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) { - TQMemArray rects = canvasRegion.tqrects(); + TQMemArray rects = canvasRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect) glDrawBuffer(GL_BACK); - TQColor widgetBackgroundColor = tqcolorGroup().mid(); + TQColor widgetBackgroundColor = colorGroup().mid(); glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); @@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect) } else { updateTQPaintDeviceCanvas(imageRect); //m_canvas->update(windowToView(imageRect)); - m_canvas->tqrepaint(windowToView(imageRect)); + m_canvas->repaint(windowToView(imageRect)); } } @@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas() updateCanvas(imageRect); // Enable this if updateCanvas does an m_canvas->update() - //m_canvas->tqrepaint(); + //m_canvas->repaint(); } void KisView::selectionDisplayToggled(bool displaySelection) @@ -2965,7 +2965,7 @@ void KisView::layerDuplicate() return; KisLayerSP dup = active->clone(); - dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); + dup->setName(i18n("Duplicate of '%1'").arg(active->name())); img->addLayer(dup, active->parent().data(), active); if (dup) { img->activate( dup ); @@ -3086,7 +3086,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, xShift, 0, &m_canvasPixmap, 0, 0, m_canvasPixmap.width() - xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } else if (xShift < 0) { @@ -3098,7 +3098,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, -xShift, 0, m_canvasPixmap.width() + xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } if (m_oldTool) { @@ -3131,7 +3131,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, yShift, &m_canvasPixmap, 0, 0, m_canvasPixmap.width(), m_canvasPixmap.height() - yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } else if (yShift < 0) { @@ -3143,7 +3143,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, 0, -yShift, m_canvasPixmap.width(), m_canvasPixmap.height() + yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } if (m_oldTool) { @@ -3470,7 +3470,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) // We ignore device change due to mouse events for a short duration // after a tablet event, since these are almost certainly mouse events - // sent to tqreceivers that don't accept the tablet event. + // sent to receivers that don't accept the tablet event. m_tabletEventTimer.start(); break; } @@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) mgr = img->guides(); if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) { - bool flag = tqgeometry().contains(pt); + bool flag = geometry().contains(pt); KisGuideSP gd; if (m_currentGuide == 0 && flag) { diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 542e257d..3ec87a6e 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -19,7 +19,7 @@ */ #include #include -#include +#include #include #include #include @@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v ) void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos) { - m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5)); - m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5)); + m_page->txtX->setText(TQString("%L1").arg(xpos, 5)); + m_page->txtY->setText(TQString("%L1").arg(ypos, 5)); } void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider) @@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r) TQPainter painter(&m_thumbnail); - painter.fillRect(thumbnailRect, tqcolorGroup().mid()); + painter.fillRect(thumbnailRect, colorGroup().mid()); painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage); } } @@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView() TQPainter painter(&m_viewBuffer); - painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid()); + painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid()); if (!m_thumbnail.isNull()) { diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 96e1e032..19f49200 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -142,9 +142,9 @@ public: { m_img = m_item->tooltipPreview(); m_timer.start( 15000, true ); - if( !isVisible() || tqsizeHint() != size() ) + if( !isVisible() || sizeHint() != size() ) { - resize( tqsizeHint() ); + resize( sizeHint() ); position(); } if( !isVisible() ) @@ -168,8 +168,8 @@ public: { TQPixmap buf( width(), height() ); TQPainter p( &buf ); - buf.fill( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + buf.fill( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( buf.rect() ); TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() ); @@ -188,12 +188,12 @@ public: p.translate( m_img.width() + 10, 0 ); } - text.draw( &p, 0, 0, rect(), tqcolorGroup() ); + text.draw( &p, 0, 0, rect(), colorGroup() ); painter->drawPixmap( 0, 0, buf ); } - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { if( !m_item ) return TQSize( 0, 0 ); @@ -217,7 +217,7 @@ public: void position() { const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); - const TQSize size = tqsizeHint(); + const TQSize size = sizeHint(); const int width = size.width(), height = size.height(); const TQRect tmp = m_item->rect(); const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() ); @@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const { TQString tip; tip += ""; - tip += TQString("").tqarg( displayName() ); + tip += TQString("").arg( displayName() ); TQString row = ""; for( int i = 0, n = listView()->d->properties.count(); i < n; ++i ) if( !isFolder() || listView()->d->properties[i].validForFolders ) { if( d->properties[i] ) - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) ); else - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) ); } tip += "
%1
%1
%1%2
"; return tip; @@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum p.setFont( font() ); - const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled(); + const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled(); const TQColor bg = isSelected() ? cg_.highlight() : isAlternate() ? listView()->alternateBackground() diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 6b957a26..31a044f2 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos ) TQListBoxItem* selectedItem = listBox->itemAt( pos ); if (selectedItem) { - TQRect positionToolTip = listBox->tqitemRect( selectedItem ); + TQRect positionToolTip = listBox->itemRect( selectedItem ); TQString toolTipText = m_originalWidget->itemHighlighted(); if (!toolTipText.isNull()) tip(positionToolTip, toolTipText); @@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const return false; } -TQSize SqueezedComboBox::tqsizeHint() const +TQSize SqueezedComboBox::sizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 03a1cdb9..50f4bc77 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -117,9 +117,9 @@ public: TQString itemHighlighted( ); /** - * Sets the tqsizeHint() of this widget. + * Sets the sizeHint() of this widget. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: void slotTimeOut(); diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui index 5227d7fb..39de910a 100644 --- a/chalk/ui/wdgapplyprofile.ui +++ b/chalk/ui/wdgapplyprofile.ui @@ -71,7 +71,7 @@ The image data you want to paste does not have an ICM profile associated with it. If you do not select a profile, Chalk will assume that the image data is encoded in the import profile defined in the Settings dialog. - + WordBreak|AlignVCenter diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index 00683ca9..6d3a572d 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -26,7 +26,7 @@ - tqlayout3 + layout3 @@ -48,7 +48,7 @@ - tqlayout21 + layout21 @@ -129,13 +129,13 @@ 0 - + 16 0 - + 16 32767 @@ -169,7 +169,7 @@ - tqlayout23 + layout23 @@ -242,13 +242,13 @@ 0 - + 16 0 - + 16 32767 @@ -273,7 +273,7 @@ - tqlayout6 + layout6 @@ -291,7 +291,7 @@ 0 - + 95 95 @@ -332,7 +332,7 @@ Expanding - + 20 0 diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 94a8a137..aec6907d 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -45,7 +45,7 @@ 0 - + 32767 30 @@ -57,7 +57,7 @@ - tqlayout11 + layout11 @@ -71,7 +71,7 @@ - tqlayout10 + layout10 @@ -95,7 +95,7 @@ - tqlayout8 + layout8 @@ -129,7 +129,7 @@ 0 - + 30 30 @@ -150,7 +150,7 @@ - tqlayout9 + layout9 @@ -184,7 +184,7 @@ 0 - + 30 30 @@ -207,7 +207,7 @@ - tqlayout5 + layout5 @@ -287,7 +287,7 @@ - tqlayout11_2 + layout11_2 diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 2b2b7910..506e2803 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -39,7 +39,7 @@ - tqlayout4 + layout4 @@ -53,7 +53,7 @@ - tqlayout10 + layout10 @@ -71,13 +71,13 @@ txtX - + 50 0 - + 50 32767 @@ -105,13 +105,13 @@ txtY - + 50 0 - + 50 32767 @@ -137,7 +137,7 @@ Expanding - + 20 20 @@ -158,13 +158,13 @@ 0 - + 75 75 - + 200 75 @@ -186,7 +186,7 @@ toolbar - + 32767 32 @@ -195,7 +195,7 @@ - tqlayout4 + layout4 diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 6f9e41e6..f4a0f695 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -21,7 +21,7 @@ - tqlayout8 + layout8 @@ -47,7 +47,7 @@ 0 - + 0 20 @@ -228,7 +228,7 @@ The different rendering intent methods will affect only what is shown on screen, <p>Select what color profile to add when pasting from external applications that do not use a color profile.</p> - + WordBreak|AlignVCenter @@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen, - tqlayout6 + layout6 @@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen, Expanding - + 20 16 diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index dba17dac..f1c67ffa 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -18,7 +18,7 @@ - tqlayout4 + layout4 @@ -103,7 +103,7 @@ - tqlayout6 + layout6 @@ -119,7 +119,7 @@ Expanding - + 40 20 @@ -138,7 +138,7 @@ 0 - + 50 50 @@ -158,7 +158,7 @@ Expanding - + 40 20 @@ -169,7 +169,7 @@ - tqlayout7 + layout7 diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 7936f20b..5b03a7f0 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -18,7 +18,7 @@ - tqlayout4 + layout4 @@ -49,7 +49,7 @@ - tqlayout6 + layout6 @@ -65,7 +65,7 @@ Expanding - + 40 20 @@ -84,7 +84,7 @@ 0 - + 50 50 @@ -104,7 +104,7 @@ Expanding - + 40 20 @@ -115,7 +115,7 @@ - tqlayout7 + layout7 diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 64b33f16..757b6b27 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -29,7 +29,7 @@ Expanding - + 20 50 @@ -49,7 +49,7 @@ - tqlayout4 + layout4 @@ -75,7 +75,7 @@ Expanding - + 121 31 diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 53f3ef90..9383fbfd 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -18,7 +18,7 @@ - tqlayout3 + layout3 @@ -26,7 +26,7 @@ - tqlayout1 + layout1 @@ -37,10 +37,10 @@ textLabel1 - &Cursor tqshape: + &Cursor shape: - m_cmbtqCursorShape + m_cmbCursorShape @@ -65,7 +65,7 @@ - m_cmbtqCursorShape + m_cmbCursorShape @@ -112,7 +112,7 @@ - tqlayout2 + layout2 @@ -148,7 +148,7 @@ Expanding - + 41 20 @@ -165,7 +165,7 @@ Expanding - + 20 41 diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 18c1f528..dbb90e0a 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -29,7 +29,7 @@ Expanding - + 20 31 @@ -57,7 +57,7 @@ Expanding - + 16 20 @@ -192,7 +192,7 @@ Expanding - + 34 20 @@ -214,7 +214,7 @@ - tqlayout8 + layout8 @@ -222,7 +222,7 @@ - tqlayout6 + layout6 @@ -294,13 +294,13 @@ 0 - + 16 0 - + 16 32767 @@ -320,7 +320,7 @@ - tqlayout9 + layout9 @@ -357,7 +357,7 @@ Expanding - + 41 20 @@ -427,7 +427,7 @@ Expanding - + 20 20 diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d977802e..02c15129 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -24,7 +24,7 @@ - tqlayout3 + layout3 @@ -42,7 +42,7 @@ 0 - + 0 10 @@ -74,7 +74,7 @@ - tqlayout6 + layout6 @@ -84,13 +84,13 @@ bnAdd - + 22 22 - + 18 18 @@ -110,13 +110,13 @@ bnLower - + 22 22 - + 18 18 @@ -136,13 +136,13 @@ bnRaise - + 22 22 - + 18 18 @@ -162,13 +162,13 @@ bnProperties - + 22 22 - + 18 18 @@ -191,7 +191,7 @@ Expanding - + 20 20 @@ -202,13 +202,13 @@ bnDelete - + 22 22 - + 18 18 diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index dd310483..82548e11 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -137,7 +137,7 @@ Expanding - + 131 61 @@ -230,7 +230,7 @@ Description: - + AlignTop @@ -316,7 +316,7 @@ - tqlayout1 + layout1 @@ -332,7 +332,7 @@ Expanding - + 480 21 @@ -359,7 +359,7 @@ Expanding - + 21 0 diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3654031b..c4de4e1d 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -29,7 +29,7 @@ - tqlayout2 + layout2 @@ -45,7 +45,7 @@ Expanding - + 255 20 diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index c8e4404b..82deb5b9 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -18,7 +18,7 @@ - tqlayout4 + layout4 @@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be Expanding - + 81 20 @@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be - tqlayout5 + layout5 @@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be m_swappiness - + 600 32767 @@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be Expanding - + 20 139 diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 90f59a33..2a21e377 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -26,7 +26,7 @@ Expanding - + 21 89 diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index ca71ee01..f6f02f39 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -24,7 +24,7 @@ - tqlayout1 + layout1 diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index 563c7dbc..2c485c4d 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -35,7 +35,7 @@ Expanding - + 20 16 @@ -85,7 +85,7 @@ Expanding - + 21 20 diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index f9dfaac6..44a43e94 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -29,7 +29,7 @@ Expanding - + 21 90 @@ -49,7 +49,7 @@ - tqlayout4 + layout4 @@ -72,7 +72,7 @@ - tqlayout4_4 + layout4_4 @@ -95,7 +95,7 @@ - tqlayout4_2 + layout4_2 @@ -118,7 +118,7 @@ - tqlayout4_3 + layout4_3 @@ -141,7 +141,7 @@ - tqlayout4_6 + layout4_6 @@ -164,7 +164,7 @@ - tqlayout4_5 + layout4_5 diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 29ff9dbb..41be6f39 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -32,7 +32,7 @@ - tqlayout4 + layout4 @@ -55,7 +55,7 @@ - tqlayout5 + layout5 @@ -91,7 +91,7 @@ Expanding - + 21 90 diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 5e5d5dac..e51a4d6c 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 @@ -29,7 +29,7 @@ - tqlayout9 + layout9 @@ -47,7 +47,7 @@ lineEdit - + 120 0 @@ -65,7 +65,7 @@ - tqlayout10 + layout10 @@ -120,7 +120,7 @@ Minimum - + 121 20 @@ -137,7 +137,7 @@ Minimum - + 20 31 diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 2194831a..5bce37b2 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -202,7 +202,7 @@ namespace { rawdata.resize(len); memcpy(rawdata.data(), imgAttr -> value, len); - KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(TQString(imgAttr -> key)), "", rawdata ); + KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata ); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); @@ -258,7 +258,7 @@ namespace { memcpy(rawdata.data(), attr -> value, len); annotation = new KisAnnotation( - TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata); + TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp index e56f53d2..2c49532a 100644 --- a/filters/chalk/gmagick/magickexport.cpp +++ b/filters/chalk/gmagick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/gmagick/magickexport.h +++ b/filters/chalk/gmagick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/gmagick/magickimport.cpp b/filters/chalk/gmagick/magickimport.cpp index dbfe6da8..9400c5bd 100644 --- a/filters/chalk/gmagick/magickimport.cpp +++ b/filters/chalk/gmagick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/gmagick/magickimport.h +++ b/filters/chalk/gmagick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc index 5fa8e78a..c9772d9a 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.cc +++ b/filters/chalk/jpeg/kis_jpeg_converter.cc @@ -73,7 +73,7 @@ namespace { { return JCS_CMYK; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return JCS_UNKNOWN; } diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc index edfbbc02..c0eef02d 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.cc +++ b/filters/chalk/jpeg/kis_jpeg_export.cc @@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport() { } -KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "JPEG export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h index ea55c12c..918c44b5 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.h +++ b/filters/chalk/jpeg/kis_jpeg_export.h @@ -29,7 +29,7 @@ class KisJPEGExport : public KoFilter { KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cc index 2ca7c4c2..bacec679 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.cc +++ b/filters/chalk/jpeg/kis_jpeg_import.cc @@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport() { } -KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using JPEGImport!\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h index a32c367f..9db52292 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.h +++ b/filters/chalk/jpeg/kis_jpeg_import.h @@ -28,7 +28,7 @@ class KisJPEGImport : public KoFilter { KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui index cb405324..456fc67a 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -21,7 +21,7 @@ - tqlayout4 + layout4 @@ -34,13 +34,13 @@ Quality: - + AlignTop - tqlayout5 + layout5 @@ -80,7 +80,7 @@ - tqlayout4 + layout4 @@ -101,7 +101,7 @@ Best - + AlignVCenter|AlignRight @@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh Expanding - + 20 61 diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index dd16dd0e..880a52c6 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -206,7 +206,7 @@ namespace { memcpy(rawdata.data(), attr -> value, len); annotation = new KisAnnotation( - TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata); + TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp index 09f351c1..8c1e3365 100644 --- a/filters/chalk/magick/magickexport.cpp +++ b/filters/chalk/magick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/magick/magickexport.h +++ b/filters/chalk/magick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/magick/magickimport.cpp b/filters/chalk/magick/magickimport.cpp index b5f73d19..d3e5bbb9 100644 --- a/filters/chalk/magick/magickimport.cpp +++ b/filters/chalk/magick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/magick/magickimport.h +++ b/filters/chalk/magick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp index 4859f5d9..062a072f 100644 --- a/filters/chalk/openexr/kis_openexr_export.cpp +++ b/filters/chalk/openexr/kis_openexr_export.cpp @@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport() { } -KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) { if (to != "image/x-exr" || from != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h index 7f0c71f9..ea62421c 100644 --- a/filters/chalk/openexr/kis_openexr_export.h +++ b/filters/chalk/openexr/kis_openexr_export.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_EXPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_import.cpp b/filters/chalk/openexr/kis_openexr_import.cpp index 974d4a67..8546edb2 100644 --- a/filters/chalk/openexr/kis_openexr_import.cpp +++ b/filters/chalk/openexr/kis_openexr_import.cpp @@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport() { } -KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-exr" || to != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h index 8bddb4f5..8654df54 100644 --- a/filters/chalk/openexr/kis_openexr_import.h +++ b/filters/chalk/openexr/kis_openexr_import.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_IMPORT_H_ diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp index 2cef93e9..ed504f67 100644 --- a/filters/chalk/pdf/kis_pdf_import.cpp +++ b/filters/chalk/pdf/kis_pdf_import.cpp @@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport() { } -KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& ) +KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& ) { TQString filename = m_chain -> inputFile(); kdDebug(41008) << "Importing using PDFImport!" << filename << endl; @@ -141,7 +141,7 @@ KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQValueList pages = wdg->pages(); for(TQValueList::const_iterator it = pages.begin(); it != pages.end(); ++it) { - KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( TQString::number(*it) + 1), TQ_UINT8_MAX); + KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX); layer->paintDevice()->convertFromTQImage( pdoc->getPage( *it )->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), ""); img->addLayer(layer, img->rootLayer(), 0); } diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h index 06e22288..ffb9c79e 100644 --- a/filters/chalk/pdf/kis_pdf_import.h +++ b/filters/chalk/pdf/kis_pdf_import.h @@ -29,7 +29,7 @@ class KisPDFImport : public KoFilter{ KisPDFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPDFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 697a3e30..88d24dc6 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -40,7 +40,7 @@ - tqlayout6 + layout6 @@ -56,7 +56,7 @@ Fixed - + 20 20 @@ -65,7 +65,7 @@ - tqlayout2 + layout2 @@ -141,7 +141,7 @@ Expanding - + 31 20 @@ -160,7 +160,7 @@ - tqlayout4 + layout4 @@ -176,7 +176,7 @@ Fixed - + 20 20 @@ -185,7 +185,7 @@ - tqlayout3 + layout3 @@ -235,7 +235,7 @@ Expanding - + 51 20 diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index d3cce618..d5c4a080 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -62,7 +62,7 @@ namespace { return alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return -1; } diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc index 8154866a..ace65954 100644 --- a/filters/chalk/png/kis_png_export.cc +++ b/filters/chalk/png/kis_png_export.cc @@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport() { } -KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Png export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h index 433b68e3..562628a9 100644 --- a/filters/chalk/png/kis_png_export.h +++ b/filters/chalk/png/kis_png_export.h @@ -29,7 +29,7 @@ class KisPNGExport : public KoFilter { KisPNGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cc index ccfe4388..dc2a6325 100644 --- a/filters/chalk/png/kis_png_import.cc +++ b/filters/chalk/png/kis_png_import.cc @@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport() { } -KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisPNGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using PNGImport!\n"; diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h index 3487d24d..0412e7bd 100644 --- a/filters/chalk/png/kis_png_import.h +++ b/filters/chalk/png/kis_png_import.h @@ -28,7 +28,7 @@ class KisPNGImport : public KoFilter { KisPNGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui index ec5e0ba8..5797c407 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -24,7 +24,7 @@ - tqlayout6 + layout6 @@ -37,7 +37,7 @@ Compress: - + AlignTop @@ -50,7 +50,7 @@ - tqlayout5 + layout5 @@ -88,7 +88,7 @@ - tqlayout4 + layout4 @@ -113,7 +113,7 @@ Small - + AlignVCenter|AlignRight @@ -137,7 +137,7 @@ Expanding - + 20 5 diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index f006f913..4ec8f028 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -103,7 +103,7 @@ KisRawImport::~KisRawImport() delete m_process; } -KoFilter::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-raw" || to != "application/x-chalk") { return KoFilter::NotImplemented; @@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen) //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n"; //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n"; int oldSize = m_data->size(); - m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim); + m_data->resize(oldSize + buflen, TQGArray::SpeedOptim); memcpy(m_data->data() + oldSize, buffer, buflen); } diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index 17fd576c..e02caeed 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -37,7 +37,7 @@ public: virtual ~KisRawImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private slots: diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui index 26115762..59d9642e 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -36,7 +36,7 @@ 0 - + 200 150 @@ -45,7 +45,7 @@ - tqlayout2 + layout2 @@ -304,7 +304,7 @@ Expanding - + 500 20 @@ -321,7 +321,7 @@ Expanding - + 20 120 @@ -330,7 +330,7 @@ - tqlayout4 + layout4 @@ -355,7 +355,7 @@ - tqlayout10 + layout10 @@ -408,7 +408,7 @@ Expanding - + 41 20 diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 7a6ad9ca..59784009 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -39,7 +39,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name) connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) ); setMainWidget(optionswdg); kapp->restoreOverrideCursor(); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); } KisDlgOptionsTIFF::~KisDlgOptionsTIFF() diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc index bcd3f22e..28495ff4 100644 --- a/filters/chalk/tiff/kis_tiff_export.cc +++ b/filters/chalk/tiff/kis_tiff_export.cc @@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport() { } -KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Tiff export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h index 9efeb940..bb78fd4f 100644 --- a/filters/chalk/tiff/kis_tiff_export.h +++ b/filters/chalk/tiff/kis_tiff_export.h @@ -29,7 +29,7 @@ class KisTIFFExport : public KoFilter { KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cc index 89d1763f..8c785ffe 100644 --- a/filters/chalk/tiff/kis_tiff_import.cc +++ b/filters/chalk/tiff/kis_tiff_import.cc @@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport() { } -KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using TIFFImport!\n"; diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h index b9e33d06..77cfd0de 100644 --- a/filters/chalk/tiff/kis_tiff_import.h +++ b/filters/chalk/tiff/kis_tiff_import.h @@ -28,7 +28,7 @@ class KisTIFFImport : public KoFilter { KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp index 681e66b7..da399a53 100644 --- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp +++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp @@ -63,7 +63,7 @@ namespace { return true; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return false; } diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index d840dc8d..29038890 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -51,7 +51,7 @@ - tqlayout10 + layout10 @@ -119,7 +119,7 @@ - tqlayout7 + layout7 @@ -283,13 +283,13 @@ You can uncheck the box if you are not using transparancy and you want to make t Quality: - + AlignTop - tqlayout5 + layout5 @@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - tqlayout4_2 + layout4_2 @@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Best - + AlignVCenter|AlignRight @@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Compress: - + AlignTop @@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - tqlayout5_2 + layout5_2 @@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - tqlayout4 + layout4 @@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Small - + AlignVCenter|AlignRight @@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Compress: - + AlignTop @@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - tqlayout5_2_2 + layout5_2_2 @@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t - tqlayout4_3 + layout4_3 @@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Small - + AlignVCenter|AlignRight @@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t Expanding - + 20 16 diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc index 90d61755..3209e181 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cc +++ b/filters/chalk/xcf/xcf/xcf-load.cc @@ -173,7 +173,7 @@ xcf_load_image (XcfInfo * info) /* add the layer to the image if its not the floating selection */ if (layer != info->floating_sel) gimp_image_add_layer (gimage, layer, - gimp_container_num_tqchildren (gimage->layers)); + gimp_container_num_children (gimage->layers)); /* restore the saved position so we'll be ready to * read the next offset. @@ -1494,7 +1494,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage) GIMP_ITEM (vectors)->tattoo = tattoo; gimp_image_add_vectors (gimage, vectors, - gimp_container_num_tqchildren (gimage->vectors)); + gimp_container_num_children (gimage->vectors)); return TRUE; } @@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) } gimp_image_add_vectors (gimage, vectors, - gimp_container_num_tqchildren (gimage->vectors)); + gimp_container_num_children (gimage->vectors)); return TRUE; } diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc index 3544baf4..a0dbb9b5 100644 --- a/filters/chalk/xcf/xcf/xcf-save.cc +++ b/filters/chalk/xcf/xcf/xcf-save.cc @@ -289,8 +289,8 @@ xcf_save_image (XcfInfo *info, xcf_write_int32_print_error (info, (TQ_INT32 *) &gimage->base_type, 1); /* determine the number of layers and channels in the image */ - nlayers = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers); - nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels); + nlayers = (TQ_UINT32) gimp_container_num_children (gimage->layers); + nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels); /* check and see if we have to save out the selection */ have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage), @@ -442,7 +442,7 @@ xcf_save_image_props (XcfInfo *info, if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp)) xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit)); - if (gimp_container_num_tqchildren (gimage->vectors) > 0) + if (gimp_container_num_children (gimage->vectors) > 0) { if (gimp_vectors_compat_is_compatible (gimage)) xcf_check_error (xcf_save_prop (info, gimage, PROP_PATHS, error)); @@ -1581,7 +1581,7 @@ xcf_save_old_paths (XcfInfo *info, * then each path:- */ - num_paths = gimp_container_num_tqchildren (gimage->vectors); + num_paths = gimp_container_num_children (gimage->vectors); active_vectors = gimp_image_get_active_vectors (gimage); @@ -1696,7 +1696,7 @@ xcf_save_vectors (XcfInfo *info, active_index = gimp_container_get_child_index (gimage->vectors, GIMP_OBJECT (active_vectors)); - num_paths = gimp_container_num_tqchildren (gimage->vectors); + num_paths = gimp_container_num_children (gimage->vectors); xcf_write_int32_check_error (info, &version, 1); xcf_write_int32_check_error (info, &active_index, 1); diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp index b26fdba8..06bcf96f 100644 --- a/filters/chalk/xcf/xcfexport.cpp +++ b/filters/chalk/xcf/xcfexport.cpp @@ -41,7 +41,7 @@ XCFExport::~XCFExport() { } -KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XCFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "xcf export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h index b8f260fb..34595b06 100644 --- a/filters/chalk/xcf/xcfexport.h +++ b/filters/chalk/xcf/xcfexport.h @@ -30,7 +30,7 @@ public: virtual ~XCFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFEXPORT_H_ diff --git a/filters/chalk/xcf/xcfimport.cpp b/filters/chalk/xcf/xcfimport.cpp index 6f07ebcf..6b81ec67 100644 --- a/filters/chalk/xcf/xcfimport.cpp +++ b/filters/chalk/xcf/xcfimport.cpp @@ -39,7 +39,7 @@ XCFImport::~XCFImport() { } -KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus XCFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using XCFImport!\n"; diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h index 434566ba..27f2cbfe 100644 --- a/filters/chalk/xcf/xcfimport.h +++ b/filters/chalk/xcf/xcfimport.h @@ -30,7 +30,7 @@ public: virtual ~XCFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFIMPORT_H_ diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc index f3ae2b13..4a1b1f08 100644 --- a/filters/generic_wrapper/generic_filter.cc +++ b/filters/generic_wrapper/generic_filter.cc @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -41,7 +41,7 @@ GenericFilter::GenericFilter(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) +KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) { //find the right script to use @@ -80,7 +80,7 @@ KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, cons return KoFilter::NotImplemented; } -KoFilter::ConversiontqStatus GenericFilter::doImport() +KoFilter::ConversionStatus GenericFilter::doImport() { KTempFile temp(TQString("genericfilter-")); temp.setAutoDelete(true); @@ -119,7 +119,7 @@ KoFilter::ConversiontqStatus GenericFilter::doImport() return KoFilter::OK; } -KoFilter::ConversiontqStatus GenericFilter::doExport() +KoFilter::ConversionStatus GenericFilter::doExport() { return KoFilter::NotImplemented; } diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h index 7b47406b..71448fce 100644 --- a/filters/generic_wrapper/generic_filter.h +++ b/filters/generic_wrapper/generic_filter.h @@ -36,11 +36,11 @@ public: GenericFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GenericFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: - KoFilter::ConversiontqStatus doImport(); - KoFilter::ConversiontqStatus doExport(); + KoFilter::ConversionStatus doImport(); + KoFilter::ConversionStatus doExport(); TQString m_to, m_from, m_exec; KoStore* m_out; }; diff --git a/filters/karbon/ai/aielement.cc b/filters/karbon/ai/aielement.cc index 608bdf61..023943b9 100644 --- a/filters/karbon/ai/aielement.cc +++ b/filters/karbon/ai/aielement.cc @@ -360,7 +360,7 @@ AIElement::Type AIElement::nameToType( const char* name ) const TQString AIElement::toString() const { if ( d->typ == CString ) - return TQString::tqfromLatin1( toCString() ); + return TQString::fromLatin1( toCString() ); if ( d->typ == Int ) return TQString::number( toInt() ); if ( d->typ == UInt ) diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cc index 4a201ec5..4e854995 100644 --- a/filters/karbon/ai/aiimport.cc +++ b/filters/karbon/ai/aiimport.cc @@ -56,7 +56,7 @@ AiImport::~AiImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AiImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/illustrator" || to != "application/x-karbon" ) diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h index c305b536..3dd9a560 100644 --- a/filters/karbon/ai/aiimport.h +++ b/filters/karbon/ai/aiimport.h @@ -36,7 +36,7 @@ public: AiImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~AiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /* private: TQString m_result; */ diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index b3df1581..47c5f2b6 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ APPLIXGRAPHICImport::APPLIXGRAPHICImport (KoFilter *, const char *, const TQStri * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) { // Check MIME Types @@ -156,7 +156,7 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from str += "\n"; str += " \n"; // str += " \n"; -// str += " \n"; +// str += " \n"; // str += " \n"; // str += " \n"; // str += " \n"; @@ -189,10 +189,10 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from TQMessageBox::critical (0L, "Applixgraphics header problem", TQString ("The Applixgraphics header is not correct. " "May be it is not an applixgraphics file!
" - "This is the header line I did read:
%1").tqarg(mystr.latin1()), + "This is the header line I did read:
%1").arg(mystr.latin1()), "Comma"); - // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine), + // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine), return KoFilter::StupidError; } diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h index 3e42256e..e0eff76c 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.h +++ b/filters/karbon/applixgraphics/applixgraphicimport.h @@ -32,7 +32,7 @@ public: APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXGRAPHICImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cc index e1bd06a5..8696e6a3 100644 --- a/filters/karbon/eps/epsexport.cc +++ b/filters/karbon/eps/epsexport.cc @@ -87,7 +87,7 @@ EpsExport::EpsExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/x-eps" || from != "application/x-karbon" ) @@ -102,7 +102,7 @@ EpsExport::convert( const TQCString& from, const TQCString& to ) return KoFilter::StupidError; - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; // Ask questions about PS level etc. EpsExportDlg* dialog = new EpsExportDlg(); @@ -194,7 +194,7 @@ EpsExport::visitVDocument( VDocument& document ) static_cast( docInfo.page( "author" ) ); // Get creation date/time = "now". - TQDateTime now( TQDateTime::tqcurrentDateTime() ); + TQDateTime now( TQDateTime::currentDateTime() ); *m_stream << "%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n" diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 1313294e..f5867b43 100644 --- a/filters/karbon/eps/epsexport.h +++ b/filters/karbon/eps/epsexport.h @@ -46,7 +46,7 @@ public: EpsExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc index 0fefb3e0..77a650bb 100644 --- a/filters/karbon/eps/epsimport.cc +++ b/filters/karbon/eps/epsimport.cc @@ -57,7 +57,7 @@ EpsImport::~EpsImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsImport::convert( const TQCString& from, const TQCString& to ) { if( @@ -93,7 +93,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to ) // sed filter TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\""). - tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury); + arg(llx).arg(lly).arg(urx).arg(ury); // Build ghostscript call to convert ps/eps -> ai: TQString command( diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h index 873dc169..c86be29d 100644 --- a/filters/karbon/eps/epsimport.h +++ b/filters/karbon/eps/epsimport.h @@ -36,7 +36,7 @@ public: EpsImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp index a260fd50..30b77ccf 100644 --- a/filters/karbon/kontour/kontourimport.cpp +++ b/filters/karbon/kontour/kontourimport.cpp @@ -49,7 +49,7 @@ KontourImport::~KontourImport() } -KoFilter::ConversiontqStatus KontourImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KontourImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if ( to != "application/x-karbon" || ( from != "application/x-kontour" && from != "application/x-killustrator") ) @@ -198,8 +198,8 @@ KontourImport::convert() if( docElem.attribute( "version" ).toInt() == 2 ) { lay = docElem; - height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble(); - width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble(); + height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble(); + width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble(); } else { diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h index e140f088..92e27a09 100644 --- a/filters/karbon/kontour/kontourimport.h +++ b/filters/karbon/kontour/kontourimport.h @@ -33,7 +33,7 @@ public: KontourImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KontourImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: TQDomDocument inpdoc; diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc index 3e79e3ab..8c4c2795 100644 --- a/filters/karbon/msod/msod.cc +++ b/filters/karbon/msod/msod.cc @@ -39,18 +39,18 @@ Msod::Msod( m_dpi = dpi; m_images.setAutoDelete(true); m_opt = new Options(*this); - m_tqshape.data = 0L; - m_tqshape.length = 0; + m_shape.data = 0L; + m_shape.length = 0; } Msod::~Msod() { - delete [] m_tqshape.data; + delete [] m_shape.data; delete m_opt; } void Msod::drawShape( - unsigned tqshapeType, + unsigned shapeType, TQ_UINT32 bytes, TQDataStream &operands) { @@ -262,25 +262,25 @@ void Msod::drawShape( }; struct { - TQ_UINT32 spid; // The tqshape id + TQ_UINT32 spid; // The shape id union { TQ_UINT32 info; struct { - TQ_UINT32 fGroup : 1; // This tqshape is a group tqshape - TQ_UINT32 fChild : 1; // Not a top-level tqshape - TQ_UINT32 fPatriarch : 1; // This is the topmost group tqshape. + TQ_UINT32 fGroup : 1; // This shape is a group shape + TQ_UINT32 fChild : 1; // Not a top-level shape + TQ_UINT32 fPatriarch : 1; // This is the topmost group shape. // Exactly one of these per drawing. TQ_UINT32 fDeleted : 1; // The shape.has been deleted - TQ_UINT32 fOleShape : 1; // The tqshape is an OLE object + TQ_UINT32 fOleShape : 1; // The shape is an OLE object TQ_UINT32 fHaveMaster : 1; // Shape has a hspMaster property TQ_UINT32 fFlipH : 1; // Shape is flipped horizontally TQ_UINT32 fFlipV : 1; // Shape is flipped vertically - TQ_UINT32 fConnector : 1; // Connector type of tqshape + TQ_UINT32 fConnector : 1; // Connector type of shape TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind - TQ_UINT32 fBackground : 1; // Background tqshape - TQ_UINT32 fHaveSpt : 1; // Shape has a tqshape type property + TQ_UINT32 fBackground : 1; // Background shape + TQ_UINT32 fHaveSpt : 1; // Shape has a shape type property TQ_UINT32 reserved : 20; // Not yet used } fields; } grfPersistent; @@ -291,12 +291,12 @@ void Msod::drawShape( operands >> data.spid; operands >> data.grfPersistent.info; bytes -= 8; - kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" << + kdDebug(s_area) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" << (data.grfPersistent.fields.fGroup ? " group" : "") << (data.grfPersistent.fields.fChild ? " child" : "") << (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") << (data.grfPersistent.fields.fDeleted ? " deleted" : "") << - (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") << + (data.grfPersistent.fields.fOleShape ? " oleshape" : "") << (data.grfPersistent.fields.fHaveMaster ? " master" : "") << (data.grfPersistent.fields.fFlipH ? " flipv" : "") << (data.grfPersistent.fields.fConnector ? " connector" : "") << @@ -309,9 +309,9 @@ void Msod::drawShape( if ((!m_isRequiredDrawing) && (m_requestedShapeId != data.spid)) return; - // An active tqshape! Let's draw it... + // An active shape! Let's draw it... - switch (tqshapeType) + switch (shapeType) { case 0: if (m_opt->m_pVertices) @@ -493,7 +493,7 @@ TQSize Msod::normaliseSize( } bool Msod::parse( - unsigned tqshapeId, + unsigned shapeId, const TQString &file, const char *delayStream) { @@ -505,19 +505,19 @@ bool Msod::parse( return false; } TQDataStream stream(&in); - bool result = parse(tqshapeId, stream, in.size(), delayStream); + bool result = parse(shapeId, stream, in.size(), delayStream); in.close(); return result; } bool Msod::parse( - unsigned tqshapeId, + unsigned shapeId, TQDataStream &stream, unsigned size, const char *delayStream) { stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt ! - m_requestedShapeId = tqshapeId; + m_requestedShapeId = shapeId; m_isRequiredDrawing = false; m_delayStream = delayStream; @@ -854,8 +854,8 @@ void Msod::opDg(Header &, TQ_UINT32, TQDataStream &operands) { struct { - TQ_UINT32 csp; // The number of tqshapes in this drawing. - TQ_UINT32 spidCur; // The last tqshape ID given to an SP in this DG. + TQ_UINT32 csp; // The number of shapes in this drawing. + TQ_UINT32 spidCur; // The last shape ID given to an SP in this DG. } data; operands >> data.csp >> data.spidCur; @@ -878,10 +878,10 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands) { struct { - TQ_UINT32 spidMax; // The current maximum tqshape ID. + TQ_UINT32 spidMax; // The current maximum shape ID. TQ_UINT32 cidcl; // The number of ID clusters (FIDCLs). - TQ_UINT32 cspSaved; // The total number of tqshapes saved. - // (including deleted tqshapes, if undo + TQ_UINT32 cspSaved; // The total number of shapes saved. + // (including deleted shapes, if undo // information was saved). TQ_UINT32 cdgSaved; // The total number of drawings saved. } data; @@ -896,7 +896,7 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands) unsigned i; operands >> data.spidMax >> data.cidcl >> data.cspSaved >> data.cdgSaved; - kdDebug(s_area) << data.cspSaved << " tqshapes in " << + kdDebug(s_area) << data.cspSaved << " shapes in " << data.cidcl - 1 << " clusters in " << data.cdgSaved << " drawings" << endl; for (i = 0; i < data.cidcl - 1; i++) @@ -943,31 +943,31 @@ void Msod::opSolvercontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands) void Msod::opSp(Header &op, TQ_UINT32 bytes, TQDataStream &operands) { - // We want to defer the act of drawing a tqshape until we have seen any options + // We want to defer the act of drawing a shape until we have seen any options // that may affect it. Thus, we merely store the data away, and let opSpContainer // do all the ahrd work. - m_tqshape.type = op.opcode.fields.inst; - m_tqshape.length = bytes; - m_tqshape.data = new char [bytes]; - operands.readRawBytes(m_tqshape.data, bytes); + m_shape.type = op.opcode.fields.inst; + m_shape.length = bytes; + m_shape.data = new char [bytes]; + operands.readRawBytes(m_shape.data, bytes); } void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands) { walk(bytes, operands); - // Having gathered all the information for this tqshape, we can now draw it. + // Having gathered all the information for this shape, we can now draw it. TQByteArray a; - a.setRawData(m_tqshape.data, m_tqshape.length); + a.setRawData(m_shape.data, m_shape.length); TQDataStream s(a, IO_ReadOnly); s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt ! - drawShape(m_tqshape.type, m_tqshape.length, s); - a.resetRawData(m_tqshape.data, m_tqshape.length); - delete [] m_tqshape.data; - m_tqshape.data = 0L; + drawShape(m_shape.type, m_shape.length, s); + a.resetRawData(m_shape.data, m_shape.length); + delete [] m_shape.data; + m_shape.data = 0L; } void Msod::opSpgr(Header &, TQ_UINT32, TQDataStream &operands) @@ -1097,7 +1097,7 @@ void Msod::Options::initialise() m_geoTop = 0; m_geoRight = 21600; m_geoBottom = 21600; - m_tqshapePath = 1; + m_shapePath = 1; delete m_pVertices; m_pVertices = 0L; m_fShadowOK = true; @@ -1233,7 +1233,7 @@ void Msod::Options::walk(TQ_UINT32 bytes, TQDataStream &operands) m_geoBottom = op.value; break; case 324: - m_tqshapePath = op.value; + m_shapePath = op.value; break; case 383: m_fShadowOK = (op.value & 0x0020) != 0; diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h index f53146bf..3db6fc2f 100644 --- a/filters/karbon/msod/msod.h +++ b/filters/karbon/msod/msod.h @@ -44,15 +44,15 @@ public: unsigned dpi); virtual ~Msod(); - // Called to parse the given file. We extract a drawing by tqshapeId. + // Called to parse the given file. We extract a drawing by shapeId. // If the drawing is not found, the return value will be false. bool parse( - unsigned tqshapeId, + unsigned shapeId, const TQString &file, const char *delayStream = 0L); bool parse( - unsigned tqshapeId, + unsigned shapeId, TQDataStream &stream, unsigned size, const char *delayStream = 0L); @@ -114,14 +114,14 @@ private: unsigned type; char *data; unsigned length; - } m_tqshape; + } m_shape; TQPoint normalisePoint( TQDataStream &operands); TQSize normaliseSize( TQDataStream &operands); void drawShape( - unsigned tqshapeType, + unsigned shapeType, TQ_UINT32 bytes, TQDataStream &operands); @@ -244,7 +244,7 @@ private: TQ_UINT32 m_geoTop; TQ_UINT32 m_geoRight; TQ_UINT32 m_geoBottom; - TQ_UINT32 m_tqshapePath; + TQ_UINT32 m_shapePath; TQPointArray *m_pVertices; bool m_fShadowOK; bool m_f3DOK; diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc index 903d50a2..e25889c0 100644 --- a/filters/karbon/msod/msodimport.cc +++ b/filters/karbon/msod/msodimport.cc @@ -46,18 +46,18 @@ MSODImport::~MSODImport() { } -KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-karbon" || from != "image/x-msod") return KoFilter::NotImplemented; - // Get configuration data: the tqshape id, and any delay stream that we were given. - unsigned tqshapeId; - emit commSignalShapeID( tqshapeId ); + // Get configuration data: the shape id, and any delay stream that we were given. + unsigned shapeId; + emit commSignalShapeID( shapeId ); const char *delayStream = 0L; emit commSignalDelayStream( delayStream ); kdDebug( s_area ) << "##################################################################" << endl; - kdDebug( s_area ) << "tqshape id: " << tqshapeId << endl; + kdDebug( s_area ) << "shape id: " << shapeId << endl; kdDebug( s_area ) << "delay stream: " << delayStream << endl; kdDebug( s_area ) << "##################################################################" << endl; /* @@ -68,9 +68,9 @@ KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const T kdDebug(s_area) << "MSODImport::filter: config: " << config << endl; for (i = 0; i < args.count(); i++) { - if (args[i].startsWith("tqshape-id=")) + if (args[i].startsWith("shape-id=")) { - tqshapeId = args[i].mid(9).toUInt(); + shapeId = args[i].mid(9).toUInt(); } else if (args[i].startsWith("delay-stream=")) @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const T m_text += "\n"; m_text += " \n"; - if (!parse(tqshapeId, m_chain->inputFile(), delayStream)) + if (!parse(shapeId, m_chain->inputFile(), delayStream)) return KoFilter::WrongFormat; // close doc @@ -175,7 +175,7 @@ void MSODImport::gotPicture( kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; TQCString destMime; // intentionally empty, the filter manager will do the rest - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; partRef = embedPart( srcMime.latin1(), destMime, status, TQString::number( key ) ); m_embeddeeData = 0; diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h index 162176de..9264b7d5 100644 --- a/filters/karbon/msod/msodimport.h +++ b/filters/karbon/msod/msodimport.h @@ -39,7 +39,7 @@ public: const TQStringList&); virtual ~MSODImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: @@ -68,7 +68,7 @@ protected: signals: // Communication signals to the parent filters void commSignalDelayStream( const char* delay ); - void commSignalShapeID( unsigned int& tqshapeID ); + void commSignalShapeID( unsigned int& shapeID ); private: virtual void savePartContents( TQIODevice* file ); diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index 90320d7e..fba48867 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -62,7 +62,7 @@ OoDrawImport::~OoDrawImport() { } -KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) { kdDebug() << "Entering Oodraw Import filter: " << from << " - " << to << endl; @@ -81,13 +81,13 @@ KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCS return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if( pretqStatus != KoFilter::OK ) + if( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } /*TQDomDocument docinfo; createDocumentInfo( docinfo ); @@ -149,9 +149,9 @@ void OoDrawImport::createDocumentInfo( TQDomDocument &docinfo ) // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoDrawImport::openFile() +KoFilter::ConversionStatus OoDrawImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -223,7 +223,7 @@ void OoDrawImport::convert() } -KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h index 2b395f48..6e753d7d 100644 --- a/filters/karbon/oodraw/oodrawimport.h +++ b/filters/karbon/oodraw/oodrawimport.h @@ -43,7 +43,7 @@ public: OoDrawImport( KoFilter *parent, const char *name, const TQStringList & ); virtual ~OoDrawImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void createDocumentInfo( TQDomDocument &docinfo ); @@ -63,8 +63,8 @@ private: double ymirror( double y ); KoRect parseViewBox( const TQDomElement& object ); - KoFilter::ConversiontqStatus openFile(); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); VDocument m_document; TQDomDocument m_content; diff --git a/filters/karbon/png/pngexport.cc b/filters/karbon/png/pngexport.cc index 4de61a44..89b43d03 100644 --- a/filters/karbon/png/pngexport.cc +++ b/filters/karbon/png/pngexport.cc @@ -48,7 +48,7 @@ PngExport::PngExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus PngExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-karbon" ) diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h index 3758daa3..df893965 100644 --- a/filters/karbon/png/pngexport.h +++ b/filters/karbon/png/pngexport.h @@ -33,7 +33,7 @@ public: PngExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~PngExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc index 2e661039..a5ed9b40 100644 --- a/filters/karbon/svg/svgexport.cc +++ b/filters/karbon/svg/svgexport.cc @@ -67,7 +67,7 @@ SvgExport::SvgExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/svg+xml" || from != "application/x-karbon" ) @@ -171,7 +171,7 @@ TQString SvgExport::getID( VObject *obj ) { if( obj && !obj->name().isEmpty() ) - return TQString( " id=\"%1\"" ).tqarg( obj->name() ); + return TQString( " id=\"%1\"" ).arg( obj->name() ); return TQString(); } @@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text ) *m_body << " font-weight=\"bold\""; if( text.font().italic() ) *m_body << " font-style=\"italic\""; - if( text.tqalignment() == VText::Center ) + if( text.alignment() == VText::Center ) *m_body << " text-anchor=\"middle\""; - else if( text.tqalignment() == VText::Right ) + else if( text.alignment() == VText::Right ) *m_body << " text-anchor=\"end\""; *m_body << ">" << endl; diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h index 6bfe5d98..c79d1fde 100644 --- a/filters/karbon/svg/svgexport.h +++ b/filters/karbon/svg/svgexport.h @@ -52,7 +52,7 @@ public: SvgExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~SvgExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc index 5a5e90aa..9d323d3d 100644 --- a/filters/karbon/svg/svgimport.cc +++ b/filters/karbon/svg/svgimport.cc @@ -54,7 +54,7 @@ SvgImport::~SvgImport() { } -KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus SvgImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/svg+xml" ) @@ -138,7 +138,7 @@ void SvgImport::convert() m_outerRect = m_document.boundingBox(); // undo y-mirroring - //m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed())); + //m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed())); if( !docElem.attribute( "viewBox" ).isEmpty() ) { // allow for viewbox def with ',' or whitespace @@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c //kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; //kdDebug() << gc->fill.gradient().vector().x() << endl; - double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox ); - double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox ); + double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox ); + double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox ); gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); if(gc->fill.gradient().type() == VGradient::radial) { - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); } - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox ); gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); //kdDebug() << offsety << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; @@ -1263,9 +1263,9 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b ) text->setName( b.attribute("id") ); if( anchor == "middle" ) - text->tqsetAlignment( VText::Center ); + text->setAlignment( VText::Center ); else if( anchor == "end" ) - text->tqsetAlignment( VText::Right ); + text->setAlignment( VText::Right ); if( offset > 0.0 ) text->setOffset( offset ); diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h index e4e3f56a..636077a1 100644 --- a/filters/karbon/svg/svgimport.h +++ b/filters/karbon/svg/svgimport.h @@ -45,7 +45,7 @@ public: SvgImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/wmf/wmfexport.cc b/filters/karbon/wmf/wmfexport.cc index a04dfc11..de929ca8 100644 --- a/filters/karbon/wmf/wmfexport.cc +++ b/filters/karbon/wmf/wmfexport.cc @@ -57,7 +57,7 @@ WmfExport::~WmfExport() { } -KoFilter::ConversiontqStatus WmfExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WmfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-wmf" || from != "application/x-karbon" ) { return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h index e0c9be57..2c464f13 100644 --- a/filters/karbon/wmf/wmfexport.h +++ b/filters/karbon/wmf/wmfexport.h @@ -20,7 +20,7 @@ #define WMFEXPORT_H #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ public: WmfExport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WmfExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void visitVPath( VPath& composite ); diff --git a/filters/karbon/wmf/wmfimport.cc b/filters/karbon/wmf/wmfimport.cc index 23eaaa12..f7dcdcf3 100644 --- a/filters/karbon/wmf/wmfimport.cc +++ b/filters/karbon/wmf/wmfimport.cc @@ -45,7 +45,7 @@ WMFImport::~WMFImport() { } -KoFilter::ConversiontqStatus WMFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMFImport::convert( const TQCString& from, const TQCString& to ) { if( to != "application/x-karbon" || from != "image/x-wmf" ) return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h index 21bcee74..34ee8140 100644 --- a/filters/karbon/wmf/wmfimport.h +++ b/filters/karbon/wmf/wmfimport.h @@ -36,7 +36,7 @@ public: WMFImport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WMFImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc index 228024f3..e1599a8c 100644 --- a/filters/karbon/xaml/xamlexport.cc +++ b/filters/karbon/xaml/xamlexport.cc @@ -60,7 +60,7 @@ XAMLExport::XAMLExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XAMLExport::convert( const TQCString& from, const TQCString& to ) { // TODO: ??? @@ -161,7 +161,7 @@ TQString XAMLExport::getID( VObject *obj ) { if( obj && !obj->name().isEmpty() ) - return TQString( " Name=\"%1\"" ).tqarg( obj->name() ); + return TQString( " Name=\"%1\"" ).arg( obj->name() ); return TQString(); } diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h index b1a0f4fd..124ea3fd 100644 --- a/filters/karbon/xaml/xamlexport.h +++ b/filters/karbon/xaml/xamlexport.h @@ -50,7 +50,7 @@ public: XAMLExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XAMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc index 3a755181..002001e2 100644 --- a/filters/karbon/xaml/xamlimport.cc +++ b/filters/karbon/xaml/xamlimport.cc @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -52,7 +52,7 @@ XAMLImport::~XAMLImport() { } -KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XAMLImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/wvg+xml" ) @@ -466,14 +466,14 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm //kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; //kdDebug() << gc->fill.gradient().vector().x() << endl; - double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox ); - double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox ); + double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox ); + double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox ); gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox ); gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); //kdDebug() << offsety << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h index b61313b9..001d1dc3 100644 --- a/filters/karbon/xaml/xamlimport.h +++ b/filters/karbon/xaml/xamlimport.h @@ -43,7 +43,7 @@ public: XAMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XAMLImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc index 3e9237fb..215c4f01 100644 --- a/filters/karbon/xcf/xcfexport.cc +++ b/filters/karbon/xcf/xcfexport.cc @@ -52,7 +52,7 @@ XcfExport::XcfExport( KoFilter*, const char*, const TQStringList& ) m_zoomY = 1.0; } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XcfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-xcf-gimp" || from != "application/x-karbon" ) @@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document ) // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for layer and channel offsets. - m_stream->tqdevice()->at( + m_stream->device()->at( // current position + (number layers + number channels + 2) * 4. current + ( document.layers().count() + 3 + 2 ) * 4 ); @@ -142,7 +142,7 @@ XcfExport::visitVDocument( VDocument& document ) for( ; itr.current(); ++itr ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // Write layer. @@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document ) // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save layer offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Append a zero offset to indicate end of layer offsets. *m_stream << static_cast( 0 ); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); // Append a zero offset to indicate end of channel offsets. *m_stream << static_cast( 0 ); @@ -279,13 +279,13 @@ XcfExport::visitVLayer( VLayer& layer ) TQIODevice::Offset end = 0; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for hierarchy offsets. - m_stream->tqdevice()->at( current + 8 ); + m_stream->device()->at( current + 8 ); // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // Write hierarchy. @@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer ) // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save hierarchy offset. *m_stream << start; @@ -333,15 +333,15 @@ XcfExport::writeHierarchy() int height = m_height; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for level offsets. - m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 ); + m_stream->device()->at( current + ( levels + 1 ) * 4 ); for( int i = 0; i < levels; ++i ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); if( i == 0 ) { @@ -360,23 +360,23 @@ XcfExport::writeHierarchy() } // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save level offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Append a zero offset to indicate end of level offsets. *m_stream << static_cast( 0 ); @@ -398,15 +398,15 @@ XcfExport::writeLevel() int tiles = rows * cols; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for tile offsets. - m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 ); + m_stream->device()->at( current + ( tiles + 1 ) * 4 ); for( int i = 0; i < tiles; ++i ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // TODO: Save tile. @@ -425,19 +425,19 @@ XcfExport::writeLevel() // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save tile offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } } diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h index 82d86883..f6a7be70 100644 --- a/filters/karbon/xcf/xcfexport.h +++ b/filters/karbon/xcf/xcfexport.h @@ -40,7 +40,7 @@ public: XcfExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XcfExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); virtual void visitVDocument( VDocument& document ); virtual void visitVLayer( VLayer& layer ); diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc index 015c4006..c3d6ab6a 100644 --- a/filters/karbon/xfig/xfigimport.cc +++ b/filters/karbon/xfig/xfigimport.cc @@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, char buf[255]; int value; - KoPageLayout tqlayout; + KoPageLayout layout; ifstream fin( file.local8Bit() ); if (! fin) @@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, GDocument *gdoc = kidoc->gdoc(); //GPage *activePage = gdoc->activePage(); - tqlayout = gdoc->activePage()->pageLayout (); + layout = gdoc->activePage()->pageLayout (); fin.getline (buf, 255); if (::strncmp (buf, "#FIG 3", 6)) { @@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // orientation fin.getline (buf, 255); if (::strcmp (buf, "Landscape") == 0) - tqlayout.orientation = PG_LANDSCAPE; + layout.orientation = PG_LANDSCAPE; else if (::strcmp (buf, "Portrait") == 0) - tqlayout.orientation = PG_PORTRAIT; + layout.orientation = PG_PORTRAIT; else kdDebug() << "ERROR: invalid orientation" << endl; @@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // units fin.getline (buf, 255); if (::strcmp (buf, "Metric") == 0) - tqlayout.unit = PG_MM; + layout.unit = PG_MM; else if (::strcmp (buf, "Inches") == 0) - tqlayout.unit = PG_INCH; + layout.unit = PG_INCH; else kdDebug() << "ERROR: invalid units" << endl; diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp index 5033762b..faff17ff 100644 --- a/filters/kchart/libimageexport/imageexport.cpp +++ b/filters/kchart/libimageexport/imageexport.cpp @@ -40,7 +40,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h index 825b0156..d1a73abe 100644 --- a/filters/kchart/libimageexport/imageexport.h +++ b/filters/kchart/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual void extraImageAttribute() {}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc index 8d8ad52c..1507f536 100644 --- a/filters/kchart/svg/svgexport.cc +++ b/filters/kchart/svg/svgexport.cc @@ -45,7 +45,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h index c04c0f22..653aae9b 100644 --- a/filters/kchart/svg/svgexport.h +++ b/filters/kchart/svg/svgexport.h @@ -31,7 +31,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc index 77488fa9..3f184674 100644 --- a/filters/kformula/latex/latexexport.cc +++ b/filters/kformula/latex/latexexport.cc @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include @@ -46,7 +46,7 @@ LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQSt } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "text/x-tex" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h index 091ed125..83672fae 100644 --- a/filters/kformula/latex/latexexport.h +++ b/filters/kformula/latex/latexexport.h @@ -33,7 +33,7 @@ public: LATEXExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // LATEXEXPORT_H diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc index 507c13a2..6103da18 100644 --- a/filters/kformula/mathml/mathmlexport.cc +++ b/filters/kformula/mathml/mathmlexport.cc @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include @@ -46,7 +46,7 @@ MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQ } -KoFilter::ConversiontqStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/mathml+xml" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h index a49b837b..2a442a22 100644 --- a/filters/kformula/mathml/mathmlexport.h +++ b/filters/kformula/mathml/mathmlexport.h @@ -33,7 +33,7 @@ public: MathMLExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~MathMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // MATHMLEXPORT_H diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc index 87ce2182..6900c61b 100644 --- a/filters/kformula/mathml/mathmlimport.cc +++ b/filters/kformula/mathml/mathmlimport.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -44,7 +44,7 @@ MathMLImport::MathMLImport(KoFilter *, const char *, const TQStringList&) { } -KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) { kdDebug( KFormula::DEBUGID ) << "From: " << from << endl; kdDebug( KFormula::DEBUGID ) << "To: " << to << endl; @@ -68,7 +68,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const const TQString filename( m_chain->inputFile() ); TQFile f( filename ); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( filename ), i18n( "MathML Import Error" ) ); + KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).arg( filename ), i18n( "MathML Import Error" ) ); delete wrapper; return KoFilter::FileNotFound; } @@ -84,7 +84,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const << " In line: " << errorLine << ", column: " << errorColumn << endl << " Error message: " << errorMsg << endl; KMessageBox::error( 0, i18n( "Parsing error in MathML file %4 at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) ); return KoFilter::WrongFormat; } f.close(); diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h index a4a28e18..4835b69b 100644 --- a/filters/kformula/mathml/mathmlimport.h +++ b/filters/kformula/mathml/mathmlimport.h @@ -21,7 +21,7 @@ #define MATHMLIMPORT_H #include -#include +#include #include #include @@ -36,7 +36,7 @@ public: MathMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MathMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* MATHMLIMPORT_H */ diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc index c6d3611e..764cfc2b 100644 --- a/filters/kformula/png/pngexport.cc +++ b/filters/kformula/png/pngexport.cc @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include @@ -46,7 +46,7 @@ PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQString } -KoFilter::ConversiontqStatus PNGExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h index 8dd3de34..eb71df94 100644 --- a/filters/kformula/png/pngexport.h +++ b/filters/kformula/png/pngexport.h @@ -33,7 +33,7 @@ public: PNGExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~PNGExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // PNGEXPORT_H diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc index fb0407e0..36741fa2 100644 --- a/filters/kformula/png/pngexportdia.cc +++ b/filters/kformula/png/pngexportdia.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -190,13 +190,13 @@ void PNGExportDia::setupGUI() width->setText( i18n( "Width" ) ); heightEdit = new KIntNumInput( page, "heightEdit" ); - TQGridLayout* tqlayout1 = new TQGridLayout; - tqlayout1->addWidget( height, 1, 0 ); - tqlayout1->addWidget( widthEdit, 0, 1 ); - tqlayout1->addWidget( width, 0, 0 ); - tqlayout1->addWidget( heightEdit, 1, 1 ); + TQGridLayout* layout1 = new TQGridLayout; + layout1->addWidget( height, 1, 0 ); + layout1->addWidget( widthEdit, 0, 1 ); + layout1->addWidget( width, 0, 0 ); + layout1->addWidget( heightEdit, 1, 1 ); - mainLayout->addLayout( tqlayout1 ); + mainLayout->addLayout( layout1 ); TQLabel* percentHeight = new TQLabel( page, "PercentHeight" ); percentHeight->setText( i18n( "Height (%)" ) ); @@ -205,15 +205,15 @@ void PNGExportDia::setupGUI() percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" ); percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" ); - TQGridLayout* tqlayout2 = new TQGridLayout; - tqlayout2->addWidget( percWidthEdit, 0, 1 ); - tqlayout2->addWidget( percHeightEdit, 1, 1 ); - tqlayout2->addWidget( percentHeight, 1, 0 ); - tqlayout2->addWidget( percentWidth, 0, 0 ); + TQGridLayout* layout2 = new TQGridLayout; + layout2->addWidget( percWidthEdit, 0, 1 ); + layout2->addWidget( percHeightEdit, 1, 1 ); + layout2->addWidget( percentHeight, 1, 0 ); + layout2->addWidget( percentWidth, 0, 0 ); - mainLayout->addLayout( tqlayout2 ); + mainLayout->addLayout( layout2 ); - /* Display the main tqlayout */ + /* Display the main layout */ mainLayout->addStretch( 5 ); mainLayout->activate(); } diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc index 25758e82..328f1518 100644 --- a/filters/kformula/svg/svgexport.cc +++ b/filters/kformula/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h index 65a5cef1..0296e574 100644 --- a/filters/kformula/svg/svgexport.h +++ b/filters/kformula/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp index cd983fe6..2339dbf0 100644 --- a/filters/kivio/imageexport/kivio_imageexport.cpp +++ b/filters/kivio/imageexport/kivio_imageexport.cpp @@ -55,7 +55,7 @@ ImageExport::ImageExport(KoFilter *, const char *, const TQStringList&) KGlobal::locale()->insertCatalogue("kofficefilters"); } -KoFilter::ConversiontqStatus ImageExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { if(from != "application/x-kivio") { return KoFilter::BadMimeType; diff --git a/filters/kivio/imageexport/kivio_imageexport.h b/filters/kivio/imageexport/kivio_imageexport.h index e1946f0f..498204fa 100644 --- a/filters/kivio/imageexport/kivio_imageexport.h +++ b/filters/kivio/imageexport/kivio_imageexport.h @@ -32,7 +32,7 @@ class ImageExport : public KoFilter public: ImageExport(KoFilter *, const char *, const TQStringList&); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; } diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui index 41d73a4c..34feba57 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -29,7 +29,7 @@ Expanding - + 20 40 @@ -81,7 +81,7 @@ Expanding - + 60 21 @@ -103,7 +103,7 @@ Expanding - + 70 20 diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index d40cd608..8dd96c5f 100644 --- a/filters/kpresenter/kword/kprkword.cc +++ b/filters/kpresenter/kword/kprkword.cc @@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) : // This filter can act as an import filter for KWord and as an export // filter for KPresenter (isn't our architecture really nice ? :) // This is why we use the file-to-file method, not a TQDomDoc one. -KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="application/x-kpresenter") return KoFilter::NotImplemented; diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h index f4141a09..30932652 100644 --- a/filters/kpresenter/kword/kprkword.h +++ b/filters/kpresenter/kword/kprkword.h @@ -33,7 +33,7 @@ public: virtual ~KprKword() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: void convert(); diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp index b87b8635..c4ceb243 100644 --- a/filters/kpresenter/libimageexport/imageexport.cpp +++ b/filters/kpresenter/libimageexport/imageexport.cpp @@ -42,7 +42,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h index 23f45e28..5cb89622 100644 --- a/filters/kpresenter/libimageexport/imageexport.h +++ b/filters/kpresenter/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual bool extraImageAttribute() { return true;}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index e2e5b50a..97527471 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -56,7 +56,7 @@ class MgpImporter: self.__reset() #init properties def __reset(self): - self.tqalignment="1" #text tqalignment, left + self.alignment="1" #text alignment, left self.vgap=1 #line spacing #font properties @@ -167,14 +167,14 @@ class MgpImporter: def __setAlign(self,command): tokens=string.split(command,' ') if (tokens[0]=='leftfill'): #justify - self.tqalignment="8" + self.alignment="8" elif (tokens[0]=='right'): - self.tqalignment="2" + self.alignment="2" elif (tokens[0]=='center'): - self.tqalignment="4" + self.alignment="4" else: - self.tqalignment="1" #left - #print self.tqalignment + self.alignment="1" #left + #print self.alignment def __setBackground(self,parent): pageElem=self.document.createElement("PAGE") @@ -233,7 +233,7 @@ class MgpImporter: indent=-1 pElem=self.document.createElement("P") #paragraph - pElem.setAttribute("align", self.tqalignment) + pElem.setAttribute("align", self.alignment) elem=self.document.createElement("NAME") #style name elem.setAttribute("value", "Standard") ###is this needed at all? @@ -283,7 +283,7 @@ class MgpImporter: if (self.fontItalic!=0): elem.setAttribute("italic", "1") - text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore')) + text=self.document.createTextNode(unicode(line, self.charset, 'ignore')) elem.appendChild(text) pElem.appendChild(elem) self.textElem.appendChild(pElem) @@ -377,7 +377,7 @@ class MgpImporter: self.__setFontSize(command) elif (command.startswith('left') or command.startswith('center') or - command.startswith('right')): #text tqalignment + command.startswith('right')): #text alignment self.__setAlign(command) elif (command.startswith('charset')): #charset self.__setCharset(command) diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc index 0e4771cf..47173cb9 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.cc +++ b/filters/kpresenter/ooimpress/ooimpressexport.cc @@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport() delete m_storeinp; } -KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, +KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl; @@ -66,10 +66,10 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, } // read in the KPresenter file - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; TQDomImplementation impl; TQDomDocument meta( impl.createDocumentType( "office:document-meta", @@ -178,7 +178,7 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressExport::openFile() +KoFilter::ConversionStatus OoImpressExport::openFile() { m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read ); @@ -558,7 +558,7 @@ void OoImpressExport::createHelpLine( TQDomNode &helpline ) TQString str( "P%1,%2" ); int tmpX = ( int ) ( KoUnit::toMM( helplines.attribute("posX").toDouble() )*100 ); int tmpY = ( int ) ( KoUnit::toMM( helplines.attribute("posY").toDouble() )*100 ); - m_helpLine+=str.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) ); + m_helpLine+=str.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) ); } } } @@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ TQDomElement noteTextBox = doc.createElement( "draw:text-box" ); //TODO : add draw:text-box size : - // + // TQStringList text = TQStringList::split( "\n", noteText ); for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { @@ -780,7 +780,7 @@ void OoImpressExport::appendTextbox( TQDomDocument & doc, TQDomElement & source, TQString gs = m_styleFactory.createGraphicStyle( source ); textbox.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, textbox ); // parse every paragraph @@ -876,7 +876,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source, image.setAttribute( "draw:style-name", gs ); TQDomElement key = source.namedItem( "KEY" ).toElement(); - TQString pictureName = TQString( "Picture/Picture%1" ).tqarg( m_pictureIndex ); + TQString pictureName = TQString( "Picture/Picture%1" ).arg( m_pictureIndex ); image.setAttribute( "xlink:type", "simple" ); image.setAttribute( "xlink:show", "embed" ); @@ -909,7 +909,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source, } image.setAttribute( "xlink:href", "#" + pictureName ); -// set the tqgeometry +// set the geometry set2DGeometry( source, image ); target.appendChild( image ); @@ -927,7 +927,7 @@ void OoImpressExport::appendLine( TQDomDocument & doc, TQDomElement & source, TQ TQString gs = m_styleFactory.createGraphicStyle( source ); line.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry setLineGeometry( source, line ); target.appendChild( line ); @@ -941,7 +941,7 @@ void OoImpressExport::appendRectangle( TQDomDocument & doc, TQDomElement & sourc TQString gs = m_styleFactory.createGraphicStyle( source ); rectangle.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, rectangle ); target.appendChild( rectangle ); @@ -955,7 +955,7 @@ void OoImpressExport::appendPolyline( TQDomDocument & doc, TQDomElement & source TQString gs = m_styleFactory.createGraphicStyle( source ); polyline.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, polyline, false, true /*multipoint*/ ); target.appendChild( polyline ); @@ -974,7 +974,7 @@ void OoImpressExport::appendEllipse( TQDomDocument & doc, TQDomElement & source, TQString gs = m_styleFactory.createGraphicStyle( source ); ellipse.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, ellipse, pieObject ); target.appendChild( ellipse ); @@ -998,7 +998,7 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe target.setAttribute( "draw:id", TQString::number( m_objectIndex ) ); target.setAttribute( "svg:x", StyleFactory::toCM( orig.attribute( "x" ) ) ); - target.setAttribute( "svg:y", TQString( "%1cm" ).tqarg( KoUnit::toCM( y ) ) ); + target.setAttribute( "svg:y", TQString( "%1cm" ).arg( KoUnit::toCM( y ) ) ); target.setAttribute( "svg:width", StyleFactory::toCM( size.attribute( "width" ) ) ); target.setAttribute( "svg:height", StyleFactory::toCM( size.attribute( "height" ) ) ); TQString nameStr = name.attribute("objectName"); @@ -1073,16 +1073,16 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe if( elemPoint.hasAttribute( "point_y" ) ) tmpY = ( int ) ( KoUnit::toMM(elemPoint.attribute( "point_y" ).toDouble() )*100 ); if ( !listOfPoint.isEmpty() ) - listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY ); else - listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY ); maxX = TQMAX( maxX, tmpX ); maxY = TQMAX( maxY, tmpY ); } elemPoint = elemPoint.nextSibling().toElement(); } target.setAttribute( "draw:points", listOfPoint ); - target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); + target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); } } } @@ -1093,7 +1093,7 @@ TQString OoImpressExport::rotateValue( double val ) if ( val!=0.0 ) { double value = -1 * ( ( double )val* M_PI )/180.0; - str=TQString( "rotate (%1)" ).tqarg( value ); + str=TQString( "rotate (%1)" ).arg( value ); } return str; } @@ -1125,29 +1125,29 @@ void OoImpressExport::setLineGeometry( TQDomElement & source, TQDomElement & tar target.setAttribute( "draw:id", TQString::number( m_objectIndex ) ); TQString xpos1 = StyleFactory::toCM( orig.attribute( "x" ) ); - TQString xpos2 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x2 ) ); + TQString xpos2 = TQString( "%1cm" ).arg( KoUnit::toCM( x2 ) ); if ( type == 0 ) { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) ); } else if ( type == 1 ) { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); - xpos1 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x1/2.0 ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); + xpos1 = TQString( "%1cm" ).arg( KoUnit::toCM( x1/2.0 ) ); xpos2 = xpos1; } else if ( type == 3 ) // from left bottom to right top { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); } else // from left top to right bottom { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); } target.setAttribute( "svg:x1", xpos1 ); target.setAttribute( "svg:x2", xpos2 ); diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h index ac369192..dec5ec4c 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.h +++ b/filters/kpresenter/ooimpress/ooimpressexport.h @@ -37,11 +37,11 @@ public: OoImpressExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); void exportBody( TQDomDocument & doccontent, TQDomElement & body ); void createDocumentMeta( TQDomDocument & docmeta ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index 1dab566d..77e1f38c 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport() m_animations.clear(); } -KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl; @@ -87,13 +87,13 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } TQDomDocument docinfo; @@ -129,9 +129,9 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T } // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoImpressImport::openFile() +KoFilter::ConversionStatus OoImpressImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -150,7 +150,7 @@ KoFilter::ConversiontqStatus OoImpressImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } @@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "KEY" ); image.setAttribute( "msec", time.msec() ); @@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "BACKPICTUREKEY" ); image.setAttribute( "msec", time.msec() ); @@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" ); appendTextObjectMargin( doc, textObjectElement ); - // vertical tqalignment + // vertical alignment if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) ) { - TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" ); - if ( tqalignment == "top" ) + TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" ); + if ( alignment == "top" ) textObjectElement.setAttribute( "verticalAlign", "top" ); - else if ( tqalignment == "middle" ) + else if ( alignment == "middle" ) textObjectElement.setAttribute( "verticalAlign", "center" ); - else if ( tqalignment == "bottom" ) + else if ( alignment == "bottom" ) textObjectElement.setAttribute( "verticalAlign", "bottom" ); textObjectElement.setAttribute("verticalValue", 0.0); @@ -1663,7 +1663,7 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle p.appendChild(nameElem); } - // Paragraph tqalignment + // Paragraph alignment if ( m_styleStack.hasAttributeNS( ooNS::fo, "text-align" ) ) { TQString align = m_styleStack.attributeNS( ooNS::fo, "text-align" ); @@ -2046,7 +2046,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object ) KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url ); TQString extension = url.mid( url.find( '.' ) ); - TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension; + TQString fileName = TQString( "picture%1" ).arg( m_numPicture++ ) + extension; KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write ); if ( file && out ) @@ -2072,7 +2072,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement & return TQString(); TQString extension = url.mid( url.find( '.' ) ); - TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension; + TQString fileName = TQString( "sound%1" ).arg( m_numSound++ ) + extension; fileName = "sounds/" + fileName; KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write ); @@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2314,9 +2314,9 @@ void OoImpressImport::createPresentationAnimation(const TQDomElement& element) { const TQString localName = e.localName(); const TQString ns = e.namespaceURI(); - if ( ns == ooNS::presentation && localName == "show-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) ) + if ( ns == ooNS::presentation && localName == "show-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) ) { - TQString name = e.attributeNS( ooNS::draw, "tqshape-id", TQString() ); + TQString name = e.attributeNS( ooNS::draw, "shape-id", TQString() ); //kdDebug(30518)<<" insert animation style : name :"<order; - kdDebug(30518)<<"e.tagName() :"< - Shadow
- Text margins
- -Qt::Vertical tqalignment for text
+ -Qt::Vertical alignment for text
- Text style (underline, sub/super script, bold, italic, strikeout, background color)
- Paragraph style (line spacing, offset before/after paragraph, indent first/right/left, borders)
- Presentation settings
@@ -168,7 +168,7 @@ - Settings element (snap line drawing)
- Export Transparency
- Export Group Object
- -Qt::Vertical tqalignment for text
+ -Qt::Vertical alignment for text
- Text margins
- Export title/keyword/subject
- Custom Slide Show
diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc index a25ba52a..e50b652e 100644 --- a/filters/kpresenter/ooimpress/stylefactory.cc +++ b/filters/kpresenter/ooimpress/stylefactory.cc @@ -362,7 +362,7 @@ void StrokeDashStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { - m_name = TQString( "Gradient %1" ).tqarg( index ); + m_name = TQString( "Gradient %1" ).arg( index ); m_start_intensity = "100%"; m_end_intensity = "100%"; m_border = "0%"; @@ -393,8 +393,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { int cx = bGradient.attribute( "xfactor" ).toInt(); int cy = bGradient.attribute( "yfactor" ).toInt(); - m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 ); - m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 ); + m_cx = TQString( "%1%" ).arg( cx / 4 + 50 ); + m_cy = TQString( "%1%" ).arg( cy / 4 + 50 ); } } @@ -419,8 +419,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { int cx = gradient.attribute( "xfactor" ).toInt(); int cy = gradient.attribute( "yfactor" ).toInt(); - m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 ); - m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 ); + m_cx = TQString( "%1%" ).arg( cx / 4 + 50 ); + m_cy = TQString( "%1%" ).arg( cy / 4 + 50 ); } } @@ -615,8 +615,8 @@ PageMasterStyle::PageMasterStyle( TQDomElement & e, const uint index ) TQDomNode borders = e.namedItem( "PAPERBORDERS" ); TQDomElement b = borders.toElement(); - m_name = TQString( "PM%1" ).tqarg( index ); - m_style = TQString( "Default%1" ).tqarg( index ); + m_name = TQString( "PM%1" ).arg( index ); + m_style = TQString( "Default%1" ).arg( index ); m_margin_top = StyleFactory::toCM( b.attribute( "ptTop" ) ); m_margin_bottom = StyleFactory::toCM( b.attribute( "ptBottom" ) ); m_margin_left = StyleFactory::toCM( b.attribute( "ptLeft" ) ); @@ -675,7 +675,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint m_bg_objects_visible = "true"; } - m_name = TQString( "dp%1" ).tqarg( index ); + m_name = TQString( "dp%1" ).arg( index ); // check if this is an empty page tag if ( !e.hasChildNodes() ) @@ -718,7 +718,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint //ISO8601 chapter 5.5.3.2 //TQDate doesn't encode it as this format. - m_page_duration = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec ); + m_page_duration = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec ); } TQDomElement pageEffect = e.namedItem( "PGEFFECT" ).toElement(); @@ -899,11 +899,11 @@ bool PageStyle::operator==( const PageStyle & pageStyle ) const TextStyle::TextStyle( TQDomElement & e, const uint index ) { - m_name = TQString( "T%1" ).tqarg( index ); + m_name = TQString( "T%1" ).arg( index ); if ( e.hasAttribute( "family" ) ) m_font_family = e.attribute( "family" ); if ( e.hasAttribute( "pointSize" ) ) - m_font_size = TQString( "%1pt" ).tqarg( e.attribute( "pointSize" ) ); + m_font_size = TQString( "%1pt" ).arg( e.attribute( "pointSize" ) ); if ( e.hasAttribute( "color" ) ) m_color = e.attribute( "color" ); if ( e.hasAttribute( "bold" ) && e.attribute( "bold" ) == "1" ) @@ -1017,25 +1017,25 @@ GraphicStyle::GraphicStyle( StyleFactory * styleFactory, TQDomElement & e, const } if ( textObjectElement.hasAttribute( "bleftpt" ) ) { - m_textMarginLeft = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bleftpt" ) ); + m_textMarginLeft = TQString( "%1pt" ).arg( textObjectElement.attribute( "bleftpt" ) ); } if ( textObjectElement.hasAttribute( "bbottompt" ) ) { - m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) ); + m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) ); } if ( textObjectElement.hasAttribute( "btoppt" ) ) { - m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) ); + m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) ); } if ( textObjectElement.hasAttribute( "brightpt" ) ) { - m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) ); + m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) ); } } - kdDebug(30518)<<" tqalignment :"< 1 ) { properties.setAttribute( "text:min-label-width", - TQString( "%1cm" ).tqarg( m_min_label_width ) ); + TQString( "%1cm" ).arg( m_min_label_width ) ); properties.setAttribute( "text:space-before", - TQString( "%1cm" ).tqarg( m_min_label_width * ( level - 1 ) ) ); + TQString( "%1cm" ).arg( m_min_label_width * ( level - 1 ) ) ); } if ( !m_color.isNull() ) diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 4f41aac7..31d2b4a1 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport() delete d; } -KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/mspowerpoint" ) return KoFilter::NotImplemented; @@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles() TQByteArray stylesData; TQBuffer stylesBuffer( stylesData ); - TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() ); - TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() ); + TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() ); + TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() ); stylesBuffer.open( IO_WriteOnly ); stylesWriter = new KoXmlWriter( &stylesBuffer ); @@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles() // office:automatic-styles stylesWriter->startElement( "office:automatic-styles" ); - stylesWriter->startElement( "style:page-tqlayout" ); + stylesWriter->startElement( "style:page-layout" ); stylesWriter->addAttribute( "style:name","pm1" ); stylesWriter->addAttribute( "style:page-usage","all" ); - stylesWriter->startElement( "style:page-tqlayout-properties" ); + stylesWriter->startElement( "style:page-layout-properties" ); stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); stylesWriter->addAttribute( "fo:margin-left","0pt" ); stylesWriter->addAttribute( "fo:margin-right","0pt" ); @@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles() stylesWriter->addAttribute( "fo:page-height", pageHeight ); stylesWriter->addAttribute( "fo:page-width", pageWidth ); stylesWriter->addAttribute( "style:print-orientation","landscape" ); - stylesWriter->endElement(); // style:page-tqlayout-properties - stylesWriter->endElement(); // style:page-tqlayout + stylesWriter->endElement(); // style:page-layout-properties + stylesWriter->endElement(); // style:page-layout stylesWriter->startElement( "style:style" ); stylesWriter->addAttribute( "style:name","dp1" ); @@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles() stylesWriter->startElement( "office:master-styles" ); stylesWriter->startElement( "style:master-page" ); stylesWriter->addAttribute( "style:name", "Standard" ); - stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" ); + stylesWriter->addAttribute( "style:page-layout-name", "pm1" ); stylesWriter->addAttribute( "draw:style-name", "dp1" ); stylesWriter->endElement(); stylesWriter->endElement(); @@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:ellipse" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // draw:ellipse } @@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm if( !drawObject ) return; if( !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:rect" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -393,7 +393,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); xmlWriter->addAttribute( "draw:transform", rot ); } else @@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); } - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // draw:rect } @@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -435,7 +435,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid+yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); xmlWriter->addAttribute( "draw:transform", rot ); } else @@ -448,7 +448,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); xmlWriter->addAttribute( "draw:transform", rot ); } @@ -463,8 +463,8 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite // xmlWriter->addAttribute( "svg:x", xStr ); // xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "round-rectangle"); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0 /3" ); @@ -486,21 +486,21 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite xmlWriter->addAttribute( "draw:formula", "top+?f0 " ); xmlWriter->addAttribute( "draw:name", "f4" ); xmlWriter->endElement(); // draw:equation - xmlWriter->endElement(); // draw:enhanced-tqgeometry - xmlWriter->endElement(); // draw:custom-tqshape + xmlWriter->endElement(); // draw:enhanced-geometry + xmlWriter->endElement(); // draw:custom-shape } void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); @@ -522,10 +522,10 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "diamond"); xmlWriter->endElement(); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); } @@ -533,20 +533,20 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); /* draw IsocelesTriangle or RightTriangle */ - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if (drawObject->hasProperty("draw:mirror-vertical")) { @@ -588,14 +588,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml double rotAngle = drawObject->getDoubleProperty("libppt:rotation" ); double xMid = ( drawObject->left() + 0.5*drawObject->width() ); double yMid = ( drawObject->top() + 0.5*drawObject->height() ); - TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); + TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); xmlWriter->addAttribute( "draw:transform", rot ); } - if (drawObject->tqshape() == DrawObject::RightTriangle) + if (drawObject->shape() == DrawObject::RightTriangle) { xmlWriter->addAttribute( "draw:type", "right-triangle"); } - else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle) + else if (drawObject->shape() == DrawObject::IsoscelesTriangle) { xmlWriter->addAttribute( "draw:type", "isosceles-triangle"); xmlWriter->startElement( "draw:equation" ); @@ -637,27 +637,27 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->endElement(); } - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); @@ -675,7 +675,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 10 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if ( drawObject->hasProperty("draw:mirror-vertical") ) { xmlWriter->addAttribute("draw:mirror-vertical","true"); @@ -718,27 +718,27 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 bottom"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 6.25 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -763,7 +763,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter xmlWriter->addAttribute( "svg:x", 1.25 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if (drawObject->hasProperty("draw:mirror-vertical")) { xmlWriter->addAttribute("draw:mirror-vertical","true"); @@ -834,27 +834,27 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -871,7 +871,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "hexagon" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0 " ); @@ -898,27 +898,27 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -935,7 +935,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 4.782 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "octagon" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "left+$0 " ); @@ -978,36 +978,36 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); - if (drawObject->tqshape() == DrawObject::RightArrow) + if (drawObject->shape() == DrawObject::RightArrow) xmlWriter->addAttribute( "draw:type", "right-arrow" ); - else if (drawObject->tqshape() == DrawObject::LeftArrow) + else if (drawObject->shape() == DrawObject::LeftArrow) xmlWriter->addAttribute( "draw:type", "left-arrow" ); - else if (drawObject->tqshape() == DrawObject::UpArrow) + else if (drawObject->shape() == DrawObject::UpArrow) xmlWriter->addAttribute( "draw:type", "up-arrow" ); - else if (drawObject->tqshape() == DrawObject::DownArrow) + else if (drawObject->shape() == DrawObject::DownArrow) xmlWriter->addAttribute( "draw:type", "down-arrow" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula","$1"); @@ -1042,7 +1042,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute( "draw:name","f7"); xmlWriter->endElement(); // draw:equation xmlWriter->startElement( "draw:handle" ); - if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == DrawObject::LeftArrow ) + if ( drawObject->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) { xmlWriter->addAttribute( "draw:handle-range-x-maximum", 21600); xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); @@ -1050,7 +1050,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute("draw:handle-range-y-maximum",10800); xmlWriter->addAttribute("draw:handle-range-y-minimum",0); } - else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow ) + else if ( drawObject->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow ) { xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800); xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); @@ -1059,19 +1059,19 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute("draw:handle-range-y-minimum",0); } xmlWriter->endElement(); // draw:handle - xmlWriter->endElement(); // draw:enhanced-tqgeometry - xmlWriter->endElement(); // draw:custom-tqshape + xmlWriter->endElement(); // draw:enhanced-geometry + xmlWriter->endElement(); // draw:custom-shape } void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter) return; - TQString x1Str = TQString("%1mm").tqarg( drawObject->left() ); - TQString y1Str = TQString("%1mm").tqarg( drawObject->top() ); - TQString x2Str = TQString("%1mm").tqarg( drawObject->left() + drawObject->width() ); - TQString y2Str = TQString("%1mm").tqarg( drawObject->top() + drawObject->height() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString x1Str = TQString("%1mm").arg( drawObject->left() ); + TQString y1Str = TQString("%1mm").arg( drawObject->top() ); + TQString x2Str = TQString("%1mm").arg( drawObject->left() + drawObject->width() ); + TQString y2Str = TQString("%1mm").arg( drawObject->top() + drawObject->height() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); if ( drawObject->hasProperty("draw:mirror-vertical") ) { TQString temp = y1Str; @@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit xmlWriter->addAttribute( "svg:y2", y2Str ); xmlWriter->addAttribute( "svg:x1", x1Str ); xmlWriter->addAttribute( "svg:x2", x2Str ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); } @@ -1099,19 +1099,19 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr { if( !drawObject ||!xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -1136,7 +1136,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr xmlWriter->addAttribute( "svg:x", 8.536 ); xmlWriter->addAttribute( "svg:y", 1.461 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "smiley" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0-15510 " ); @@ -1156,27 +1156,27 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr xmlWriter->addAttribute( "draw:handle-range-y-minimum", 15510); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 1 ); @@ -1193,22 +1193,22 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute( "svg:x", 8.553 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "heart" ); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter) { if( !drawObject ||!xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:path" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // path } @@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm drawingObjectCounter++; - if (drawObject->tqshape() == DrawObject::Ellipse) + if (drawObject->shape() == DrawObject::Ellipse) { processEllipse (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Rectangle) + else if (drawObject->shape() == DrawObject::Rectangle) { processRectangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::RoundRectangle) + else if (drawObject->shape() == DrawObject::RoundRectangle) { processRoundRectangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Diamond) + else if (drawObject->shape() == DrawObject::Diamond) { processDiamond (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle | - drawObject->tqshape() == DrawObject::RightTriangle) + else if (drawObject->shape() == DrawObject::IsoscelesTriangle | + drawObject->shape() == DrawObject::RightTriangle) { processTriangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Trapezoid) + else if (drawObject->shape() == DrawObject::Trapezoid) { processTrapezoid (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Parallelogram) + else if (drawObject->shape() == DrawObject::Parallelogram) { processParallelogram( drawObject, xmlWriter); } - else if (drawObject->tqshape() == DrawObject::Hexagon) + else if (drawObject->shape() == DrawObject::Hexagon) { processHexagon ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Octagon) + else if (drawObject->shape() == DrawObject::Octagon) { processOctagon ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::RightArrow | - drawObject->tqshape() == DrawObject::LeftArrow | - drawObject->tqshape() == DrawObject::UpArrow | - drawObject->tqshape() == DrawObject::DownArrow ) + else if (drawObject->shape() == DrawObject::RightArrow | + drawObject->shape() == DrawObject::LeftArrow | + drawObject->shape() == DrawObject::UpArrow | + drawObject->shape() == DrawObject::DownArrow ) { processArrow ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Line) + else if (drawObject->shape() == DrawObject::Line) { processLine ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Smiley) + else if (drawObject->shape() == DrawObject::Smiley) { processSmiley (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Heart) + else if (drawObject->shape() == DrawObject::Heart) { processHeart (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::FreeLine) + else if (drawObject->shape() == DrawObject::FreeLine) { processFreeLine (drawObject, xmlWriter ); } @@ -1317,14 +1317,14 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr // TQString pStr = string( textObject->text() ).string(); TQString pStr; - TQString widthStr = TQString("%1mm").tqarg( textObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( textObject->height() ); - TQString xStr = TQString("%1mm").tqarg( textObject->left() ); - TQString yStr = TQString("%1mm").tqarg( textObject->top() ); + TQString widthStr = TQString("%1mm").arg( textObject->width() ); + TQString heightStr = TQString("%1mm").arg( textObject->height() ); + TQString xStr = TQString("%1mm").arg( textObject->left() ); + TQString yStr = TQString("%1mm").arg( textObject->top() ); xmlWriter->startElement( "draw:frame" ); xmlWriter->addAttribute( "presentation:style-name", "pr1" ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); @@ -1381,15 +1381,15 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm TQString nameStr = Libppt::string( slide->title() ).string(); if( nameStr.isEmpty() ) - nameStr = TQString("page%1").tqarg(slideNo+1); + nameStr = TQString("page%1").arg(slideNo+1); - TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1); + TQString styleNameStr = TQString("dp%1").arg(slideNo+1); xmlWriter->startElement( "draw:page" ); xmlWriter->addAttribute( "draw:master-page-name", "Default" ); xmlWriter->addAttribute( "draw:name", nameStr ); xmlWriter->addAttribute( "draw:style-name", styleNameStr ); - xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0"); + xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0"); GroupObject* root = slide->rootObject(); if( root ) @@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( !drawObject || !xmlWriter) return; drawingObjectCounter++; - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:name", styleName ); @@ -1490,7 +1490,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( drawObject->hasProperty( "svg:stroke-width" ) ) { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); - xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) ); + xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").arg( strokeWidth ) ); } if( drawObject->hasProperty( "svg:stroke-color" ) ) @@ -1528,14 +1528,14 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); double arrowWidth = (drawObject->getDoubleProperty("draw:marker-start-width") * strokeWidth); - xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( arrowWidth ) ); + xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").arg( arrowWidth ) ); } if( drawObject->hasProperty( "draw:marker-end-width" ) ) { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); double arrowWidth = (drawObject->getDoubleProperty("draw:marker-end-width") * strokeWidth); - xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) ); + xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").arg( arrowWidth ) ); } @@ -1569,19 +1569,19 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( drawObject->hasProperty( "draw:shadow-opacity" ) ) { double opacity = drawObject->getDoubleProperty("draw:shadow-opacity") ; - xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) ); + xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").arg( opacity ) ); } if( drawObject->hasProperty( "draw:shadow-offset-x" ) ) { double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ; - xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) ); + xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) ); } if( drawObject->hasProperty( "draw:shadow-offset-y" ) ) { double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); - xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) ); + xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) ); } diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h index ca3e7365..6b75cfb3 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.h +++ b/filters/kpresenter/powerpoint/import/powerpointimport.h @@ -39,7 +39,7 @@ Q_OBJECT public: PowerPointImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~PowerPointImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp index d0343b43..29870cbd 100644 --- a/filters/kpresenter/powerpoint/libppt/objects.cpp +++ b/filters/kpresenter/powerpoint/libppt/objects.cpp @@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object ) class DrawObject::Private { public: - unsigned tqshape; + unsigned shape; bool isVerFlip; bool isHorFlip; }; @@ -387,7 +387,7 @@ public: DrawObject::DrawObject() { d = new Private; - d->tqshape = None; + d->shape = None; } DrawObject::~DrawObject() @@ -395,14 +395,14 @@ DrawObject::~DrawObject() delete d; } -unsigned DrawObject::tqshape() const +unsigned DrawObject::shape() const { - return d->tqshape; + return d->shape; } void DrawObject::setShape( unsigned s ) { - d->tqshape = s; + d->shape = s; } bool DrawObject::isVerFlip() const diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h index a9160897..823e2a75 100644 --- a/filters/kpresenter/powerpoint/libppt/objects.h +++ b/filters/kpresenter/powerpoint/libppt/objects.h @@ -103,7 +103,7 @@ public: Body = 1, Notes = 2, NotUsed = 3, - Other = 4, // text in a tqshape + Other = 4, // text in a shape CenterBody = 5, // subtitle in title slide CenterTitle = 6, // title in title slide HalfBody = 7, // body in two-column slide @@ -184,7 +184,7 @@ public: virtual ~DrawObject(); virtual bool isDrawing() const { return true; } - unsigned tqshape() const; + unsigned shape() const; void setShape( unsigned s ); bool isVerFlip() const; diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp index b905539d..2a78b79f 100644 --- a/filters/kpresenter/powerpoint/libppt/pole.cpp +++ b/filters/kpresenter/powerpoint/libppt/pole.cpp @@ -94,7 +94,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -115,7 +115,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector tqchildren( unsigned index ); + std::vector children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j chi = tqchildren( j ); + std::vector chi = children( j ); for( unsigned i=0; i chi = tqchildren( index ); + // find among the children of index + std::vector chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -589,7 +589,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector& result, } } -std::vector DirTree::tqchildren( unsigned index ) +std::vector DirTree::children( unsigned index ) { std::vector result; @@ -1249,9 +1249,9 @@ std::list Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp index bf3fc51f..af035c69 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp @@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */ class msofbtSpAtom::Private { public: - unsigned long tqshapeId; + unsigned long shapeId; unsigned long persistentFlag; bool background; bool hFlip; @@ -4115,7 +4115,7 @@ public: msofbtSpAtom ::msofbtSpAtom () { d = new Private; - d->tqshapeId = 0; + d->shapeId = 0; d->persistentFlag = 0; d->background = false; d->hFlip = false; @@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom () delete d; } -unsigned long msofbtSpAtom::tqshapeId() const +unsigned long msofbtSpAtom::shapeId() const { - return d->tqshapeId; + return d->shapeId; } void msofbtSpAtom::setShapeId( unsigned long id ) { - d->tqshapeId = id; + d->shapeId = id; } -const char* msofbtSpAtom::tqshapeTypeAsString() const +const char* msofbtSpAtom::shapeTypeAsString() const { switch( instance() ) { @@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom ) // set rect bound of current group - // this is tqshape for the group, no need to + // this is shape for the group, no need to d->isShapeGroup = true; } diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h index 6eec1564..b2a0f649 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.h +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h @@ -1901,9 +1901,9 @@ public: msofbtSpAtom (); ~msofbtSpAtom (); - unsigned long tqshapeId() const; + unsigned long shapeId() const; void setShapeId( unsigned long id ); - const char* tqshapeTypeAsString() const; + const char* shapeTypeAsString() const; unsigned long persistentFlag() const; void setPersistentFlag( unsigned long persistentFlag ); @@ -1957,10 +1957,10 @@ public: FillSolid, // Fill with a solid color FillPattern, // Fill with a pattern (bitmap) FillTexture, // A texture (pattern with its own color map) - FillPicture, // Center a picture in the tqshape + FillPicture, // Center a picture in the shape FillShade, // Shade from start to end points FillShadeCenter, // Shade from bounding rectangle to end point - FillShadeShape, // Shade from tqshape outline to end point + FillShadeShape, // Shade from shape outline to end point FillShadeScale, // Similar to msofillShade, but the fillAngle FillShadeTitle, // special type - shade to title --- for PP FillBackground // Use the background fill color/pattern @@ -2385,9 +2385,9 @@ public: int ruid() const; // rule ID void setRuid( int ruid ); int align() const; - void setAlign( int align );// tqalignment + void setAlign( int align );// alignment int cProxies() const; - void setCProxies( int cProxies );// number of tqshapes governed by rule + void setCProxies( int cProxies );// number of shapes governed by rule void setData( unsigned size, const unsigned char* data ); const char* name(){ return "msofbtAlignRuleAtom "; } diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp index 23b61d30..b0a44e56 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.cpp +++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp @@ -216,13 +216,13 @@ UString UString::null; static char *statBuffer = 0L; UChar::UChar(const UCharReference &c) - : uc( c.tqunicode() ) + : uc( c.unicode() ) { } UChar UChar::toLower() const { - // ### properly support tqunicode tolower + // ### properly support unicode tolower if (uc >= 256 || islower(uc)) return *this; @@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2) l++; } if (l < lmin) - return (c1->tqunicode() < c2->tqunicode()); + return (c1->unicode() < c2->unicode()); return (l1 < l2); } diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h index c0e34cf4..52a43afe 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.h +++ b/filters/kpresenter/powerpoint/libppt/ustring.h @@ -71,7 +71,7 @@ namespace Libppt { /** * @return the 16 bit Unicode value of the character */ - unsigned short tqunicode() const { return uc; } + unsigned short unicode() const { return uc; } public: /** * @return The character converted to lower case. @@ -128,7 +128,7 @@ namespace Libppt { /** * @return Unicode value. */ - unsigned short tqunicode() const { return ref().tqunicode(); } + unsigned short unicode() const { return ref().unicode(); } /** * @return Lower byte. */ diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc index 990d12cd..9eae5cd8 100644 --- a/filters/kpresenter/svg/svgexport.cc +++ b/filters/kpresenter/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h index eafdd792..17e3d79f 100644 --- a/filters/kpresenter/svg/svgexport.h +++ b/filters/kpresenter/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc index a75cccac..5b88d11c 100644 --- a/filters/kspread/applixspread/applixspreadimport.cc +++ b/filters/kspread/applixspread/applixspreadimport.cc @@ -55,7 +55,7 @@ TQString APPLIXSPREADImport::nextLine( TQTextStream & stream ) return s; } -KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-applixspread") @@ -390,7 +390,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, //kdDebug()<< " Type (%2d) >%s< ", // nn, (*it).latin1() ); nn++; - // Grep horizontal tqalignment + // Grep horizontal alignment if ( (*it) == "1") { kdDebug()<< " = left align\n"; @@ -407,7 +407,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, align = 2; // center } - // Grep verticale tqalignment + // Grep verticale alignment else if ( (*it) == "VT") { kdDebug()<<" = top valign\n"; @@ -1268,7 +1268,7 @@ APPLIXSPREADImport::readHeader (TQTextStream &stream) TQMessageBox::critical (0L, "Applix spreadsheet header problem", TQString ("The Applix Spreadsheet header is not correct. " "May be it is not an applix spreadsheet file!
" - "This is the header line I did read:
%1").tqarg(mystr.latin1()), + "This is the header line I did read:
%1").arg(mystr.latin1()), "Okay"); diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h index 78deb2ca..15decadc 100644 --- a/filters/kspread/applixspread/applixspreadimport.h +++ b/filters/kspread/applixspread/applixspreadimport.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ public: APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~APPLIXSPREADImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQString nextLine (TQTextStream &); diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html index 968bf333..c944ef5c 100644 --- a/filters/kspread/applixspread/status.html +++ b/filters/kspread/applixspread/status.html @@ -53,7 +53,7 @@ - tests the headline of the document
- converts <, >, &, to &lt; &gt; &amp;
- converts all applix special characters
- - converts fontsize, fontcolor, horizontal and vertical tqalignment, bold, italic, underline
+ - converts fontsize, fontcolor, horizontal and vertical alignment, bold, italic, underline
- eats long text strings (more than one row in inputfile)
- converts different tables inside of one document
- cellformat: background color, brushstyles, brushcolor
@@ -352,43 +352,43 @@ 6.1.1. Part 1 - Alignment format
- This is the tqalignment format for vertical, horizontal tqalignment
+ This is the alignment format for vertical, horizontal alignment
- + - + - + - + - + - + @@ -402,7 +402,7 @@ 6.1.2. Part 2 - Text format
- This is the tqalignment format for the text
+ This is the alignment format for the text
6.1.1.1   1horizontal tqalignmenthorizontal alignment left
6.1.1.2   2horizontal tqalignmenthorizontal alignment right
6.1.1.3   3horizontal tqalignmenthorizontal alignment center
6.1.1.4   VTvertical tqalignmentvertical alignment top
6.1.1.5   VCvertical tqalignmentvertical alignment center
6.1.1.5   VBvertical tqalignmentvertical alignment bottom
@@ -441,7 +441,7 @@ 6.1.3. Part 3 - Cell format
- This is the tqalignment format for the text
+ This is the alignment format for the text
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 17e9cc65..3ea3f967 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -27,11 +27,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include @@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); m_formatList << i18n( "Text" ); @@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* fillTable(); - //resize(tqsizeHint()); + //resize(sizeHint()); resize( 600, 400 ); // Try to show as much as possible of the table view setMainWidget(m_dialog); @@ -613,7 +613,7 @@ TQTextCodec* CSVDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index 9961d218..b37d1c8f 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -118,7 +118,7 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row, // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus CSVExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30501) << "CSVExport::convert" << endl; KoDocument* document = m_chain->inputDocument(); diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h index decdb81c..ebc8a861 100644 --- a/filters/kspread/csv/csvexport.h +++ b/filters/kspread/csv/csvexport.h @@ -38,7 +38,7 @@ class CSVExport : public KoFilter CSVExport(KoFilter * parent, const char * name, const TQStringList &); virtual ~CSVExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to ); + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: TQString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, TQChar const & textQuote, TQChar delimiter ); diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index a4ef1347..e0a4db8c 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -33,9 +33,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include @@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -306,7 +306,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index cd93017b..e9852c61 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -57,7 +57,7 @@ CSVFilter::CSVFilter(KoFilter *, const char*, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) { TQString file( m_chain->inputFile() ); KoDocument* document = m_chain->outputDocument(); diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h index df14a756..c68ecffb 100644 --- a/filters/kspread/csv/csvimport.h +++ b/filters/kspread/csv/csvimport.h @@ -31,6 +31,6 @@ public: CSVFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~CSVFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // CSVFILTER_H diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 8c3a72cf..f8960f4b 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -66,7 +66,7 @@ - tqlayout3 + layout3 @@ -104,7 +104,7 @@ Expanding - + 106 20 @@ -123,7 +123,7 @@ Expanding - + 20 60 @@ -223,7 +223,7 @@ 0 - + 30 32767 @@ -313,7 +313,7 @@ Expanding - + 51 21 @@ -330,7 +330,7 @@ Expanding - + 51 21 @@ -379,7 +379,7 @@ AutoText - + WordBreak|AlignCenter @@ -428,7 +428,7 @@ AutoText - + WordBreak|AlignCenter @@ -472,7 +472,7 @@ Expanding - + 468 20 @@ -489,7 +489,7 @@ Expanding - + 468 20 @@ -506,7 +506,7 @@ Expanding - + 611 20 @@ -523,7 +523,7 @@ Expanding - + 71 20 diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 45eb6914..f6a552e1 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -47,7 +47,7 @@ - tqlayout3 + layout3 @@ -85,7 +85,7 @@ Expanding - + 106 20 @@ -156,7 +156,7 @@ Expanding - + 20 96 @@ -254,7 +254,7 @@ <SHEETNAME> gets replaced by the name of the next sheet. - + WordBreak|AlignVCenter @@ -375,7 +375,7 @@ 0 - + 30 32767 @@ -469,7 +469,7 @@ Expanding - + 0 81 diff --git a/filters/kspread/csv/xmltree.h b/filters/kspread/csv/xmltree.h index 247af4e5..1eede0dc 100644 --- a/filters/kspread/csv/xmltree.h +++ b/filters/kspread/csv/xmltree.h @@ -22,7 +22,7 @@ #include #include -#include +#include class XMLTree { diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp index acc1e27d..2c8ba3b8 100644 --- a/filters/kspread/dbase/dbase.cpp +++ b/filters/kspread/dbase/dbase.cpp @@ -165,7 +165,7 @@ bool DBase::load( const TQString& filename ) } // set the index to the first record - m_stream.tqdevice()->at( m_headerLength ); + m_stream.device()->at( m_headerLength ); return true; } @@ -184,7 +184,7 @@ TQStringList DBase::readRecord( unsigned recno ) // seek to where the record is unsigned filepos = m_headerLength + recno * m_recordLength; - m_stream.tqdevice()->at( filepos ); + m_stream.device()->at( filepos ); // first char == '*' means the record is deleted // so we just skip it diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc index bcbc98b8..6121baaf 100644 --- a/filters/kspread/dbase/dbaseimport.cc +++ b/filters/kspread/dbase/dbaseimport.cc @@ -48,7 +48,7 @@ DBaseImport::DBaseImport ( TQObject*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-dbase") return KoFilter::NotImplemented; diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h index 39a0ac0e..293bda21 100644 --- a/filters/kspread/dbase/dbaseimport.h +++ b/filters/kspread/dbase/dbaseimport.h @@ -33,7 +33,7 @@ public: DBaseImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~DBaseImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __DBASEIMPORT_H diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc index 2e2c50e7..0ecf41f7 100644 --- a/filters/kspread/excel/excelexport.cc +++ b/filters/kspread/excel/excelexport.cc @@ -13,7 +13,7 @@ ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilt } -KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { +KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { // Double check that's we really what we want to do if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") { kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl; @@ -28,37 +28,37 @@ KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const T /* -KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { return KoFilter::OK; } */ diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h index 029cdac1..e4b6b499 100644 --- a/filters/kspread/excel/excelexport.h +++ b/filters/kspread/excel/excelexport.h @@ -16,20 +16,20 @@ public: ExcelExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~ExcelExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; class ExcelWorker : public KSpreadBaseWorker { public: // Implement those - //KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc index f1bade9e..75ee412a 100644 --- a/filters/kspread/excel/import/excelimport.cc +++ b/filters/kspread/excel/import/excelimport.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -107,7 +107,7 @@ ExcelImport::~ExcelImport() delete d; } -KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/msexcel" ) return KoFilter::NotImplemented; @@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() ); xmlWriter->addAttribute( "table:print", "false" ); xmlWriter->addAttribute( "table:protected", "false" ); - xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex)); + xmlWriter->addAttribute( "table:style-name", TQString("ta%1").arg(sheetFormatIndex)); sheetFormatIndex++; unsigned ci = 0; @@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table" ); xmlWriter->addAttribute( "style:master-page-name", "Default" ); - xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("ta%1").arg(sheetFormatIndex) ); sheetFormatIndex++; xmlWriter->startElement( "style:table-properties" ); @@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX xmlWriter->addAttribute( "table:default-style-name", "Default" ); xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" ); if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat ); - xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) ); + xmlWriter->addAttribute( "table:style-name", TQString("co%1").arg(columnFormatIndex) ); columnFormatIndex++; xmlWriter->endElement(); // table:table-column @@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/ xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-column" ); - xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("co%1").arg(columnFormatIndex) ); columnFormatIndex++; xmlWriter->startElement( "style:table-column-properties" ); xmlWriter->addAttribute( "fo:break-before", "auto" ); - xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) ); + xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) ); xmlWriter->endElement(); // style:table-column-properties xmlWriter->endElement(); // style:style @@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri xmlWriter->startElement( "table:table-row" ); xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" ); - xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) ); + xmlWriter->addAttribute( "table:style-name", TQString("ro%1").arg(rowFormatIndex) ); rowFormatIndex++; for( int i = 0; i <= lastCol; i++ ) @@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-row" ); if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat ); - xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("ro%1").arg(rowFormatIndex) ); rowFormatIndex++; xmlWriter->startElement( "style:table-row-properties" ); xmlWriter->addAttribute( "fo:break-before", "auto" ); - xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) ); + xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) ); xmlWriter->endElement(); // style:table-row-properties xmlWriter->endElement(); // style:style @@ -703,7 +703,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit const UString& valueFormat = format.valueFormat(); if( !valueFormat.isEmpty() ) { - refName = TQString("N%1").tqarg(cell->formatIndex()); + refName = TQString("N%1").arg(cell->formatIndex()); TQString numformat = string( valueFormat ).string(); processValueFormat( numformat, refName, xmlWriter ); } @@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit // now the real table-cell xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-cell" ); - xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) ); + xmlWriter->addAttribute( "style:name", TQString("ce%1").arg( cell->formatIndex() ) ); if( !refName.isEmpty() ) xmlWriter->addAttribute( "style:data-style-name", refName ); @@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml if( !xmlWriter ) return; const FormatFont& font = format->font(); - const FormatAlignment& align = format->tqalignment(); + const FormatAlignment& align = format->alignment(); const FormatBackground& back = format->background(); const FormatBorders& borders = format->borders(); @@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml if( !font.fontFamily().isEmpty() ) xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() ); - xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) ); + xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").arg(font.fontSize()) ); xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) ); diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h index 5b733733..84729b4d 100644 --- a/filters/kspread/excel/import/excelimport.h +++ b/filters/kspread/excel/import/excelimport.h @@ -35,7 +35,7 @@ public: ExcelImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~ExcelImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 8155bca5..2a3a6247 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode ) class EString::Private { public: - bool tqunicode; + bool unicode; bool richText; UString str; unsigned size; @@ -194,7 +194,7 @@ public: EString::EString() { d = new EString::Private(); - d->tqunicode = false; + d->unicode = false; d->richText = false; d->str = UString::null; d->size = 0; @@ -208,7 +208,7 @@ EString::EString( const EString& es ) EString& EString::operator=( const EString& es ) { - d->tqunicode = es.d->tqunicode; + d->unicode = es.d->unicode; d->richText = es.d->richText; d->size = es.d->size; d->str = es.d->str; @@ -220,14 +220,14 @@ EString::~EString() delete d; } -bool EString::tqunicode() const +bool EString::unicode() const { - return d->tqunicode; + return d->unicode; } void EString::setUnicode( bool u ) { - d->tqunicode = u; + d->unicode = u; } bool EString::richText() const @@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* unsigned char flag = data[ offset ]; offset++; // for flag (1 byte) - bool tqunicode = flag & 0x01; + bool unicode = flag & 0x01; bool richText = flag & 0x08; unsigned formatRuns = 0; @@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* // find out total bytes used in this string unsigned size = offset + len; // string data - if( tqunicode ) size += len; // because tqunicode takes 2-bytes char + if( unicode ) size += len; // because unicode takes 2-bytes char if( richText ) size += (formatRuns*4); - if( !tqunicode ) + if( !unicode ) { char* buffer = new char[ len+1 ]; memcpy( buffer, data + offset, len ); @@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* } EString result; - result.setUnicode( tqunicode ); + result.setUnicode( unicode ); result.setRichText( richText ); result.setSize( size ); result.setStr( str ); @@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize ) unsigned len = data[0]; unsigned flag = data[1]; - bool tqunicode = flag & 1; + bool unicode = flag & 1; if( len > datasize-2 ) len = datasize-2; if( len == 0 ) return EString(); unsigned offset = 2; - if( !tqunicode ) + if( !unicode ) { char* buffer = new char[ len+1 ]; memcpy( buffer, data + offset, len ); @@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize ) } EString result; - result.setUnicode( tqunicode ); + result.setUnicode( unicode ); result.setRichText( richText ); result.setSize( datasize ); result.setStr( str ); @@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data ) d->visibility = data[4]; d->type = data[5]; - /* FIXME: it turned out that sheet name is not normal tqunicode string + /* FIXME: it turned out that sheet name is not normal unicode string where the first two bytes specifies string length, but instead only the first specifies it. the next byte could be correctly interpreted as flag. @@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename ) format.setFont( convertFont( xf.fontIndex() ) ); - FormatAlignment tqalignment; + FormatAlignment alignment; switch( xf.horizontalAlignment() ) { case XFRecord::Left: - tqalignment.setAlignX( Format::Left ); break; + alignment.setAlignX( Format::Left ); break; case XFRecord::Right: - tqalignment.setAlignX( Format::Right ); break; + alignment.setAlignX( Format::Right ); break; case XFRecord::Centered: - tqalignment.setAlignX( Format::Center ); break; + alignment.setAlignX( Format::Center ); break; default: break; // FIXME still unsupported: Repeat, Justified, Filled, Distributed }; switch( xf.verticalAlignment() ) { case XFRecord::Top: - tqalignment.setAlignY( Format::Top ); break; + alignment.setAlignY( Format::Top ); break; case XFRecord::VCentered: - tqalignment.setAlignY( Format::Middle ); break; + alignment.setAlignY( Format::Middle ); break; case XFRecord::Bottom: - tqalignment.setAlignY( Format::Bottom ); break; + alignment.setAlignY( Format::Bottom ); break; default: break; // FIXME still unsupported: Justified, Distributed } - tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + alignment.setWrap( xf.textWrap() ); + format.setAlignment( alignment ); FormatBorders borders; @@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex ) format.setFont( convertFont( xf.fontIndex() ) ); - FormatAlignment tqalignment; + FormatAlignment alignment; switch( xf.horizontalAlignment() ) { case XFRecord::Left: - tqalignment.setAlignX( Format::Left ); break; + alignment.setAlignX( Format::Left ); break; case XFRecord::Right: - tqalignment.setAlignX( Format::Right ); break; + alignment.setAlignX( Format::Right ); break; case XFRecord::Centered: - tqalignment.setAlignX( Format::Center ); break; + alignment.setAlignX( Format::Center ); break; default: break; // FIXME still unsupported: Repeat, Justified, Filled, Distributed }; switch( xf.verticalAlignment() ) { case XFRecord::Top: - tqalignment.setAlignY( Format::Top ); break; + alignment.setAlignY( Format::Top ); break; case XFRecord::VCentered: - tqalignment.setAlignY( Format::Middle ); break; + alignment.setAlignY( Format::Middle ); break; case XFRecord::Bottom: - tqalignment.setAlignY( Format::Bottom ); break; + alignment.setAlignY( Format::Bottom ); break; default: break; // FIXME still unsupported: Justified, Distributed } - tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + alignment.setWrap( xf.textWrap() ); + format.setAlignment( alignment ); FormatBorders borders; diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index 8cbdfd53..5221b518 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 }; class Record; -// rich-text, tqunicode, far-east support Excel string +// rich-text, unicode, far-east support Excel string class EString { @@ -50,7 +50,7 @@ public: ~EString(); - bool tqunicode() const; + bool unicode() const; void setUnicode( bool u ); @@ -2805,17 +2805,17 @@ public: Distributed }; /** - * Gets the horizontal tqalignment, e.g Left. + * Gets the horizontal alignment, e.g Left. */ unsigned horizontalAlignment() const; /** - * Sets the horizontal tqalignment, e.g Left. + * Sets the horizontal alignment, e.g Left. */ void setHorizontalAlignment( unsigned ha ); /** - * Returns human-readable string representation of the horizontal tqalignment. + * Returns human-readable string representation of the horizontal alignment. For example, XFRecord::Left will return "Left". */ const char* horizontalAlignmentAsString() const; @@ -2828,21 +2828,21 @@ public: VDistributed = 4 }; /** - * Gets the vertical tqalignment, e.g Bottom. + * Gets the vertical alignment, e.g Bottom. * * \sa setVerticalAlignment */ unsigned verticalAlignment() const; /** - * Sets the vertical tqalignment, e.g Top. + * Sets the vertical alignment, e.g Top. * * \sa verticalAlignment */ void setVerticalAlignment( unsigned va ); /** - * Returns human-readable string representation of the vertical tqalignment. + * Returns human-readable string representation of the vertical alignment. For example, XFRecord::Top will return "Top". */ const char* verticalAlignmentAsString() const; diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp index 29481fd0..8ce69f24 100644 --- a/filters/kspread/excel/sidewinder/format.cpp +++ b/filters/kspread/excel/sidewinder/format.cpp @@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align ) return assign( align ); } -// assign from another tqalignment +// assign from another alignment FormatAlignment& FormatAlignment::assign( const FormatAlignment& align ) { d->null = align.isNull(); @@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun return assign( background ); } -// assign from another tqalignment +// assign from another alignment FormatBackground& FormatBackground::assign( const FormatBackground& background ) { d->null = background.isNull(); @@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border ) return assign( border ); } -// assign from another tqalignment +// assign from another alignment FormatBorders& FormatBorders::assign( const FormatBorders& border ) { d->null = border.isNull(); @@ -581,7 +581,7 @@ class Format::Private { public: FormatFont font; - FormatAlignment tqalignment; + FormatAlignment alignment; FormatBorders borders; FormatBackground background; UString valueFormat; @@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f ) Format& Format::assign( const Format& f ) { d->font = f.font(); - d->tqalignment = f.tqalignment(); + d->alignment = f.alignment(); d->borders = f.borders(); d->valueFormat = f.valueFormat(); d->background = f.background(); @@ -626,7 +626,7 @@ Format& Format::assign( const Format& f ) bool Format::isNull() const { - return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull(); + return d->font.isNull() && d->alignment.isNull() && d->borders.isNull(); } FormatFont& Format::font() const @@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font ) d->font = font; } -FormatAlignment& Format::tqalignment() const +FormatAlignment& Format::alignment() const { - return d->tqalignment; + return d->alignment; } -void Format::tqsetAlignment( const FormatAlignment& tqalignment ) +void Format::setAlignment( const FormatAlignment& alignment ) { - d->tqalignment = tqalignment; + d->alignment = alignment; } FormatBorders& Format::borders() const @@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat ) // merge f into current format Format& Format::apply( const Format& f ) { - if( !f.tqalignment().isNull() ) - tqalignment() = f.tqalignment(); + if( !f.alignment().isNull() ) + alignment() = f.alignment(); if( !f.font().isNull() ) font() = f.font(); if( !f.borders().isNull() ) @@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const { return d->font == format.d->font && - d->tqalignment == format.d->tqalignment && + d->alignment == format.d->alignment && d->borders == format.d->borders && d->background == format.d->background && d->valueFormat == format.d->valueFormat; @@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const { return d->font != format.d->font || - d->tqalignment != format.d->tqalignment || + d->alignment != format.d->alignment || d->borders != format.d->borders || d->background != format.d->background || d->valueFormat != format.d->valueFormat; diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h index dcadc1c2..acb566a5 100644 --- a/filters/kspread/excel/sidewinder/format.h +++ b/filters/kspread/excel/sidewinder/format.h @@ -266,9 +266,9 @@ private: /** - * Defines tqalignment information for cell format. + * Defines alignment information for cell format. * - * Class FormatAlignment defines the horizontal and vertical tqalignment + * Class FormatAlignment defines the horizontal and vertical alignment * for the text inside a cell. * */ @@ -278,37 +278,37 @@ class FormatAlignment public: /** - * Creates a default tqalignment information. + * Creates a default alignment information. */ FormatAlignment(); /** - * Destroys the tqalignment information + * Destroys the alignment information */ ~FormatAlignment(); /** - * Creates a copy of tqalignment information. + * Creates a copy of alignment information. */ FormatAlignment( const FormatAlignment& ); /** - * Assigns from another tqalignment information. + * Assigns from another alignment information. */ FormatAlignment& operator=( const FormatAlignment& ); /** - * Assigns from another tqalignment information. + * Assigns from another alignment information. */ FormatAlignment& assign( const FormatAlignment& ); /** - * Returns true if it is a default tqalignment information. + * Returns true if it is a default alignment information. */ bool isNull() const; /** - * Returns horizontal tqalignment. Possible values are + * Returns horizontal alignment. Possible values are * Format::Left, Format::Right and Format::Center. * * \sa setAlignX @@ -316,14 +316,14 @@ public: unsigned alignX() const; /** - * Sets the horizontal tqalignment. + * Sets the horizontal alignment. * * \sa alignX */ void setAlignX( unsigned xa ); /** - * Returns horizontal tqalignment. Possible values are + * Returns horizontal alignment. Possible values are * Format::Top, Format::Middle and Format::Bottom. * * \sa setAlignY @@ -331,7 +331,7 @@ public: unsigned alignY() const; /** - * Sets the horizontal tqalignment. + * Sets the horizontal alignment. * * \sa alignY */ @@ -380,12 +380,12 @@ public: void setRotationAngle( unsigned r ); /** - * Returns true if this tqalignment is equal to f; otherwise returns false. + * Returns true if this alignment is equal to f; otherwise returns false. */ bool operator==(const FormatAlignment& f) const; /** - * Returns true if this tqalignment is not equal to f; otherwise returns false. + * Returns true if this alignment is not equal to f; otherwise returns false. */ bool operator!=(const FormatAlignment& f) const; @@ -683,14 +683,14 @@ public: void setFont( const FormatFont& font ); /** - * Returns a constant reference to the tqalignment information of this format. + * Returns a constant reference to the alignment information of this format. */ - FormatAlignment& tqalignment() const; + FormatAlignment& alignment() const; /** - * Sets new tqalignment information for this format. + * Sets new alignment information for this format. */ - void tqsetAlignment( const FormatAlignment& tqalignment ); + void setAlignment( const FormatAlignment& alignment ); /** * Returns a reference to the borders information of this format. diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp index 38fe8cb5..e4090cd9 100644 --- a/filters/kspread/excel/sidewinder/pole.cpp +++ b/filters/kspread/excel/sidewinder/pole.cpp @@ -95,7 +95,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -116,7 +116,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector tqchildren( unsigned index ); + std::vector children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -509,11 +509,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j chi = tqchildren( j ); + std::vector chi = children( j ); for( unsigned i=0; i chi = tqchildren( index ); + // find among the children of index + std::vector chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -650,7 +650,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector& result, } } -std::vector DirTree::tqchildren( unsigned index ) +std::vector DirTree::children( unsigned index ) { std::vector result; @@ -1286,9 +1286,9 @@ std::list Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp index b26ee196..304fed18 100644 --- a/filters/kspread/excel/sidewinder/ustring.cpp +++ b/filters/kspread/excel/sidewinder/ustring.cpp @@ -39,7 +39,7 @@ UString UString::null; static char *statBuffer = 0L; UChar::UChar(const UCharReference &c) - : uc( c.tqunicode() ) + : uc( c.unicode() ) { } @@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2) l++; } if (l < lmin) - return (c1->tqunicode() < c2->tqunicode()); + return (c1->unicode() < c2->unicode()); return (l1 < l2); } diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h index 1c4f2bc5..3f41867b 100644 --- a/filters/kspread/excel/sidewinder/ustring.h +++ b/filters/kspread/excel/sidewinder/ustring.h @@ -68,7 +68,7 @@ namespace Swinder { /** * @return the 16 bit Unicode value of the character */ - unsigned short tqunicode() const { return uc; } + unsigned short unicode() const { return uc; } public: /** * A static instance of UChar(0). @@ -120,7 +120,7 @@ namespace Swinder { /** * @return Unicode value. */ - unsigned short tqunicode() const { return ref().uc; } + unsigned short unicode() const { return ref().uc; } /** * @return Lower byte. */ diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd index 04949083..7150f7e4 100644 --- a/filters/kspread/gnumeric/gnumeric.xsd +++ b/filters/kspread/gnumeric/gnumeric.xsd @@ -427,8 +427,8 @@ - - + + @@ -492,7 +492,7 @@ - + diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index cccfcc9f..f7416cc7 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc) TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow) { - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQDomElement cell_style; @@ -938,7 +938,7 @@ void GNUMERICExport::addSummaryItem(TQDomDocument gnumeric_doc, TQDomElement sum // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) { kdDebug(30521) << "Exporting GNUmeric" << endl; @@ -1443,7 +1443,7 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con // cellComment = gnumeric_doc.createElement("gmr:CellComment"); cellComment.setAttribute( "Text", cell->format()->comment( currentcolumn, currentrow ) ); - TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow ); + TQString sCell=TQString( "%1%2" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow ); cellComment.setAttribute("ObjectBound", sCell ); objects.appendChild(cellComment); diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h index 392f0f72..0b2b0324 100644 --- a/filters/kspread/gnumeric/gnumericexport.h +++ b/filters/kspread/gnumeric/gnumericexport.h @@ -37,7 +37,7 @@ public: GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~GNUMERICExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: TQDomElement GetCellStyle(TQDomDocument gnumeric_doc, KSpread::Cell* cell, int currentcolumn, int currentrow); diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index 249258b3..b0833e87 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -1822,7 +1822,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) */ -KoFilter::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) { dateInit(); bool bSuccess=true; diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h index b7fbd4bd..c449a599 100644 --- a/filters/kspread/gnumeric/gnumericimport.h +++ b/filters/kspread/gnumeric/gnumericimport.h @@ -39,7 +39,7 @@ class GNUMERICFilter : public KoFilter GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GNUMERICFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal}; private: diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index 7bd198cc..a25cdf4b 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -211,7 +211,7 @@ Bold
Cell Size:Qt::Horizontal &Qt::Vertical
Hidden columns/rows 
Selected Tab -
Paper tqlayout +
Paper layout
area name
Cell comment
Text Rotation diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc index 72dd6875..aa9366bf 100644 --- a/filters/kspread/html/exportdialog.cc +++ b/filters/kspread/html/exportdialog.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name ) m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) ); m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) ); - m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) ); + m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) ); m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly ); diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index df5dcc90..1b6ad59b 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -56,7 +56,7 @@ Expanding - + 40 20 @@ -86,7 +86,7 @@ - tqlayout7 + layout7 @@ -124,7 +124,7 @@ Expanding - + 330 20 @@ -222,7 +222,7 @@ - tqlayout4 + layout4 @@ -271,7 +271,7 @@ Expanding - + 16 20 @@ -292,7 +292,7 @@ Expanding - + 20 16 diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc index 54711d8d..93991ad0 100644 --- a/filters/kspread/html/htmlexport.cc +++ b/filters/kspread/html/htmlexport.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -76,7 +76,7 @@ const TQString strGt (">"); // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if(to!="text/html" || from!="application/x-kspread") { @@ -186,7 +186,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str ) str += "\n"; str += "\n"; str += "\n").tqarg( m_dialog->encoding()->mimeName() ); + str += TQString("content=\"text/html; charset=%1\">\n").arg( m_dialog->encoding()->mimeName() ); str += "" + title + "\n"; str += "\n"; - str += TQString("\n").tqarg( + str += TQString("\n").arg( sheet->isRightToLeft()?"rtl":"ltr"); str += "\n"; @@ -234,8 +234,8 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int int step=iMaxRow > 50 ? iMaxRow/50 : 1; int i=1; - str += "<" + html_table_tag + html_table_options.tqarg( m_dialog->useBorders() ? "1" : "0" ).tqarg( m_dialog->pixelsBetweenCells() ) + - TQString("dir=\"%1\">\n").tqarg(sheet->isRightToLeft()?"rtl":"ltr"); + str += "<" + html_table_tag + html_table_options.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) + + TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr"); unsigned int nonempty_cells_prev=0; @@ -297,7 +297,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int #endif line += " <" + html_cell_tag + html_cell_options; if (text.isRightToLeft() != sheet->isRightToLeft()) - line += TQString(" dir=\"%1\" ").tqarg(text.isRightToLeft()?"rtl":"ltr"); + line += TQString(" dir=\"%1\" ").arg(text.isRightToLeft()?"rtl":"ltr"); if (bgcolor.isValid() && bgcolor.name()!="#ffffff") // change color only for non-white cells line += " bgcolor=\"" + bgcolor.name() + "\""; diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h index 09f904d3..c7007157 100644 --- a/filters/kspread/html/htmlexport.h +++ b/filters/kspread/html/htmlexport.h @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~HTMLExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: /** Writes the top of the page in HTML to @par str */ void openPage( KSpread::Sheet *sheet,KoDocument *document, TQString &str); diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index 15e8ee2a..ac725982 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport() //============================================================================= -KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) { TQPtrList objects; TQString file( m_chain->inputFile() ); diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index aec65889..4de3e704 100644 --- a/filters/kspread/kexi/kspread_kexiimport.h +++ b/filters/kspread/kexi/kspread_kexiimport.h @@ -76,7 +76,7 @@ class KSpreadKexiImport : public KoFilter */ virtual ~KSpreadKexiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: KSpread::Doc *ksdoc; diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 9ddf240f..f99b76a3 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index d9d28d55..fad0e0be 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -35,7 +35,7 @@ - tqlayout5 + layout5 @@ -110,7 +110,7 @@ - tqlayout8 + layout8 @@ -180,7 +180,7 @@ - tqlayout4 + layout4 @@ -196,7 +196,7 @@ Expanding - + 145 0 diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h index 6e35bd1c..969d021d 100644 --- a/filters/kspread/latex/export/config.h +++ b/filters/kspread/latex/export/config.h @@ -22,7 +22,7 @@ #ifndef __LATEX_CONFIG_H__ #define __LATEX_CONFIG_H__ -#include +#include #include /***********************************************************************/ @@ -84,8 +84,8 @@ class Config bool convertPictures() const { return _convertPictures; } TQString getPicturesDir() const { return _picturesDir; } - bool mustUseUnicode() const { return (_encoding == "tqunicode"); } - bool mustUseLatin1() const { return (_encoding != "tqunicode"); } + bool mustUseUnicode() const { return (_encoding == "unicode"); } + bool mustUseLatin1() const { return (_encoding != "unicode"); } TQString getEncoding() const { return _encoding; } TQStringList getLanguagesList() const { return _languagesList; } TQString getDefaultLanguage() const { return _defaultLanguage; } diff --git a/filters/kspread/latex/export/document.h b/filters/kspread/latex/export/document.h index b8f0296c..733310bc 100644 --- a/filters/kspread/latex/export/document.h +++ b/filters/kspread/latex/export/document.h @@ -24,7 +24,7 @@ #define __KSPREAD_LATEX_DOCUMENT_H__ #include /* for TQFile class */ -#include /* for TQTextStream class */ +#include /* for TQTextStream class */ #include /* for TQString class */ #include "xmlparser.h" diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc index 8ee9eee0..07b1fbe4 100644 --- a/filters/kspread/latex/export/fileheader.cc +++ b/filters/kspread/latex/export/fileheader.cc @@ -79,7 +79,7 @@ void FileHeader::analysePaper(const TQDomNode balise) analysePaperParam(balise); //setTokenCurrent(balise_initiale->pContent); - // Analyse tqchildren markups --> PAPERBORDERS + // Analyse children markups --> PAPERBORDERS TQDomNode fils = getChild(balise, "PAPERSBORDERS"); _leftBorder = getAttr(fils, "left").toInt(); _rightBorder = getAttr(fils, "right").toInt(); @@ -282,7 +282,7 @@ void FileHeader::generatePackage(TQTextStream &out) if(Config::instance()->mustUseUnicode()) out << "\\usepackage{omega}" << endl; if(getFormat() == TF_A4) - out << "\\usepackage[a4paper]{tqgeometry}" << endl; + out << "\\usepackage[a4paper]{geometry}" << endl; if(hasFooter() || hasHeader()) out << "\\usepackage{fancyhdr}" << endl; if(hasColor()) diff --git a/filters/kspread/latex/export/fileheader.h b/filters/kspread/latex/export/fileheader.h index 5c4e7774..1d9b6025 100644 --- a/filters/kspread/latex/export/fileheader.h +++ b/filters/kspread/latex/export/fileheader.h @@ -22,7 +22,7 @@ #ifndef __KSPREAD_LATEX_FILEHEADER_H__ #define __KSPREAD_LATEX_FILEHEADER_H__ -#include +#include #include "xmlparser.h" diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h index 7025c371..9b03a258 100644 --- a/filters/kspread/latex/export/format.h +++ b/filters/kspread/latex/export/format.h @@ -23,7 +23,7 @@ #ifndef __KSPREAD_LATEX_FORMAT_H__ #define __KSPREAD_LATEX_FORMAT_H__ -#include +#include #include #include #include "xmlparser.h" diff --git a/filters/kspread/latex/export/formula.h b/filters/kspread/latex/export/formula.h index 03ba4bd6..b023cdf6 100644 --- a/filters/kspread/latex/export/formula.h +++ b/filters/kspread/latex/export/formula.h @@ -25,7 +25,7 @@ #include "element.h" #include -#include +#include /***********************************************************************/ /* Class: Formula */ diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index a7f03f60..7a058550 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare TQString value; while(i < 10) { - /*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) ); + /*value = _config->readPathEntry( TQString("Recent%1").arg(i) ); kdDebug(30522) << "recent : " << value << endl; if(!value.isEmpty()) { @@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare classComboBox->insertItem("report"); classComboBox->insertItem("slides"); - encodingComboBox->insertItem("tqunicode"); + encodingComboBox->insertItem("unicode"); encodingComboBox->insertItem("ansinew"); encodingComboBox->insertItem("applemac"); encodingComboBox->insertItem("ascii"); diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc index 66927728..c1cdd389 100644 --- a/filters/kspread/latex/export/latexexport.cc +++ b/filters/kspread/latex/export/latexexport.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "kspreadlatexexportdiaImpl.h" typedef KGenericFactory LATEXExportFactory; @@ -35,7 +35,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h index e7c0312b..4d34e0f0 100644 --- a/filters/kspread/latex/export/latexexport.h +++ b/filters/kspread/latex/export/latexexport.h @@ -21,7 +21,7 @@ #define __LATEXEXPORT_H__ #include -#include +#include #include #include @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 8c3835ed..741a9c7e 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ Expanding - + 20 0 diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc index a2256d5e..886f6c11 100644 --- a/filters/kspread/latex/export/map.cc +++ b/filters/kspread/latex/export/map.cc @@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise) /* Analyse of the parameters */ kdDebug(30522) << "ANALYSE A MAP" << endl; - /* Analyse of the tqchildren markups */ + /* Analyse of the children markups */ for(int index = 0; index < getNbChild(balise); index++) { // Only tables diff --git a/filters/kspread/latex/export/pen.h b/filters/kspread/latex/export/pen.h index 49da17e0..54792205 100644 --- a/filters/kspread/latex/export/pen.h +++ b/filters/kspread/latex/export/pen.h @@ -23,7 +23,7 @@ #ifndef __KSPREAD_LATEX_PEN_H__ #define __KSPREAD_LATEX_PEN_H__ -#include +#include #include #include #include "xmlparser.h" diff --git a/filters/kspread/latex/export/spreadsheet.h b/filters/kspread/latex/export/spreadsheet.h index 03984105..dfc2f092 100644 --- a/filters/kspread/latex/export/spreadsheet.h +++ b/filters/kspread/latex/export/spreadsheet.h @@ -23,7 +23,7 @@ #define __KSPREAD_LATEX_SPREADSHEET_H__ #include -#include +#include #include "map.h" #include "config.h" diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc index 6b85f243..fb2c8e1f 100644 --- a/filters/kspread/latex/export/xmlparser.cc +++ b/filters/kspread/latex/export/xmlparser.cc @@ -89,18 +89,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name) TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index) { if(balise.isElement()) { - TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.toElement().elementsByTagName(name); + if ( children.count() ) + return children.item(index); } return TQDomNode(); } TQDomNode XmlParser::getChild(TQDomNode balise, int index) { - TQDomNodeList tqchildren = balise.childNodes(); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.childNodes(); + if ( children.count() ) + return children.item(index); return TQDomNode(); } diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc index ba56c229..cc7b2b46 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc @@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() { } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startDocument: " << it.key() << "->" << it.data() << endl; @@ -40,7 +40,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterPrope } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoLog: " << it.key() << "->" << it.data() << endl; @@ -49,7 +49,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProper } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAuthor: " << it.key() << "->" << it.data() << endl; @@ -58,7 +58,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAbout: " << it.key() << "->" << it.data() << endl; @@ -67,7 +67,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProp } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadBook: " << it.key() << "->" << it.data() << endl; @@ -76,7 +76,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadSheet: " << it.key() << "->" << it.data() << endl; @@ -85,7 +85,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterPr } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadCell: " << it.key() << "->" << it.data() << endl; diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h index 4ba82383..13b3d380 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h @@ -33,13 +33,13 @@ public: KSpreadBaseWorker(); virtual ~KSpreadBaseWorker(); - virtual KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif /* KSPREAD_BASE_WORKER_H */ diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc index 9ba2d874..b1b9a0aa 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.cc +++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc @@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) { } -KoFilter::ConversiontqStatus Leader::convert() { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::convert() { + KoFilter::ConversionStatus status; // Validate the filter chain and the worker if (!m_filterChain) { @@ -122,8 +122,8 @@ KoFilter::ConversiontqStatus Leader::convert() { } -KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) { + KoFilter::ConversionStatus status; #if 0 // this was never used, it's been removed now // Gather data about the document log @@ -164,7 +164,7 @@ KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { } -KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { +KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) { KSpreadFilterProperty docSpreadBookProperty; docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count()); docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol(); @@ -216,7 +216,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { } -KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { +KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { KSpreadFilterProperty docSpreadSheetProperty; docSpreadSheetProperty["name"] = spreadSheet->tableName(); docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX()); @@ -257,7 +257,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { } -KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { +KoFilter::ConversionStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { KSpreadFilterProperty docSpreadCellProperty; docSpreadCellProperty["column"] = TQString::number(column); docSpreadCellProperty["row"] = TQString::number(row); diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.h b/filters/kspread/libkspreadexport/KSpreadLeader.h index 7e9abfed..eee950b9 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.h +++ b/filters/kspread/libkspreadexport/KSpreadLeader.h @@ -78,10 +78,10 @@ private: protected: KSpreadBaseWorker *getWorker() const; - KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row); - KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet); - KoFilter::ConversiontqStatus doSpreadBook(Doc *document); - KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info); + KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row); + KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet); + KoFilter::ConversionStatus doSpreadBook(Doc *document); + KoFilter::ConversionStatus doInfo(KoDocumentInfo *info); public: /** @@ -97,7 +97,7 @@ public: * * @return status of the conversion. */ - KoFilter::ConversiontqStatus convert(); + KoFilter::ConversionStatus convert(); }; } // namespace KSpread diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index 9e37597c..ce1a55ad 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & ) { } -KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, +KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from, const TQCString & to ) { /* later... @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, OpenCalcWorker * worker = new OpenCalcWorker(); leader->setWorker( worker ); - KoFilter::ConversiontqStatus status = leader->convert(); + KoFilter::ConversionStatus status = leader->convert(); delete worker; delete leader; @@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc ) data.appendChild( meta.createTextNode( aboutPage->subject() ) ); officeMeta.appendChild( data ); - const TQDateTime dt ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dt ( TQDateTime::currentDateTime() ); if ( dt.isValid() ) { data = meta.createElement( "dc:date" ); @@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement & TQDomElement style = doc.createElement( "style:properties" ); style.setAttribute( "style:font-name", font.family() ); - style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) ); + style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) ); style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) ); style.setAttribute( "fo:language", language ); style.setAttribute( "fo:country", country ); @@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a height = sheet->print()->paperHeight() / 10; } - TQString sWidth = TQString( "%1cm" ).tqarg( width ); - TQString sHeight = TQString( "%1cm" ).tqarg( height ); + TQString sWidth = TQString( "%1cm" ).arg( width ); + TQString sHeight = TQString( "%1cm" ).arg( height ); TQDomElement pageMaster = doc.createElement( "style:page-master" ); pageMaster.setAttribute( "style:name", "pm1" ); @@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, TQDomElement t = doc.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" - t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) ); + t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); } else if ( var == "
Jan 12, 2003 - Initial Revision
- Jan 18, 2003 - page tqlayout, header, footer
+ Jan 18, 2003 - page layout, header, footer
Jan 19, 2003 - Added support for fonts, text color, background color, formula conversion
- Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells
+ Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells
Jan 19, 2003 - angle, vertical text, text wrap
Jan 19, 2003 - named area, hidden columns and rows
Jan 20, 2003 - cell borders
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index 9a0db4fa..920d20a7 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult) } } -KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to ) { bool bSuccess=true; diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h index 1c3c7d85..e69d2a65 100644 --- a/filters/kspread/qpro/qproimport.h +++ b/filters/kspread/qpro/qproimport.h @@ -37,7 +37,7 @@ public: QpImport(KoFilter* parent, const char* name, const TQStringList&); virtual ~QpImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); void InitTableName(int pIdx, TQString& pResult); }; diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp index f8ad242c..f3b132db 100644 --- a/filters/kugar/kugarnop/kugarnopimport.cpp +++ b/filters/kugar/kugarnop/kugarnopimport.cpp @@ -31,7 +31,7 @@ KugarNOPImport::KugarNOPImport( KoFilter *, const char *, const TQStringList& ) { } -KoFilter::ConversiontqStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) +KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) { TQFile in( m_chain->inputFile()); diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h index 03085410..a7099bc4 100644 --- a/filters/kugar/kugarnop/kugarnopimport.h +++ b/filters/kugar/kugarnop/kugarnopimport.h @@ -28,7 +28,7 @@ class KugarNOPImport : public KoFilter public: KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& ); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc index dfba826d..5e875ecd 100644 --- a/filters/kword/abiword/ImportField.cc +++ b/filters/kword/abiword/ImportField.cc @@ -26,7 +26,7 @@ TQString getFootnoteFramesetName(const TQString& id) { - return i18n("Frameset name","Footnote %1").tqarg(id); + return i18n("Frameset name","Footnote %1").arg(id); } static void InsertTimeVariable(TQDomDocument& mainDocument, diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc index 1687e958..7c45f07a 100644 --- a/filters/kword/abiword/ImportFormatting.cc +++ b/filters/kword/abiword/ImportFormatting.cc @@ -208,7 +208,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, followingElement.setAttribute("name","Normal"); layoutElement.appendChild(followingElement); } - // Else: we are a tqlayout, so we leave the work to KWord (from the style) + // Else: we are a layout, so we leave the work to KWord (from the style) } else { diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc index 4f84a8e4..5a08cf0d 100644 --- a/filters/kword/abiword/ImportStyle.cc +++ b/filters/kword/abiword/ImportStyle.cc @@ -121,7 +121,7 @@ void StyleDataMap::defineDefaultStyles(void) defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt"); TQFontInfo fixedInfo(KGlobalSettings::fixedFont()); TQString strPlainText=TQString("font-family: %1") - .tqarg(fixedInfo.family()); // TODO: should be "Courier New" + .arg(fixedInfo.family()); // TODO: should be "Courier New" kdDebug(30506) << "Plain Text: " << strPlainText << endl; defineNewStyle("Plain Text",-1,strPlainText); // TODO: all list and numbered types diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 717611cd..d52fa1c8 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -84,7 +84,7 @@ public: virtual bool doCloseFile(void); // Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doOpenTextFrameSet(void); // AbiWord's
virtual bool doCloseTextFrameSet(void); // AbiWord's
@@ -95,7 +95,7 @@ public: virtual bool doCloseHead(void); // Write virtual bool doOpenStyles(void); // AbiWord's virtual bool doCloseStyles(void); // AbiWord's - virtual bool doFullDefineStyle(LayoutData& tqlayout); // AbiWord's + virtual bool doFullDefineStyle(LayoutData& layout); // AbiWord's virtual bool doOpenSpellCheckIgnoreList (void); // AbiWord's virtual bool doCloseSpellCheckIgnoreList (void); // AbiWord's virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); // AbiWord's @@ -116,7 +116,7 @@ private: TQString textFormatToAbiProps(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force) const; TQString layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const; + const LayoutData& layout, const bool force) const; TQString escapeAbiWordText(const TQString& strText) const; bool makeTable(const FrameAnchor& anchor); bool makePicture(const FrameAnchor& anchor); @@ -649,7 +649,7 @@ void AbiWordWorker::processVariable ( const TQString&, TQString fstr; TQValueList::ConstIterator it; for (it=paraList->begin();it!=paraList->end();it++) - fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList); + fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList); str += "{\\super "; str += automatic ? "\\chftn " : value; str += "{\\footnote "; @@ -719,50 +719,50 @@ void AbiWordWorker::processParagraphData ( const TQString ¶Text, } TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const + const LayoutData& layout, const bool force) const { TQString props; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - // Check if the current tqalignment is a valid one for AbiWord. - if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right") - || (tqlayout.tqalignment == "center") || (tqlayout.tqalignment == "justify")) + // Check if the current alignment is a valid one for AbiWord. + if ((layout.alignment == "left") || (layout.alignment == "right") + || (layout.alignment == "center") || (layout.alignment == "justify")) { props += "text-align:"; - props += tqlayout.tqalignment; + props += layout.alignment; props += "; "; } - else if (tqlayout.tqalignment == "auto") + else if (layout.alignment == "auto") { - // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.) + // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.) props += "text-align:left; "; } else { - kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl; } } // TODO/FIXME: what if all tabulators must be erased? #if 0 // DEPRECATED! - if (!tqlayout.tabulator.isEmpty() - && (force || (layoutOrigin.tabulator!=tqlayout.tabulator))) + if (!layout.tabulator.isEmpty() + && (force || (layoutOrigin.tabulator!=layout.tabulator))) { props += "tabstops:"; - props += tqlayout.tabulator; + props += layout.tabulator; props += "; "; } #endif - if (!tqlayout.tabulatorList.isEmpty() - && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + if (!layout.tabulatorList.isEmpty() + && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) )) { props += "tabstops:"; bool first=true; TabulatorList::ConstIterator it; - TabulatorList::ConstIterator end(tqlayout.tabulatorList.end()); - for (it=tqlayout.tabulatorList.begin();it!=end;++it) + TabulatorList::ConstIterator end(layout.tabulatorList.end()); + for (it=layout.tabulatorList.begin();it!=end;++it) { if (first) { @@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, props += "; "; } - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { - props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); + props += TQString("margin-left:%1pt; ").arg(layout.indentLeft); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { - props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); + props += TQString("margin-right:%1pt; ").arg(layout.indentRight); } - if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=layout.indentLeft)) { props += "text-indent: "; - props += TQString::number(tqlayout.indentFirst); + props += TQString::number(layout.indentFirst); props += "pt; "; } - if ((tqlayout.marginBottom>=0.0) - && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + if ((layout.marginBottom>=0.0) + && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) ) { - props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); + props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom); } - if ((tqlayout.marginTop>=0.0) - && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) + if ((layout.marginTop>=0.0) + && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) ) { - props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); + props += TQString("margin-top:%1pt; ").arg(layout.marginTop); } if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - switch ( tqlayout.lineSpacingType ) + switch ( layout.lineSpacingType ) { case LayoutData::LS_CUSTOM: { // We have a custom line spacing (in points). However AbiWord cannot do it, so transform in "at-least" props += "line-height=:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt+; "; break; } @@ -852,7 +852,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, case LayoutData::LS_MULTIPLE: { props += "line-height:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "; "; break; } @@ -860,7 +860,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, { // We have a fixed line height (in points) props += "line-height:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt; "; break; } @@ -868,32 +868,32 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, { // We have an "at-least" line height (in points) props += "line-height=:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt+; "; // The + makes the difference break; } default: { - kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; break; } } } // Add all AbiWord properties collected in the element - props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force); + props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force); return props; } -bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, +bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { - TQString style=tqlayout.styleName; + TQString style=layout.styleName; const LayoutData& styleLayout=m_styleMap[style]; - TQString props=layoutToCss(styleLayout,tqlayout,false); + TQString props=layoutToCss(styleLayout,layout,false); *m_streamOut << ""; //Warning: No trailing white space or else it's in the text!!! // Before processing the text, test if we have a page break - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) { // We have a page break before the paragraph *m_streamOut << ""; } - processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList); + processParagraphData(paraText, layout.formatData.text, paraFormatDataList); // Before closing the paragraph, test if we have a page break - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) { // We have a page break after the paragraph *m_streamOut << ""; @@ -935,26 +935,26 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& return true; } -bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout) +bool AbiWordWorker::doFullDefineStyle(LayoutData& layout) { //Register style in the style map - m_styleMap[tqlayout.styleName]=tqlayout; + m_styleMap[layout.styleName]=layout; *m_streamOut << "=0) @@ -1041,7 +1041,7 @@ bool AbiWordWorker::doFullPaperFormat(const int format, } else { // We prefer to use inches, as to limit rounding errors (page size is in points!) - outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0); + outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").arg(width/72.0).arg(height/72.0); } break; } @@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) *m_streamOut << "\n"; - TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC + TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC *m_streamOut << "" << escapeAbiWordText(transformToTextDate(now)) << "\n"; @@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/x-abiword" || from != "application/x-kword" ) { @@ -1252,7 +1252,7 @@ KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, cons return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h index 550b7682..656283f8 100644 --- a/filters/kword/abiword/abiwordexport.h +++ b/filters/kword/abiword/abiwordexport.h @@ -47,6 +47,6 @@ public: ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~ABIWORDExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDEXPORT_H diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 4815d02c..2c7e4d3f 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler public: StructureParser(KoFilterChain* chain) : m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0), - m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false) + m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false) { createDocument(); structureStack.setAutoDelete(true); @@ -363,7 +363,7 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent, stackItem->stackElementFormatsPlural=formatsPluralElementOut; // stackItem->pos=0; // No text characters yet - // Now we populate the tqlayout + // Now we populate the layout TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); paragraphElementOut.appendChild(layoutElement); @@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu kdDebug(30506) << "Image: " << strDataId << endl; } - TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber)); + TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber)); // Create the frame set of the image @@ -817,7 +817,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent, TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS"); paragraphElementOut.appendChild(formatsPluralElementOut); - // We must now copy/clone the tqlayout of elementText. + // We must now copy/clone the layout of elementText. TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT"); @@ -1127,7 +1127,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu // ### TODO: in case of automatic column widths, we have not any width given by AbiWord const uint tableNumber(++m_tableGroupNumber); - const TQString tableName(i18n("Table %1").tqarg(tableNumber)); + const TQString tableName(i18n("Table %1").arg(tableNumber)); TQDomElement elementText=stackCurrent->stackElementText; TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH"); @@ -1159,7 +1159,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu stackItem->strTemp2=TQString::number(tableNumber); // needed as I18N does not allow adding phrases stackItem->pos=1; // Just # - // Now we populate the tqlayout + // Now we populate the layout TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); paragraphElementOut.appendChild(layoutElement); @@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur } const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2") - .tqarg(row).tqarg(col).tqarg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last! + .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last! // We need to create a frameset for the cell TQDomElement framesetElement(mainDocument.createElement("FRAMESET")); @@ -1638,8 +1638,8 @@ bool StructureParser::fatalError (const TQXmlParseException& exception) << " col " << exception.columnNumber() << " message: " << exception.message() << endl; m_fatalerror=true; KMessageBox::error(NULL, i18n("An error has occurred while parsing the AbiWord file.\nAt line: %1, column %2\nError message: %3") - .tqarg(exception.lineNumber()).tqarg(exception.columnNumber()) - .tqarg( i18n( "TQXml", exception.message().utf8() ) ), + .arg(exception.lineNumber()).arg(exception.columnNumber()) + .arg( i18n( "TQXml", exception.message().utf8() ) ), i18n("AbiWord Import Filter"),0); return false; // Stop parsing now, we do not need further errors. } @@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) { if ((to != "application/x-kword") || (from != "application/x-abiword")) return KoFilter::NotImplemented; @@ -1825,7 +1825,7 @@ KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, cons if (!handler.wasFatalError()) { // As the parsing was stopped for something else than a fatal error, we have not yet get an error message. (Can it really happen?) - KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()), + KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").arg(from.data()), i18n("AbiWord Import Filter"),0); } return KoFilter::ParsingError; diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h index 9ff4d764..8b8349b7 100644 --- a/filters/kword/abiword/abiwordimport.h +++ b/filters/kword/abiword/abiwordimport.h @@ -50,6 +50,6 @@ public: ABIWORDImport(); virtual ~ABIWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDIMPORT_H diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt index f795b56c..15f20037 100644 --- a/filters/kword/amipro/FileFormat.txt +++ b/filters/kword/amipro/FileFormat.txt @@ -43,9 +43,9 @@ Note: Word underline is just like underline, except that spaces between words are not underlined. Paragraph align is also encoded using tag, here it the list: - <+@> left tqalignment - <+A> right tqalignment - <+B> center tqalignment + <+@> left alignment + <+A> right alignment + <+B> center alignment <+C> justified Linespacing is encoded using tag: @@ -81,7 +81,7 @@ example below: 0 font color (see below) 16385 formatting flag (see below) [algn] - 4 tqalignment flag (see below) + 4 alignment flag (see below) 1 216 indent, 216/20 = 10.8 pt 144 first line indent, 144/20 = 7.2 pt @@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph. 5 Page Layout ------------- -Page tqlayout is defined in section [lay]. Here is the format, +Page layout is defined in section [lay]. Here is the format, along with an example: [lay] diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc index dd4550b8..22bc741e 100644 --- a/filters/kword/amipro/amiproexport.cc +++ b/filters/kword/amipro/amiproexport.cc @@ -23,10 +23,10 @@ #include #endif -#include +#include #include #include -#include +#include #include #include @@ -50,7 +50,7 @@ class AmiProWorker : public KWEFBaseWorker virtual bool doCloseFile(void); virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString filename; @@ -116,7 +116,7 @@ static TQString AmiProEscape( const TQString& text ) for( unsigned i=0; i': result += "<;>"; break; @@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text ) } bool AmiProWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList) + const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList) { TQString amiproText = ""; TQString text = paraText; @@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AmiProExport::convert( const TQCString& from, const TQCString& to ) { @@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from, AmiProWorker* worker = new AmiProWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h index c9e1f5d9..bffb4362 100644 --- a/filters/kword/amipro/amiproexport.h +++ b/filters/kword/amipro/amiproexport.h @@ -35,7 +35,7 @@ class AmiProExport : public KoFilter virtual ~AmiProExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROEXPORT_H diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc index 7f37746c..fe45ca18 100644 --- a/filters/kword/amipro/amiproimport.cc +++ b/filters/kword/amipro/amiproimport.cc @@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList ) return result; } -// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT -static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout ) +// helper function to convert AmiPro paragraph layout to KWord's LAYOUT +static TQString AmiProLayoutAsXML( const AmiProLayout& layout ) { TQString result; - TQString referredStyle = tqlayout.name; + TQString referredStyle = layout.name; if( referredStyle.isEmpty() ) referredStyle = "Standard"; - TQString fontname = tqlayout.fontFamily; + TQString fontname = layout.fontFamily; if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family(); - TQString fontsize = TQString::number( tqlayout.fontSize ); - TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) + - "\" green=\"" + TQString::number( tqlayout.fontColor.green() ) + - "\" blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\""; - TQString boldness = tqlayout.bold ? "75" : "50"; - TQString italic = tqlayout.italic ? "1" : "0"; - TQString strikeout = tqlayout.strikethrough ? "1" : "0"; - TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0"; - TQString underline = tqlayout.double_underline ? "double" : - tqlayout.underline|tqlayout.word_underline ? "1" : "0"; + TQString fontsize = TQString::number( layout.fontSize ); + TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) + + "\" green=\"" + TQString::number( layout.fontColor.green() ) + + "\" blue=\"" + TQString::number( layout.fontColor.blue() ) + "\""; + TQString boldness = layout.bold ? "75" : "50"; + TQString italic = layout.italic ? "1" : "0"; + TQString strikeout = layout.strikethrough ? "1" : "0"; + TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0"; + TQString underline = layout.double_underline ? "double" : + layout.underline|layout.word_underline ? "1" : "0"; TQString align; - align = tqlayout.align==TQt::AlignLeft ? "left" : - tqlayout.align==TQt::AlignRight ? "right" : - tqlayout.align==TQt::AlignCenter ? "center" : - tqlayout.align==TQt::AlignJustify ? "justify" : + align = layout.align==TQt::AlignLeft ? "left" : + layout.align==TQt::AlignRight ? "right" : + layout.align==TQt::AlignCenter ? "center" : + layout.align==TQt::AlignJustify ? "justify" : "left"; TQString offsets; - offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) + - "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\""; + offsets = "before=\"" + TQString::number(layout.spaceBefore) + + "\" after=\"" + TQString::number(layout.spaceAfter) + "\""; TQString linespacing; - linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : - TQString::number( tqlayout.linespace ); + linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : + TQString::number( layout.linespace ); result.append( "\n" ); result.append( " \n" ); @@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style ) "left"; TQString linespacing; - linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( style.linespace ); TQString offsets; @@ -308,18 +308,18 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style ) } bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ) + AmiProLayout& layout ) { root.append( "\n" ); root.append( "" + XMLEscape( text ) + "\n" ); root.append( AmiProFormatListAsXML( formatList ) ); - root.append( AmiProLayoutAsXML( tqlayout ) ); + root.append( AmiProLayoutAsXML( layout ) ); root.append( "\n" ); return true; } -KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/x-amipro" ) diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h index ad078543..45c8cc2b 100644 --- a/filters/kword/amipro/amiproimport.h +++ b/filters/kword/amipro/amiproimport.h @@ -37,7 +37,7 @@ class AmiProImport : public KoFilter virtual ~AmiProImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROIMPORT_H diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp index fdae97e6..14a0084b 100644 --- a/filters/kword/amipro/amiproparser.cpp +++ b/filters/kword/amipro/amiproparser.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include const float AmiPro::LS_Single = -1; const float AmiPro::LS_OneAndHalf = -1.5; @@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str ) else { result.truncate( result.length() - 1 ); // remove the '<' - result.append( TQChar(str[i+2].tqunicode() + 0x40 ) ); + result.append( TQChar(str[i+2].unicode() + 0x40 ) ); i += 3; } } @@ -92,7 +92,7 @@ static TQString AmiProUnescape( const TQString& str ) if( str[i+1] == '\\' ) { result.truncate( result.length() - 1 ); // remove the '<' - result.append( TQChar(str[i+2].tqunicode() | 0x80 ) ); + result.append( TQChar(str[i+2].unicode() | 0x80 ) ); i += 3; } @@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines ) style.word_underline = flag & 8; style.double_underline = flag & 64; - // tqalignment + // alignment if( lines[7].stripWhiteSpace() != "[algn]" ) return true; unsigned align_flag = lines[8].stripWhiteSpace().toUInt(); if( align_flag & 1 ) style.align = TQt::AlignLeft; @@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style ) strikethrough = style.strikethrough; } -// paragraph tqlayout +// paragraph layout AmiProLayout::AmiProLayout() { name = ""; diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h index 40a8f82b..b6f07753 100644 --- a/filters/kword/amipro/amiproparser.h +++ b/filters/kword/amipro/amiproparser.h @@ -104,7 +104,7 @@ class AmiProListener virtual bool doCloseDocument(); virtual bool doDefineStyle( const AmiProStyle& style ); virtual bool doParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ); + AmiProLayout& layout ); }; class AmiProParser @@ -144,7 +144,7 @@ class AmiProParser bool processOpenDocument(); bool processCloseDocument(); bool processParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ); + AmiProLayout& layout ); }; diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc index d7acc7ed..89bf5541 100644 --- a/filters/kword/applixword/applixwordimport.cc +++ b/filters/kword/applixword/applixwordimport.cc @@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream) * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="application/x-applixword") @@ -780,10 +780,10 @@ APPLIXWORDImport::readHeader (TQTextStream &stream, TQFile &in) TQMessageBox::critical (0L, "Applixword header problem", TQString ("The Applixword header is not correct. " "May be it is not an applixword file!
" - "This is the header line I did read:
%1").tqarg(mystr.latin1()), + "This is the header line I did read:
%1").arg(mystr.latin1()), "Okay"); - // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine), + // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine), return false; } else return true; diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h index ccd80df7..957e4058 100644 --- a/filters/kword/applixword/applixwordimport.h +++ b/filters/kword/applixword/applixwordimport.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -50,7 +50,7 @@ public: APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQChar specCharfind (TQChar , TQChar ); diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc index 138618b2..f4bddc03 100644 --- a/filters/kword/ascii/ExportDialog.cc +++ b/filters/kword/ascii/ExportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -85,7 +85,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 8f66942c..9345a64c 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -29,7 +29,7 @@ - tqlayout3 + layout3 @@ -67,7 +67,7 @@ Expanding - + 106 20 @@ -138,7 +138,7 @@ Expanding - + 20 20 diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc index adb345b1..c11753bc 100644 --- a/filters/kword/ascii/ImportDialog.cc +++ b/filters/kword/ascii/ImportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -84,7 +84,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index fd124062..4b32a441 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -29,7 +29,7 @@ - tqlayout3 + layout3 @@ -67,7 +67,7 @@ Expanding - + 106 20 @@ -132,7 +132,7 @@ Expanding - + 20 20 diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 4f4fbb06..3748e8e7 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -86,7 +86,7 @@ public: virtual bool doFullParagraphList(const TQValueList& paraList); virtual bool doFullParagraph(const ParaData& para); virtual bool doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, + const LayoutData& layout, const ValueListFormatData& paraFormatDataList); public: @@ -204,10 +204,10 @@ bool ASCIIWorker::doFullParagraphList(const TQValueList& paraList) bool ASCIIWorker::doFullParagraph(const ParaData& para) { - return doFullParagraph(para.text, para.tqlayout, para.formattingList); + return doFullParagraph(para.text, para.layout, para.formattingList); } -bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, +bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl; @@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq // As KWord has only one depth of lists, we can process lists very simply. // -- // Not anymore - Clarence - if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) + if ( layout.counter.numbering == CounterData::NUM_LIST ) { // Are we still in a list of the right type? - if (!m_inList || (tqlayout.counter.style!=m_typeList)) + if (!m_inList || (layout.counter.style!=m_typeList)) { // We are not yet part of a list m_inList=true; m_counterList=1; // Start numbering - m_typeList=tqlayout.counter.style; + m_typeList=layout.counter.style; } switch (m_typeList) @@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq else { m_inList=false; // Close an eventual list - if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER ) + if ( layout.counter.numbering == CounterData::NUM_CHAPTER ) { - if (!tqlayout.counter.depth) + if (!layout.counter.depth) { // HEAD 1 *m_streamOut << "###################################" << m_eol; *m_streamOut << "# "; ProcessParagraphData ( paraText, paraFormatDataList); *m_streamOut << "###################################" << m_eol; } - else if (tqlayout.counter.depth==1) + else if (layout.counter.depth==1) { // HEAD 2 *m_streamOut << "#### "; ProcessParagraphData ( paraText, paraFormatDataList); } - else if (tqlayout.counter.depth==2) + else if (layout.counter.depth==2) { // HEAD 3 *m_streamOut << "## "; ProcessParagraphData ( paraText, paraFormatDataList); } - else if (tqlayout.counter.depth==3) + else if (layout.counter.depth==3) { // HEAD 4 *m_streamOut << "# "; ProcessParagraphData ( paraText, paraFormatDataList); @@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq } } #else - if (!tqlayout.counter.text.isEmpty()) - *m_streamOut << tqlayout.counter.text << " "; + if (!layout.counter.text.isEmpty()) + *m_streamOut << layout.counter.text << " "; if (!ProcessParagraphData(paraText, paraFormatDataList)) return false; #endif @@ -357,7 +357,7 @@ bool ASCIIWorker::ProcessTable(const Table& table) { kdDebug(30502) << "processTable CALLED!" << endl; - // just dump the table out (no tqlayout for now) + // just dump the table out (no layout for now) for (TQValueList::ConstIterator it = table.cellList.begin(); it != table.cellList.end(); it++) @@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&) { } -KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) { if (to != "text/plain" || from != "application/x-kword") { @@ -534,7 +534,7 @@ KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const T return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result = leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h index af1e2e04..429ad6c8 100644 --- a/filters/kword/ascii/asciiexport.h +++ b/filters/kword/ascii/asciiexport.h @@ -31,7 +31,7 @@ public: ASCIIExport(KoFilter* parent, const char* name, const TQStringList&); virtual ~ASCIIExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // ASCIIEXPORT_H diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index f2a6e039..52c5c4d9 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -28,9 +28,9 @@ #include #include // #include // Currently not needed (due to disabled code) -#include +#include #include -#include +#include #include #include @@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai } -KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="text/plain") return KoFilter::NotImplemented; @@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen } const int length = strLine.length(); - if (strLine.tqat(length-1) == '-') + if (strLine.at(length-1) == '-') // replace the hard hyphen - at line end by a soft hyphen - strLine.tqat(length-1)=TQChar(173); + strLine.at(length-1)=TQChar(173); else strLine += ' '; // add space to end of line diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h index 4d332776..b2cfcbdd 100644 --- a/filters/kword/ascii/asciiimport.h +++ b/filters/kword/ascii/asciiimport.h @@ -65,7 +65,7 @@ public: ASCIIImport(); virtual ~ASCIIImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: // not yet changed #if 0 void WriteOutTableCell( int table_no, int row, int col, Position *pos, diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc index db9c754a..f54bec6b 100644 --- a/filters/kword/docbook/docbookexport.cc +++ b/filters/kword/docbook/docbookexport.cc @@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData ¶, fixedFont = true; } - if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic ) + if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic ) { outputText += ""; } - if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight ) + if ( (*formattingIt).text.weight > para.layout.formatData.text.weight ) { outputText += ""; } @@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData ¶, outputText += ""; } - if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight ) + if ( (*formattingIt).text.weight > para.layout.formatData.text.weight ) { outputText += ""; } - if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic ) + if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic ) { outputText += ""; } @@ -516,10 +516,10 @@ bool DocBookWorker::doFullDocument ( const TQValueList ¶List ) TQValueList::ConstIterator end(paraList.end ()); for ( paraIt = paraList.begin (); paraIt != end ; ++paraIt ) { - switch ( (*paraIt).tqlayout.counter.numbering ) + switch ( (*paraIt).layout.counter.numbering ) { case CounterData::NUM_LIST: - switch ( (*paraIt).tqlayout.counter.style ) + switch ( (*paraIt).layout.counter.style ) { case CounterData::STYLE_CUSTOMBULLET: case CounterData::STYLE_CIRCLEBULLET: @@ -581,7 +581,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList ¶List ) break; default: - kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.counter.style << "!" << endl; + kdError (30507) << "Unknown counter style " << (*paraIt).layout.counter.style << "!" << endl; CloseLists (); OpenArticleUnlessHead1 (); ProcessParagraphData (*paraIt, "PARA" ); @@ -590,7 +590,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList ¶List ) break; case CounterData::NUM_CHAPTER: - switch ( (*paraIt).tqlayout.counter.depth ) + switch ( (*paraIt).layout.counter.depth ) { case 0: CloseHead1AndArticle (); @@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList ¶List ) break; default: - kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl; + kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl; CloseLists (); OpenArticleUnlessHead1 (); ProcessParagraphData (*paraIt, "PARA" ); @@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo ) } -KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) { #if 0 kdError (30507) << "to = " << to << ", from = " << from << endl; diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h index cf7ec804..29362aaa 100644 --- a/filters/kword/docbook/docbookexport.h +++ b/filters/kword/docbook/docbookexport.h @@ -38,6 +38,6 @@ public: DocBookExport (KoFilter *parent, const char *name, const TQStringList & ); virtual ~DocBookExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // DOCBOOKEXPORT_H diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp index 6fc353e5..47191bc7 100644 --- a/filters/kword/hancomword/hancomwordimport.cpp +++ b/filters/kword/hancomword/hancomwordimport.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p ) } -KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/x-hancomword" ) return KoFilter::NotImplemented; diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h index 64d279a8..f78c3a47 100644 --- a/filters/kword/hancomword/hancomwordimport.h +++ b/filters/kword/hancomword/hancomwordimport.h @@ -35,7 +35,7 @@ public: HancomWordImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~HancomWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp index f712f0e1..cb3771f5 100644 --- a/filters/kword/hancomword/pole.cpp +++ b/filters/kword/hancomword/pole.cpp @@ -96,7 +96,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -117,7 +117,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector tqchildren( unsigned index ); + std::vector children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -507,11 +507,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j chi = tqchildren( j ); + std::vector chi = children( j ); for( unsigned i=0; i chi = tqchildren( index ); + // find among the children of index + std::vector chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -591,7 +591,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -648,7 +648,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector& result, } } -std::vector DirTree::tqchildren( unsigned index ) +std::vector DirTree::children( unsigned index ) { std::vector result; @@ -1249,9 +1249,9 @@ std::list Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc index 13864d7a..673b035a 100644 --- a/filters/kword/html/export/ExportBasic.cc +++ b/filters/kword/html/export/ExportBasic.cc @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include @@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin, } void HtmlBasicWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction) + const LayoutData& layout, TQChar::Direction direction) { *m_streamOut << '<' << strTag; - if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") - || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) + if ( (layout.alignment=="left") || (layout.alignment== "right") + || (layout.alignment=="center") || (layout.alignment=="justify")) { - *m_streamOut << " align=\"" << tqlayout.tqalignment << "\""; + *m_streamOut << " align=\"" << layout.alignment << "\""; if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) ) *m_streamOut << " dir=\"rtl\""; } - else if ( tqlayout.tqalignment=="auto") + else if ( layout.alignment=="auto") { // Do nothing, the user-agent should be more intelligent than us. } else { - kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl; } *m_streamOut << ">"; // Allow bold only if tag is not a heading! - openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); } void HtmlBasicWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { // Allow bold only if tag is not a heading! - closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); *m_streamOut << "\n"; } diff --git a/filters/kword/html/export/ExportBasic.h b/filters/kword/html/export/ExportBasic.h index a6de0082..c8f2864c 100644 --- a/filters/kword/html/export/ExportBasic.h +++ b/filters/kword/html/export/ExportBasic.h @@ -33,9 +33,9 @@ public: protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL); + const LayoutData& layout,TQChar::Direction direction=TQChar::DirL); virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout); + const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); virtual bool doOpenBody(void); ///< HTML's \ diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 49abcf79..58f2860e 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include @@ -52,7 +52,7 @@ TQString HtmlCssWorker::escapeCssIdentifier(const TQString& strText) const for (uint i=0; i='a') && (ch<='z')) || ((ch>='A') && (ch<='Z')) @@ -309,68 +309,68 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi } TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const + const LayoutData& layout, const bool force) const { TQString strLayout; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") - || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) + if ( (layout.alignment=="left") || (layout.alignment== "right") + || (layout.alignment=="center") || (layout.alignment=="justify")) { - strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment); + strLayout += TQString("text-align:%1; ").arg(layout.alignment); } - else if ( tqlayout.tqalignment=="auto") + else if ( layout.alignment=="auto") { // Do nothing, the user-agent should be more intelligent than us. } else { - kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl; } } - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { - strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); + strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { - strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); + strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight); } - if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=layout.indentLeft)) { - strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst); + strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst); } - if ((tqlayout.marginBottom>=0.0) - && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + if ((layout.marginBottom>=0.0) + && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) ) { - strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); + strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom); } - if ((tqlayout.marginTop>=0.0) - && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) + if ((layout.marginTop>=0.0) + && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) ) { - strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); + strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop); } if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - switch ( tqlayout.lineSpacingType ) + switch ( layout.lineSpacingType ) { case LayoutData::LS_CUSTOM: { // ### TODO: CSS 2 does not known "at-least". #if 0 // We have a custom line spacing (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "style:line-spacing:"; strLayout += height; strLayout += "pt; "; @@ -394,7 +394,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, } case LayoutData::LS_MULTIPLE: { - const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) ); + const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) ); strLayout += "line-height:"; strLayout += mult; strLayout += "%; "; @@ -403,7 +403,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, case LayoutData::LS_FIXED: { // We have a fixed line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "line-height:"; strLayout += height; strLayout += "pt; "; @@ -414,7 +414,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // ### TODO: CSS 2 does not known "at-least". // ### TODO: however draft CCS3 (module 'line') has 'line-stacking-strategy' to tweak this behaviour // We have a at-least line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "line-height:"; strLayout += height; strLayout += "pt; "; @@ -422,7 +422,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, } default: { - kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30503) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; break; } } @@ -430,12 +430,12 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // TODO: Konqueror/KHTML does not support "text-shadow" if (!force - && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection ) - && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) + && ( layoutOrigin.shadowDirection == layout.shadowDirection ) + && ( layoutOrigin.shadowDistance == layout.shadowDistance ) ) { // Do nothing! } - else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance)) + else if ((!layout.shadowDirection) || (!layout.shadowDistance)) { strLayout += "text-shadow:"; strLayout+="none; "; @@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, else { double xDistance,yDistance; - const double distance=tqlayout.shadowDistance; - switch (tqlayout.shadowDirection) + const double distance=layout.shadowDistance; + switch (layout.shadowDirection) { case 1: // SD_LEFT_UP { @@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, else { strLayout += "text-shadow:"; - strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name()) - .tqarg(xDistance,0,'f',0).tqarg(yDistance,0,'f',0); + strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name()) + .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0); // We do not want any scientific notation or any decimal } } @@ -519,60 +519,60 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // This must remain last, as the last property does not have a semi-colon strLayout+=textFormatToCss(layoutOrigin.formatData.text, - tqlayout.formatData.text,force); + layout.formatData.text,force); return strLayout; } void HtmlCssWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction) + const LayoutData& layout, TQChar::Direction direction) { - const LayoutData& styleLayout=m_styleMap[tqlayout.styleName]; + const LayoutData& styleLayout=m_styleMap[layout.styleName]; *m_streamOut << '<' << strTag; // Opening elements - *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName); + *m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName); *m_streamOut << "\""; - TQString strStyle=layoutToCss(styleLayout,tqlayout,false); + TQString strStyle=layoutToCss(styleLayout,layout,false); if (!strStyle.isEmpty()) { *m_streamOut << " style=\"" << strStyle; if (direction == TQChar::DirRLE) { - *m_streamOut << "direction: rtl; tqunicode-bidi: embed; "; + *m_streamOut << "direction: rtl; unicode-bidi: embed; "; } else if (direction == TQChar::DirRLO) { - *m_streamOut << "direction: rtl; tqunicode-bidi: override; "; + *m_streamOut << "direction: rtl; unicode-bidi: override; "; } *m_streamOut<< "\""; } *m_streamOut << ">"; - if ( 1==tqlayout.formatData.text.verticalAlignment ) + if ( 1==layout.formatData.text.verticalAlignment ) { *m_streamOut << ""; //Subscript } - else if ( 2==tqlayout.formatData.text.verticalAlignment ) + else if ( 2==layout.formatData.text.verticalAlignment ) { *m_streamOut << ""; //Superscript } - if ( tqlayout.tqalignment == "center" ) *m_streamOut << "
"; + if ( layout.alignment == "center" ) *m_streamOut << "
"; } void HtmlCssWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { - if ( 2==tqlayout.formatData.text.verticalAlignment ) + if ( 2==layout.formatData.text.verticalAlignment ) { *m_streamOut << ""; //Superscript } - else if ( 1==tqlayout.formatData.text.verticalAlignment ) + else if ( 1==layout.formatData.text.verticalAlignment ) { *m_streamOut << ""; //Subscript } - if ( tqlayout.tqalignment == "center" ) *m_streamOut << "
"; + if ( layout.alignment == "center" ) *m_streamOut << "
"; *m_streamOut << "\n"; } @@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void) return true; } -bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout) +bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout) { //Register style in the style map - m_styleMap[tqlayout.styleName]=tqlayout; + m_styleMap[layout.styleName]=layout; // We do not limit (anymore) any style to

...

, because - // the style could be forced on

by the tqlayout. + // the style could be forced on

by the layout. - *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName); - *m_streamOut << "\n{\n " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n"; + *m_streamOut << "." << escapeCssIdentifier(layout.styleName); + *m_streamOut << "\n{\n " << layoutToCss(layout,layout,true) << "\n}\n"; return true; } diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h index 358ea688..a33a0049 100644 --- a/filters/kword/html/export/ExportCss.h +++ b/filters/kword/html/export/ExportCss.h @@ -41,20 +41,20 @@ public: public: virtual bool doOpenStyles(void); ///< HTML's \ virtual bool doCloseStyles(void); ///< HTML's \ - virtual bool doFullDefineStyle(LayoutData& tqlayout); + virtual bool doFullDefineStyle(LayoutData& layout); virtual bool doFullPaperFormat(const int format, const double width, const double height, const int orientation); virtual bool doFullPaperBorders (const double top, const double left, const double bottom, const double right); ///< Like KWord's \ protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); - virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout, + virtual void openParagraph(const TQString& strTag, const LayoutData& layout, TQChar::Direction direction=TQChar::DirL); - virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout); + virtual void closeParagraph(const TQString& strTag, const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: - TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout, + TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& layout, const bool force) const; TQString escapeCssIdentifier(const TQString& strText) const; TQString textFormatToCss(const TextFormatting& formatOrigin, diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc index 20c7069b..7e005538 100644 --- a/filters/kword/html/export/ExportDialog.cc +++ b/filters/kword/html/export/ExportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) TQStringList encodingList; - encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_dialog->comboBoxEncoding->insertStringList( encodingList ); @@ -106,7 +106,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30503) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index cbdc4fc2..a6683c04 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -29,7 +29,7 @@ - tqlayout3 + layout3 @@ -67,7 +67,7 @@ Expanding - + 106 20 @@ -196,7 +196,7 @@ - tqlayout6 + layout6 @@ -212,7 +212,7 @@ Fixed - + 16 20 @@ -221,7 +221,7 @@ - tqlayout5 + layout5 @@ -262,7 +262,7 @@ Expanding - + 20 90 diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc index f0e4b3aa..0cb6339e 100644 --- a/filters/kword/html/export/ExportDocStruct.cc +++ b/filters/kword/html/export/ExportDocStruct.cc @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include @@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin, } void HtmlDocStructWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction /*direction*/) + const LayoutData& layout,TQChar::Direction /*direction*/) { *m_streamOut << '<' << strTag << ">"; - openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); } void HtmlDocStructWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { - closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); *m_streamOut << "\n"; } diff --git a/filters/kword/html/export/ExportDocStruct.h b/filters/kword/html/export/ExportDocStruct.h index 43b1e76a..6e963183 100644 --- a/filters/kword/html/export/ExportDocStruct.h +++ b/filters/kword/html/export/ExportDocStruct.h @@ -33,9 +33,9 @@ public: protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL); + const LayoutData& layout,TQChar::Direction direction=TQChar::DirL); virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout); + const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index aa1b1817..ecaba65c 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include #include @@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText, } void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList) + const LayoutData& layout, const ValueListFormatData ¶FormatDataList) { if (paraText.isEmpty() && paraFormatDataList.first().id != 6) { - openParagraph(strTag,tqlayout); + openParagraph(strTag,layout); *m_streamOut << " " ; // A paragraph can never be empty in HTML - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } else { @@ -302,17 +302,17 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p // For normal text, we need an opened paragraph if (paragraphNotOpened) { - openParagraph(strTag,tqlayout,partialText.ref(0).direction()); + openParagraph(strTag,layout,partialText.ref(0).direction()); paragraphNotOpened=false; } - formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt); + formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt); } else if (4==(*paraFormatDataIt).id) { // For variables, we need an opened paragraph if (paragraphNotOpened) { - openParagraph(strTag,tqlayout); + openParagraph(strTag,layout); paragraphNotOpened=false; } if (9==(*paraFormatDataIt).variable.m_type) @@ -341,7 +341,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p if (!paragraphNotOpened) { // The paragraph was opened, so close it. - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } makeTable((*paraFormatDataIt).frameAnchor); // The paragraph will need to be opened again @@ -355,7 +355,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p // and need to be in a paragraph if (paragraphNotOpened) { - openParagraph( strTag, tqlayout,partialText.ref(0). direction() ); + openParagraph( strTag, layout,partialText.ref(0). direction() ); paragraphNotOpened=false; } makeImage((*paraFormatDataIt).frameAnchor); @@ -370,30 +370,30 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p if (!paragraphNotOpened) { // The paragraph was opened, so close it. - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } } } bool HtmlWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl; TQString strParaText=paraText; TQString strTag; // Tag that will be written. - if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) + if ( layout.counter.numbering == CounterData::NUM_LIST ) { - const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0! + const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0! const uint listDepth=m_listStack.size(); // We are in a list, but has it the right depth? if (layoutDepth>listDepth) { ListInfo newList; - newList.m_typeList=tqlayout.counter.style; + newList.m_typeList=layout.counter.style; for (uint i=listDepth; i\n"; } ListInfo newList; - *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList); - newList.m_typeList=tqlayout.counter.style; + *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList); + newList.m_typeList=layout.counter.style; m_listStack.push(newList); } @@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, } } } - if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER) - && (tqlayout.counter.depth<6) ) + if ( (layout.counter.numbering == CounterData::NUM_CHAPTER) + && (layout.counter.depth<6) ) { - strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6 + strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6 } else { @@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, } } - ProcessParagraphData(strTag, strParaText, tqlayout, paraFormatDataList); + ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList); kdDebug(30503) << "Quiting HtmlWorker::doFullParagraph" << endl; return true; diff --git a/filters/kword/html/export/ExportFilter.h b/filters/kword/html/export/ExportFilter.h index f8446c1b..04d3129f 100644 --- a/filters/kword/html/export/ExportFilter.h +++ b/filters/kword/html/export/ExportFilter.h @@ -42,7 +42,7 @@ public: virtual bool doCloseFile(void); // Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); virtual bool doOpenTextFrameSet(void); @@ -58,9 +58,9 @@ protected: * be detected from the actual string data */ virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0; + const LayoutData& layout, TQChar::Direction direction=TQChar::DirL)=0; virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout)=0; + const LayoutData& layout)=0; virtual void openSpan(const FormatData& formatOrigin, const FormatData& format)=0; virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format)=0; virtual void writeDocType(void); @@ -84,7 +84,7 @@ protected: TQString getAdditionalFileName(const TQString& additionalName); private: void ProcessParagraphData ( const TQString& strTag, const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList); + const LayoutData& layout, const ValueListFormatData ¶FormatDataList); void formatTextParagraph(const TQString& strText, const FormatData& formatOrigin, const FormatData& format); bool makeTable(const FrameAnchor& anchor); diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc index f8af8e3e..013fb7ff 100644 --- a/filters/kword/html/export/htmlexport.cc +++ b/filters/kword/html/export/htmlexport.cc @@ -31,7 +31,7 @@ License version 2. */ -#include +#include #include #include @@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/html")) { @@ -118,7 +118,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T delete worker; return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h index 5de5ef6a..5b62781a 100644 --- a/filters/kword/html/export/htmlexport.h +++ b/filters/kword/html/export/htmlexport.h @@ -22,7 +22,7 @@ #define HTMLEXPORT_H #include -#include +#include #include #include @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLEXPORT_H diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index 2c403b2f..9b29320d 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) : // 123 } -KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="text/html") return KoFilter::NotImplemented; diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h index f7c61a41..ab2a293c 100644 --- a/filters/kword/html/import/htmlimport.h +++ b/filters/kword/html/import/htmlimport.h @@ -37,7 +37,7 @@ public: HTMLImport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLIMPORT_H diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp index 6e134e38..8545fb0d 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/khtmlreader.cpp @@ -80,7 +80,7 @@ HTMLReader_state *KHTMLReader::state() s->frameset=_writer->mainFrameset(); s->paragraph = _writer->addParagraph(s->frameset); s->format=_writer->currentFormat(s->paragraph,true); - s->tqlayout=_writer->currentLayout(s->paragraph); + s->layout=_writer->currentLayout(s->paragraph); s->in_pre_mode = false; _state.push(s); } @@ -93,7 +93,7 @@ HTMLReader_state *KHTMLReader::pushNewState() s->frameset=state()->frameset; s->paragraph=state()->paragraph; s->format=state()->format; - s->tqlayout=state()->tqlayout; + s->layout=state()->layout; s->in_pre_mode=state()->in_pre_mode; _writer->cleanUpParagraph(s->paragraph); _state.push(s); @@ -118,9 +118,9 @@ void KHTMLReader::popState() if (s->frameset == state()->frameset) { state()->paragraph=s->paragraph; - if ((state()->tqlayout != s->tqlayout)) + if ((state()->layout != s->layout)) { - if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout); + if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout); } state()->format=_writer->startFormat(state()->paragraph, state()->format); } @@ -129,15 +129,15 @@ void KHTMLReader::popState() void KHTMLReader::startNewLayout(bool startNewFormat) { - TQDomElement tqlayout; - startNewLayout(startNewFormat,tqlayout); + TQDomElement layout; + startNewLayout(startNewFormat,layout); } -void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout) +void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) { kdDebug() << "entering startNewLayout" << endl; startNewParagraph(startNewFormat,true); - state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout); + state()->layout=_writer->setLayout(state()->paragraph,layout); } void KHTMLReader::completed() @@ -178,12 +178,12 @@ void KHTMLReader::parseNode(DOM::Node node) if (!t.isNull()) { _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode); - return; // no tqchildren anymore... + return; // no children anymore... } // is this really needed ? it can't do harm anyway. state()->format=_writer->currentFormat(state()->paragraph,true); - state()->tqlayout=_writer->currentLayout(state()->paragraph); + state()->layout=_writer->currentLayout(state()->paragraph); pushNewState(); DOM::Element e=node; @@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e) } \ } -// the state->tqlayout=_writer->setLayout is meant to tell popState something changed in the tqlayout, and a new -// tqlayout should probably be started after closing. +// the state->layout=_writer->setLayout is meant to tell popState something changed in the layout, and a new +// layout should probably be started after closing. #define _PL(x,a,b,c) { \ if (e.tagName().lower() == #x) \ { \ - state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\ + state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\ if (!(_writer->getText(state()->paragraph).isEmpty())) \ startNewParagraph(false,false); \ _writer->layoutAttribute(state()->paragraph, #a,#b,#c); \ @@ -283,20 +283,20 @@ bool KHTMLReader::parseTag(DOM::Element e) return true; } -void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) +void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) { kdDebug() << "Entering startNewParagraph" << endl; TQDomElement qf=state()->format; - TQDomElement ql=state()->tqlayout; + TQDomElement ql=state()->layout; _writer->cleanUpParagraph(state()->paragraph); - if ((startnewtqlayout==true) || ql.isNull()) + if ((startnewlayout==true) || ql.isNull()) {state()->paragraph=_writer->addParagraph(state()->frameset);} else {state()->paragraph= - _writer->addParagraph(state()->frameset,state()->tqlayout);} + _writer->addParagraph(state()->frameset,state()->layout);} @@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt(); - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(currdepth+1)); } } @@ -403,7 +403,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/) bool KHTMLReader::parse_br(DOM::Element /*e*/) { - startNewParagraph(false,false); //keep the current format and tqlayout + startNewParagraph(false,false); //keep the current format and layout return false; // a BR tag has no childs. } @@ -508,7 +508,7 @@ void KHTMLReader::parseStyle(DOM::Element e) // process e.g. this is in the center if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") ) { - state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout); + state()->layout=_writer->setLayout(state()->paragraph,state()->layout); _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); } // done @@ -520,11 +520,11 @@ void KHTMLReader::parseStyle(DOM::Element e) // debugging code. kdDebug(30503) << "e.style()" << endl; for (unsigned int i=0;iaddText(state()->paragraph,htmlelement.innerHTML().string(),1); startNewParagraph(); //popState(); - return false; // tqchildren are already handled. + return false; // children are already handled. #else pushNewState(); state()->in_pre_mode=true; @@ -640,7 +640,7 @@ bool KHTMLReader::parse_pre(DOM::Element e) } popState(); _writer->formatAttribute(state()->paragraph,"FONT","name",face); - return false; // tqchildren are already handled. + return false; // children are already handled. #endif } @@ -668,11 +668,11 @@ bool KHTMLReader::parse_font(DOM::Element e) _writer->formatAttribute(state()->paragraph,"FONT","name",face); if ((isize>=0) && (isize != 12)) - _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize)); + _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").arg(isize)); - _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").tqarg(color.red())); - _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").tqarg(color.green())); - _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").tqarg(color.blue())); + _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").arg(color.red())); + _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").arg(color.green())); + _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").arg(color.blue())); return true; } @@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) _list_depth++; if (e.firstChild().nodeName().string().lower() == "#text") // e.g.
    this is indented
  • first listitem
{ - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent startNewLayout(); } for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) @@ -706,7 +706,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); } - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent } parseNode(items); } diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h index 9987a589..db93531a 100644 --- a/filters/kword/html/import/khtmlreader.h +++ b/filters/kword/html/import/khtmlreader.h @@ -39,7 +39,7 @@ struct HTMLReader_state { TQDomElement format; TQDomElement frameset; TQDomElement paragraph; - TQDomElement tqlayout; + TQDomElement layout; bool in_pre_mode; // keep formatting as is. }; @@ -77,8 +77,8 @@ private: KWDWriter *_writer; void startNewLayout(bool startNewFormat=false); - void startNewLayout(bool startNewFormat, TQDomElement tqlayout); - void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true); + void startNewLayout(bool startNewFormat, TQDomElement layout); + void startNewParagraph(bool startnewformat=true, bool startnewlayout=true); bool _it_worked; // ----------------------------------------------------- int _list_depth; diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index 56568be9..a194b219 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -173,9 +173,9 @@ TQDomElement KWDWriter::createTableCell(int tableno, int nrow, TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement(); TQDomElement fs=addFrameSet(parent,1,0, - TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol), + TQString("Table %1 - %2,%3").arg(tableno).arg(nrow).arg(ncol), 1); - fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno)); + fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno)); fs.setAttribute("row",nrow); fs.setAttribute("col",ncol); fs.setAttribute("cols",colspan); // FIXME do colspan in finishTable @@ -189,9 +189,9 @@ TQDomElement KWDWriter::fetchTableCell(int tableno, int rowno, int colno) { TQDomNodeList e=docroot().elementsByTagName("FRAMESET"); for (unsigned int i=0;icreateElement("LAYOUT"); else - theLayout=tqlayout.cloneNode().toElement(); + theLayout=layout.cloneNode().toElement(); TQDomElement oldLayout=currentLayout(paragraph); paragraph.removeChild(oldLayout); paragraph.appendChild(theLayout); @@ -357,12 +357,12 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC TQDomElement paragraph=_doc->createElement("PARAGRAPH"); TQDomElement formats=_doc->createElement("FORMATS"); - TQDomElement tqlayout; + TQDomElement layout; if (layoutToClone.isNull()) { - tqlayout=_doc->createElement("LAYOUT"); + layout=_doc->createElement("LAYOUT"); } else { - tqlayout=layoutToClone.cloneNode().toElement(); + layout=layoutToClone.cloneNode().toElement(); } TQDomElement text=_doc->createElement("TEXT"); TQDomText t=_doc->createTextNode(TQString("")); @@ -370,7 +370,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC paragraph.appendChild(formats); paragraph.appendChild(text); parent.appendChild(paragraph); - paragraph.appendChild(tqlayout); + paragraph.appendChild(layout); layoutAttribute(paragraph,"NAME","value","Standard"); return paragraph; } @@ -460,8 +460,8 @@ void KWDWriter::addText(TQDomElement paragraph, TQString text, int format_id, bo TQDomElement lastformat=currentFormat(paragraph,true); if (lastformat.attribute("id").isEmpty()) // keep old id value, e.g. for LINK URL lastformat.setAttribute("id",format_id); - lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength)); - lastformat.setAttribute("len",TQString("%1").tqarg(newLength)); + lastformat.setAttribute("pos",TQString("%1").arg(oldLength)); + lastformat.setAttribute("len",TQString("%1").arg(newLength)); } TQString KWDWriter::getText(TQDomElement paragraph) { diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 542a1748..2942f22a 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -93,7 +93,7 @@ public: /** - * create a horizontal ruler tqlayout + * create a horizontal ruler layout **/ void createHR(TQDomElement paragraph, int width=1); @@ -115,7 +115,7 @@ public: * adds a paragraph **/ TQDomElement addParagraph(TQDomElement parent); - TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout); + TQDomElement addParagraph(TQDomElement parent, TQDomElement layout); /** * adds/changes an attribute to/of the current format @@ -123,13 +123,13 @@ public: TQDomElement formatAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); /** - * get a tqlayout attribute + * get a layout attribute **/ TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName); /** - * adds/changes an attribute to/of the current tqlayout + * adds/changes an attribute to/of the current layout **/ TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); @@ -164,9 +164,9 @@ public: TQDomElement createLink(TQDomElement paragraph, TQString linkName, TQString hrefName); /** - * copy the given tqlayout, and set it as tqlayout of the given paragraph + * copy the given layout, and set it as layout of the given paragraph **/ - TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout); + TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout); /** * returns the text of this paragraph. diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp index 9a658e41..5d1d2fe3 100644 --- a/filters/kword/kword1.3/import/kword13formatone.cpp +++ b/filters/kword/kword1.3/import/kword13formatone.cpp @@ -1,4 +1,4 @@ -#include +#include #include "kword13utils.h" #include "kword13formatone.h" diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h index e4cc7f38..682ef887 100644 --- a/filters/kword/kword1.3/import/kword13formatone.h +++ b/filters/kword/kword1.3/import/kword13formatone.h @@ -29,8 +29,8 @@ class TQTextStream; #include "kword13format.h" /** - * Contains the data of the \ tqchildren - * also the grand-tqchildren of \ and \ + * Contains the data of the \ children + * also the grand-children of \ and \ */ class KWord13FormatOneData { @@ -75,7 +75,7 @@ public: virtual KWord13FormatOneData* getFormatOneData(void); public: int m_length; ///< Length of format - KWord13FormatOneData m_formatOne; ///< Data of tqchildren of \ + KWord13FormatOneData m_formatOne; ///< Data of children of \ }; #endif // KWORD_1_3_FORMAT_ONE diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index ebcf3f6a..47eed1e7 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -59,7 +59,7 @@ bool KWord13Import::parseInfo( TQIODevice* io, KWord13Document& kwordDocument ) return false; } TQDomElement docElement( doc.documentElement() ); - // In documentinfo.xml, the text data is in the grand-tqchildren of the document element + // In documentinfo.xml, the text data is in the grand-children of the document element for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { kdDebug(30520) << "Child " << node.nodeName() << endl; @@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc ) return post.postParse( store, doc ); } -KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.oasis.opendocument.text" || from != "application/x-kword" ) diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h index 7d60dd89..77c05c23 100644 --- a/filters/kword/kword1.3/import/kword13import.h +++ b/filters/kword/kword1.3/import/kword13import.h @@ -39,7 +39,7 @@ public: KWord13Import(KoFilter *parent, const char *name, const TQStringList &); virtual ~KWord13Import() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument ); bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument ); diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp index cc8a7046..f72dd5f8 100644 --- a/filters/kword/kword1.3/import/kword13layout.cpp +++ b/filters/kword/kword1.3/import/kword13layout.cpp @@ -1,4 +1,4 @@ -#include +#include #include "kword13utils.h" #include "kword13layout.h" @@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void ) void KWord13Layout::xmldump( TQTextStream& iostream ) { - iostream << " \n"; for ( TQMap::ConstIterator it = m_layoutProperties.begin(); @@ -25,7 +25,7 @@ void KWord13Layout::xmldump( TQTextStream& iostream ) m_format.xmldump( iostream ); - iostream << " \n"; + iostream << " \n"; } TQString KWord13Layout::key( void ) const diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp index 00b899f9..7f246cad 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp @@ -178,11 +178,11 @@ double KWord13OasisGenerator::positiveNumberOrNull( const TQString& str ) const } // Inspired by KoParagStyle::saveStyle -void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout ) +void KWord13OasisGenerator::declareLayout( KWord13Layout& layout ) { - KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name ); + KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name ); - // ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.m_name ); + // ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name ); #if 0 // TODO: check that this is correct if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) { @@ -192,21 +192,21 @@ void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout ) gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 ); } #endif - fillGenStyleWithLayout( tqlayout, gs, false ); - fillGenStyleWithFormatOne( tqlayout.m_format , gs, false ); + fillGenStyleWithLayout( layout, gs, false ); + fillGenStyleWithFormatOne( layout.m_format , gs, false ); - tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true ); + layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true ); - kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl; + kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl; } // Inspired by KoParagStyle::saveStyle -void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout ) +void KWord13OasisGenerator::declareStyle( KWord13Layout& layout ) { KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() ); - gs.addAttribute( "style:display-name", tqlayout.m_name ); + gs.addAttribute( "style:display-name", layout.m_name ); #if 0 // TODO: check that this is correct if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) { @@ -216,12 +216,12 @@ void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout ) gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 ); } #endif - fillGenStyleWithLayout( tqlayout, gs, true ); - fillGenStyleWithFormatOne( tqlayout.m_format , gs, true ); + fillGenStyleWithLayout( layout, gs, true ); + fillGenStyleWithFormatOne( layout.m_format , gs, true ); - tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false ); + layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false ); - kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl; + kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl; } @@ -341,13 +341,13 @@ void KWord13OasisGenerator::fillGenStyleWithFormatOne( const KWord13FormatOneDat } // Inspired from KoParagLayout::saveOasis but we have not the same data to start with. -void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const +void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const { // ### TODO syntaxVersion < 3 - TQString str; // Help string to store each KWord 1.3 tqlayout property + TQString str; // Help string to store each KWord 1.3 layout property - str = tqlayout.getProperty( "FLOW:align" ); + str = layout.getProperty( "FLOW:align" ); if ( str.isEmpty() && ! style) { // Nothing to do! @@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent } - str = tqlayout.getProperty( "FLOW:dir" ); + str = layout.getProperty( "FLOW:dir" ); if ( str == "R" ) // ### TODO: check the right value { gs.addProperty( "style:writing-mode", "rl-tb" ); // right-to-left, top-to-bottom @@ -372,11 +372,11 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou } // ### TODO: do not define if it does not exist and ! style - gs.addPropertyPt( "fo:margin-left", numberOrNull( tqlayout.getProperty( "INDENTS:left" ) ) ); - gs.addPropertyPt( "fo:margin-right", numberOrNull( tqlayout.getProperty( "INDENTS:right" ) ) ); - gs.addPropertyPt( "fo:text-indent", numberOrNull( tqlayout.getProperty( "INDENTS:first" ) ) ); - gs.addPropertyPt( "fo:margin-top", numberOrNull( tqlayout.getProperty( "OFFSETS:before" ) ) ); - gs.addPropertyPt( "fo:margin-bottom", numberOrNull( tqlayout.getProperty( "OFFSETS:after" ) ) ); + gs.addPropertyPt( "fo:margin-left", numberOrNull( layout.getProperty( "INDENTS:left" ) ) ); + gs.addPropertyPt( "fo:margin-right", numberOrNull( layout.getProperty( "INDENTS:right" ) ) ); + gs.addPropertyPt( "fo:text-indent", numberOrNull( layout.getProperty( "INDENTS:first" ) ) ); + gs.addPropertyPt( "fo:margin-top", numberOrNull( layout.getProperty( "OFFSETS:before" ) ) ); + gs.addPropertyPt( "fo:margin-bottom", numberOrNull( layout.getProperty( "OFFSETS:after" ) ) ); #if 0 switch ( lineSpacingType ) { @@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou case T_RIGHT: tabsWriter.addAttribute( "style:type", "right" ); break; - case T_DEC_PNT: // "tqalignment on decimal point" + case T_DEC_PNT: // "alignment on decimal point" tabsWriter.addAttribute( "style:type", "char" ); tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) ); break; @@ -614,7 +614,7 @@ void KWord13OasisGenerator::writeStylesXml( void ) Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); //if ( m_pageLayout.columns > 1 ) TODO add columns element. This is a bit of a hack, // which only works as long as we have only one page master stylesWriter->endElement(); @@ -629,7 +629,7 @@ void KWord13OasisGenerator::writeStylesXml( void ) stylesWriter->startElement( "office:master-styles" ); stylesWriter->startElement( "style:master-page" ); stylesWriter->addAttribute( "style:name", "Standard" ); - stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName ); + stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName ); stylesWriter->endElement(); stylesWriter->endElement(); // office:master-styles diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.h b/filters/kword/kword1.3/import/kword13oasisgenerator.h index 39bc232a..3db989f2 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.h +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.h @@ -49,17 +49,17 @@ protected: // Generating phase void writePreviewFile(void); void writePictures( void ); protected: // Preparing phase - /// Preparing page tqlayout + /// Preparing page layout void preparePageLayout( void ); void prepareTextFrameset( KWordTextFrameset* frameset ); /// Also sets the name of the automatical style - void declareLayout( KWord13Layout& tqlayout ); + void declareLayout( KWord13Layout& layout ); /// Also sets the name of the automatical style - void declareStyle( KWord13Layout& tqlayout ); + void declareStyle( KWord13Layout& layout ); double numberOrNull( const TQString& str ) const; double positiveNumberOrNull( const TQString& str ) const; void fillGenStyleWithFormatOne( const KWord13FormatOneData& one, KoGenStyle& gs, const bool style ) const; - void fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const; + void fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const; protected: KWord13Document* m_kwordDocument; KoStore* m_store; diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index e3958b45..a3e22290 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -133,7 +133,7 @@ bool KWord13Parser::startElementLayoutProperty( const TQString& name, const TQXm } else { - kdError(30520) << "No current tqlayout for storing property: " << name << endl; + kdError(30520) << "No current layout for storing property: " << name << endl; return false; } } @@ -166,7 +166,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes& else if ( stackItem->elementType == KWord13TypeLayout ) { stackItem->elementType = KWord13TypeLayoutFormatOne; - return true; // Everything is done directly on the tqlayout + return true; // Everything is done directly on the layout } else if ( stackItem->elementType != KWord13TypeFormatsPlural ) { @@ -247,7 +247,7 @@ bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes& if ( m_currentLayout ) { // Delete an eventually already existing paragraph (should not happen) - kdWarning(30520) << "Current tqlayout already defined!" << endl; + kdWarning(30520) << "Current layout already defined!" << endl; delete m_currentLayout; } @@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri } else if ( name == "FRAMESTYLE" ) { - // ### TODO, but some of the