From 7c71ab86d1f7e387fc3df63b48df07231f111862 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../colorspaces/kis_alpha_colorspace.cc | 4 +- .../colorspaces/kis_alpha_colorspace.h | 2 +- .../colorspaces/kis_lab_colorspace.cc | 46 +- .../colorspaces/kis_lab_colorspace.h | 30 +- .../colorspaces/kis_xyz_colorspace.cc | 68 +- .../colorspaces/kis_xyz_colorspace.h | 22 +- chalk/chalkcolor/kis_abstract_colorspace.cc | 8 +- chalk/chalkcolor/kis_abstract_colorspace.h | 14 +- chalk/chalkcolor/kis_colorspace.h | 2 +- .../cmyk_u16/kis_cmyk_u16_colorspace.cc | 68 +- .../cmyk_u16/kis_cmyk_u16_colorspace.h | 22 +- .../cmyk_u8/kis_cmyk_colorspace.cc | 68 +- .../colorspaces/cmyk_u8/kis_cmyk_colorspace.h | 22 +- .../gray_u16/kis_gray_u16_colorspace.cc | 68 +- .../gray_u16/kis_gray_u16_colorspace.h | 22 +- .../gray_u8/kis_gray_colorspace.cc | 110 +- .../colorspaces/gray_u8/kis_gray_colorspace.h | 24 +- .../lms_f32/kis_lms_f32_colorspace.cc | 22 +- .../lms_f32/kis_lms_f32_colorspace.h | 8 +- .../rgb_f16half/kis_rgb_f16half_colorspace.cc | 76 +- .../rgb_f16half/kis_rgb_f16half_colorspace.h | 30 +- .../rgb_f32/kis_rgb_f32_colorspace.cc | 76 +- .../rgb_f32/kis_rgb_f32_colorspace.h | 30 +- .../rgb_u16/kis_rgb_u16_colorspace.cc | 76 +- .../rgb_u16/kis_rgb_u16_colorspace.h | 30 +- .../colorspaces/rgb_u8/kis_rgb_colorspace.cc | 150 +- chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h | 32 +- chalk/colorspaces/wet/kis_wet_colorspace.cc | 2 +- chalk/colorspaces/wet/kis_wet_colorspace.h | 2 +- chalk/colorspaces/wet/kis_wetop.cc | 12 +- chalk/colorspaces/wet/wdgpressure.ui | 2 +- chalk/colorspaces/wet/wetphysicsfilter.cc | 2 +- .../wetsticky/brushop/kis_wsbrushop.cc | 2 +- .../wetsticky/kis_wet_sticky_colorspace.cc | 16 +- .../wetsticky/kis_wet_sticky_colorspace.h | 8 +- chalk/colorspaces/wetsticky/wstool.ui | 2 +- .../ycbcr_u16/kis_ycbcr_u16_colorspace.cc | 20 +- .../ycbcr_u16/kis_ycbcr_u16_colorspace.h | 6 +- .../ycbcr_u8/kis_ycbcr_u8_colorspace.cc | 22 +- .../ycbcr_u8/kis_ycbcr_u8_colorspace.h | 8 +- chalk/core/kis_alpha_mask.h | 2 +- chalk/core/kis_brush.cc | 24 +- chalk/core/kis_brush.h | 6 +- chalk/core/kis_merge_visitor.h | 6 +- chalk/core/kis_paint_device.cc | 12 +- chalk/core/kis_paint_device.h | 12 +- chalk/core/kis_paint_layer.cc | 42 +- chalk/core/kis_paint_layer.h | 8 +- chalk/core/kis_paintop.cc | 8 +- chalk/core/kis_selection.cc | 4 +- chalk/core/kis_selection.h | 4 +- chalk/core/kis_transaction.cc | 4 +- chalk/core/kis_transform_worker.cc | 4 +- chalk/core/tiles/kis_tilemanager.h | 2 +- chalk/doc/DESIGN.obsolete | 2 +- chalk/doc/background_paper.txt | 2 +- chalk/doc/brush.txt | 6 +- chalk/doc/chalk-features | 2 +- chalk/doc/chalk.xmi | 14450 ++++++++-------- chalk/doc/channels_masks_selections | 2 +- chalk/doc/colorspaces.xmi | 7328 ++++---- chalk/doc/colorstrategyAPI | 8 +- chalk/doc/controller.xmi | 5540 +++--- chalk/doc/doc-outline | 2 +- chalk/doc/howtofilters.txt | 2 +- chalk/doc/paint_device.txt | 2 +- chalk/plugins/filters/blur/wdgblur.ui | 2 +- chalk/plugins/filters/bumpmap/wdgbumpmap.ui | 2 +- chalk/plugins/filters/cimg/CImg.h | 16 +- chalk/plugins/filters/cimg/wdg_cimg.ui | 2 +- .../filters/colorify/WdgColorifyBase.ui | 2 +- .../filters/colors/wdgcolortoalphabase.ui | 2 +- .../colorsfilters/wdg_brightness_contrast.ui | 2 +- .../filters/colorsfilters/wdg_perchannel.ui | 2 +- ...lution_filter_configuration_base_widget.ui | 2 +- .../fastcolortransfer/wdgfastcolortransfer.ui | 2 +- .../wdglenscorrectionoptions.ui | 2 +- .../plugins/filters/levelfilter/wdg_level.ui | 2 +- .../filters/noisefilter/wdgnoiseoptions.ui | 2 +- .../randompickfilter/wdgrandompickoptions.ui | 2 +- chalk/plugins/filters/unsharp/wdgunsharp.ui | 2 +- .../filters/wavefilter/wdgwaveoptions.ui | 2 +- .../defaultpaintops/kis_airbrushop.cc | 2 +- .../paintops/defaultpaintops/kis_brushop.cc | 4 +- .../kis_dlgbrushcurvecontrol.ui | 2 +- .../defaultpaintops/kis_duplicateop.cc | 2 +- .../paintops/defaultpaintops/kis_eraseop.cc | 8 +- .../paintops/defaultpaintops/kis_penop.cc | 2 +- .../paintops/defaultpaintops/kis_smudgeop.cc | 4 +- .../tools/defaulttools/wdgcolorpicker.ui | 2 +- .../selectiontools/kis_tool_move_selection.cc | 2 +- .../plugins/tools/tool_crop/wdg_tool_crop.ui | 2 +- .../tools/tool_curves/wdg_tool_example.ui | 2 +- .../plugins/tools/tool_filter/kis_filterop.cc | 14 +- .../plugins/tools/tool_star/wdg_tool_star.ui | 2 +- .../tool_transform/wdg_tool_transform.ui | 2 +- .../viewplugins/colorrange/dlg_colorrange.cc | 2 +- .../viewplugins/colorrange/wdg_colorrange.ui | 2 +- .../wdgconvertcolorspace.ui | 2 +- .../viewplugins/dropshadow/wdg_dropshadow.ui | 2 +- .../filtersgallery/kis_wdg_filtersgallery.ui | 2 +- .../viewplugins/histogram/wdghistogram.ui | 2 +- .../viewplugins/imagesize/wdg_imagesize.ui | 2 +- .../viewplugins/imagesize/wdg_layersize.ui | 2 +- .../viewplugins/imagesize/wdg_resolution.ui | 2 +- .../modify_selection/wdg_border_selection.ui | 2 +- .../modify_selection/wdg_grow_selection.ui | 2 +- .../modify_selection/wdg_shrink_selection.ui | 2 +- .../performancetest/wdg_perftest.ui | 2 +- .../rotateimage/wdg_rotateimage.ui | 2 +- .../viewplugins/screenshot/ksnapshot.cpp | 10 +- .../viewplugins/screenshot/ksnapshotwidget.ui | 4 +- .../scripting/chalkcore/krs_iterator.h | 12 +- .../separate_channels/wdg_separations.ui | 2 +- .../viewplugins/shearimage/wdg_shearimage.ui | 2 +- .../viewplugins/substrate/wdgsubstrate.ui | 2 +- .../viewplugins/variations/wdg_variations.ui | 2 +- chalk/sdk/kis_global.h | 2 +- chalk/ui/kis_canvas.cc | 8 +- chalk/ui/kis_canvas.h | 2 +- chalk/ui/kis_cursor.cc | 8 +- chalk/ui/kis_doc.cc | 8 +- chalk/ui/kis_doc.h | 4 +- chalk/ui/kis_factory.cc | 4 +- chalk/ui/kis_factory.h | 2 +- chalk/ui/kis_filter_manager.cc | 2 +- chalk/ui/kis_layerbox.cc | 6 +- chalk/ui/kis_layerlist.h | 4 +- chalk/ui/kis_matrix_widget.ui | 2 +- chalk/ui/kis_opengl_image_context.h | 2 +- chalk/ui/kis_part_layer.cc | 4 +- chalk/ui/kis_previewwidget.cc | 6 +- chalk/ui/kis_previewwidgetbase.ui | 2 +- chalk/ui/kis_tool_freehand.cc | 4 +- chalk/ui/kis_view.cc | 22 +- chalk/ui/kis_view.h | 6 +- chalk/ui/layerlist.cpp | 16 +- chalk/ui/layerlist.h | 10 +- chalk/ui/wdgapplyprofile.ui | 2 +- chalk/ui/wdgautobrush.ui | 2 +- chalk/ui/wdgautogradient.ui | 2 +- chalk/ui/wdgbirdeye.ui | 6 +- chalk/ui/wdgcolorsettings.ui | 2 +- chalk/ui/wdgcustombrush.ui | 2 +- chalk/ui/wdgcustompalette.ui | 2 +- chalk/ui/wdgcustompattern.ui | 2 +- chalk/ui/wdgdisplaysettings.ui | 2 +- chalk/ui/wdggeneralsettings.ui | 2 +- chalk/ui/wdggridsettings.ui | 2 +- chalk/ui/wdglayerbox.ui | 2 +- chalk/ui/wdglayerproperties.ui | 2 +- chalk/ui/wdgnewimage.ui | 2 +- chalk/ui/wdgpalettechooser.ui | 2 +- chalk/ui/wdgperformancesettings.ui | 2 +- chalk/ui/wdgpressuresettings.ui | 2 +- chalk/ui/wdgselectionoptions.ui | 2 +- chalk/ui/wdgshapeoptions.ui | 2 +- chalk/ui/wdgtabletdevicesettings.ui | 2 +- chalk/ui/wdgtabletsettings.ui | 2 +- chalk/ui/wdgtextbrush.ui | 2 +- example/example_factory.cc | 6 +- example/example_factory.h | 2 +- example/example_part.cc | 6 +- example/example_part.h | 4 +- filters/chalk/jpeg/kis_wdg_options_jpeg.ui | 2 +- filters/chalk/pdf/pdfimportwidgetbase.ui | 2 +- filters/chalk/png/kis_wdg_options_png.ui | 2 +- filters/chalk/raw/wdgrawimport.ui | 2 +- filters/chalk/tiff/kis_wdg_options_tiff.ui | 2 +- filters/chalk/xcf/xcf/xcf-load.cc | 16 +- filters/chalk/xcf/xcf/xcf-save.cc | 8 +- filters/karbon/oodraw/oodrawimport.cc | 6 +- filters/karbon/xaml/xamlexport.cc | 2 +- .../imageexport/kivio_imageexportwidget.ui | 4 +- filters/kpresenter/kword/kprkword.cc | 26 +- .../kpresenter/libimageexport/imageexport.cpp | 6 +- .../kpresenter/ooimpress/ooimpressimport.cc | 2 +- .../powerpoint/libppt/powerpoint.cpp | 100 +- .../kpresenter/powerpoint/libppt/powerpoint.h | 10 +- filters/kpresenter/svg/svgexport.cc | 6 +- filters/kspread/csv/dialogui.ui | 2 +- filters/kspread/csv/exportdialogui.ui | 2 +- filters/kspread/excel/sidewinder/excel.cpp | 14 +- filters/kspread/excel/sidewinder/excel.h | 4 +- filters/kspread/gnumeric/gnumeric.xsd | 2 +- filters/kspread/gnumeric/status.html | 2 +- filters/kspread/html/exportwidget.ui | 2 +- .../kexi/kspread_kexiimportdialogbase.ui | 2 +- .../kspread/latex/export/latexexportdia.ui | 2 +- filters/kspread/opencalc/opencalcimport.cc | 2 +- filters/kspread/opencalc/status.html | 4 +- filters/kword/abiword/ImportFormatting.cc | 22 +- filters/kword/abiword/ImportFormatting.h | 4 +- filters/kword/abiword/abiwordexport.cc | 30 +- filters/kword/abiword/abiwordimport.cc | 14 +- filters/kword/ascii/ExportDialogUI.ui | 2 +- filters/kword/ascii/ImportDialogUI.ui | 2 +- filters/kword/ascii/asciiimport.cc | 8 +- filters/kword/ascii/status.html | 2 +- filters/kword/html/export/ExportCss.cc | 28 +- filters/kword/html/export/ExportCss.h | 2 +- filters/kword/html/export/ExportDialogUI.ui | 2 +- filters/kword/html/export/ExportFilter.cc | 10 +- filters/kword/html/import/khtmlreader.cpp | 36 +- filters/kword/html/import/kwdwriter.cpp | 14 +- filters/kword/html/import/kwdwriter.h | 2 +- .../kword/kword1.3/import/kword13parser.cpp | 2 +- filters/kword/latex/export/latexexportdia.ui | 2 +- filters/kword/libexport/TagProcessing.cc | 12 +- filters/kword/libexport/TagProcessing.h | 2 +- filters/kword/msword/conversion.cpp | 2 +- filters/kword/msword/document.cpp | 8 +- filters/kword/msword/document.h | 2 +- filters/kword/msword/texthandler.cpp | 42 +- filters/kword/msword/texthandler.h | 6 +- filters/kword/mswrite/ImportDialogUI.ui | 2 +- filters/kword/mswrite/structures_generated.h | 2 +- filters/kword/oowriter/ExportFilter.cc | 26 +- filters/kword/oowriter/ExportFilter.h | 2 +- filters/kword/oowriter/oowriterimport.cc | 64 +- filters/kword/oowriter/oowriterimport.h | 14 +- filters/kword/pdf/DESIGN | 2 +- filters/kword/pdf/FilterDevice.cpp | 10 +- filters/kword/pdf/FilterDevice.h | 2 +- filters/kword/pdf/FilterPage.cpp | 12 +- filters/kword/pdf/data.cpp | 6 +- filters/kword/pdf/data.h | 2 +- .../xpdf_security_integer_overflow_2.diff | 12 +- filters/kword/pdf/fstring.cpp | 2 +- filters/kword/pdf/fstring.h | 2 +- filters/kword/pdf/status.html | 2 +- filters/kword/pdf/transform.h | 2 +- filters/kword/pdf/xpdf/xpdf/Catalog.cc | 2 +- filters/kword/pdf/xpdf/xpdf/Gfx.cc | 18 +- filters/kword/pdf/xpdf/xpdf/GfxFont.cc | 2 +- filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc | 2 +- filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/OutputDev.cc | 2 +- filters/kword/pdf/xpdf/xpdf/OutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc | 10 +- filters/kword/pdf/xpdf/xpdf/PSOutputDev.h | 6 +- filters/kword/pdf/xpdf/xpdf/XOutputDev.cc | 14 +- filters/kword/pdf/xpdf/xpdf/XOutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/XPDFCore.cc | 10 +- filters/kword/pdf/xpdf/xpdf/XPDFCore.h | 6 +- filters/kword/pdf/xpdf/xpdf/XPDFTree.cc | 26 +- filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h | 6 +- filters/kword/rtf/export/ExportFilter.cc | 32 +- filters/kword/rtf/export/ExportFilter.h | 2 +- filters/liboofilter/ooutils.cc | 50 +- filters/liboofilter/ooutils.h | 10 +- filters/xsltfilter/export/xsltdialog.ui | 2 +- filters/xsltfilter/import/xsltdialog.ui | 2 +- interfaces/koChart.cc | 4 +- interfaces/koChart.h | 2 +- karbon/commands/vdeletenodescmd.cc | 2 +- karbon/commands/vtransformcmd.cc | 8 +- karbon/commands/vungroupcmd.cc | 2 +- karbon/core/vgroup.cc | 8 +- karbon/core/vobject.cc | 6 +- karbon/core/vobject.h | 4 +- karbon/core/vobject_iface.h | 2 +- karbon/core/vpath.cc | 10 +- karbon/core/vselection.cc | 12 +- karbon/core/vstroke.cc | 4 +- karbon/dockers/vdocumentdocker.cc | 2 +- karbon/karbon_factory.cc | 6 +- karbon/karbon_factory.h | 2 +- karbon/karbon_part.cc | 12 +- karbon/karbon_part.h | 4 +- .../roundcorners/roundcornersplugin.cc | 2 +- karbon/plugins/whirlpinch/whirlpinchplugin.cc | 2 +- .../xrgbrender/gdk-pixbuf-xlib-render.c | 16 +- karbon/render/xrgbrender/gdk-pixbuf-xlib.h | 2 +- karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c | 2 +- kchart/csvimportdialogui.ui | 2 +- kchart/kchartBackgroundPixmapConfigPage.cc | 14 +- kchart/kchart_factory.cc | 4 +- kchart/kchart_part.cc | 10 +- kchart/kchart_part.h | 4 +- kchart/kdchart/KDChartCustomBox.h | 14 +- kchart/kdchart/KDChartEnums.h | 2 +- kchart/kdchart/KDChartPainter.cpp | 18 +- kchart/kdchart/KDChartParams.cpp | 2 +- kchart/kdchart/KDChartParams_io.cpp | 4 +- kdgantt/KDGanttMinimizeSplitter.cpp | 16 +- kdgantt/KDGanttView.cpp | 4 +- kdgantt/KDGanttViewEventItem.cpp | 2 +- kdgantt/KDGanttViewItem.cpp | 20 +- kdgantt/KDGanttViewItem.h | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 36 +- kdgantt/KDGanttViewSubwidgets.h | 12 +- kdgantt/KDGanttViewSummaryItem.cpp | 2 +- kdgantt/KDGanttViewTaskItem.cpp | 2 +- kdgantt/KDGanttViewTaskLink.cpp | 6 +- kdgantt/KDGanttViewTaskLink.h | 2 +- kdgantt/KDGanttViewTaskLinkGroup.cpp | 6 +- kdgantt/KDGanttViewTaskLinkGroup.h | 2 +- kdgantt/Makefile.am | 2 +- kdgantt/itemAttributeDialog.ui | 2 +- kdgantt/qlayoutengine_p.h | 2 +- kexi/3rdparty/kexisql/src/pager.c | 4 +- kexi/3rdparty/kexisql/src/select.c | 14 +- kexi/3rdparty/kexisql/src/vdbe.c | 2 +- kexi/3rdparty/kexisql/src/where.c | 20 +- kexi/3rdparty/kexisql3/src/alter.c | 2 +- kexi/3rdparty/kexisql3/src/btree.c | 16 +- kexi/3rdparty/kexisql3/src/pager.c | 4 +- kexi/3rdparty/kexisql3/src/parse.y | 2 +- kexi/3rdparty/kexisql3/src/pragma.c | 8 +- kexi/3rdparty/kexisql3/src/select.c | 14 +- kexi/3rdparty/kexisql3/src/vdbe.c | 4 +- kexi/3rdparty/kexisql3/src/vdbeaux.c | 6 +- kexi/3rdparty/kexisql3/src/vdbemem.c | 2 +- kexi/3rdparty/kexisql3/src/where.c | 26 +- kexi/3rdparty/kolibs/KoPageLayoutColumns.h | 4 +- .../kolibs/KoPageLayoutColumnsBase.ui | 2 +- kexi/3rdparty/kolibs/KoPageLayoutHeader.h | 4 +- .../3rdparty/kolibs/KoPageLayoutHeaderBase.ui | 2 +- kexi/3rdparty/kolibs/KoPageLayoutSize.h | 4 +- kexi/core/kexidataiteminterface.cpp | 4 +- kexi/core/kexidataiteminterface.h | 6 +- kexi/core/kexidialogbase.cpp | 8 +- kexi/core/kexidialogbase.h | 8 +- kexi/core/kexisharedactionhost.cpp | 8 +- kexi/core/kexisharedactionhost.h | 4 +- kexi/core/kexiviewbase.cpp | 16 +- kexi/core/kexiviewbase.h | 8 +- .../html.tmp/05_04_00_form_designing.html | 22 +- kexi/doc/handbook/translation-status.txt | 8 +- kexi/examples/Simple_Database.kexi.sql | 6 +- kexi/formeditor/commands.cpp | 42 +- kexi/formeditor/commands.h | 2 +- kexi/formeditor/connectiondialog.cpp | 2 +- kexi/formeditor/container.cpp | 28 +- kexi/formeditor/container.h | 10 +- kexi/formeditor/events.cpp | 14 +- kexi/formeditor/events.h | 6 +- .../formeditor/factories/containerfactory.cpp | 36 +- kexi/formeditor/factories/containerfactory.h | 2 +- .../formeditor/factories/stdwidgetfactory.cpp | 14 +- kexi/formeditor/factories/stdwidgetfactory.h | 4 +- kexi/formeditor/form.cpp | 22 +- kexi/formeditor/form.h | 2 +- kexi/formeditor/formIO.cpp | 54 +- kexi/formeditor/formIO.h | 12 +- kexi/formeditor/formmanager.cpp | 72 +- kexi/formeditor/formmanager.h | 16 +- .../kdevelop_plugin/kfd_kdev_part.cpp | 42 +- .../kdevelop_plugin/kfd_kdev_part.h | 2 +- kexi/formeditor/objecttree.cpp | 4 +- kexi/formeditor/objecttree.h | 2 +- kexi/formeditor/resizehandle.cpp | 16 +- kexi/formeditor/scripting/scriptIO.cpp | 26 +- kexi/formeditor/scripting/scriptIO.h | 10 +- kexi/formeditor/spring.cpp | 6 +- kexi/formeditor/test/kfd_part.cpp | 80 +- kexi/formeditor/test/kfd_part.h | 2 +- kexi/formeditor/widgetfactory.cpp | 20 +- kexi/formeditor/widgetfactory.h | 6 +- kexi/formeditor/widgetlibrary.cpp | 30 +- kexi/formeditor/widgetlibrary.h | 2 +- kexi/formeditor/widgetpropertyset.cpp | 26 +- kexi/kexidb/connection.h | 2 +- kexi/kexidb/expression.cpp | 2 +- kexi/kexidb/fieldlist.h | 2 +- kexi/kexidb/indexschema.cpp | 14 +- kexi/kexidb/indexschema.h | 4 +- kexi/kexidb/lookupfieldschema.cpp | 4 +- kexi/kexidb/lookupfieldschema.h | 4 +- kexi/kexidb/parser/sqlparser.y | 2 +- kexi/kexidb/queryschema.h | 4 +- kexi/kexidb/utils.cpp | 8 +- kexi/kexidb/utils.h | 10 +- kexi/kexiutils/styleproxy.cpp | 6 +- kexi/kexiutils/styleproxy.h | 6 +- kexi/main/kexifinddialogbase.ui | 4 +- kexi/main/keximainwindowimpl.cpp | 130 +- kexi/main/keximainwindowimpl.h | 16 +- kexi/main/keximainwindowimpl_p.h | 12 +- kexi/main/kexinewstuff.cpp | 2 +- .../kexisimpleprintingpagesetupbase.ui | 2 +- kexi/main/startup/KexiConnSelector.cpp | 2 +- kexi/main/startup/KexiConnSelectorBase.ui | 2 +- kexi/main/startup/KexiDBTitlePageBase.ui | 2 +- kexi/main/startup/KexiNewPrjTypeSelector.ui | 2 +- kexi/main/startup/KexiOpenExistingFile.ui | 2 +- kexi/main/startup/KexiProjectSelectorBase.ui | 2 +- kexi/main/startup/KexiServerDBNamePage.ui | 2 +- kexi/main/startup/KexiStartupFileDialog.cpp | 2 +- kexi/migration/importwizard.cpp | 2 +- .../plugins/forms/kexidataawarewidgetinfo.cpp | 4 +- kexi/plugins/forms/kexidataawarewidgetinfo.h | 2 +- kexi/plugins/forms/kexidataprovider.cpp | 16 +- kexi/plugins/forms/kexidataprovider.h | 2 +- kexi/plugins/forms/kexidbfactory.cpp | 2 +- kexi/plugins/forms/kexidbfactory.h | 2 +- .../forms/kexiformdataiteminterface.cpp | 4 +- kexi/plugins/forms/kexiformmanager.cpp | 4 +- kexi/plugins/forms/kexiformmanager.h | 2 +- kexi/plugins/forms/kexiformpart.cpp | 2 +- kexi/plugins/forms/kexiformscrollview.cpp | 2 +- kexi/plugins/forms/kexiformview.cpp | 60 +- kexi/plugins/forms/kexiformview.h | 2 +- .../plugins/forms/widgets/kexidbautofield.cpp | 2 +- kexi/plugins/forms/widgets/kexidbcombobox.cpp | 4 +- kexi/plugins/forms/widgets/kexidbform.cpp | 22 +- kexi/plugins/forms/widgets/kexidbimagebox.cpp | 4 +- kexi/plugins/forms/widgets/kexidblineedit.h | 2 +- kexi/plugins/forms/widgets/kexidbsubform.cpp | 16 +- kexi/plugins/forms/widgets/kexidbsubform.h | 2 +- .../importexport/csv/kexicsvimportdialog.cpp | 10 +- .../macros/kexipart/keximacroerrorbase.ui | 2 +- .../macros/kexipart/keximacroproperty.cpp | 20 +- .../macros/kexipart/keximacroproperty.h | 2 +- .../macros/kexipart/keximacrotextview.cpp | 2 +- .../plugins/macros/kexipart/keximacroview.cpp | 4 +- kexi/plugins/queries/kexiaddparamwidget.ui | 2 +- .../queries/kexiparameterlisteditor.ui | 2 +- .../queries/kexiquerydesignerguieditor.cpp | 24 +- kexi/plugins/queries/kexiquerydesignersql.cpp | 10 +- kexi/plugins/queries/kexiqueryview.cpp | 10 +- kexi/plugins/reports/kexireportfactory.h | 2 +- kexi/plugins/reports/kexireportform.cpp | 10 +- kexi/plugins/reports/kexireportview.cpp | 6 +- kexi/plugins/reports/kexireportview.h | 2 +- kexi/plugins/reports/reportwidgets.cpp | 6 +- .../kexiscripting/kexiscriptdesignview.cpp | 4 +- .../scripts/copycenter/CopyCenter.py | 12 +- .../tables/kexitabledesigner_dataview.cpp | 2 +- kexi/plugins/tables/kexitabledesignerview.cpp | 18 +- .../tables/kexitabledesignerview_p.cpp | 2 +- kexi/tests/altertable/1.kexi | Bin 49212 -> 49206 bytes kexi/tests/altertable/altertable.cpp | 2 +- .../gui/finddialog/kexifinddialogbase.ui | 2 +- kexi/tests/newapi/statements.txt | 2 +- kexi/widget/kexidbconnectionwidgetbase.ui | 2 +- .../kexidbconnectionwidgetdetailsbase.ui | 2 +- kexi/widget/kexiprjtypeselectorbase.ui | 2 +- kexi/widget/pixmapcollection.cpp | 14 +- kexi/widget/pixmapcollection.h | 2 +- kexi/widget/relations/kexirelationview.cpp | 22 +- kexi/widget/relations/kexirelationview.h | 2 +- .../relations/kexirelationviewtable.cpp | 12 +- kexi/widget/relations/kexirelationwidget.cpp | 16 +- kexi/widget/relations/kexirelationwidget.h | 2 +- kexi/widget/tableview/kexiblobtableedit.cpp | 2 +- kexi/widget/tableview/kexicomboboxbase.cpp | 2 +- kexi/widget/tableview/kexicomboboxpopup.cpp | 4 +- .../tableview/kexicomboboxtableedit.cpp | 2 +- kexi/widget/tableview/kexitableview.cpp | 8 +- kexi/widget/tableview/kexitableviewdata.h | 2 +- kexi/widget/tableview/kexitableviewheader.cpp | 4 +- kexi/widget/utils/kexiarrowtip.cpp | 12 +- kexi/widget/utils/kexiflowlayout.cpp | 4 +- kformula/DESIGN | 4 +- kformula/kformula_doc.cc | 6 +- kformula/kformula_doc.h | 4 +- kformula/kformula_factory.cc | 4 +- kformula/kformula_factory.h | 2 +- kivio/kiviopart/kivio_doc.cpp | 12 +- kivio/kiviopart/kivio_doc.h | 4 +- kivio/kiviopart/kivio_factory.cpp | 4 +- kivio/kiviopart/kivio_factory.h | 2 +- kivio/kiviopart/kivio_page.cpp | 8 +- kivio/kiviopart/kivio_view.cpp | 2 +- kivio/kiviopart/ui/aligndialog.ui | 18 +- kivio/kiviopart/ui/export_page_dialog_base.ui | 4 +- .../kiviopart/ui/kivio_birdeye_panel_base.ui | 6 +- kivio/kiviopart/ui/kivio_layer_panel_base.ui | 6 +- .../ui/kivio_protection_panel_base.ui | 2 +- kivio/kiviopart/ui/kiviooptionsdialog.cpp | 14 +- kivio/kiviopart/ui/kiviostencilsetwidget.ui | 4 +- .../kivio_stenciltexteditorui.ui | 4 +- koshell/iconsidepane.cpp | 4 +- kounavail/kounavail.cc | 8 +- kounavail/kounavail.h | 4 +- kplato/kptaccountspanelbase.ui | 2 +- kplato/kptaccountsviewconfigurepanelbase.ui | 2 +- kplato/kptcalendar.h | 8 +- kplato/kptcalendarlistpanel.ui | 2 +- kplato/kptcanvasitem.cc | 188 +- kplato/kptcanvasitem.h | 8 +- kplato/kptconfigbehaviorpanelbase.ui | 2 +- kplato/kptconfigtaskpanelbase.ui | 2 +- kplato/kptdurationwidget.ui | 2 +- kplato/kptfactory.cc | 6 +- kplato/kptfactory.h | 2 +- kplato/kptganttview.cc | 80 +- kplato/kptganttview.h | 22 +- kplato/kptintervaleditbase.ui | 2 +- kplato/kptmainprojectpanelbase.ui | 2 +- kplato/kptmilestoneprogresspanelbase.ui | 2 +- kplato/kptnode.cc | 2 +- kplato/kptpart.cc | 12 +- kplato/kptpart.h | 4 +- kplato/kptpertcanvas.cc | 28 +- kplato/kptpertcanvas.h | 2 +- kplato/kptproject.cc | 52 +- kplato/kptprojectdialogbase.ui | 2 +- kplato/kptsummarytaskgeneralpanelbase.ui | 2 +- kplato/kpttask.cc | 4 +- kplato/kpttaskcostpanelbase.ui | 2 +- kplato/kpttaskgeneralpanelbase.ui | 2 +- kplato/kpttasknotespanelbase.ui | 2 +- kplato/kpttaskprogresspanelbase.ui | 2 +- kplato/kpttaskresourcespanelbase.ui | 2 +- kplato/kptwbsdefinitionpanelbase.ui | 2 +- kplato/relationpanel.ui | 2 +- kplato/resourcedialogbase.ui | 2 +- kplato/resourcespanelbase.ui | 2 +- kplato/standardworktimedialogbase.ui | 2 +- kpresenter/KPrDocument.cpp | 20 +- kpresenter/KPrDocument.h | 6 +- kpresenter/KPrFactory.cpp | 4 +- kpresenter/KPrFactory.h | 2 +- kpresenter/KPrGotoPage.cpp | 4 +- kpresenter/KPrTextObject.cpp | 88 +- kpresenter/KPrTextObject.h | 8 +- kpresenter/KPrView.cpp | 10 +- kpresenter/KPrView.h | 2 +- kpresenter/brushpropertyui.ui | 2 +- kpresenter/generalpropertyui.ui | 2 +- kpresenter/gradientpropertyui.ui | 2 +- kpresenter/imageEffectBase.ui | 2 +- kpresenter/insertpagedia.ui | 4 +- kpresenter/marginui.ui | 2 +- kpresenter/penstyle.ui | 4 +- kpresenter/picturepropertyui.ui | 2 +- kpresenter/piepropertyui.ui | 2 +- kpresenter/polygonpropertyui.ui | 2 +- kpresenter/rectpropertyui.ui | 2 +- kpresenter/rotationpropertyui.ui | 2 +- kpresenter/shadowdialog.ui | 2 +- kpresenter/slidetransitionwidget.ui | 2 +- kpresenter/textpropertyui.ui | 2 +- kspread/DESIGN.html | 6 +- kspread/KSpreadViewIface.cc | 4 +- kspread/KSpreadViewIface.h | 2 +- kspread/commands.cc | 2 +- kspread/dialogs/SheetSelectWidget.ui | 2 +- kspread/dialogs/font_cell_format.ui | 2 +- kspread/dialogs/kspread_dlg_layout.cc | 22 +- kspread/dialogs/kspread_dlg_layout.h | 4 +- kspread/dialogs/kspread_dlg_paperlayout.h | 4 +- kspread/dialogs/kspread_dlg_sort.cc | 10 +- kspread/dialogs/kspreadsubtotal.ui | 2 +- kspread/dialogs/position_cell_format.ui | 2 +- kspread/dialogs/protection_cell_format.ui | 2 +- kspread/dialogs/sheet_properties.cc | 2 +- kspread/dialogs/sheet_properties.h | 2 +- kspread/dialogs/sheet_properties_base.ui | 4 +- kspread/formula.cc | 4 +- kspread/kspread_canvas.cc | 106 +- kspread/kspread_cell.cc | 14 +- kspread/kspread_cell.h | 2 +- kspread/kspread_doc.cc | 8 +- kspread/kspread_doc.h | 4 +- kspread/kspread_editors.cc | 2 +- kspread/kspread_factory.cc | 4 +- kspread/kspread_factory.h | 2 +- kspread/kspread_format.cc | 4 +- kspread/kspread_sheet.cc | 34 +- kspread/kspread_sheet.h | 4 +- kspread/kspread_sheetprint.cc | 2 +- kspread/kspread_style.h | 2 +- kspread/kspread_style_manager.cc | 22 +- kspread/kspread_undo.cc | 76 +- kspread/kspread_undo.h | 38 +- kspread/kspread_view.cc | 28 +- kspread/kspread_view.h | 2 +- kspread/manipulator.cc | 38 +- kspread/manipulator.h | 24 +- kspread/plugins/calculator/kcalc.cpp | 6 +- .../kspread_insertcalendardialogbase.ui | 2 +- .../scripts/scripteditor/ScriptEditor.py | 116 +- kspread/tests/formula_tester.cc | 2 +- kspread/tests/inspector.cc | 2 +- kugar/kudesigner/kudesigner_doc.cpp | 8 +- kugar/kudesigner/kudesigner_doc.h | 4 +- kugar/kudesigner/kudesigner_factory.cpp | 6 +- kugar/kudesigner/kudesigner_factory.h | 2 +- kugar/kudesigner_lib/line.cpp | 2 +- kugar/kudesigner_lib/reportitem.cpp | 6 +- kugar/kudesigner_lib/reportitem.h | 4 +- kugar/kudesigner_lib/view.cpp | 8 +- kugar/lib/inputmask.cpp | 72 +- kugar/lib/inputmask.h | 8 +- kugar/part/kugar_factory.cpp | 8 +- kugar/part/kugar_factory.h | 2 +- kugar/part/kugar_part.cpp | 6 +- kugar/part/kugar_part.h | 4 +- kword/KWAnchor.cpp | 14 +- kword/KWCommand.cpp | 4 +- kword/KWConfigFootNoteDia.cpp | 2 +- kword/KWCreateBookmarkDiaBase.ui | 2 +- kword/KWDocument.cpp | 44 +- kword/KWDocument.h | 20 +- kword/KWFactory.cpp | 4 +- kword/KWFormulaFrameSet.cpp | 8 +- kword/KWFormulaFrameSet.h | 2 +- kword/KWFrameDia.cpp | 12 +- kword/KWFrameLayout.cpp | 2 +- kword/KWFrameLayout.h | 2 +- kword/KWFrameList.cpp | 8 +- kword/KWFrameSet.cpp | 24 +- kword/KWFrameSet.h | 8 +- kword/KWFrameStyle.cpp | 46 +- kword/KWFrameStyle.h | 6 +- kword/KWFrameView.cpp | 4 +- kword/KWInsertTOCCommand.cpp | 2 +- kword/KWMailMergeDataBase.cpp | 16 +- kword/KWPartFrameSet.cpp | 6 +- kword/KWPartFrameSet.h | 2 +- kword/KWPictureFrameSet.cpp | 10 +- kword/KWPictureFrameSet.h | 2 +- kword/KWSelectBookmarkDiaBase.ui | 2 +- kword/KWStartupWidgetBase.ui | 2 +- kword/KWTableFrameSet.cpp | 10 +- kword/KWTableFrameSet.h | 4 +- kword/KWTableStyle.cpp | 24 +- kword/KWTableStyle.h | 6 +- kword/KWTableTemplate.cpp | 34 +- kword/KWTableTemplate.h | 8 +- kword/KWTextFrameSet.cpp | 60 +- kword/KWTextFrameSet.h | 12 +- kword/KWTextImage.cpp | 16 +- kword/KWTextParag.cpp | 30 +- kword/KWTextParag.h | 6 +- kword/KWVariable.cpp | 24 +- kword/KWVariable.h | 4 +- kword/KWView.cpp | 28 +- kword/KWView.h | 6 +- kword/KWViewMode.cpp | 12 +- kword/mailmerge/KWClassicSerialDataSource.cpp | 10 +- kword/mailmerge/KWClassicSerialDataSource.h | 2 +- kword/mailmerge/kabc/KWMailMergeKABC.cpp | 4 +- kword/mailmerge/kabc/addresspicker.ui | 2 +- .../mailmerge/kspread/kwmailmerge_kspread.cpp | 4 +- .../sql/KWQtSqlPowerSerialDataSource.cpp | 6 +- .../mailmerge/sql/KWQtSqlSerialDataSource.cpp | 6 +- kword/mailmerge/sql/kwqtsqlpower.ui | 2 +- kword/mailmerge/sql/qtsqldatasourceeditor.ui | 2 +- kword/mailmerge/sql/qtsqlopenwidget.ui | 2 +- lib/kformula/DESIGN | 6 +- lib/kformula/basicelement.cc | 6 +- lib/kformula/basicelement.h | 10 +- lib/kformula/bracketelement.cc | 78 +- lib/kformula/bracketelement.h | 28 +- lib/kformula/errorelement.cc | 18 +- lib/kformula/errorelement.h | 6 +- lib/kformula/fontstyle.cc | 104 +- lib/kformula/fontstyle.h | 8 +- lib/kformula/formulaelement.cc | 6 +- lib/kformula/formulaelement.h | 8 +- lib/kformula/fractionelement.cc | 28 +- lib/kformula/fractionelement.h | 10 +- lib/kformula/glyphelement.cc | 28 +- lib/kformula/glyphelement.h | 8 +- lib/kformula/indexelement.cc | 26 +- lib/kformula/indexelement.h | 10 +- lib/kformula/kformulacommand.cc | 28 +- lib/kformula/kformulacommand.h | 2 +- lib/kformula/kformulacontainer.cc | 52 +- lib/kformula/kformuladefs.h | 2 +- lib/kformula/kformulamimesource.cc | 4 +- lib/kformula/kformulaview.cc | 2 +- lib/kformula/matrixelement.cc | 74 +- lib/kformula/matrixelement.h | 22 +- lib/kformula/paddedelement.cc | 2 +- lib/kformula/paddedelement.h | 2 +- lib/kformula/phantomelement.cc | 4 +- lib/kformula/phantomelement.h | 6 +- lib/kformula/rootelement.cc | 56 +- lib/kformula/rootelement.h | 10 +- lib/kformula/sequenceelement.cc | 90 +- lib/kformula/sequenceelement.h | 10 +- lib/kformula/spaceelement.cc | 40 +- lib/kformula/spaceelement.h | 8 +- lib/kformula/styleelement.cc | 4 +- lib/kformula/symbolelement.cc | 44 +- lib/kformula/symbolelement.h | 10 +- lib/kformula/textelement.cc | 64 +- lib/kformula/textelement.h | 16 +- lib/kformula/tokenstyleelement.cc | 14 +- lib/kformula/tokenstyleelement.h | 2 +- lib/kofficecore/KoChild.h | 2 +- lib/kofficecore/KoDocument.cpp | 4 +- lib/kofficecore/KoDocument.h | 14 +- lib/kofficecore/KoDocumentChild.cpp | 6 +- lib/kofficecore/KoDocumentChild.h | 2 +- lib/kofficecore/KoFilterChain.cpp | 26 +- lib/kofficecore/KoFilterChain.h | 4 +- lib/kofficecore/KoFilterManager.cpp | 4 +- lib/kofficecore/KoFilterManager.h | 6 +- lib/kofficecore/KoFrame.cpp | 18 +- lib/kofficecore/KoGenStyles.cpp | 60 +- lib/kofficecore/KoGenStyles.h | 8 +- lib/kofficecore/KoOasisLoadingContext.cpp | 18 +- lib/kofficecore/KoSpeaker.cpp | 2 +- lib/kofficecore/KoStyleStack.cpp | 2 +- lib/kofficecore/KoView.cpp | 30 +- lib/kofficecore/KoView.h | 4 +- lib/kofficecore/KoXmlReader.cpp | 6 +- lib/kofficecore/KoXmlReader.h | 2 +- lib/kofficecore/kkbdaccessextensions.cpp | 4 +- lib/kofficecore/koDetailsPaneBase.ui | 4 +- lib/kofficecore/koDocumentInfoAboutWidget.ui | 4 +- lib/kofficecore/koDocumentInfoAuthorWidget.ui | 4 +- .../koDocumentInfoUserMetadataWidget.ui | 4 +- lib/kofficecore/koOpenPaneBase.ui | 4 +- lib/kofficecore/tests/kogenstylestest.cpp | 2 +- lib/kofficecore/tests/koxmlreadertest.cpp | 260 +- lib/kofficeui/KoCommandHistory.h | 2 +- lib/kofficeui/KoContextCelp.h | 2 +- lib/kofficeui/KoGeneralPropertyUi.ui | 2 +- lib/kofficeui/KoPageLayoutColumns.h | 4 +- lib/kofficeui/KoPageLayoutColumnsBase.ui | 2 +- lib/kofficeui/KoPageLayoutHeader.h | 4 +- lib/kofficeui/KoPageLayoutHeaderBase.ui | 2 +- lib/kofficeui/KoPageLayoutSize.h | 4 +- lib/kofficeui/KoTabBar.cpp | 32 +- lib/kofficeui/KoTooluButton.cpp | 8 +- lib/kofficeui/kcoloractions.cpp | 4 +- lib/kofficeui/tktoolbarbutton.cpp | 2 +- lib/kopainter/koColorSlider.cc | 2 +- lib/koproperty/editor.cpp | 8 +- lib/koproperty/editoritem.cpp | 6 +- lib/koproperty/editors/spinbox.cpp | 12 +- lib/koproperty/widget.cpp | 2 +- lib/kotext/DESIGN | 4 +- lib/kotext/KFontDialog_local.cpp | 4 +- lib/kotext/KoCompletionBase.ui | 2 +- lib/kotext/KoComplexText.cpp | 2 +- lib/kotext/KoFontDia.cpp | 30 +- lib/kotext/KoFontDia.h | 2 +- lib/kotext/KoLayoutTab.h | 4 +- lib/kotext/KoParagCounter.cpp | 4 +- lib/kotext/KoParagDecorationTab.ui | 2 +- lib/kotext/KoParagDia.cpp | 20 +- lib/kotext/KoParagDia.h | 6 +- lib/kotext/KoParagLayout.cpp | 66 +- lib/kotext/KoParagLayout.h | 8 +- lib/kotext/KoParagStyle.cpp | 24 +- lib/kotext/KoParagStyle.h | 8 +- lib/kotext/KoRichText.cpp | 6 +- lib/kotext/KoStyleManager.cpp | 4 +- lib/kotext/KoStyleManager.h | 2 +- lib/kotext/KoTextCommand.cpp | 4 +- lib/kotext/KoTextCustomItem.cpp | 18 +- lib/kotext/KoTextDocument.cpp | 14 +- lib/kotext/KoTextFormat.cpp | 6 +- lib/kotext/KoTextFormatter.cpp | 46 +- lib/kotext/KoTextObject.cpp | 4 +- lib/kotext/KoTextParag.cpp | 106 +- lib/kotext/KoTextParag.h | 2 +- lib/kotext/KoTextView.cpp | 2 +- lib/kotext/KoTextZoomHandler.cpp | 24 +- lib/kotext/KoTextZoomHandler.h | 36 +- lib/kotext/KoVariable.cpp | 58 +- lib/kotext/KoVariable.h | 24 +- lib/kotext/kodecorationtabbase.ui | 2 +- lib/kotext/kofonttabbase.ui | 2 +- lib/kotext/kohighlightingtabbase.ui | 2 +- lib/kotext/kolanguagetabbase.ui | 2 +- lib/kotext/kolayouttabbase.ui | 2 +- lib/kotext/timedateformatwidget.ui | 2 +- lib/kross/main/wdgscriptsmanager.cpp | 16 +- lib/kross/main/wdgscriptsmanager.h | 2 +- lib/kross/main/wdgscriptsmanagerbase.ui | 2 +- lib/kross/python/scripts/gui.py | 28 +- lib/store/KoXmlWriter.cpp | 4 +- lib/store/fix_storage.pl | 8 +- tools/kfile-plugins/ooo/kfile_ooo.cpp | 10 +- tools/kfile-plugins/ooo/kfile_ooo.h | 2 +- tools/thesaurus/thesaurus.txt | 24 +- 776 files changed, 18038 insertions(+), 18038 deletions(-) diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc index 4b54556f..db50c7d9 100644 --- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc @@ -132,7 +132,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -148,7 +148,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst, return; switch (op.op()) { case COMPOSITE_COPY: - compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); return; case COMPOSITE_CLEAR: linesize = sizeof(TQ_UINT8) * cols; diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h index dd4f3916..173a809e 100644 --- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h @@ -80,7 +80,7 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc index 829b4f27..e8476d75 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc @@ -262,12 +262,12 @@ void KisLabColorSpace::getSingleChannelPixel(TQ_UINT8 *dst, const TQ_UINT8 *src, } } -void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { while (rows > 0) { const Pixel *src = reinterpret_cast(srcRowStart); Pixel *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -331,8 +331,8 @@ printf("%d %d %d\n", dst->lightness, dst->a, dst->b); rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -342,7 +342,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT16 /*opacity*/) @@ -372,7 +372,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -382,7 +382,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -425,16 +425,16 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - //compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -469,22 +469,22 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - //compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -493,24 +493,24 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - //compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h index eeab55cf..e85408f8 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h @@ -81,28 +81,28 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); /* - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); */ - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: struct Pixel { diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc index 98ccead0..7e765d7a 100644 --- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc @@ -119,13 +119,13 @@ TQ_UINT8 KisXyzColorSpace::intensity8(const TQ_UINT8 * src) const return 0; } -void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { while (rows > 0) { const TQ_UINT16 *src = reinterpret_cast(srcRowStart); TQ_UINT16 *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -186,8 +186,8 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -198,7 +198,7 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid const TQ_UINT16 *src = reinterpret_cast(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -248,12 +248,12 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -273,7 +273,7 @@ void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -294,7 +294,7 @@ void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -315,7 +315,7 @@ void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -336,7 +336,7 @@ void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -357,7 +357,7 @@ void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -379,7 +379,7 @@ void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -400,7 +400,7 @@ void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -428,7 +428,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT16 /*opacity*/) @@ -458,7 +458,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -468,7 +468,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -510,16 +510,16 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -554,22 +554,22 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -578,24 +578,24 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h index 2f7c3efd..4a785825 100644 --- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h @@ -78,7 +78,7 @@ public: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -87,16 +87,16 @@ public: KisCompositeOpList userVisiblecompositeOps() const; protected: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc index a19b9d69..66b8e1ad 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.cc +++ b/chalk/chalkcolor/kis_abstract_colorspace.cc @@ -638,7 +638,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -671,7 +671,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst, m_conversionCache.data(), srcRowStride, srcAlphaMask, - tqmaskRowStride, + maskRowStride, opacity, rows, cols, @@ -684,7 +684,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst, src, srcRowStride, srcAlphaMask, - tqmaskRowStride, + maskRowStride, opacity, rows, cols, @@ -741,7 +741,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa return 0; } -void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { TQ_UINT8 *dst = dstRowStart; const TQ_UINT8 *src = srcRowStart; diff --git a/chalk/chalkcolor/kis_abstract_colorspace.h b/chalk/chalkcolor/kis_abstract_colorspace.h index 75dfd1ef..732918d4 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.h +++ b/chalk/chalkcolor/kis_abstract_colorspace.h @@ -181,7 +181,7 @@ public: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -201,7 +201,7 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -212,7 +212,7 @@ protected: KisProfile * dstProfile, TQ_INT32 renderingIntent); - virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity); + virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity); // So I don't need to re-implement it everywhere. @@ -221,7 +221,7 @@ protected: int AlphaPos, int NonAlphaSize, int TotalSize> void abstractCompositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, + const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity, NativeMult nativeMult, Uint8ToNative uint8ToNative, NativeOpacityTest nativeOpacityTest) { @@ -229,7 +229,7 @@ protected: const ColorType *src = reinterpret_cast(srcRowStart); ColorType *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -263,8 +263,8 @@ protected: rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } diff --git a/chalk/chalkcolor/kis_colorspace.h b/chalk/chalkcolor/kis_colorspace.h index 6071909c..1ce2ac6a 100644 --- a/chalk/chalkcolor/kis_colorspace.h +++ b/chalk/chalkcolor/kis_colorspace.h @@ -401,7 +401,7 @@ public: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc index 3f2ccc80..58ed3857 100644 --- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc +++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc @@ -210,13 +210,13 @@ void KisCmykU16ColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UI } } -void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { while (rows > 0) { const TQ_UINT16 *src = reinterpret_cast(srcRowStart); TQ_UINT16 *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -278,8 +278,8 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -290,7 +290,7 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -340,12 +340,12 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -366,7 +366,7 @@ void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -387,7 +387,7 @@ void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -408,7 +408,7 @@ void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -429,7 +429,7 @@ void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -450,7 +450,7 @@ void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -472,7 +472,7 @@ void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -493,7 +493,7 @@ void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -519,7 +519,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT16 /*opacity*/) @@ -549,7 +549,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -560,7 +560,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -602,16 +602,16 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_CYAN: //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -646,22 +646,22 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -670,24 +670,24 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h index 8e43cd1c..c617607c 100644 --- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h +++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h @@ -72,22 +72,22 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisCmykU16ColorSpaceTester; diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc index 49256c26..bfe85f0d 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc @@ -208,13 +208,13 @@ void KisCmykColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UINT8 } } -void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -276,8 +276,8 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -288,7 +288,7 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; \ TQ_UINT8 *dst = dstRowStart; \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -338,12 +338,12 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -364,7 +364,7 @@ void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -385,7 +385,7 @@ void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -406,7 +406,7 @@ void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -427,7 +427,7 @@ void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -448,7 +448,7 @@ void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -470,7 +470,7 @@ void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -491,7 +491,7 @@ void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -517,7 +517,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) @@ -547,7 +547,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -557,7 +557,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -598,16 +598,16 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY_CYAN: //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -642,22 +642,22 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -666,24 +666,24 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U8Mult(), Uint8ToU8(), U8OpacityTest()); break; default: diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h index 69ef80e4..a7723915 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h @@ -74,22 +74,22 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc index 00f3440c..4e50b1c2 100644 --- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc +++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc @@ -161,13 +161,13 @@ TQ_UINT32 KisGrayU16ColorSpace::pixelSize() const return MAX_CHANNEL_GRAYA * sizeof(TQ_UINT16); } -void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { while (rows > 0) { const TQ_UINT16 *src = reinterpret_cast(srcRowStart); TQ_UINT16 *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -226,8 +226,8 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -238,7 +238,7 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -288,12 +288,12 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -310,7 +310,7 @@ void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -331,7 +331,7 @@ void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -352,7 +352,7 @@ void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -373,7 +373,7 @@ void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -394,7 +394,7 @@ void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -416,7 +416,7 @@ void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -437,7 +437,7 @@ void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -464,7 +464,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT16 /*opacity*/) @@ -494,7 +494,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -504,7 +504,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -517,7 +517,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -546,16 +546,16 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -590,22 +590,22 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -614,24 +614,24 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h index 5c2351da..eeec10a7 100644 --- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h +++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h @@ -70,22 +70,22 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisGrayU16ColorSpaceTester; diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc index dbd475df..59b70f77 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc @@ -200,7 +200,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, { switch (op.op()) { case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_CLEAR: { TQ_UINT8 *d; @@ -253,7 +253,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, } break; case COMPOSITE_ALPHA_DARKEN: - compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; default: @@ -278,14 +278,14 @@ KisCompositeOpList KisGrayColorSpace::userVisiblecompositeOps() const return list; } -void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -341,19 +341,19 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -407,19 +407,19 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -478,19 +478,19 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -549,19 +549,19 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -620,19 +620,19 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -691,19 +691,19 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -763,19 +763,19 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -834,19 +834,19 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -905,8 +905,8 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } @@ -915,7 +915,7 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) @@ -944,21 +944,21 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; if(srcAlphaMask) - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; src += srcRowSize; } } void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, + const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -991,7 +991,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h index 8a3bc34b..a46adcc0 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h @@ -61,7 +61,7 @@ public: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -70,17 +70,17 @@ public: KisCompositeOpList userVisiblecompositeOps() const; protected: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc index 57475a03..55054bc6 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc @@ -220,13 +220,13 @@ TQImage KisLmsF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w } -void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { while (rows > 0) { const float *src = reinterpret_cast(srcRowStart); float *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -287,8 +287,8 @@ void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -298,7 +298,7 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, float /*opacity*/) @@ -328,13 +328,13 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } void KisLmsF32ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, - const TQ_UINT8 */*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/) + const TQ_UINT8 */*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/) { while (rows > 0) { memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel)); @@ -349,7 +349,7 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -362,13 +362,13 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; default: break; diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h index 36e9a01c..468ac5e4 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h @@ -81,15 +81,15 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); private: inline TQ_UINT8 computeRed(float l, float m, float s) const diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc index fb2df8c1..4ae8004b 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc @@ -299,13 +299,13 @@ TQImage KisRgbF16HalfColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT } -void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { while (rows > 0) { const half *src = reinterpret_cast(srcRowStart); half *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -366,8 +366,8 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -378,7 +378,7 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR const half *src = reinterpret_cast(srcRowStart); \ half *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -428,12 +428,12 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -463,7 +463,7 @@ void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -484,7 +484,7 @@ void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 ds COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -505,7 +505,7 @@ void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 ds COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -526,7 +526,7 @@ void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 d COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -547,7 +547,7 @@ void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dst COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -569,7 +569,7 @@ void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstR COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -590,7 +590,7 @@ void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 ds COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -611,7 +611,7 @@ void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 d COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -645,7 +645,7 @@ void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -679,7 +679,7 @@ void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT3 COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -713,7 +713,7 @@ void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dst COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) +void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -752,7 +752,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, half /*opacity*/) @@ -782,7 +782,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -792,7 +792,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -805,7 +805,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -834,16 +834,16 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -878,22 +878,22 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -902,24 +902,24 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity, F16HalfMult(), Uint8ToF16Half(), F16HalfOpacityTest()); break; diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h index a148a8f9..f965a766 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h @@ -79,26 +79,26 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); private: friend class KisRgbF16HalfColorSpaceTester; diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc index 98e0b28b..1edd63f9 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc @@ -298,13 +298,13 @@ TQImage KisRgbF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w } -void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { while (rows > 0) { const float *src = reinterpret_cast(srcRowStart); float *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -365,8 +365,8 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -377,7 +377,7 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const float *src = reinterpret_cast(srcRowStart); \ float *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -427,12 +427,12 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -462,7 +462,7 @@ void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -483,7 +483,7 @@ void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -504,7 +504,7 @@ void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -525,7 +525,7 @@ void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -546,7 +546,7 @@ void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -568,7 +568,7 @@ void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -589,7 +589,7 @@ void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -610,7 +610,7 @@ void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -644,7 +644,7 @@ void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -678,7 +678,7 @@ void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -712,7 +712,7 @@ void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) +void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -751,7 +751,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, float /*opacity*/) @@ -781,7 +781,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -791,7 +791,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -804,7 +804,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -833,16 +833,16 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -877,22 +877,22 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -901,24 +901,24 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity, F32Mult(), Uint8ToF32(), F32OpacityTest()); default: break; diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h index 6f2ff3ae..cfd93010 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h @@ -83,26 +83,26 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); private: friend class KisRgbF32ColorSpaceTester; diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc index c61433d2..f792e875 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc @@ -196,13 +196,13 @@ TQ_UINT32 KisRgbU16ColorSpace::pixelSize() const } -void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { while (rows > 0) { const TQ_UINT16 *src = reinterpret_cast(srcRowStart); TQ_UINT16 *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -263,8 +263,8 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } @@ -275,7 +275,7 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT16 *src = reinterpret_cast(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = tqmaskRowStart; \ + const TQ_UINT8 *tqmask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -325,12 +325,12 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; \ srcRowStart += srcRowStride; \ dstRowStart += dstRowStride; \ - if(tqmaskRowStart) { \ - tqmaskRowStart += tqmaskRowStride; \ + if(maskRowStart) { \ + maskRowStart += maskRowStride; \ } \ } -void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -350,7 +350,7 @@ void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -371,7 +371,7 @@ void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -392,7 +392,7 @@ void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -413,7 +413,7 @@ void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -434,7 +434,7 @@ void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -456,7 +456,7 @@ void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -477,7 +477,7 @@ void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -498,7 +498,7 @@ void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -540,7 +540,7 @@ void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -582,7 +582,7 @@ void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -624,7 +624,7 @@ void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS COMMON_COMPOSITE_OP_EPILOG(); } -void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) +void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity) { COMMON_COMPOSITE_OP_PROLOG(); @@ -671,7 +671,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT16 /*opacity*/) @@ -701,7 +701,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } @@ -711,7 +711,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -724,7 +724,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -753,16 +753,16 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -797,22 +797,22 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -821,24 +821,24 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken( - dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, + dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h index a4edbffa..5994921a 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h @@ -74,26 +74,26 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisRgbU16ColorSpaceTester; diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc index 34ab79fc..e4e181ca 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -265,14 +265,14 @@ TQImage KisRgbColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 width, void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, + const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -331,22 +331,22 @@ void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, + const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -379,20 +379,20 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -461,19 +461,19 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -532,19 +532,19 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -603,19 +603,19 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -675,19 +675,19 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -747,19 +747,19 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -819,19 +819,19 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -890,19 +890,19 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -961,19 +961,19 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -1044,19 +1044,19 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -1127,19 +1127,19 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -1210,19 +1210,19 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; while (columns > 0) { @@ -1293,8 +1293,8 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } @@ -1303,7 +1303,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) @@ -1332,7 +1332,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst, dst += dstRowSize; if(srcAlphaMask) - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; src += srcRowSize; } } @@ -1342,7 +1342,7 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -1354,10 +1354,10 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: - compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1387,16 +1387,16 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY_RED: compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1431,22 +1431,22 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1455,19 +1455,19 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; default: break; diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h index 53281faf..77628c31 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h @@ -69,27 +69,27 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); }; class KisRgbColorSpaceFactory : public KisColorSpaceFactory diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc index 7d6f0d67..edb09289 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -350,7 +350,7 @@ void KisWetColorSpace::bitBlt( TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 */*srcAlphaMask*/, - TQ_INT32 /*tqmaskRowStride*/, + TQ_INT32 /*maskRowStride*/, TQ_UINT8 /*opacity*/, TQ_INT32 rows, TQ_INT32 cols, diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.h b/chalk/colorspaces/wet/kis_wet_colorspace.h index 0523bf97..25af68fd 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.h +++ b/chalk/colorspaces/wet/kis_wet_colorspace.h @@ -167,7 +167,7 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cc index 70e07280..55f466fa 100644 --- a/chalk/colorspaces/wet/kis_wetop.cc +++ b/chalk/colorspaces/wet/kis_wetop.cc @@ -164,15 +164,15 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) double eff_height; double press, contact; - int tqmaskW = brush->tqmaskWidth(inf); - int tqmaskH = brush->tqmaskHeight(inf); + int maskW = brush->maskWidth(inf); + int maskH = brush->maskHeight(inf); KoPoint dest = (pos - (brush->hotSpot(inf))); int xStart = (int)dest.x(); int yStart = (int)dest.y(); - for (int y = 0; y < tqmaskH; y++) { - KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, tqmaskW, false); - KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, tqmaskW, true); + for (int y = 0; y < maskH; y++) { + KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, maskW, false); + KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, maskW, true); while (!dabIt.isDone()) { // This only does something with .paint, and not with adsorb. @@ -226,5 +226,5 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) } } - m_painter->addDirtyRect(TQRect(xStart, yStart, tqmaskW, tqmaskH)); + m_painter->addDirtyRect(TQRect(xStart, yStart, maskW, maskH)); } diff --git a/chalk/colorspaces/wet/wdgpressure.ui b/chalk/colorspaces/wet/wdgpressure.ui index 96727ff1..e6a78445 100644 --- a/chalk/colorspaces/wet/wdgpressure.ui +++ b/chalk/colorspaces/wet/wdgpressure.ui @@ -56,5 +56,5 @@ - + diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc index d63574fd..11aaeb04 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.cc +++ b/chalk/colorspaces/wet/wetphysicsfilter.cc @@ -88,7 +88,7 @@ void WetPhysicsFilter::flow(KisPaintDeviceSP src, KisPaintDeviceSP /*dst*/, cons kdDebug() << "Flowing: " << r << endl; /* width of a line in a layer in pixel units, not in bytes -- used to move to the next - line in the fluid tqmasks below */ + line in the fluid masks below */ int rs = width; // rowstride double * flow_t = new double[width * height]; diff --git a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc index 8b182e08..abcf2cec 100644 --- a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc +++ b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc @@ -96,7 +96,7 @@ void KisWSBrushOp::paintAt(const KisPoint &pos, } m_painter -> setPressure(pressure); - TQRect dabRect = TQRect(0, 0, brush -> tqmaskWidth(pressure), brush -> tqmaskHeight(pressure)); + TQRect dabRect = TQRect(0, 0, brush -> maskWidth(pressure), brush -> maskHeight(pressure)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device -> image(); diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index 44426382..b1e1ec82 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -357,7 +357,7 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -368,18 +368,18 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: default: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); break; } } -void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { // XXX: This is basically the same as with rgb and used to composite layers for Composition for // painting works differently @@ -389,7 +389,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; @@ -461,13 +461,13 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) + maskRowStart += maskRowStride; } } -void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity) +void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity) { TQ_INT32 linesize = sizeof(CELL) * columns; TQ_UINT8 *d; diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h index 57f3ac70..9ff6452b 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h @@ -124,7 +124,7 @@ protected: const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, @@ -139,9 +139,9 @@ protected: private: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); }; diff --git a/chalk/colorspaces/wetsticky/wstool.ui b/chalk/colorspaces/wetsticky/wstool.ui index 2f95d18b..3824b626 100644 --- a/chalk/colorspaces/wetsticky/wstool.ui +++ b/chalk/colorspaces/wetsticky/wstool.ui @@ -250,7 +250,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc index d8ea896b..b19845b2 100644 --- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc +++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc @@ -204,33 +204,33 @@ TQImage KisYCbCrU16ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 w } -void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op) +void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op) { switch (op.op()) { case COMPOSITE_UNDEF: // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; default: break; } } -void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT16 *src = reinterpret_cast(srcRowStart); TQ_UINT16 *dst = reinterpret_cast(dstRowStart); - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -291,13 +291,13 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } -void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) +void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) { while (rows-- > 0) { @@ -324,7 +324,7 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h index 69c499f2..d6ca157d 100644 --- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h +++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h @@ -69,14 +69,14 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: #define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX) diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc index 9c7548bf..389a91b9 100644 --- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc +++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc @@ -204,33 +204,33 @@ TQImage KisYCbCrU8ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 wi } -void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op) +void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op) { switch (op.op()) { case COMPOSITE_UNDEF: // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity); break; default: break; } } -void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) +void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity) { while (rows > 0) { const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = tqmaskRowStart; + const TQ_UINT8 *tqmask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -289,13 +289,13 @@ void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS rows--; srcRowStart += srcRowStride; dstRowStart += dstRowStride; - if(tqmaskRowStart) { - tqmaskRowStart += tqmaskRowStride; + if(maskRowStart) { + maskRowStart += maskRowStride; } } } -void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) +void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/) { while (rows-- > 0) { @@ -320,12 +320,12 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co dst += dstRowSize; src += srcRowSize; if(srcAlphaMask) { - srcAlphaMask += tqmaskRowStride; + srcAlphaMask += maskRowStride; } } } -void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/) +void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/) { while (rows > 0) { memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel)); diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h index a0308881..6c2b21c7 100644 --- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h +++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h @@ -69,15 +69,15 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, - TQ_INT32 tqmaskRowStride, + TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: #define CLAMP_TO_8BITCHANNEL(a) CLAMP(a, 0, TQ_UINT8_MAX) diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h index 4665857e..5573f5e6 100644 --- a/chalk/core/kis_alpha_mask.h +++ b/chalk/core/kis_alpha_mask.h @@ -70,7 +70,7 @@ class KisAlphaMask : public KShared { Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is outside the bounds of the tqmask. - XXX: this is, of course, not the best way of tqmasking. + XXX: this is, of course, not the best way of masking. Better would be to let KisAlphaMask fill a chunk of memory with the alpha values at the right position, something like void applyMask(TQ_UINT8 *pixeldata, TQ_INT32 pixelWidth, diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 9720a3e1..60f475f0 100644 --- a/chalk/core/kis_brush.cc +++ b/chalk/core/kis_brush.cc @@ -392,7 +392,7 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel KisAlphaMaskSP outputMask = 0; if (belowBrush != 0) { - // We're in between two tqmasks. Interpolate between them. + // We're in between two masks. Interpolate between them. KisAlphaMaskSP scaledAboveMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY); KisAlphaMaskSP scaledBelowMask = scaleMask(belowBrush, scale, subPixelX, subPixelY); @@ -608,13 +608,13 @@ double KisBrush::scaleForPressure(double pressure) return scale; } -TQ_INT32 KisBrush::tqmaskWidth(const KisPaintInformation& info) const +TQ_INT32 KisBrush::maskWidth(const KisPaintInformation& info) const { // Add one for sub-pixel shift return static_cast(ceil(width() * scaleForPressure(info.pressure)) + 1); } -TQ_INT32 KisBrush::tqmaskHeight(const KisPaintInformation& info) const +TQ_INT32 KisBrush::maskHeight(const KisPaintInformation& info) const { // Add one for sub-pixel shift return static_cast(ceil(height() * scaleForPressure(info.pressure)) + 1); @@ -971,7 +971,7 @@ void KisBrush::findScaledBrushes(double scale, const ScaledBrush **aboveBrush, c } } -KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY) +KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY) { int srcWidth = 1; int srcHeight = 1; @@ -986,10 +986,10 @@ KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue for (int y = 0; y < dstHeight; y++) { for (int x = 0; x < dstWidth; x++) { - TQ_UINT8 topLeft = (x > 0 && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT; - TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT; - TQ_UINT8 topRight = (x < srcWidth && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT; - TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT; + TQ_UINT8 topLeft = (x > 0 && y > 0) ? maskValue : OPACITY_TRANSPARENT; + TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT; + TQ_UINT8 topRight = (x < srcWidth && y > 0) ? maskValue : OPACITY_TRANSPARENT; + TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT; // Bi-linear interpolation int d = static_cast(a * b * topLeft @@ -1244,8 +1244,8 @@ void KisBrush::setHeight(TQ_INT32 h) KisLayerSP layer = image(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),""), KisPaintInformation(pressure)); KisBoundary bounds(layer.data()); - int w = tqmaskWidth(pressure); - int h = tqmaskHeight(pressure); + int w = maskWidth(pressure); + int h = maskHeight(pressure); bounds.generateBoundary(w, h); TQPixmap pix(bounds.pixmap(w, h)); @@ -1256,8 +1256,8 @@ void KisBrush::setHeight(TQ_INT32 h) void KisBrush::generateBoundary() { KisPaintDeviceSP dev; - int w = tqmaskWidth(KisPaintInformation()); - int h = tqmaskHeight(KisPaintInformation()); + int w = maskWidth(KisPaintInformation()); + int h = maskHeight(KisPaintInformation()); if (brushType() == IMAGE || brushType() == PIPE_IMAGE) { dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation()); diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h index 091cebde..57dd9d9e 100644 --- a/chalk/core/kis_brush.h +++ b/chalk/core/kis_brush.h @@ -95,8 +95,8 @@ public: double ySpacing(double pressure = PRESSURE_DEFAULT) const; // Dimensions in pixels of the tqmask/image at a given pressure. - TQ_INT32 tqmaskWidth(const KisPaintInformation& info) const; - TQ_INT32 tqmaskHeight(const KisPaintInformation& info) const; + TQ_INT32 maskWidth(const KisPaintInformation& info) const; + TQ_INT32 maskHeight(const KisPaintInformation& info) const; virtual void setUseColorAsMask(bool useColorAsMask) { m_useColorAsMask = useColorAsMask; } virtual bool useColorAsMask() const { return m_useColorAsMask; } @@ -157,7 +157,7 @@ private: static TQImage scaleImage(const TQImage& srcImage, int width, int height); static TQImage interpolate(const TQImage& image1, const TQImage& image2, double t); - static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY); + static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY); static TQImage scaleSinglePixelImage(double scale, TQRgb pixel, double subPixelX, double subPixelY); // Find the scaled brush(es) nearest to the given scale. diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h index 68053384..721ce827 100644 --- a/chalk/core/kis_merge_visitor.h +++ b/chalk/core/kis_merge_visitor.h @@ -153,9 +153,9 @@ public: KisSelectionSP tqmask = layer->getMaskAsSelection(); // The indirect painting happens on the tqmask if (tempTarget && layer->editMask()) { - KisPaintDeviceSP tqmaskSrc = layer->getMask(); - KisPaintDeviceSP temp = new KisPaintDevice(tqmaskSrc->colorSpace()); - temp = paintIndirect(tqmaskSrc, temp, layer, sx, sy, dx, dy, w, h); + KisPaintDeviceSP maskSrc = layer->getMask(); + KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace()); + temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h); // Blegh KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false); KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true); diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc index 1ce2e98f..59665829 100644 --- a/chalk/core/kis_paint_device.cc +++ b/chalk/core/kis_paint_device.cc @@ -343,14 +343,14 @@ DCOPObject *KisPaintDevice::dcopObject() return m_dcop; } -KisLayer *KisPaintDevice::tqparentLayer() const +KisLayer *KisPaintDevice::parentLayer() const { return m_parentLayer; } -void KisPaintDevice::setParentLayer(KisLayer *tqparentLayer) +void KisPaintDevice::setParentLayer(KisLayer *parentLayer) { - m_parentLayer = tqparentLayer; + m_parentLayer = parentLayer; } void KisPaintDevice::setDirty(const TQRect & rc) @@ -1115,15 +1115,15 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask) for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) { KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true); - KisHLineIterator tqmaskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false); + KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false); while (!pixelIt.isDone()) { // XXX: Optimize by using stretches - m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), tqmaskIt.rawData(), 1); + m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), maskIt.rawData(), 1); ++pixelIt; - ++tqmaskIt; + ++maskIt; } } } diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h index 6e804afe..6c8d7331 100644 --- a/chalk/core/kis_paint_device.h +++ b/chalk/core/kis_paint_device.h @@ -90,13 +90,13 @@ public: /** * Create a new paint device with the specified colorspace. The - * tqparentLayer will be notified of changes to this paint device. + * parentLayer will be notified of changes to this paint device. * - * @param tqparentLayer the layer that contains this paint device. + * @param parentLayer the layer that contains this paint device. * @param colorSpace the colorspace of this paint device * @param name for debugging purposes */ - KisPaintDevice(KisLayer *tqparentLayer, KisColorSpace * colorSpace, const char * name = 0); + KisPaintDevice(KisLayer *parentLayer, KisColorSpace * colorSpace, const char * name = 0); KisPaintDevice(const KisPaintDevice& rhs); virtual ~KisPaintDevice(); @@ -386,7 +386,7 @@ public: /** * Return the image that contains this paint device, or 0 if it is not - * part of an image. This is the same as calling tqparentLayer()->image(). + * part of an image. This is the same as calling parentLayer()->image(). */ KisImage *image() const; @@ -394,13 +394,13 @@ public: * Returns the KisLayer that contains this paint device, or 0 if this is not * part of a layer. */ - KisLayer *tqparentLayer() const; + KisLayer *parentLayer() const; /** * Set the KisLayer that contains this paint device, or 0 if this is not * part of a layer. */ - void setParentLayer(KisLayer *tqparentLayer); + void setParentLayer(KisLayer *parentLayer); /** * Add the specified rect top the tqparent layer (if present) diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc index 63663067..2df12e01 100644 --- a/chalk/core/kis_paint_layer.cc +++ b/chalk/core/kis_paint_layer.cc @@ -40,7 +40,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci Q_ASSERT(dev); m_paintdev = dev; m_tqmask = 0; - m_tqmaskAsSelection = 0; + m_maskAsSelection = 0; m_paintdev->setParentLayer(this); m_renderMask = false; m_editMask = true; @@ -53,7 +53,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci Q_ASSERT(img); m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1()); m_tqmask = 0; - m_tqmaskAsSelection = 0; + m_maskAsSelection = 0; m_renderMask = false; m_editMask = true; } @@ -65,7 +65,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci Q_ASSERT(colorSpace); m_paintdev = new KisPaintDevice(this, colorSpace, name.latin1()); m_tqmask = 0; - m_tqmaskAsSelection = 0; + m_maskAsSelection = 0; m_renderMask = false; m_editMask = true; } @@ -193,7 +193,7 @@ void KisPaintLayer::removeMask() { m_tqmask->setParentLayer(0); m_tqmask = 0; - m_tqmaskAsSelection = 0; + m_maskAsSelection = 0; setDirty(); emit sigMaskInfoChanged(); @@ -210,7 +210,7 @@ void KisPaintLayer::applyMask() { // A bit slow; but it works KisPaintDeviceSP temp = new KisPaintDevice(m_paintdev->colorSpace()); KisPainter gc(temp); - gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_tqmaskAsSelection, OPACITY_OPAQUE, x, y, w, h); + gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_maskAsSelection, OPACITY_OPAQUE, x, y, w, h); gc.end(); gc.begin(m_paintdev); gc.bitBlt(x, y, COMPOSITE_COPY, temp, OPACITY_OPAQUE, x, y, w, h); @@ -252,7 +252,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) { ->getColorSpace(KisID("GRAYA"), 0)); m_tqmask->setParentLayer(this); - m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough + m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough // Default pixel is opaque white == don't tqmask? TQ_UINT8 const defPixel[] = { 255, 255 }; @@ -292,7 +292,7 @@ KisPaintDeviceSP KisPaintLayer::getMask() { KisSelectionSP KisPaintLayer::getMaskAsSelection() { createMask(); kdDebug() << k_funcinfo << endl; - return m_tqmaskAsSelection; + return m_maskAsSelection; } void KisPaintLayer::setEditMask(bool b) { @@ -312,7 +312,7 @@ void KisPaintLayer::setRenderMask(bool b) { void KisPaintLayer::convertMaskToSelection(const TQRect& r) { KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(), r.width(), r.height(), false); - KisRectIteratorPixel dstIt = m_tqmaskAsSelection->createRectIterator(r.x(), r.y(), + KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(), r.width(), r.height(), true); while(!dstIt.isDone()) { @@ -328,7 +328,7 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) { void KisPaintLayer::genericMaskCreationHelper() { m_tqmask->setParentLayer(this); - m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough + m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough // Default pixel is opaque white == don't tqmask? TQ_UINT8 const defPixel[] = { 255, 255 }; @@ -374,35 +374,35 @@ namespace { class KisMaskFromSelectionCommand : public KNamedCommand { typedef KNamedCommand super; KisPaintLayerSP m_layer; - KisPaintDeviceSP m_tqmaskBefore; - KisPaintDeviceSP m_tqmaskAfter; + KisPaintDeviceSP m_maskBefore; + KisPaintDeviceSP m_maskAfter; KisSelectionSP m_selection; public: KisMaskFromSelectionCommand(const TQString& name, KisPaintLayer* layer) : super(name), m_layer(layer) { if (m_layer->hasMask()) - m_tqmaskBefore = m_layer->getMask(); + m_maskBefore = m_layer->getMask(); else - m_tqmaskBefore = 0; - m_tqmaskAfter = 0; + m_maskBefore = 0; + m_maskAfter = 0; if (m_layer->paintDevice()->hasSelection()) m_selection = m_layer->paintDevice()->selection(); else m_selection = 0; } virtual void execute() { - if (!m_tqmaskAfter) { + if (!m_maskAfter) { m_layer->createMaskFromSelection(m_selection); - m_tqmaskAfter = m_layer->getMask(); + m_maskAfter = m_layer->getMask(); } else { m_layer->paintDevice()->deselect(); - m_layer->createMaskFromPaintDevice(m_tqmaskAfter); + m_layer->createMaskFromPaintDevice(m_maskAfter); } } virtual void unexecute() { m_layer->paintDevice()->setSelection(m_selection); - if (m_tqmaskBefore) - m_layer->createMaskFromPaintDevice(m_tqmaskBefore); + if (m_maskBefore) + m_layer->createMaskFromPaintDevice(m_maskBefore); else m_layer->removeMask(); } @@ -488,11 +488,11 @@ KNamedCommand* KisPaintLayer::createMaskCommand() { return new KisCreateMaskCommand(i18n("Create Layer Mask"), this); } -KNamedCommand* KisPaintLayer::tqmaskFromSelectionCommand() { +KNamedCommand* KisPaintLayer::maskFromSelectionCommand() { return new KisMaskFromSelectionCommand(i18n("Mask From Selection"), this); } -KNamedCommand* KisPaintLayer::tqmaskToSelectionCommand() { +KNamedCommand* KisPaintLayer::maskToSelectionCommand() { return new KisMaskToSelectionCommand(i18n("Mask to Selection"), this); } diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h index 9e598e7a..6319f981 100644 --- a/chalk/core/kis_paint_layer.h +++ b/chalk/core/kis_paint_layer.h @@ -106,15 +106,15 @@ public: /// Undoable version of createMask KNamedCommand* createMaskCommand(); /// Undoable version of createMaskFromSelection - KNamedCommand* tqmaskFromSelectionCommand(); + KNamedCommand* maskFromSelectionCommand(); /// Undoable, removes the current tqmask, but converts it to the current selection - KNamedCommand* tqmaskToSelectionCommand(); + KNamedCommand* maskToSelectionCommand(); /// Undoable version of removeMask KNamedCommand* removeMaskCommand(); /// Undoable version of applyMask KNamedCommand* applyMaskCommand(); - /// Returns true if the tqmasked part of the tqmask will be rendered instead of being transparent + /// Returns true if the masked part of the tqmask will be rendered instead of being transparent bool renderMask() const { return m_renderMask; } /// Set the renderMask property void setRenderMask(bool b); @@ -146,7 +146,7 @@ private: // Layer tqmask related: // XXX It would be nice to merge the next 2 devices... KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily - KisSelectionSP m_tqmaskAsSelection; // The tqmask as selection, to apply and render easily + KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily bool m_renderMask; bool m_editMask; }; diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cc index 71989bd9..bff50cf5 100644 --- a/chalk/core/kis_paintop.cc +++ b/chalk/core/kis_paintop.cc @@ -65,14 +65,14 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs TQ_INT32 pixelSize = colorSpace->pixelSize(); - TQ_INT32 tqmaskWidth = tqmask->width(); - TQ_INT32 tqmaskHeight = tqmask->height(); + TQ_INT32 maskWidth = tqmask->width(); + TQ_INT32 maskHeight = tqmask->height(); // Convert the kiscolor to the right colorspace. kc.convertTo(colorSpace); - KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, tqmaskWidth, true); - for (int y = 0; y < tqmaskHeight; y++) + KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, maskWidth, true); + for (int y = 0; y < maskHeight; y++) { int x=0; while(! hiter.isDone()) diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index e988eff0..10e96a05 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -35,7 +35,7 @@ #include "kis_selection.h" KisSelection::KisSelection(KisPaintDeviceSP dev) - : super(dev->tqparentLayer() + : super(dev->parentLayer() , KisMetaRegistry::instance()->csRegistry()->getAlpha8() , (TQString("selection for ") + dev->name()).latin1()) , m_parentPaintDevice(dev) @@ -79,7 +79,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s) *pix = s; } -TQImage KisSelection::tqmaskImage() +TQImage KisSelection::maskImage() { // If part of a KisAdjustmentLayer, there may be no tqparent device. TQImage img; diff --git a/chalk/core/kis_selection.h b/chalk/core/kis_selection.h index f41915da..d5323337 100644 --- a/chalk/core/kis_selection.h +++ b/chalk/core/kis_selection.h @@ -69,7 +69,7 @@ public: void setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s); - TQImage tqmaskImage(); + TQImage maskImage(); void select(TQRect r); @@ -115,7 +115,7 @@ public: virtual void setDirty(const TQRect & rc); virtual void setDirty(); - inline KisPaintDeviceSP tqparentPaintDevice() { return m_parentPaintDevice; } + inline KisPaintDeviceSP parentPaintDevice() { return m_parentPaintDevice; } private: void paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion); diff --git a/chalk/core/kis_transaction.cc b/chalk/core/kis_transaction.cc index b755c597..d0a10acc 100644 --- a/chalk/core/kis_transaction.cc +++ b/chalk/core/kis_transaction.cc @@ -62,7 +62,7 @@ void KisTransaction::execute() m_private->m_memento->extent(x,y,width,height); rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height); - KisLayerSP l = m_private->m_device->tqparentLayer(); + KisLayerSP l = m_private->m_device->parentLayer(); if (l) l->setDirty(rc); } @@ -76,7 +76,7 @@ void KisTransaction::unexecute() m_private->m_memento->extent(x,y,width,height); rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height); - KisLayerSP l = m_private->m_device->tqparentLayer(); + KisLayerSP l = m_private->m_device->parentLayer(); if (l) l->setDirty(rc); } diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cc index fbc952ea..ae4f4e24 100644 --- a/chalk/core/kis_transform_worker.cc +++ b/chalk/core/kis_transform_worker.cc @@ -665,8 +665,8 @@ bool KisTransformWorker::run() rotateNone(tmpdev3, m_dev); } - if (m_dev->tqparentLayer()) { - m_dev->tqparentLayer()->setDirty(); + if (m_dev->parentLayer()) { + m_dev->parentLayer()->setDirty(); } //progress info emit notifyProgressDone(); diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h index d6886abe..5d388136 100644 --- a/chalk/core/tiles/kis_tilemanager.h +++ b/chalk/core/tiles/kis_tilemanager.h @@ -114,7 +114,7 @@ private: TQMutex * m_swapMutex; // This is the constant that we will use to see if we want to add a new tempfile - // We use 1<<30 (one gigabyte) because aptqparently 32bit systems don't really like very + // We use 1<<30 (one gigabyte) because apparently 32bit systems don't really like very // large files. static const long MaxSwapFileSize = 1<<30; // For debugging purposes: 1<<20 is a megabyte diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index 51cadc58..520d4058 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -26,7 +26,7 @@ Design Patterns here. * The composite pattern is used in paint devices, layers, channels, - etc. (What about tqmasks?) + etc. (What about masks?) * Change colourspace handling to a Strategy pattern (strategy/kis_strategy_color) diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt index 96226fe2..aa3bf87b 100644 --- a/chalk/doc/background_paper.txt +++ b/chalk/doc/background_paper.txt @@ -68,7 +68,7 @@ trying to use a pencil on a watercolor layer causes a nasty flow-impeding useless error box to popup. Media and ordinary layers can be grouped and mixed at will, together with adjustment -layers. Adjustment layers can also be attached to selection tqmasks, per layer. +layers. Adjustment layers can also be attached to selection masks, per layer. The composited layers is either scaled and color corrected, or color corrected and then scaled, depending on whether the zoom > 100% or < 100%. diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt index bb932eee..17df4b48 100644 --- a/chalk/doc/brush.txt +++ b/chalk/doc/brush.txt @@ -16,17 +16,17 @@ grayscale or rgba images. If the image is grayscale, the gray image is intended to be used as an alpha tqmask: each gray level corresponds to a certain alpha level, and when painting the current painting colour is composited in the image with this level as its alpha component. The -image brushes should be tqmasked -- i.e., these are coloured images placed +image brushes should be masked -- i.e., these are coloured images placed on a white background. The white background should be made transparent, and then the brush image can be composited onto our image. -This is currently only half supported: I make tqmasks of everything, +This is currently only half supported: I make masks of everything, partly because I like that better, partly because until very recently there was no way of making out the difference between gray and rgb brushes because KisBrush didn't remember that bit of data. Making the initial tqmask of a brush is however by now pretty well done; the next -problem is painting with those tqmasks. +problem is painting with those masks. Here we have two situations, one easy, one difficult. The easy one is the single mouse click. If the user clicks or taps with his stylus, we can composite the diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features index 77f79dcb..1c737ce6 100644 --- a/chalk/doc/chalk-features +++ b/chalk/doc/chalk-features @@ -206,7 +206,7 @@ of a tablet. Tilt and rotation is not yet supported. ** custom brush tqshapes ** text brush tqshapes ** brushes created from layers or images. These brushes can be saved -** colored brushes can also be used as tqmasks +** colored brushes can also be used as masks * Fills diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 913db577..c16828cf 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -485,11 +485,11 @@ tiles." visibility="public" xmi.id="362" type="bool" name="empty" /> - + - + @@ -843,7 +843,7 @@ percentage." visibility="public" xmi.id="631" type="" name="KisAlphaMask" > - + @@ -1186,7 +1186,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1449,7 +1449,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1839,9 +1839,9 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - - - + + + @@ -1943,10 +1943,10 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + - + @@ -2094,7 +2094,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2436,8 +2436,8 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - - + + @@ -3526,7 +3526,7 @@ in the constructor, you have to call loadAsync. - + @@ -3873,9 +3873,9 @@ in the constructor, you have to call loadAsync. - - - + + + @@ -4130,8 +4130,8 @@ in the constructor, you have to call loadAsync. - - + + @@ -4538,8 +4538,8 @@ in the constructor, you have to call loadAsync. - - + + @@ -4929,7 +4929,7 @@ in the constructor, you have to call loadAsync. - +
@@ -4947,12 +4947,12 @@ in the constructor, you have to call loadAsync.
- +
- +
@@ -4965,7 +4965,7 @@ in the constructor, you have to call loadAsync. - +
@@ -4983,117 +4983,117 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5105,101 +5105,101 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5207,7 +5207,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5225,57 +5225,57 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5287,56 +5287,56 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5344,7 +5344,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5369,7 +5369,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5394,7 +5394,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5412,97 +5412,97 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5514,81 +5514,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5596,7 +5596,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5614,32 +5614,32 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
@@ -5651,61 +5651,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5713,7 +5713,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5731,67 +5731,67 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5804,7 +5804,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5822,62 +5822,62 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5889,71 +5889,71 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5961,7 +5961,7 @@ in the constructor, you have to call loadAsync. - +
@@ -5979,87 +5979,87 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6071,61 +6071,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6133,7 +6133,7 @@ in the constructor, you have to call loadAsync. - +
@@ -6151,47 +6151,47 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6203,81 +6203,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6285,7 +6285,7 @@ in the constructor, you have to call loadAsync. - +
@@ -6303,37 +6303,37 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
@@ -6345,21 +6345,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -6367,7 +6367,7 @@ in the constructor, you have to call loadAsync. - +
@@ -6385,37 +6385,37 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
@@ -6427,21 +6427,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -6449,7 +6449,7 @@ in the constructor, you have to call loadAsync. - +
@@ -6467,127 +6467,127 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6599,141 +6599,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6741,7 +6741,7 @@ in the constructor, you have to call loadAsync. - +
@@ -6759,267 +6759,267 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7031,176 +7031,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7208,7 +7208,7 @@ in the constructor, you have to call loadAsync. - +
@@ -7226,97 +7226,97 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7328,96 +7328,96 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7425,7 +7425,7 @@ in the constructor, you have to call loadAsync. - +
@@ -7443,72 +7443,72 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7520,36 +7520,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -7557,7 +7557,7 @@ in the constructor, you have to call loadAsync. - +
@@ -7575,52 +7575,52 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7632,36 +7632,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -7669,7 +7669,7 @@ in the constructor, you have to call loadAsync. - +
@@ -7687,332 +7687,332 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8024,311 +8024,311 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8336,7 +8336,7 @@ in the constructor, you have to call loadAsync. - +
@@ -8361,7 +8361,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8379,72 +8379,72 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8456,81 +8456,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8538,7 +8538,7 @@ in the constructor, you have to call loadAsync. - +
@@ -8556,67 +8556,67 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8628,41 +8628,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -8670,7 +8670,7 @@ in the constructor, you have to call loadAsync. - +
@@ -8688,37 +8688,37 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
@@ -8730,21 +8730,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -8752,7 +8752,7 @@ in the constructor, you have to call loadAsync. - +
@@ -8770,87 +8770,87 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8862,81 +8862,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8944,7 +8944,7 @@ in the constructor, you have to call loadAsync. - +
@@ -8962,122 +8962,122 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9089,21 +9089,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -9111,7 +9111,7 @@ in the constructor, you have to call loadAsync. - +
@@ -9129,47 +9129,47 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9181,21 +9181,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -9203,7 +9203,7 @@ in the constructor, you have to call loadAsync. - +
@@ -9221,217 +9221,217 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9443,291 +9443,291 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9735,7 +9735,7 @@ in the constructor, you have to call loadAsync. - +
@@ -9753,17 +9753,17 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
@@ -9776,7 +9776,7 @@ in the constructor, you have to call loadAsync. - +
@@ -9794,27 +9794,27 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
@@ -9826,36 +9826,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -9863,7 +9863,7 @@ in the constructor, you have to call loadAsync. - +
@@ -9881,57 +9881,57 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9943,41 +9943,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -9985,7 +9985,7 @@ in the constructor, you have to call loadAsync. - +
@@ -10003,62 +10003,62 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10070,81 +10070,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10152,7 +10152,7 @@ in the constructor, you have to call loadAsync. - +
@@ -10170,102 +10170,102 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10278,7 +10278,7 @@ in the constructor, you have to call loadAsync. - +
@@ -10296,252 +10296,252 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10553,256 +10553,256 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10810,7 +10810,7 @@ in the constructor, you have to call loadAsync. - +
@@ -10828,162 +10828,162 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10995,151 +10995,151 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11147,7 +11147,7 @@ in the constructor, you have to call loadAsync. - +
@@ -11165,432 +11165,432 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11602,256 +11602,256 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11859,7 +11859,7 @@ in the constructor, you have to call loadAsync. - +
@@ -11877,132 +11877,132 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12015,7 +12015,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12033,72 +12033,72 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12110,21 +12110,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -12132,7 +12132,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12150,27 +12150,27 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
@@ -12183,7 +12183,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12201,77 +12201,77 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12283,81 +12283,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12365,7 +12365,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12383,92 +12383,92 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12481,7 +12481,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12499,107 +12499,107 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12612,7 +12612,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12630,27 +12630,27 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
@@ -12662,36 +12662,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -12699,7 +12699,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12717,52 +12717,52 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12774,71 +12774,71 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12846,7 +12846,7 @@ in the constructor, you have to call loadAsync. - +
@@ -12864,772 +12864,772 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13641,671 +13641,671 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14313,7 +14313,7 @@ in the constructor, you have to call loadAsync. - +
@@ -14331,562 +14331,562 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14898,431 +14898,431 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15330,9 +15330,9 @@ in the constructor, you have to call loadAsync. - + - +
@@ -15348,157 +15348,157 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15510,141 +15510,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15652,7 +15652,7 @@ in the constructor, you have to call loadAsync. - +
@@ -15670,47 +15670,47 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15722,41 +15722,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -15764,7 +15764,7 @@ in the constructor, you have to call loadAsync. - +
@@ -15782,7 +15782,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15795,7 +15795,7 @@ in the constructor, you have to call loadAsync. - +
@@ -15813,62 +15813,62 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15881,7 +15881,7 @@ in the constructor, you have to call loadAsync. - +
@@ -15899,32 +15899,32 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
@@ -15937,7 +15937,7 @@ in the constructor, you have to call loadAsync. - +
@@ -15955,47 +15955,47 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16008,7 +16008,7 @@ in the constructor, you have to call loadAsync. - +
@@ -16026,147 +16026,147 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16178,176 +16178,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16355,7 +16355,7 @@ in the constructor, you have to call loadAsync. - +
@@ -16373,357 +16373,357 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16735,351 +16735,351 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17087,7 +17087,7 @@ in the constructor, you have to call loadAsync. - +
@@ -17105,142 +17105,142 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17252,141 +17252,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17394,7 +17394,7 @@ in the constructor, you have to call loadAsync. - +
@@ -17412,117 +17412,117 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17534,131 +17534,131 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17666,7 +17666,7 @@ in the constructor, you have to call loadAsync. - +
@@ -17684,132 +17684,132 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17821,121 +17821,121 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17943,7 +17943,7 @@ in the constructor, you have to call loadAsync. - +
@@ -17961,47 +17961,47 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18013,41 +18013,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -18055,7 +18055,7 @@ in the constructor, you have to call loadAsync. - +
@@ -18073,92 +18073,92 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18170,101 +18170,101 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18272,7 +18272,7 @@ in the constructor, you have to call loadAsync. - +
@@ -18290,117 +18290,117 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18412,141 +18412,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18554,7 +18554,7 @@ in the constructor, you have to call loadAsync. - +
@@ -18572,177 +18572,177 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18754,141 +18754,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18896,7 +18896,7 @@ in the constructor, you have to call loadAsync. - +
@@ -18914,57 +18914,57 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18977,7 +18977,7 @@ in the constructor, you have to call loadAsync. - +
@@ -18995,142 +18995,142 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19142,176 +19142,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19319,7 +19319,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19344,7 +19344,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19362,127 +19362,127 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19494,36 +19494,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -19531,7 +19531,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19549,77 +19549,77 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19631,36 +19631,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -19668,7 +19668,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19686,67 +19686,67 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19758,91 +19758,91 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19850,7 +19850,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19868,32 +19868,32 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
@@ -19906,7 +19906,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19924,32 +19924,32 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
@@ -19962,7 +19962,7 @@ in the constructor, you have to call loadAsync. - +
@@ -19980,217 +19980,217 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20202,61 +20202,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20264,7 +20264,7 @@ in the constructor, you have to call loadAsync. - +
@@ -20282,1317 +20282,1317 @@ in the constructor, you have to call loadAsync.
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21604,1776 +21604,1776 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23387,7 +23387,7 @@ in the constructor, you have to call loadAsync. - +
@@ -23414,7 +23414,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -23471,7 +23471,7 @@ in the constructor, you have to call loadAsync. - +
@@ -23528,7 +23528,7 @@ in the constructor, you have to call loadAsync. - +
@@ -23605,7 +23605,7 @@ in the constructor, you have to call loadAsync. - +
@@ -23632,7 +23632,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -23689,47 +23689,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23786,22 +23786,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -23822,27 +23822,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -23876,52 +23876,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23954,101 +23954,101 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -24056,7 +24056,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24083,7 +24083,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24098,7 +24098,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24138,27 +24138,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -24172,22 +24172,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -24259,7 +24259,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24293,12 +24293,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -24331,56 +24331,56 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -24388,7 +24388,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24415,7 +24415,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24594,7 +24594,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24621,7 +24621,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24800,7 +24800,7 @@ in the constructor, you have to call loadAsync. - +
@@ -24827,7 +24827,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24884,57 +24884,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25006,22 +25006,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -25055,42 +25055,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -25123,81 +25123,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25205,7 +25205,7 @@ in the constructor, you have to call loadAsync. - +
@@ -25232,7 +25232,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25247,17 +25247,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -25297,32 +25297,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -25457,61 +25457,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25519,7 +25519,7 @@ in the constructor, you have to call loadAsync. - +
@@ -25546,7 +25546,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25603,57 +25603,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25710,12 +25710,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -25792,7 +25792,7 @@ in the constructor, you have to call loadAsync. - +
@@ -25819,7 +25819,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25834,7 +25834,7 @@ in the constructor, you have to call loadAsync. - +
@@ -25874,27 +25874,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -25908,27 +25908,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -25985,12 +25985,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -26066,71 +26066,71 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26138,7 +26138,7 @@ in the constructor, you have to call loadAsync. - +
@@ -26165,7 +26165,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26222,57 +26222,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26344,17 +26344,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -26388,32 +26388,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -26446,61 +26446,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26508,7 +26508,7 @@ in the constructor, you have to call loadAsync. - +
@@ -26535,7 +26535,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26550,22 +26550,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -26605,42 +26605,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -26654,7 +26654,7 @@ in the constructor, you have to call loadAsync. - +
@@ -26781,81 +26781,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26863,7 +26863,7 @@ in the constructor, you have to call loadAsync. - +
@@ -26890,7 +26890,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26947,22 +26947,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -27019,7 +27019,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27040,7 +27040,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27074,12 +27074,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -27112,21 +27112,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -27134,7 +27134,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27161,7 +27161,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27218,27 +27218,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -27310,7 +27310,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27344,12 +27344,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -27382,21 +27382,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -27404,7 +27404,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27431,7 +27431,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27488,47 +27488,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -27585,12 +27585,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -27611,37 +27611,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -27675,72 +27675,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -27773,141 +27773,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -27915,7 +27915,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27942,7 +27942,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27957,7 +27957,7 @@ in the constructor, you have to call loadAsync. - +
@@ -27997,27 +27997,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -28031,152 +28031,152 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -28233,22 +28233,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -28269,37 +28269,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -28333,72 +28333,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -28431,176 +28431,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -28608,7 +28608,7 @@ in the constructor, you have to call loadAsync. - +
@@ -28635,7 +28635,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -28650,7 +28650,7 @@ in the constructor, you have to call loadAsync. - +
@@ -28690,27 +28690,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -28724,32 +28724,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -28806,12 +28806,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -28832,17 +28832,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -28876,32 +28876,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -28934,96 +28934,96 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29031,7 +29031,7 @@ in the constructor, you have to call loadAsync. - +
@@ -29058,7 +29058,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -29073,7 +29073,7 @@ in the constructor, you have to call loadAsync. - +
@@ -29113,27 +29113,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -29147,47 +29147,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29314,36 +29314,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -29351,7 +29351,7 @@ in the constructor, you have to call loadAsync. - +
@@ -29378,7 +29378,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -29393,7 +29393,7 @@ in the constructor, you have to call loadAsync. - +
@@ -29433,27 +29433,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -29467,27 +29467,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -29614,36 +29614,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -29651,7 +29651,7 @@ in the constructor, you have to call loadAsync. - +
@@ -29678,7 +29678,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -29693,12 +29693,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -29738,52 +29738,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29797,147 +29797,147 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29994,17 +29994,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -30025,62 +30025,62 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30114,122 +30114,122 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30262,311 +30262,311 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30574,7 +30574,7 @@ in the constructor, you have to call loadAsync. - +
@@ -30601,7 +30601,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -30780,7 +30780,7 @@ in the constructor, you have to call loadAsync. - +
@@ -30807,7 +30807,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -30864,32 +30864,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -30961,22 +30961,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -31010,42 +31010,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -31078,81 +31078,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -31160,7 +31160,7 @@ in the constructor, you have to call loadAsync. - +
@@ -31187,7 +31187,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31244,42 +31244,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -31336,7 +31336,7 @@ in the constructor, you have to call loadAsync. - +
@@ -31357,12 +31357,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -31396,22 +31396,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -31444,41 +31444,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -31486,7 +31486,7 @@ in the constructor, you have to call loadAsync. - +
@@ -31513,7 +31513,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31621,27 +31621,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -31662,7 +31662,7 @@ in the constructor, you have to call loadAsync. - +
@@ -31696,12 +31696,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -31734,21 +31734,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -31756,7 +31756,7 @@ in the constructor, you have to call loadAsync. - +
@@ -31783,7 +31783,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31840,37 +31840,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -31927,12 +31927,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -31953,22 +31953,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -32002,42 +32002,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -32070,81 +32070,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -32152,7 +32152,7 @@ in the constructor, you have to call loadAsync. - +
@@ -32179,7 +32179,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32287,112 +32287,112 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -32413,7 +32413,7 @@ in the constructor, you have to call loadAsync. - +
@@ -32447,12 +32447,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -32485,21 +32485,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -32507,7 +32507,7 @@ in the constructor, you have to call loadAsync. - +
@@ -32534,7 +32534,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32642,37 +32642,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -32693,7 +32693,7 @@ in the constructor, you have to call loadAsync. - +
@@ -32727,12 +32727,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -32765,21 +32765,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -32787,7 +32787,7 @@ in the constructor, you have to call loadAsync. - +
@@ -32814,7 +32814,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32829,12 +32829,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -32874,52 +32874,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -32933,52 +32933,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33035,7 +33035,7 @@ in the constructor, you have to call loadAsync. - +
@@ -33056,57 +33056,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33140,112 +33140,112 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33278,291 +33278,291 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33570,7 +33570,7 @@ in the constructor, you have to call loadAsync. - +
@@ -33597,7 +33597,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -33654,17 +33654,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -33792,7 +33792,7 @@ in the constructor, you have to call loadAsync. - +
@@ -33819,7 +33819,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -33834,7 +33834,7 @@ in the constructor, you have to call loadAsync. - +
@@ -33874,27 +33874,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -34029,36 +34029,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -34066,7 +34066,7 @@ in the constructor, you have to call loadAsync. - +
@@ -34093,7 +34093,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34150,32 +34150,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -34232,7 +34232,7 @@ in the constructor, you have to call loadAsync. - +
@@ -34253,12 +34253,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -34292,22 +34292,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -34340,41 +34340,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -34382,7 +34382,7 @@ in the constructor, you have to call loadAsync. - +
@@ -34409,7 +34409,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34424,22 +34424,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -34479,42 +34479,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -34528,22 +34528,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -34670,81 +34670,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34752,7 +34752,7 @@ in the constructor, you have to call loadAsync. - +
@@ -34779,7 +34779,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34836,92 +34836,92 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34978,12 +34978,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -35060,7 +35060,7 @@ in the constructor, you have to call loadAsync. - +
@@ -35087,7 +35087,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -35102,7 +35102,7 @@ in the constructor, you have to call loadAsync. - +
@@ -35142,27 +35142,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -35176,112 +35176,112 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -35338,7 +35338,7 @@ in the constructor, you have to call loadAsync. - +
@@ -35359,57 +35359,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -35443,112 +35443,112 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -35581,256 +35581,256 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -35838,7 +35838,7 @@ in the constructor, you have to call loadAsync. - +
@@ -35865,7 +35865,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -35880,12 +35880,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -35925,52 +35925,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -35984,72 +35984,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36121,22 +36121,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -36170,42 +36170,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -36238,151 +36238,151 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36390,7 +36390,7 @@ in the constructor, you have to call loadAsync. - +
@@ -36417,7 +36417,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -36432,7 +36432,7 @@ in the constructor, you have to call loadAsync. - +
@@ -36472,27 +36472,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -36506,222 +36506,222 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36778,77 +36778,77 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36869,57 +36869,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36953,112 +36953,112 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37091,256 +37091,256 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37348,7 +37348,7 @@ in the constructor, you have to call loadAsync. - +
@@ -37375,7 +37375,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -37432,132 +37432,132 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37685,7 +37685,7 @@ in the constructor, you have to call loadAsync. - +
@@ -37712,7 +37712,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -37769,52 +37769,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37871,12 +37871,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -37897,7 +37897,7 @@ in the constructor, you have to call loadAsync. - +
@@ -37931,12 +37931,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -37969,21 +37969,21 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -37991,7 +37991,7 @@ in the constructor, you have to call loadAsync. - +
@@ -38018,7 +38018,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38075,17 +38075,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -38142,12 +38142,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -38224,7 +38224,7 @@ in the constructor, you have to call loadAsync. - +
@@ -38251,7 +38251,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38308,37 +38308,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -38410,22 +38410,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -38459,42 +38459,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -38527,81 +38527,81 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -38609,7 +38609,7 @@ in the constructor, you have to call loadAsync. - +
@@ -38636,7 +38636,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38693,92 +38693,92 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -38906,7 +38906,7 @@ in the constructor, you have to call loadAsync. - +
@@ -38933,7 +38933,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38990,97 +38990,97 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39137,12 +39137,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -39219,7 +39219,7 @@ in the constructor, you have to call loadAsync. - +
@@ -39246,7 +39246,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39261,7 +39261,7 @@ in the constructor, you have to call loadAsync. - +
@@ -39301,27 +39301,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -39456,36 +39456,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -39493,7 +39493,7 @@ in the constructor, you have to call loadAsync. - +
@@ -39520,7 +39520,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39535,12 +39535,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -39580,52 +39580,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39760,71 +39760,71 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39832,7 +39832,7 @@ in the constructor, you have to call loadAsync. - +
@@ -39859,7 +39859,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39874,12 +39874,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -39919,52 +39919,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39978,402 +39978,402 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40430,22 +40430,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -40466,152 +40466,152 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40645,302 +40645,302 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40973,671 +40973,671 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -41645,7 +41645,7 @@ in the constructor, you have to call loadAsync. - +
@@ -41672,7 +41672,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -41687,12 +41687,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -41732,52 +41732,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -41791,312 +41791,312 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -42153,22 +42153,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -42189,92 +42189,92 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -42308,182 +42308,182 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -42516,431 +42516,431 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -42948,14 +42948,14 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -42975,7 +42975,7 @@ in the constructor, you have to call loadAsync. - +
@@ -43032,87 +43032,87 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -43184,37 +43184,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -43248,72 +43248,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -43346,141 +43346,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -43488,7 +43488,7 @@ in the constructor, you have to call loadAsync. - +
@@ -43515,7 +43515,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -43572,27 +43572,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -43664,12 +43664,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -43703,22 +43703,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -43751,41 +43751,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -43793,7 +43793,7 @@ in the constructor, you have to call loadAsync. - +
@@ -43820,7 +43820,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -43877,7 +43877,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44005,7 +44005,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44032,7 +44032,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44089,62 +44089,62 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -44272,7 +44272,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44299,7 +44299,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44356,22 +44356,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -44428,12 +44428,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -44510,7 +44510,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44537,7 +44537,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44594,47 +44594,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -44762,7 +44762,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44789,7 +44789,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44804,7 +44804,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44844,27 +44844,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -44878,47 +44878,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -44975,7 +44975,7 @@ in the constructor, you have to call loadAsync. - +
@@ -44996,37 +44996,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -45060,72 +45060,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45158,176 +45158,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45335,7 +45335,7 @@ in the constructor, you have to call loadAsync. - +
@@ -45362,7 +45362,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -45377,12 +45377,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -45422,52 +45422,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45481,142 +45481,142 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45673,27 +45673,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -45714,72 +45714,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45813,142 +45813,142 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -45981,351 +45981,351 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -46333,7 +46333,7 @@ in the constructor, you have to call loadAsync. - +
@@ -46360,7 +46360,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -46417,72 +46417,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -46554,37 +46554,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -46618,72 +46618,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -46716,141 +46716,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -46858,7 +46858,7 @@ in the constructor, you have to call loadAsync. - +
@@ -46885,7 +46885,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -46900,12 +46900,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -46945,52 +46945,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -47004,37 +47004,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -47106,17 +47106,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -47150,32 +47150,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -47208,131 +47208,131 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -47340,7 +47340,7 @@ in the constructor, you have to call loadAsync. - +
@@ -47367,7 +47367,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -47424,57 +47424,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -47531,17 +47531,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -47562,32 +47562,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -47621,62 +47621,62 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -47709,121 +47709,121 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -47831,7 +47831,7 @@ in the constructor, you have to call loadAsync. - +
@@ -47858,7 +47858,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -47915,22 +47915,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -47987,7 +47987,7 @@ in the constructor, you have to call loadAsync. - +
@@ -48008,12 +48008,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -48047,22 +48047,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -48095,41 +48095,41 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -48137,7 +48137,7 @@ in the constructor, you have to call loadAsync. - +
@@ -48164,7 +48164,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -48221,42 +48221,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -48328,27 +48328,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -48382,52 +48382,52 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -48460,101 +48460,101 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -48562,7 +48562,7 @@ in the constructor, you have to call loadAsync. - +
@@ -48589,7 +48589,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -48646,47 +48646,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -48758,37 +48758,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -48822,72 +48822,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -48920,141 +48920,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -49062,7 +49062,7 @@ in the constructor, you have to call loadAsync. - +
@@ -49089,7 +49089,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -49146,87 +49146,87 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -49283,22 +49283,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -49319,37 +49319,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -49383,72 +49383,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -49481,141 +49481,141 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -49623,7 +49623,7 @@ in the constructor, you have to call loadAsync. - +
@@ -49650,7 +49650,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -49707,57 +49707,57 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -49885,7 +49885,7 @@ in the constructor, you have to call loadAsync. - +
@@ -49912,7 +49912,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -49927,7 +49927,7 @@ in the constructor, you have to call loadAsync. - +
@@ -49967,27 +49967,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -50001,47 +50001,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -50113,37 +50113,37 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -50177,72 +50177,72 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -50275,176 +50275,176 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -50452,7 +50452,7 @@ in the constructor, you have to call loadAsync. - +
@@ -50479,7 +50479,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -50658,7 +50658,7 @@ in the constructor, you have to call loadAsync. - +
@@ -50685,7 +50685,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -50700,7 +50700,7 @@ in the constructor, you have to call loadAsync. - +
@@ -50740,27 +50740,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -50774,92 +50774,92 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -50916,12 +50916,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -50997,36 +50997,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -51034,7 +51034,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51061,7 +51061,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51076,7 +51076,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51116,27 +51116,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -51150,42 +51150,42 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
@@ -51242,12 +51242,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -51323,36 +51323,36 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
@@ -51360,7 +51360,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51387,7 +51387,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51402,7 +51402,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51442,27 +51442,27 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
@@ -51476,22 +51476,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -51548,12 +51548,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -51574,7 +51574,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51608,12 +51608,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -51646,91 +51646,91 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -51738,7 +51738,7 @@ in the constructor, you have to call loadAsync. - +
@@ -51765,7 +51765,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51822,22 +51822,22 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
@@ -51894,12 +51894,12 @@ in the constructor, you have to call loadAsync. - +
- +
@@ -51976,7 +51976,7 @@ in the constructor, you have to call loadAsync. - +
@@ -52003,7 +52003,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -52060,32 +52060,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -52213,7 +52213,7 @@ in the constructor, you have to call loadAsync. - +
@@ -52240,7 +52240,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -52297,187 +52297,187 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -52549,17 +52549,17 @@ in the constructor, you have to call loadAsync. - +
- +
- +
@@ -52593,32 +52593,32 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
@@ -52651,61 +52651,61 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -52713,7 +52713,7 @@ in the constructor, you have to call loadAsync. - +
@@ -52740,7 +52740,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -52755,47 +52755,47 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -52835,227 +52835,227 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53069,67 +53069,67 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53186,297 +53186,297 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53497,367 +53497,367 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -53891,732 +53891,732 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -54649,1776 +54649,1776 @@ in the constructor, you have to call loadAsync. - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/chalk/doc/channels_masks_selections b/chalk/doc/channels_masks_selections index 4ce65414..66588363 100644 --- a/chalk/doc/channels_masks_selections +++ b/chalk/doc/channels_masks_selections @@ -1,4 +1,4 @@ -We did a rethink on channels, selections and tqmasks last summer. +We did a rethink on channels, selections and masks last summer. Traditionally, a tqmask is seen as an extra channel for an image, analogous to the alpha channel. We want to do away with that idea. diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index cd874de8..c517ab0c 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -433,7 +433,7 @@ converted to the target model." isSpecification="false" isLeaf="false" visibilit - + @@ -450,7 +450,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x - + @@ -727,7 +727,7 @@ Returns false if the conversion failed, true if it succeeded" isSpecification="f - + @@ -973,7 +973,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -992,7 +992,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1005,7 +1005,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1018,7 +1018,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1031,7 +1031,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1044,7 +1044,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1057,7 +1057,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1070,7 +1070,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1083,7 +1083,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1096,7 +1096,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1109,7 +1109,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1122,7 +1122,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1302,7 +1302,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1509,7 +1509,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1528,7 +1528,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1541,7 +1541,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1554,7 +1554,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1567,7 +1567,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1580,7 +1580,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1593,7 +1593,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1606,7 +1606,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1619,7 +1619,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1632,7 +1632,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1645,7 +1645,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility - + @@ -1881,7 +1881,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1895,7 +1895,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1908,7 +1908,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1921,7 +1921,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1934,7 +1934,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1947,7 +1947,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1960,7 +1960,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1973,7 +1973,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1986,7 +1986,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -1999,7 +1999,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2012,7 +2012,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2025,7 +2025,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2038,7 +2038,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2051,7 +2051,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2064,7 +2064,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2077,7 +2077,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2278,7 +2278,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2292,7 +2292,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2305,7 +2305,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2318,7 +2318,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2331,7 +2331,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2344,7 +2344,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2357,7 +2357,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2370,7 +2370,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2383,7 +2383,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2396,7 +2396,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2409,7 +2409,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2422,7 +2422,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2435,7 +2435,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2448,7 +2448,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2461,7 +2461,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2474,7 +2474,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal - + @@ -2688,7 +2688,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2702,7 +2702,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2715,7 +2715,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2728,7 +2728,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2741,7 +2741,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2754,7 +2754,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2767,7 +2767,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2780,7 +2780,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2793,7 +2793,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2806,7 +2806,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2819,7 +2819,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2832,7 +2832,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2845,7 +2845,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2858,7 +2858,7 @@ the compensation factor will be used to limit the darkening. - + @@ -2871,7 +2871,7 @@ the compensation factor will be used to limit the darkening. - + @@ -3087,7 +3087,7 @@ these wetpix structs for every paint device pixel" isSpecification="false" isLea - + @@ -3297,7 +3297,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - + @@ -3323,7 +3323,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - + @@ -3336,7 +3336,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - + @@ -3349,7 +3349,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - + @@ -4065,7 +4065,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4077,7 +4077,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4140,7 +4140,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4152,7 +4152,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4215,7 +4215,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4227,7 +4227,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4290,7 +4290,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4302,7 +4302,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4365,7 +4365,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4377,7 +4377,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4440,7 +4440,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4452,7 +4452,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4515,7 +4515,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4527,7 +4527,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4590,7 +4590,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4602,7 +4602,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4665,7 +4665,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4677,7 +4677,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4740,7 +4740,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4752,7 +4752,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4815,7 +4815,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4827,7 +4827,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4890,7 +4890,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4902,7 +4902,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -4965,7 +4965,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -4977,7 +4977,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5040,7 +5040,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -5052,7 +5052,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5062,27 +5062,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -5116,52 +5116,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5191,101 +5191,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5293,7 +5293,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -5305,7 +5305,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5368,7 +5368,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -5380,7 +5380,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5443,7 +5443,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -5455,7 +5455,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5518,7 +5518,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -5530,7 +5530,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -5540,67 +5540,67 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5634,132 +5634,132 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5779,252 +5779,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6040,471 +6040,471 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -6512,7 +6512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6524,7 +6524,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6586,36 +6586,36 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -6623,7 +6623,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6635,7 +6635,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6698,7 +6698,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6710,7 +6710,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6773,7 +6773,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6785,7 +6785,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6848,7 +6848,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6860,7 +6860,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6923,7 +6923,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6935,7 +6935,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6998,7 +6998,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7010,7 +7010,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7073,7 +7073,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7085,7 +7085,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7148,7 +7148,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7160,7 +7160,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7223,7 +7223,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7235,7 +7235,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7298,7 +7298,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7310,7 +7310,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7373,7 +7373,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7385,7 +7385,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7448,7 +7448,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7460,7 +7460,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7523,7 +7523,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7535,7 +7535,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7598,7 +7598,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7610,7 +7610,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7673,7 +7673,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7685,7 +7685,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7748,7 +7748,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7760,7 +7760,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7823,7 +7823,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7835,7 +7835,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7898,7 +7898,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7910,7 +7910,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -7973,7 +7973,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -7985,7 +7985,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8048,7 +8048,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8060,7 +8060,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8123,7 +8123,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8135,7 +8135,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8198,7 +8198,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8210,7 +8210,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8273,7 +8273,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8285,7 +8285,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8348,7 +8348,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8360,7 +8360,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8423,7 +8423,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8435,7 +8435,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8498,7 +8498,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8510,7 +8510,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8573,7 +8573,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8585,7 +8585,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8648,7 +8648,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8660,7 +8660,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8723,7 +8723,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8735,7 +8735,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8798,7 +8798,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8810,7 +8810,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8873,7 +8873,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8885,7 +8885,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -8948,7 +8948,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -8960,7 +8960,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9023,7 +9023,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9035,7 +9035,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9098,7 +9098,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9110,7 +9110,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9173,7 +9173,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9185,7 +9185,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9248,7 +9248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9260,7 +9260,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9323,7 +9323,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9335,7 +9335,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9398,7 +9398,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9410,7 +9410,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9473,7 +9473,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9485,7 +9485,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9548,7 +9548,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9560,7 +9560,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9570,7 +9570,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9604,27 +9604,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -9644,7 +9644,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9660,176 +9660,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9837,7 +9837,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -9849,7 +9849,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -9859,12 +9859,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -9898,37 +9898,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -9948,122 +9948,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10079,56 +10079,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10136,7 +10136,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10148,7 +10148,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -10158,7 +10158,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10192,27 +10192,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -10232,7 +10232,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10248,71 +10248,71 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10320,7 +10320,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10332,7 +10332,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -10342,17 +10342,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
@@ -10386,47 +10386,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10446,7 +10446,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10462,146 +10462,146 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10609,7 +10609,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10621,7 +10621,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -10684,7 +10684,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -10696,7 +10696,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -10706,42 +10706,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -10775,82 +10775,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10870,174 +10870,174 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11051,196 +11051,196 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11248,7 +11248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -11260,7 +11260,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -11270,37 +11270,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -11334,72 +11334,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11429,141 +11429,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11571,7 +11571,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -11583,7 +11583,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -11646,7 +11646,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -11658,7 +11658,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -11668,47 +11668,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11742,92 +11742,92 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11847,122 +11847,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -11978,216 +11978,216 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12195,7 +12195,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12207,7 +12207,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -12217,17 +12217,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
@@ -12261,32 +12261,32 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
@@ -12306,179 +12306,179 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12492,96 +12492,96 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12589,7 +12589,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12601,7 +12601,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -12664,7 +12664,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12676,7 +12676,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -12686,7 +12686,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12720,12 +12720,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -12745,12 +12745,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -12766,56 +12766,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12823,7 +12823,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12835,7 +12835,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -12898,7 +12898,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -12910,7 +12910,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -12972,36 +12972,36 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -13009,7 +13009,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13021,7 +13021,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13084,7 +13084,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13096,7 +13096,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13159,7 +13159,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13171,7 +13171,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13234,7 +13234,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13246,7 +13246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13309,7 +13309,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13321,7 +13321,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13331,27 +13331,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -13385,52 +13385,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13450,204 +13450,204 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13661,136 +13661,136 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13798,7 +13798,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13810,7 +13810,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13873,7 +13873,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13885,7 +13885,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13948,7 +13948,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -13960,7 +13960,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -14023,7 +14023,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -14035,7 +14035,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -14045,37 +14045,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -14109,72 +14109,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14194,204 +14194,204 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14405,176 +14405,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14582,7 +14582,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -14594,7 +14594,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -14657,7 +14657,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -14669,7 +14669,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -14679,7 +14679,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -14713,12 +14713,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -14738,219 +14738,219 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14964,56 +14964,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15021,7 +15021,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15033,7 +15033,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15096,7 +15096,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15108,7 +15108,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15171,7 +15171,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15183,7 +15183,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15246,7 +15246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15258,7 +15258,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15268,42 +15268,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -15337,82 +15337,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15442,161 +15442,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15604,7 +15604,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15616,7 +15616,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15626,12 +15626,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -15665,22 +15665,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -15710,41 +15710,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -15752,7 +15752,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -15764,7 +15764,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -15774,42 +15774,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -15843,82 +15843,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15948,161 +15948,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16110,7 +16110,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16122,7 +16122,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16132,37 +16132,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -16196,72 +16196,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16281,147 +16281,147 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16437,176 +16437,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -16614,7 +16614,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16626,7 +16626,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16689,7 +16689,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16701,7 +16701,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16764,7 +16764,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16776,7 +16776,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16839,7 +16839,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16851,7 +16851,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16914,7 +16914,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -16926,7 +16926,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -16989,7 +16989,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17001,7 +17001,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17064,7 +17064,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17076,7 +17076,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17139,7 +17139,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17151,7 +17151,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17214,7 +17214,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17226,7 +17226,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17236,7 +17236,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17270,12 +17270,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -17295,144 +17295,144 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17446,56 +17446,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17503,7 +17503,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17515,7 +17515,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17580,7 +17580,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17605,7 +17605,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17630,7 +17630,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17655,7 +17655,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17680,7 +17680,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17705,7 +17705,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17723,52 +17723,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17780,101 +17780,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17882,7 +17882,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -17907,7 +17907,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17932,7 +17932,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17957,7 +17957,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -17975,382 +17975,382 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18362,261 +18362,261 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18624,7 +18624,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -18649,7 +18649,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18674,7 +18674,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18699,7 +18699,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18724,7 +18724,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18749,7 +18749,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18774,7 +18774,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18799,7 +18799,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18824,7 +18824,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18849,7 +18849,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18874,7 +18874,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18899,7 +18899,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18924,7 +18924,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18949,7 +18949,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18974,7 +18974,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -18999,7 +18999,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19024,7 +19024,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19049,7 +19049,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19074,7 +19074,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19099,7 +19099,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19124,7 +19124,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19149,7 +19149,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19174,7 +19174,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19199,7 +19199,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19217,7 +19217,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19230,7 +19230,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -19248,132 +19248,132 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19385,21 +19385,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -19407,7 +19407,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -19425,7 +19425,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -19438,7 +19438,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -19456,27 +19456,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
@@ -19488,41 +19488,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -19530,7 +19530,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -19548,252 +19548,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19805,161 +19805,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19967,7 +19967,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -19985,72 +19985,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20062,141 +20062,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20204,7 +20204,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -20222,212 +20222,212 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20439,181 +20439,181 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20621,7 +20621,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -20639,207 +20639,207 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20851,61 +20851,61 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -20913,7 +20913,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -20938,7 +20938,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -20956,22 +20956,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
@@ -20983,21 +20983,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -21005,7 +21005,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -21030,7 +21030,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21055,7 +21055,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21080,7 +21080,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21098,252 +21098,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21355,101 +21355,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21457,7 +21457,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -21482,7 +21482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21507,7 +21507,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21525,272 +21525,272 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21802,141 +21802,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21944,7 +21944,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -21969,7 +21969,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -21987,227 +21987,227 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22219,21 +22219,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -22241,7 +22241,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -22266,7 +22266,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -22291,7 +22291,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -22316,7 +22316,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -22334,82 +22334,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22421,161 +22421,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22583,7 +22583,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -22601,22 +22601,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
@@ -22628,41 +22628,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -22670,7 +22670,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -22688,82 +22688,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22775,161 +22775,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22937,7 +22937,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -22955,217 +22955,217 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23177,141 +23177,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23319,7 +23319,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -23344,7 +23344,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23369,7 +23369,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23394,7 +23394,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23419,7 +23419,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23437,152 +23437,152 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23594,21 +23594,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -23622,7 +23622,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -23647,7 +23647,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23674,7 +23674,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -23853,7 +23853,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -23880,7 +23880,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -24059,7 +24059,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -24086,7 +24086,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -24265,7 +24265,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -24292,7 +24292,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -24471,7 +24471,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -24498,7 +24498,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -24677,7 +24677,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -24704,7 +24704,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -24719,27 +24719,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -24779,52 +24779,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -24959,101 +24959,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25061,7 +25061,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -25088,7 +25088,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -25267,7 +25267,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -25294,7 +25294,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -25473,7 +25473,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -25500,7 +25500,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -25679,7 +25679,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -25706,7 +25706,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -25763,222 +25763,222 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25999,37 +25999,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -26063,72 +26063,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26142,22 +26142,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -26178,32 +26178,32 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
@@ -26237,62 +26237,62 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26306,12 +26306,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -26336,261 +26336,261 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26598,7 +26598,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -26625,7 +26625,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -26804,7 +26804,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -26831,7 +26831,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -27010,7 +27010,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -27037,7 +27037,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -27216,7 +27216,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -27243,7 +27243,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -27422,7 +27422,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -27449,7 +27449,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -27628,7 +27628,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -27655,7 +27655,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -27834,7 +27834,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -27861,7 +27861,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -28040,7 +28040,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -28067,7 +28067,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -28246,7 +28246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -28273,7 +28273,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -28452,7 +28452,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -28479,7 +28479,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -28658,7 +28658,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -28685,7 +28685,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -28864,7 +28864,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -28891,7 +28891,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -29070,7 +29070,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -29097,7 +29097,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -29276,7 +29276,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -29303,7 +29303,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -29482,7 +29482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -29509,7 +29509,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -29688,7 +29688,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -29715,7 +29715,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -29894,7 +29894,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -29921,7 +29921,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -30100,7 +30100,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -30127,7 +30127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -30306,7 +30306,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -30333,7 +30333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -30512,7 +30512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -30539,7 +30539,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -30718,7 +30718,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -30745,7 +30745,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -30924,7 +30924,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -30951,7 +30951,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -31130,7 +31130,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31157,7 +31157,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -31336,7 +31336,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31363,7 +31363,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -31420,7 +31420,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31548,7 +31548,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31575,7 +31575,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -31632,107 +31632,107 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -31789,17 +31789,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -31820,7 +31820,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31854,12 +31854,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -31892,21 +31892,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -31914,7 +31914,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -31941,7 +31941,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -31998,7 +31998,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -32126,7 +32126,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -32153,7 +32153,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -32168,12 +32168,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -32207,22 +32207,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -32242,7 +32242,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -32369,41 +32369,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -32411,7 +32411,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -32438,7 +32438,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -32495,117 +32495,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -32662,59 +32662,59 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -32733,42 +32733,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -32796,42 +32796,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -32843,42 +32843,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -32911,161 +32911,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33073,7 +33073,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -33100,7 +33100,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -33115,37 +33115,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -33185,72 +33185,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33385,141 +33385,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33527,7 +33527,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -33554,7 +33554,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -33611,117 +33611,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33778,7 +33778,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -33799,47 +33799,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33867,52 +33867,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -33924,42 +33924,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -33992,181 +33992,181 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34174,7 +34174,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -34201,7 +34201,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -34258,127 +34258,127 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34435,54 +34435,54 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34501,17 +34501,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
@@ -34539,22 +34539,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -34566,12 +34566,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -34604,61 +34604,61 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -34666,7 +34666,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -34693,7 +34693,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -34872,7 +34872,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -34899,7 +34899,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -34956,12 +34956,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -35033,7 +35033,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35067,12 +35067,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -35105,21 +35105,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -35127,7 +35127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35154,7 +35154,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -35333,7 +35333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35360,7 +35360,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -35539,7 +35539,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35566,7 +35566,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -35745,7 +35745,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -35772,7 +35772,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -35829,122 +35829,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36001,84 +36001,84 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36097,27 +36097,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -36145,42 +36145,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -36192,12 +36192,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -36230,101 +36230,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36332,7 +36332,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -36359,7 +36359,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -36538,7 +36538,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -36565,7 +36565,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -36744,7 +36744,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -36771,7 +36771,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -36786,12 +36786,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -36825,22 +36825,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -36860,122 +36860,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37032,84 +37032,84 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37128,27 +37128,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
@@ -37176,42 +37176,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -37223,12 +37223,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -37261,141 +37261,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37403,7 +37403,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -37430,7 +37430,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -37609,7 +37609,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -37636,7 +37636,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -37693,142 +37693,142 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37885,79 +37885,79 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37976,7 +37976,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -38010,12 +38010,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -38048,21 +38048,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -38070,7 +38070,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -38097,7 +38097,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -38276,7 +38276,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -38303,7 +38303,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -38482,7 +38482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -38509,7 +38509,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -38688,7 +38688,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -38715,7 +38715,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -38730,42 +38730,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -38805,82 +38805,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39015,161 +39015,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39177,7 +39177,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -39204,7 +39204,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -39219,12 +39219,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -39264,22 +39264,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -39414,41 +39414,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -39456,7 +39456,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -39483,7 +39483,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -39498,42 +39498,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
@@ -39573,82 +39573,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39783,161 +39783,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -39945,7 +39945,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -39972,7 +39972,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -40029,127 +40029,127 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40206,9 +40206,9 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -40227,37 +40227,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
@@ -40291,72 +40291,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40370,17 +40370,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
@@ -40405,141 +40405,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -40547,7 +40547,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -40574,7 +40574,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -40753,7 +40753,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -40780,7 +40780,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -40959,7 +40959,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -40986,7 +40986,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -41165,7 +41165,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -41192,7 +41192,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -41371,7 +41371,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -41398,7 +41398,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -41455,117 +41455,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -41622,12 +41622,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
@@ -41648,7 +41648,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -41682,12 +41682,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
@@ -41701,19 +41701,19 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
- +
- +
@@ -41736,21 +41736,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
- +
- +
- +
@@ -41758,7 +41758,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -41780,7 +41780,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
diff --git a/chalk/doc/colorstrategyAPI b/chalk/doc/colorstrategyAPI index 07c95ae9..faa5724e 100644 --- a/chalk/doc/colorstrategyAPI +++ b/chalk/doc/colorstrategyAPI @@ -41,17 +41,17 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask) for (Q_INT32 y = r.top(); y <= r.bottom(); ++y) { KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true); - KisHLineIterator tqmaskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false); + KisHLineIterator maskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false); while (!pixelIt.isDone()) { KisPixel pixel = toPixel(pixelIt.rawData()); - KisPixel tqmaskValue = tqmask -> toPixel(tqmaskIt.rawData()); + KisPixel maskValue = tqmask -> toPixel(maskIt.rawData()); - pixel.alpha() = (pixel.alpha() * tqmaskValue.alpha()) / MAX_SELECTED; + pixel.alpha() = (pixel.alpha() * maskValue.alpha()) / MAX_SELECTED; ++pixelIt; - ++tqmaskIt; + ++maskIt; } } } diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 3281c344..baf5589f 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -1341,7 +1341,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not. - + @@ -1356,7 +1356,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not. - + @@ -4426,7 +4426,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4438,7 +4438,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4501,7 +4501,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4513,7 +4513,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4576,7 +4576,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4588,7 +4588,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4651,7 +4651,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4663,7 +4663,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4726,7 +4726,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4738,7 +4738,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4801,7 +4801,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4813,7 +4813,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4876,7 +4876,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4888,7 +4888,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -4951,7 +4951,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -4963,7 +4963,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5026,7 +5026,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5038,7 +5038,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5090,142 +5090,142 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5242,7 +5242,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5254,7 +5254,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5306,47 +5306,47 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -5363,7 +5363,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5375,7 +5375,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5438,7 +5438,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5450,7 +5450,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5513,7 +5513,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5525,7 +5525,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5588,7 +5588,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5600,7 +5600,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5663,7 +5663,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5675,7 +5675,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5738,7 +5738,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5750,7 +5750,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5813,7 +5813,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5825,7 +5825,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5888,7 +5888,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5900,7 +5900,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -5963,7 +5963,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -5975,7 +5975,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6038,7 +6038,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6050,7 +6050,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6113,7 +6113,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6125,7 +6125,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6188,7 +6188,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6200,7 +6200,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6263,7 +6263,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6275,7 +6275,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6338,7 +6338,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6350,7 +6350,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6413,7 +6413,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6425,7 +6425,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6477,22 +6477,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -6508,36 +6508,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -6545,7 +6545,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6557,7 +6557,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6619,36 +6619,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -6656,7 +6656,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6668,7 +6668,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6731,7 +6731,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6743,7 +6743,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6806,7 +6806,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6818,7 +6818,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6881,7 +6881,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6893,7 +6893,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -6956,7 +6956,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -6968,7 +6968,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -7031,7 +7031,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -7043,7 +7043,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -7106,7 +7106,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -7118,7 +7118,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -7128,122 +7128,122 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7277,242 +7277,242 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7532,362 +7532,362 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -7903,551 +7903,551 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8455,7 +8455,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -8467,7 +8467,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -8530,7 +8530,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -8542,7 +8542,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -8605,7 +8605,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -8617,7 +8617,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -8680,7 +8680,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -8692,7 +8692,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -8755,7 +8755,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -8767,7 +8767,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -8777,67 +8777,67 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -8871,132 +8871,132 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9016,372 +9016,372 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9397,366 +9397,366 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -9764,7 +9764,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -9776,7 +9776,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -9839,7 +9839,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -9851,7 +9851,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -9914,7 +9914,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -9926,7 +9926,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -9989,7 +9989,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10001,7 +10001,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10064,7 +10064,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10076,7 +10076,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10139,7 +10139,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10151,7 +10151,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10214,7 +10214,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10226,7 +10226,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10289,7 +10289,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10301,7 +10301,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10364,7 +10364,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10376,7 +10376,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10439,7 +10439,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10451,7 +10451,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10461,17 +10461,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -10505,34 +10505,34 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -10550,47 +10550,47 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10606,104 +10606,104 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -10715,7 +10715,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10778,7 +10778,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10790,7 +10790,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10853,7 +10853,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10865,7 +10865,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -10928,7 +10928,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -10940,7 +10940,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11003,7 +11003,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11015,7 +11015,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11078,7 +11078,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11090,7 +11090,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11153,7 +11153,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11165,7 +11165,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11228,7 +11228,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11240,7 +11240,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11303,7 +11303,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11315,7 +11315,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11378,7 +11378,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11390,7 +11390,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11453,7 +11453,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11465,7 +11465,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11528,7 +11528,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11540,7 +11540,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11603,7 +11603,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11615,7 +11615,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11678,7 +11678,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11690,7 +11690,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11753,7 +11753,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11765,7 +11765,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11828,7 +11828,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11840,7 +11840,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11903,7 +11903,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11915,7 +11915,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -11978,7 +11978,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -11990,7 +11990,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12053,7 +12053,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12065,7 +12065,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12128,7 +12128,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12140,7 +12140,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12203,7 +12203,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12215,7 +12215,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12278,7 +12278,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12290,7 +12290,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12353,7 +12353,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12365,7 +12365,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12428,7 +12428,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12440,7 +12440,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12503,7 +12503,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12515,7 +12515,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12567,92 +12567,92 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -12668,36 +12668,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -12705,7 +12705,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12717,7 +12717,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12780,7 +12780,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12792,7 +12792,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12855,7 +12855,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12867,7 +12867,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -12930,7 +12930,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -12942,7 +12942,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13005,7 +13005,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13017,7 +13017,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13080,7 +13080,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13092,7 +13092,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13102,27 +13102,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -13156,52 +13156,52 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13221,27 +13221,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -13257,136 +13257,136 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -13394,7 +13394,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13406,7 +13406,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13469,7 +13469,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13481,7 +13481,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13544,7 +13544,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13556,7 +13556,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13619,7 +13619,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13631,7 +13631,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13694,7 +13694,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13706,7 +13706,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13769,7 +13769,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13781,7 +13781,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13844,7 +13844,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13856,7 +13856,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13919,7 +13919,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -13931,7 +13931,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13941,42 +13941,42 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -14010,82 +14010,82 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14105,82 +14105,82 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14196,231 +14196,231 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -14428,7 +14428,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14440,7 +14440,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14503,7 +14503,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14515,7 +14515,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14578,7 +14578,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14590,7 +14590,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14653,7 +14653,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14665,7 +14665,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14728,7 +14728,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14740,7 +14740,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14803,7 +14803,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14815,7 +14815,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14878,7 +14878,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14890,7 +14890,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14953,7 +14953,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -14965,7 +14965,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14975,17 +14975,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -15019,32 +15019,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -15064,22 +15064,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -15095,96 +15095,96 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -15192,7 +15192,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15204,7 +15204,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15267,7 +15267,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15279,7 +15279,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15342,7 +15342,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15354,7 +15354,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15417,7 +15417,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15429,7 +15429,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15492,7 +15492,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15504,7 +15504,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15567,7 +15567,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15579,7 +15579,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15642,7 +15642,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15654,7 +15654,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15717,7 +15717,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15729,7 +15729,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15792,7 +15792,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15804,7 +15804,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15867,7 +15867,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15879,7 +15879,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15942,7 +15942,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -15954,7 +15954,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16017,7 +16017,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16029,7 +16029,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16092,7 +16092,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16104,7 +16104,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16167,7 +16167,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16179,7 +16179,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16242,7 +16242,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16254,7 +16254,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16317,7 +16317,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16329,7 +16329,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16392,7 +16392,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16404,7 +16404,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16467,7 +16467,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16479,7 +16479,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16542,7 +16542,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16554,7 +16554,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16617,7 +16617,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16629,7 +16629,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16692,7 +16692,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16704,7 +16704,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16767,7 +16767,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16779,7 +16779,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16842,7 +16842,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16854,7 +16854,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16917,7 +16917,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -16929,7 +16929,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16981,137 +16981,137 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17128,7 +17128,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17140,7 +17140,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17192,27 +17192,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -17229,7 +17229,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17241,7 +17241,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17304,7 +17304,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17316,7 +17316,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17379,7 +17379,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17391,7 +17391,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17454,7 +17454,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17466,7 +17466,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17476,12 +17476,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -17515,22 +17515,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -17550,42 +17550,42 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -17601,76 +17601,76 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17678,7 +17678,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17690,7 +17690,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17752,211 +17752,211 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -17964,7 +17964,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17976,7 +17976,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18039,7 +18039,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18051,7 +18051,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18114,7 +18114,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18126,7 +18126,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18189,7 +18189,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18201,7 +18201,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18264,7 +18264,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18276,7 +18276,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18339,7 +18339,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18351,7 +18351,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18414,7 +18414,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18426,7 +18426,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18489,7 +18489,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18501,7 +18501,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18564,7 +18564,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18576,7 +18576,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18639,7 +18639,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18651,7 +18651,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18714,7 +18714,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18726,7 +18726,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18789,7 +18789,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -18801,7 +18801,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -18811,122 +18811,122 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -18960,242 +18960,242 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19215,132 +19215,132 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19356,516 +19356,516 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -19873,7 +19873,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -19885,7 +19885,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -19948,7 +19948,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -19960,7 +19960,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20023,7 +20023,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20035,7 +20035,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20098,7 +20098,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20110,7 +20110,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20173,7 +20173,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20185,7 +20185,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20248,7 +20248,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20260,7 +20260,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20323,7 +20323,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20335,7 +20335,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20398,7 +20398,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20410,7 +20410,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20473,7 +20473,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20485,7 +20485,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20548,7 +20548,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20560,7 +20560,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20623,7 +20623,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20635,7 +20635,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20698,7 +20698,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20710,7 +20710,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20773,7 +20773,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20785,7 +20785,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20848,7 +20848,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20860,7 +20860,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20923,7 +20923,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -20935,7 +20935,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -20998,7 +20998,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21010,7 +21010,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21073,7 +21073,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21085,7 +21085,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21148,7 +21148,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21160,7 +21160,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21223,7 +21223,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21235,7 +21235,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21245,7 +21245,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21279,12 +21279,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -21304,57 +21304,57 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -21370,21 +21370,21 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -21392,7 +21392,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21404,7 +21404,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21467,7 +21467,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21479,7 +21479,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21542,7 +21542,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21554,7 +21554,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21617,7 +21617,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21629,7 +21629,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21692,7 +21692,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21704,7 +21704,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21767,7 +21767,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21779,7 +21779,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21842,7 +21842,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21854,7 +21854,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21917,7 +21917,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21929,7 +21929,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21992,7 +21992,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22004,7 +22004,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22014,57 +22014,57 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22098,112 +22098,112 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22223,117 +22223,117 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22349,221 +22349,221 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -22571,7 +22571,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22583,7 +22583,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22646,7 +22646,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22658,7 +22658,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22721,7 +22721,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22733,7 +22733,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22796,7 +22796,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22808,7 +22808,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22871,7 +22871,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22883,7 +22883,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -22946,7 +22946,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -22958,7 +22958,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23021,7 +23021,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23033,7 +23033,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23096,7 +23096,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23108,7 +23108,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23171,7 +23171,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23183,7 +23183,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23246,7 +23246,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23258,7 +23258,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23321,7 +23321,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23333,7 +23333,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23396,7 +23396,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23408,7 +23408,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23471,7 +23471,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23483,7 +23483,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23546,7 +23546,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23558,7 +23558,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23568,17 +23568,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -23612,77 +23612,77 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23702,17 +23702,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -23728,246 +23728,246 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -23975,7 +23975,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -23987,7 +23987,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -23997,7 +23997,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24031,27 +24031,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -24071,12 +24071,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24092,36 +24092,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24129,7 +24129,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24141,7 +24141,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24193,12 +24193,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24214,36 +24214,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24251,7 +24251,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24263,7 +24263,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24315,12 +24315,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24336,36 +24336,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24373,7 +24373,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24385,7 +24385,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24395,7 +24395,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24429,27 +24429,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -24469,12 +24469,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24490,36 +24490,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24527,7 +24527,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24539,7 +24539,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24591,12 +24591,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24612,36 +24612,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24649,7 +24649,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24661,7 +24661,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24713,17 +24713,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -24739,36 +24739,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24776,7 +24776,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24788,7 +24788,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24798,7 +24798,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24832,27 +24832,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -24872,12 +24872,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -24893,36 +24893,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -24930,7 +24930,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -24942,7 +24942,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -24952,17 +24952,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -24996,32 +24996,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -25041,32 +25041,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -25082,96 +25082,96 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25179,7 +25179,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25191,7 +25191,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25253,71 +25253,71 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -25325,7 +25325,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25337,7 +25337,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25347,12 +25347,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -25386,22 +25386,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -25431,41 +25431,41 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -25473,7 +25473,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25485,7 +25485,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25495,12 +25495,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -25534,22 +25534,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -25579,41 +25579,41 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -25621,7 +25621,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25633,7 +25633,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25696,7 +25696,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25708,7 +25708,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25771,7 +25771,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25783,7 +25783,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25846,7 +25846,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25858,7 +25858,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25921,7 +25921,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -25933,7 +25933,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -25943,32 +25943,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -26002,62 +26002,62 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26077,112 +26077,112 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26198,191 +26198,191 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26390,7 +26390,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26402,7 +26402,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26464,176 +26464,176 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -26641,7 +26641,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26653,7 +26653,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26716,7 +26716,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26728,7 +26728,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26791,7 +26791,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26803,7 +26803,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26866,7 +26866,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26878,7 +26878,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26941,7 +26941,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -26953,7 +26953,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27016,7 +27016,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27028,7 +27028,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27091,7 +27091,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27103,7 +27103,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27166,7 +27166,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27178,7 +27178,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27241,7 +27241,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27253,7 +27253,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27316,7 +27316,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27328,7 +27328,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27391,7 +27391,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27403,7 +27403,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27466,7 +27466,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27478,7 +27478,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27541,7 +27541,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27553,7 +27553,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27616,7 +27616,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27628,7 +27628,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27691,7 +27691,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27703,7 +27703,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27766,7 +27766,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27778,7 +27778,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27841,7 +27841,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27853,7 +27853,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27916,7 +27916,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -27928,7 +27928,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -27991,7 +27991,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28003,7 +28003,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28066,7 +28066,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28078,7 +28078,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28141,7 +28141,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28153,7 +28153,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28216,7 +28216,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28228,7 +28228,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28291,7 +28291,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28303,7 +28303,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28366,7 +28366,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28378,7 +28378,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28441,7 +28441,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28453,7 +28453,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28516,7 +28516,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28528,7 +28528,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28591,7 +28591,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28603,7 +28603,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28666,7 +28666,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28678,7 +28678,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28741,7 +28741,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28753,7 +28753,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28816,7 +28816,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28828,7 +28828,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -28838,7 +28838,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -28872,27 +28872,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -28912,17 +28912,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -28938,71 +28938,71 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29010,7 +29010,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29022,7 +29022,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29085,7 +29085,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29097,7 +29097,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29160,7 +29160,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29172,7 +29172,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29224,17 +29224,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -29250,36 +29250,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -29287,7 +29287,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29299,7 +29299,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29351,17 +29351,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -29377,36 +29377,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -29414,7 +29414,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29426,7 +29426,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29436,12 +29436,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -29475,22 +29475,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -29510,32 +29510,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -29551,41 +29551,41 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
@@ -29593,7 +29593,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29605,7 +29605,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29668,7 +29668,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29680,7 +29680,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -29690,27 +29690,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -29744,52 +29744,52 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29809,47 +29809,47 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29865,101 +29865,101 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -29967,7 +29967,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -29979,7 +29979,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -30042,7 +30042,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -30054,7 +30054,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -30064,27 +30064,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -30118,52 +30118,52 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30183,57 +30183,57 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30249,101 +30249,101 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30351,7 +30351,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -30363,7 +30363,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -30373,27 +30373,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -30427,112 +30427,112 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30552,22 +30552,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -30583,266 +30583,266 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -30850,7 +30850,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -30862,7 +30862,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -30872,7 +30872,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -30906,27 +30906,27 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
@@ -30946,17 +30946,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -30972,36 +30972,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31009,7 +31009,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31021,7 +31021,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31073,17 +31073,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -31099,36 +31099,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31136,7 +31136,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31148,7 +31148,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31200,17 +31200,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -31226,36 +31226,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31263,7 +31263,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31275,7 +31275,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31327,17 +31327,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -31353,36 +31353,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31390,7 +31390,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31402,7 +31402,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31454,17 +31454,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -31480,36 +31480,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31517,7 +31517,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31529,7 +31529,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31581,22 +31581,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -31612,36 +31612,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31649,7 +31649,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31661,7 +31661,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31713,17 +31713,17 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
@@ -31739,36 +31739,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -31776,7 +31776,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -31788,7 +31788,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -31798,12 +31798,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
@@ -31837,22 +31837,22 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
@@ -31872,32 +31872,32 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
@@ -31913,76 +31913,76 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -31990,7 +31990,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32002,7 +32002,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32065,7 +32065,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32077,7 +32077,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32140,7 +32140,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32152,7 +32152,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32214,36 +32214,36 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
@@ -32251,7 +32251,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32263,7 +32263,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32326,7 +32326,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32338,7 +32338,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32401,7 +32401,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32413,7 +32413,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32476,7 +32476,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32488,7 +32488,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32551,7 +32551,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32563,7 +32563,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32626,7 +32626,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32638,7 +32638,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32701,7 +32701,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32713,7 +32713,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32776,7 +32776,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32788,7 +32788,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32851,7 +32851,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32863,7 +32863,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -32926,7 +32926,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -32938,7 +32938,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33001,7 +33001,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33013,7 +33013,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33076,7 +33076,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33088,7 +33088,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33151,7 +33151,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33163,7 +33163,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33226,7 +33226,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33238,7 +33238,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33301,7 +33301,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33313,7 +33313,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33376,7 +33376,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33388,7 +33388,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33451,7 +33451,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33463,7 +33463,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33526,7 +33526,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33538,7 +33538,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33601,7 +33601,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33613,7 +33613,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33676,7 +33676,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33688,7 +33688,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33751,7 +33751,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33763,7 +33763,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33826,7 +33826,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33838,7 +33838,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33901,7 +33901,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33913,7 +33913,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -33976,7 +33976,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -33988,7 +33988,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34051,7 +34051,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34063,7 +34063,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34126,7 +34126,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34138,7 +34138,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34201,7 +34201,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34213,7 +34213,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34276,7 +34276,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34288,7 +34288,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34351,7 +34351,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34363,7 +34363,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34426,7 +34426,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34438,7 +34438,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34501,7 +34501,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34513,7 +34513,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34576,7 +34576,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34588,7 +34588,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34651,7 +34651,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34663,7 +34663,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34726,7 +34726,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34738,7 +34738,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34801,7 +34801,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34813,7 +34813,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34876,7 +34876,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34888,7 +34888,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -34951,7 +34951,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -34963,7 +34963,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35026,7 +35026,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35038,7 +35038,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35101,7 +35101,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35113,7 +35113,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35176,7 +35176,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35188,7 +35188,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35251,7 +35251,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35263,7 +35263,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35326,7 +35326,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35338,7 +35338,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35401,7 +35401,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35413,7 +35413,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35476,7 +35476,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35488,7 +35488,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35551,7 +35551,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35563,7 +35563,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35626,7 +35626,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35638,7 +35638,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35701,7 +35701,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35713,7 +35713,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35776,7 +35776,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35788,7 +35788,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35851,7 +35851,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35863,7 +35863,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -35926,7 +35926,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -35938,7 +35938,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -36001,7 +36001,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -36013,7 +36013,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -36076,7 +36076,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -36088,7 +36088,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -36098,177 +36098,177 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36302,352 +36302,352 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36667,107 +36667,107 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -36783,736 +36783,736 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -37520,7 +37520,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37532,7 +37532,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37595,7 +37595,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37607,7 +37607,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37670,7 +37670,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37682,7 +37682,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37745,7 +37745,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37757,7 +37757,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37820,7 +37820,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37832,7 +37832,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37895,7 +37895,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37907,7 +37907,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -37970,7 +37970,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -37982,7 +37982,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38045,7 +38045,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38057,7 +38057,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38120,7 +38120,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38132,7 +38132,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38195,7 +38195,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38207,7 +38207,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38270,7 +38270,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38282,7 +38282,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38345,7 +38345,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38357,7 +38357,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38420,7 +38420,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38432,7 +38432,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38495,7 +38495,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38507,7 +38507,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38570,7 +38570,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38582,7 +38582,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38645,7 +38645,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38657,7 +38657,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38720,7 +38720,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38732,7 +38732,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38795,7 +38795,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38807,7 +38807,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38870,7 +38870,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38882,7 +38882,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -38945,7 +38945,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -38957,7 +38957,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39020,7 +39020,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39032,7 +39032,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39095,7 +39095,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39107,7 +39107,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39170,7 +39170,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39182,7 +39182,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39245,7 +39245,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39257,7 +39257,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39320,7 +39320,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39332,7 +39332,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39395,7 +39395,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39407,7 +39407,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39470,7 +39470,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39482,7 +39482,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39545,7 +39545,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39557,7 +39557,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39620,7 +39620,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39632,7 +39632,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -39695,7 +39695,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -39707,7 +39707,7 @@ 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 373370b5..081f9ed7 100644 --- a/chalk/doc/doc-outline +++ b/chalk/doc/doc-outline @@ -62,7 +62,7 @@ The current outline (working towards 1.6): - Layer box - Working with layers ([TODO] expand) - Adjustment layers ([TODO] expand) - - [TODO] Layer tqmasks + - [TODO] Layer masks - Compositing modes ([TODO] expand) - [TODO] Create, transform, combine, histograms, ... diff --git a/chalk/doc/howtofilters.txt b/chalk/doc/howtofilters.txt index 09deabf6..8be969b9 100644 --- a/chalk/doc/howtofilters.txt +++ b/chalk/doc/howtofilters.txt @@ -22,7 +22,7 @@ Just copy the following in a file named (for instance) myfiltercw.ui : kisFilterConfigurationWidget1 - + And then open Qt/Designer diff --git a/chalk/doc/paint_device.txt b/chalk/doc/paint_device.txt index a3c34a35..ab071cfe 100644 --- a/chalk/doc/paint_device.txt +++ b/chalk/doc/paint_device.txt @@ -59,7 +59,7 @@ per channel; QUANTUM can be bigger. Fill the buf with the data. x1, y1, x2, y2 are the top left and bottom right corner of the section you want. stride is the width of the section in bytes, i.e. (x2 - x1 + 1) * depth. Note that stride does -not need to be pre-multiplied with sizeof(QUANTUM), aptqparently. +not need to be pre-multiplied with sizeof(QUANTUM), apparently. tilemgr -> readPixelData(x1, y1, x2, y2, buf, stride); diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 06119596..3e381bbe 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -212,7 +212,7 @@ - + kcombobox.h knuminput.h diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index a783dd85..513912ea 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -360,7 +360,7 @@ layer, the current layer will be used. intWaterLevel intAmbient - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index 871cb496..f69fe2a1 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -8799,8 +8799,8 @@ namespace cimg_library { - -1 = Backward finite differences - 0 = Centered finite differences - 1 = Forward finite differences - - 2 = Using Sobel tqmasks - - 3 = Using rotation invariant tqmasks + - 2 = Using Sobel masks + - 3 = Using rotation invariant masks - 4 = Using Deriche recusrsive filter. **/ CImgl::type> get_gradientXY(const int scheme=0) const { @@ -9822,7 +9822,7 @@ namespace cimg_library { } #endif - //! Draw a tqmasked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). + //! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). /** \param sprite = sprite image. \param tqmask = tqmask image. @@ -9830,7 +9830,7 @@ namespace cimg_library { \param y0 = Y-coordinate of the sprite position in the instance image. \param z0 = Z-coordinate of the sprite position in the instance image. \param v0 = V-coordinate of the sprite position in the instance image. - \param tqmask_valmax = Maximum pixel value of the tqmask image \c tqmask. + \param mask_valmax = Maximum pixel value of the tqmask image \c tqmask. \param opacity = opacity of the drawing. \note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite. \note Clipping is supported. @@ -9838,7 +9838,7 @@ namespace cimg_library { **/ template CImg& draw_image(const CImg& sprite,const CImg& tqmask, const int x0=0,const int y0=0,const int z0=0,const int v0=0, - const tm tqmask_valmax=1,const float opacity=1) { + const tm mask_valmax=1,const float opacity=1) { if (!is_empty()) { if (sprite.is_empty()) throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.", @@ -9873,8 +9873,8 @@ namespace cimg_library { for (int y=0; ychkLinearInterpolation chkNormalize - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index a5fcebf9..ad1c062e 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -90,7 +90,7 @@ - + kcolorbutton.h diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index f824a9ab..525b221c 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -106,7 +106,7 @@ - + kcolorbutton.h diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 9474462b..1e576f66 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -285,7 +285,7 @@ 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + kcurve.h diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 243d628f..8d95814c 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -183,7 +183,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kcurve.h 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 495fd3bc..03c0e336 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 @@ -185,5 +185,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index a7184b4b..c14bd51a 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -66,7 +66,7 @@ - + kurlrequester.h klineedit.h diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index d5ef416d..6ee2631a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -213,7 +213,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 0db94640..841b78fb 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -323,7 +323,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kgradientslider.h kgradientslider.h diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 969d4153..3bafae01 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -101,7 +101,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index 5bdae980..c9ce3acf 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -123,7 +123,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index 376ed16e..faf74dd4 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -126,7 +126,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index 10fff389..b8132262 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -261,7 +261,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index 85bef3f6..1977d58b 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -122,7 +122,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info m_painter->setDab(dab); // Cache dab for future paints in the painter. m_painter->setPressure(info.pressure); // Cache pressure in the current painter. - TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index 360fa66e..ffa51114 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -251,8 +251,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) m_painter->setPressure(adjustedInfo.pressure); - TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo), - brush->tqmaskHeight(adjustedInfo)); + TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo), + brush->maskHeight(adjustedInfo)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index f6021ecc..89207a50 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -262,7 +262,7 @@ reject() - + kcurve.h kcurve.h diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc index 139ed51d..7ad4a4da 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc @@ -312,7 +312,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf OPACITY_OPAQUE, 0, 0, sw, sh); copyPainter.end(); - TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc index 13045139..794923a4 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc @@ -99,19 +99,19 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab"); Q_CHECK_PTR(dab); - TQ_INT32 tqmaskWidth = tqmask->width(); - TQ_INT32 tqmaskHeight = tqmask->height(); + TQ_INT32 maskWidth = tqmask->width(); + TQ_INT32 maskHeight = tqmask->height(); TQRect dstRect; - KisRectIteratorPixel it = dab->createRectIterator(0, 0, tqmaskWidth, tqmaskHeight, true); + KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true); KisColorSpace* cs = dab->colorSpace(); while (!it.isDone()) { cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1); ++it; } - TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight); + TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight); dstRect = TQRect(destX, destY, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc index 0fcbca02..e8780100 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc @@ -85,7 +85,7 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) } m_painter->setPressure(info.pressure); - TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index 2e50bebb..a493f132 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -263,8 +263,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) m_painter->setPressure(adjustedInfo.pressure); - TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo), - brush->tqmaskHeight(adjustedInfo)); + TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo), + brush->maskHeight(adjustedInfo)); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index a2b9d7d3..7675b875 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -163,5 +163,5 @@ - + diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc index b7b123d7..343cee9f 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc @@ -88,7 +88,7 @@ private: m_layer->setX(pos.x()); m_layer->setY(pos.y()); - m_layer->tqparentPaintDevice()->setDirty(); + m_layer->parentPaintDevice()->setDirty(); if (m_layer->undoAdapter()) { m_layer->undoAdapter()->setUndo(true); diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 4f857cf9..8d3bf1d8 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -204,7 +204,7 @@ cmbType bnCrop - + knuminput.h knuminput.h diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index eac06e2b..035eff3b 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -120,7 +120,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + knuminput.h knuminput.h diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cc index 1f2200b3..2296965c 100644 --- a/chalk/plugins/tools/tool_filter/kis_filterop.cc +++ b/chalk/plugins/tools/tool_filter/kis_filterop.cc @@ -88,8 +88,8 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) m_painter->setPressure(info.pressure); - TQ_INT32 tqmaskWidth = tqmask->width(); - TQ_INT32 tqmaskHeight = tqmask->height(); + TQ_INT32 maskWidth = tqmask->width(); + TQ_INT32 maskHeight = tqmask->height(); // Create a temporary paint device KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev"); @@ -98,17 +98,17 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Copy the layer data onto the new paint device KisPainter p( tmpDev ); - p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, tqmaskWidth, tqmaskHeight ); + p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, maskWidth, maskHeight ); // Filter the paint device filter->disableProgress(); - filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, tqmaskWidth, tqmaskHeight )); + filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, maskWidth, maskHeight )); filter->enableProgress(); // Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important) - for (int y = 0; y < tqmaskHeight; y++) + for (int y = 0; y < maskHeight; y++) { - KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, tqmaskWidth, false); + KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false); int x=0; while(! hiter.isDone()) { @@ -120,7 +120,7 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) } // Blit the paint device onto the layer - TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight); + TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight); TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = m_painter->device()->image(); diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index b342a927..3f4f30f5 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -120,7 +120,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + knuminput.h knuminput.h diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 2f41e1b3..2cf6806e 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -235,7 +235,7 @@ intEndX intEndY - + knuminput.h kis_cmb_idlist.h diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 43f98a53..22a82e55 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -239,7 +239,7 @@ void DlgColorRange::updatePreview() TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - TQPixmap pix = TQPixmap(m_selection->tqmaskImage().smoothScale(350, 350, TQ_ScaleMin)); + TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQ_ScaleMin)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 3eafd180..67c6028b 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -248,5 +248,5 @@ - + diff --git a/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui b/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui index ae183206..cd71eef5 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui +++ b/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui @@ -214,5 +214,5 @@ colors (Pantone, TruMatch, logo colors, ...) 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082 - + diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index 4bd2f38c..69aae624 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -228,7 +228,7 @@ opacitySpinBox allowResizingCheckBox - + kcolorbutton.h diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 488c9564..4b812770 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -115,7 +115,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082 - + kis_previewwidget.h kis_filters_listview.h diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 77c418ed..320b7d7a 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -222,7 +222,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kis_histogram_view.h diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 4cdd5c95..1686fe97 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -358,7 +358,7 @@ chkConstrain radioScale - + knuminput.h diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui index fb7547d2..13cd72a8 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -227,7 +227,7 @@ intHeightPercent chkConstrain - + knuminput.h diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui index df0e010d..d3a8326a 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -138,7 +138,7 @@ - + knuminput.h knuminput.h diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui index 06d01e9f..6df7cddd 100644 --- a/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui +++ b/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui @@ -53,5 +53,5 @@ radiusSpinBox - + diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui index d1180803..59827625 100644 --- a/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui +++ b/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui @@ -53,5 +53,5 @@ radiusSpinBox - + diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui index 28429d72..f4d747ab 100644 --- a/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui +++ b/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui @@ -64,5 +64,5 @@ radiusSpinBox - + diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index 7dc14f17..20f66825 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -275,7 +275,7 @@ intTestCount - + knuminput.h knuminput.h diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index d58c458d..884776f1 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -238,7 +238,7 @@ 89504e470d0a1a0a0000000d494844520000002c0000002e0806000000534cfb0a00000132494441545885ed994b12032108449b54ee7f65b3cd5440f92a56a5f7326f5a11451a63608b8806c6a0689857068b5a446177f6020361e8fdc04008fa0c30e086a6b4a4f3ba664cc418704212013041fb80b340bfa5847e9b825680022687f549d70016d03aac815d7d988be1a87c6be015acb7dc3ac7cd8167b091734160acbc861bc2029e4a77101690f661c9dd840f46a577b8012cc00157edb749d239dcc45de0e4f1d2a927705235aad4e50e5fa03f70b56c0778ab227bba90ec7d1d167eb62f30c0423f81b9696856aa7b3bcc487fa7f3543ccb18e54cfe3adca914332ce7aff9c6d83cb0e47205b4f176634fba4c68472c1978b69633a09db7f2753330bb91128ca7eb5e56b5aaac316069b756573ce54cf5b8e65fd3d0769870e6c920305bfb1e659296541ef0265d77bcbc0ef803779f9c39421cd9b50000000049454e44ae426082 - + knuminput.h diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index f9887821..dad0ee01 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -413,15 +413,15 @@ void KSnapshot::performGrab() contents += TQRegion( w - border, 0, border, h ); } - //Get the tqmasked away area. - TQRegion tqmaskedAway = bbox - contents; - TQMemArray tqmaskedAwayRects = tqmaskedAway.rects(); + //Get the masked away area. + TQRegion maskedAway = bbox - contents; + TQMemArray maskedAwayRects = maskedAway.rects(); //Construct a bitmap tqmask from the rectangles TQPainter p(&tqmask); p.fillRect(0, 0, w, h, TQt::color1); - for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++) - p.fillRect(tqmaskedAwayRects[pos], TQt::color0); + for (uint pos = 0; pos < maskedAwayRects.count(); pos++) + p.fillRect(maskedAwayRects[pos], TQt::color0); p.end(); snapshot.setMask(tqmask); diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 0672215e..34643902 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -330,6 +330,6 @@ If <i>no delay</i> is set, the program will wait for a mouse click b preview() SmallIconSet - - + + diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index 2e17ed98..b01ba0a8 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -39,7 +39,7 @@ namespace ChalkCore { // stupid TQt which doesn't support templated TQObject class IteratorMemoryManaged { public: - virtual void tqinvalidateIterator() = 0; + virtual void invalidateIterator() = 0; }; class IteratorMemoryManager : public TQObject { @@ -49,13 +49,13 @@ class IteratorMemoryManager : public TQObject { IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it) { // Connect the Monitor to know when the invalidating of iterator is needed - connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(tqinvalidateIterator())); + connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(invalidateIterator())); } public slots: - void tqinvalidateIterator() + void invalidateIterator() { - m_it->tqinvalidateIterator(); + m_it->invalidateIterator(); } private: IteratorMemoryManaged* m_it; @@ -147,7 +147,7 @@ class Iterator : public Kross::Api::Class >, private IteratorMem ~Iterator() { - tqinvalidateIterator(); + invalidateIterator(); delete m_itmm; } virtual const TQString getClassName() const { @@ -282,7 +282,7 @@ class Iterator : public Kross::Api::Class >, private IteratorMem return 0; } private: - virtual void tqinvalidateIterator() + virtual void invalidateIterator() { kdDebug(41011) << "invalidating iterator" << endl; if(m_it) diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui index 0593258b..f1eeeaa2 100644 --- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -178,5 +178,5 @@ chkDownscale chkColors - + diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui index d63b58f5..848eb328 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -92,7 +92,7 @@ shearAngleX - + knuminput.h knuminput.h diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index be0713ed..3382fe1f 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -214,7 +214,7 @@ - + kcolorbutton.h diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 191b84bb..65f20e23 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -893,5 +893,5 @@ 789cccbd47b7eb38b2ef397f9fa2d6e5ecae5e7cf266d0035266cb6da7ed77af1ed07b2f1aa9bf7c83883f704c56d5cd7c75bb5f95d6c9ca5f8a22114044202200f0fccffffcdbe7d3fddffef37ffe8fea625c02eb6f966f947ffb4fbb4e92ebfff57fff9fffcffff88fe160f0b7fecf68389bfe6df41fffc7fff80febf96fd6df9401ff5fcff64232ffde36244f7a762ac953fefd56f29cf35cf2a267f3072ff9f733c906e7836493f35eb2c59fd74ab6797b1f243bfcfb46b2cb7fef0a1e72799c5af2907f7f94cce5732cc963fefd483297cf3a8387d43f992999ffde0c25f3dfb79a64de5f662099dfcfe924cf386f24f3fe4a44ff0fd17e5b327f9e772799dfcfb8078fa87d662499cbebbb9249de6fc9bcbd9d2f99dab795ccc7b31a48e6e3b71a4ae6e315ed25f3f1b04f82a93f0dc1636a9ff32999daf32599f757a54ae6fde17e48e6fae23892b97e78a2bd63ea1f438cef849e97e892f9f7652b99b76f3d91cce53763f0947e6f08fd9c1137b664de5e43c83fc7f53bf0022cf475499c8be719c4f113d824de5cc01671fd0eb6895dbaff50d8ab174ae6f2ad3ac9a47f63c924df4832d73f732a99f777f324998fb73993ccfb5f7f96ccc7df3a49e6e3514592b9bd3aa664ae1fd6bd646eaf9a2b98f4ddf52573fdb58e60d89f6d49e6df9b13c97c3c1d45326fbf634826ffb2934cfee40086fdf88164de7ff65232d9eb9b646e1fa607867e9bbe641a8f816092cf14f2423f4d070c7d8b9f25f3e7bbaf60e89fb791ccfb3b15df43ffe22f30f42f13f240ffea1b18fab716bf877ee967b043dc92bf1f0ea16fdd9af3a8f740bc3dbe64f2f70bc9bcbfcd2fc9bcbfbd4432f90b4730f5cff55e3297bfc9c0187f732899f4772099c6e35b321f7f6b0fc6f8daa6649aff7692f9f3724d32d7f7cb4932ef6ffb4e32e9b302c6f86723c9dcdefc50326f9ff32e99f7975382a10fd75c32d7e795906742fdd3bd49e6df67a2bdd09ff20886beb89164fefcd54932ef9ffa2c98fca72bda0b7d6a9f25f3feb0c4f842bf9a07b0d02fd13fd0afe2090cffd6c660e85b24ae87be05a40f63e1df8277c9bc7debab643e5e575732efef6e2799cb1bfcf89ecbdbed2573fd5cfd781e1fcf952d98fa3b91cf277f74cd24f3fe0f3ec08807ba8d64ae9fc54232e98f27993faff9f13df787ae680ff4d57995cce57103c95c7fac3bc97c7c7c5f308d67b8028bf9f72299cbd3dc49e6f2981f92797fd69664de5f7e2499dbb33b92ccdb6f2dc1d067772099fca72e99b7ff6a49a6f946f437f4b9bd48267934b0d0ef77c9bc7dad68df9cee9fee25f3fe69447fcc31df88f1843eaf6e92f9f3da89649a0fee25f3f1cb85be41ff0331bed07f5f8ca7f0a7d43f13a1df9d2a99f777f32899dfffea80111faeae92b93cee41f090f7effa0c463ce77f48a6f9ee51321fafeb4930f547bb01433fecb164fe7cff5b321f2f2f92ccfb3f93d793bd745b30f421ae2593bfd94be6fd1b2692b93cde4e32b79fda164ced8ddec1d017e74332f9dbb564de5e772899e299140c7dcaa692b93db8df92797fe61d18fe3117e303fd59b792e979b164de3f8918ff05f5cf46f40ff4c715e301fdb9bd80e13f57f792797fad4a30fce906bf17f3f51ae331c4fc19a13d43f89780e693a9f0a7ed028cebfd4e321fafe6198c7cc00b2473f9bc77c95cdf4a4ff0908fc75a5c8f78bfb52553fcf02999ebbfdf08a6f10e5ec1c2bfdc49a6f97c2b99e6ff27c9642f3fbee7fab416f2407fc299643efe912f99ec692099cbd3b492b9bc9ab8ff94c63711fd0bfdb2a792c93e2ac9140f689229df5125f3feed5660e85ffd2a99fce34432efdfee00867e5e14c9941f8ec0d0bfcc904cf9572a99b7a76e25f3fe73c760a1afaa646ebf99e85fe86f2ec61bfaea0b79e11f0ba12f2eda8bfb4b7d267b98897c64dd81a1cfeb503297afbd934cf1d45e30fc93f81ef363b896ccefbf3a4a26793dc1149fae7d30f247ff2a99ea1d3fbee7fed68b05a31eb1924cf9c2083ca5f6076bc9542fd948e6fa900e2473fdbbbc09463d630246be1a6692f9f84481643edef95532b73f5df01cfd7993ccdb7be92453beb5924cf3c14432efbf5cfc7e01fffa2999e6bfb1646e5f9b022ce2cba364de3e37114cfec132c0d047f74d32f9e37b30f26b2f05431f5763c9bc7f42c1d04797e6cf99d0c71be41fc21fa52a18fe24207d9f0bfd5a1d04d3f8570fe009d573dca3642e7fbb054f697ca237c1246f3a944cf53a5b32c5a72f60f81bd796ccaf4f2bc994af2d2593be6f2453bea682e7345eed4e32d5ff14c9bcbf2f57c95cff7dd15ef8a35097ccdb93cd25537e2bfa6b3124fffd055ec2bfcc24537c548045fe518331decda7647ebd2eda6ba37fc478c01f6d44ffb8d43e1ded17e3af3960cc97f5022cf481e257a6dd149fd96bf08cc6ffe64aa6f92604c35eec4032b7efab2799e2375b30e94b2aae5f50ff58aa642e6fe148a67ce1065e927fb80d2553bd2494cc9fdf3e49a6fc45c863c07e1dc97cfcd3a3606a5f7d05633e887682497faf4bb08df8e2030cfb2bc9de17a2ff4bf49f886762f4cf10f666bd80618f3e8dff92f5177f5e914be6ed2f36e005c91b5f24533cf22598ecafeec04be467ae64f28757b041bfaf5f040f29fe68c0268d9726da63917e14a2bdd0c7f424998f5f44fdb314fd91bf83a18f8105467fdc4660e86783e789fee94a30e215e3118c78a3a0f9dc60fd45fa34072f491fc329d8a0f685a964aae7dfc0265d5f2f05537f568f60d86bb091ccfbe36248e6fad988dfbba85f8e24533e48f66f88fe892b30fa67634ba6f97508467f6d1cb0a827435ed11f35fa6388f9c9a7f8c814f157fd065e92fe5f6e6083e42f5cb0897ac417d8227dca3fc036f55fb305431fba77c1747f3b02bba4df3ad9ab29e42f669229df46fb647fe460d8d3aa0243fecd2758d4bbefc0a21eb403a33f2a8a772c263f6fff35055ba827d1f85aa2bf2f1a58f4f70a8cfb252a18febdf1c0f02701f58f2dda7f5d48a6fe9b8071fff21d2cfc83603caf51c1b87fb106433f4b1a1f87fd17eebf1b17ec903efbd43e46b0f71a0c79cb2d58c4e72d18cf2f1bb078be0dc6f3339abf5cd11f8906c6f5de1a8cf846e3f6c1cbe724df068cf6548964ae3f1b130c7f9096608c7f7603a3bde90e8ce7bb2f60b4d77e00c39f075c9f98f639e47fa34832d7e7f84c2c9eb7ba80216ffb08c6f3cc042cd64f1a30e42f9760d88fe382d19e1ced19c11e42aebf0cf17cd306435ecb04a33d610e16f20b16f1470a16ed3981457cf9443c82bdae2660e19f79bc341c8be7d70e18cfd71ec022df8ac178feaa05e379d72bf108e3df70ff369cc8fe1d8345bc9c81d1fe60452cfaeb7a03c3be74ba7e2adbd382f1fbcb3b18e3910dc1689f4df24e657fd4603cafb2c168bffb0cc6f32b1ebf0c67e2fe01e9d34cdcef1283e12faa6f30ee67f860e1ffe660a1efdc7f0ee7e2fed58c58b6e70cc6ef8d002cd6173db0a83f2dc0d0b78edbf77021e5bd078bf6aec1f87d41fabd14f2155bb0f8fd108cdfeb2330da93de83f1fc8ac6d310f2ac1a309ed772ff3734c5fdb48d64ee0fb72e58d4e75ec0f87d7202a33f0d713df4a5237bb7e4782a60b11ee681d15eed112cee1782a1cf158f4f86b6b8bf6581c5fa2af5a733823f762d30eed7d2efdd11f2efcd1d18d76bdc5e468311f2a3c007e379f5082cea75f760e8fbfa8d782cf49dfba3d150fcbebc030b7bdc83a17f099faf472371ffe64c2ceed73460e883cefb6b3416f7ab4fc463e10f2c30e46b8927e279b94b2cee6f6cc1d087ec092cec4930c6f342f24f85fc46442caef75660e8cf85fb93d18cfd9ec783f1162ceaa37cfe19cdc5fd3ceabfb990d79d80d13eeb152cd64fe9fa85f8de7c05a33df9188cf66cbec0d0c7f50d0c7df3b8ff1f2d85bcce002ce227078ceb1d0f2cfca54e3c41fb6f74bd21ef5780f17c5d058bf53beeaf46e618ebd77a2299c77f5bba9f25c6b7f4c1c2bfbd80d19eeb07f104fda1933cb678de2603e37eba01c6ef6f57b0a8ff71ff3d72c6a8b7e8d47faee88fb507c6effd188cdf3bdc1ec67d38c739e2e3c5a63393e21723269e60fde4f22c99d677b93e307577285eb7b8fd8f27ecfe9cf50e0c7d8a79ff8ca7ec7bfefb6b412cc627db81c57e823730ead9eb1158d43fb8bce399b8fe7a0716eb5d7330c663c3fb733c67eda1fa484d2cc6c39a83a11fed193ca57a651282b13e16f3f96ebc9860bdc8d880c5fe810c2cf21bae8fe3e544d4cb23c93c5ed30a30ea071b170cff92d0f81813d443d71730eaed9a07c6f53eb7b7b1c9bee7fa117c49a6f5024b30c5b3760cb6b19ec9e3adb13331e8face93ccfbaf3883f13c23013ba8a72e05d3fd0d1b8c7c734df23b53d8df86facf9da03e7e1b80f1fc82f7e76430813e6d63e229fa3be5e333194e4cd40b52b04ded31b8fe4e4653110ff2fa0a73a736f28d9a788afd67fa180cfd6a1db0588fe3fe7f32610accfb77c3f59721f2c77c493cc5fe0aaf00e37eb731788afa4e059ed1f8361f60d48f6dde1f93d914ebc7460a46bd2fe4fd37994fc7940f6cbec1e89f98cf5f93a578def5013c433d86da6f4c51bf09b9bd4dcce982f2b39cebcbc49a22fff6b83e4dec29ea15d95932adb704c433acffebf43c776ad1fd039d7886f5d315bf3f5356f09acf77d3d1d4a5fa65734f3cc3fe035d134cf7372c30ec355b824dc413dc3fb0e9906574dcdf79c4e2f74501c6fa5b74104cdfb73c3e9d4ea6d6887f7fdb10b3e791bef1f9940ddf1ceb078fe005f5b7c5e7e3e96c86f58f8d0246fd3a76c1f311f9b377b043e31bf07c693a9fa1de19df816dec07f804bb584fa3fe5accc47a86069e517b82002cd6f775b043f39bc6e3dde9923d8eeb7332035bd47f3705ec60ff824d3cc7fecf84ebefd498c19e2faf609bfa2be6f9f0d49c2d51cff5c016e5fb2b176c8f78fb8b15d8a5fa99c9e7d7a93543fdab1b831dfafde6287844f5d10e8cf1af49bfac39c63bff024f499e98ee6fb3fb937f7d023bd4fed407bb435aafb124d37e2d5d30b53f03cf87d43eeb0d8cf5dd7803c67cb7e1f63d75587f707df1e9fece7c30a2fd5d7b30f6b3469f9269fdc792cce5594dc1587fba52ffb84c1edebecd5e326f7f41faebceb19f2cda8271bfa6133ca2e727e0118d4fb2164cfa9c2892f978af4c30eca1f1c19321d7bf2bff7e3660e34ff5e53bb043cfaf5dc174bf6c0076a97fdb929805acfcfb6d0446bdbee4ed9f0d857eddd660f89b6e2298da5f05c4ac3f687e6bc0c311ad87e07a263f9f0fda77f094da537f8067245fc5f569369a1963d29f2b31eb5fdabfe20ba6e7a777e0d188ff3eb9815906c29fa78227d04f053ca3f6b65c3f6663260fd553a93d2cfca4fec91bc95cfeea041e517f5fb8fece2662fcdd023c86ff33c1d31167cd06cf21cf5c308d679d8017d41f0df72fb3e9cc1ef3ebab14ec8c69bfc05432ed47d38885fe5d4cc9b4fe37028fc8fecb37c9649f25784cf6ebbf82e7f47dbc042fe87e05f5cf4ce8936b82e7f4fb36113ca6f17a002fe8f986b8de80fe8bef4dd28fc292cce52fa68269fc4d1effb0db2f49decd0c0c7fdc92fe2ce6131a3f6d2d98fcb7bf02cf49bf370330d68fea5a30fdde38831dfabea3fe59b2fea178b0009bd41e4f03db23aeff37713decb5f00593fc2df5a7c1ee47eb6f2330eadd17156c8ea87ff7609bfc45590b267f78d5c02e714bfa6ab2f1207ff80136c87ef22918f34dfe06c67cd186c48b018dafcee3cd99c5ee47faa48217647f99609bf4c7a0f1b2160392afa3f6da6cfc68bcd69279ff949f6093daef4ec1f067f5817831a4e76de8f70ebb9ece177c806d6abfb3235ec0dfba2bc9b4df9bc6d7ed1376ae5f5c3fe703263f6f4f520a1e53fc99102f66d4be8cf7cf7cc8e4e3d7673e784c7cdd82a7d4de5a03c3fe751e9f3265c2fca09be009d94fc2e397394b87c99f186bf08cfa4fe3fd3b9fb0e7717dacc792e97c0b8f5f58f8bb20d6793d613e5f2cc7b49fc5005bd49e35b56fb1c4fcecf1fe9e2fd9f7743dfdde582ca83f8267b049ed59f3f9686eb2eb69fd782699d62fa83de67244f67de1fa3eb79643b237ef2698f4ab9e8347d4feb0008fc99e1c6a8fbd70d05f4762261e6f9f46e3e730a6f3160618fdbbe6f9c6dc5d0ea8bd0df5bf6b88f89aebdfa25f00a5f8ff4e32edd749c0636aff66019ee17939780e7de2f92a73f643e8bb031e537b7c133c237bf5dec073ba7f44f71f1a225ea3e78f447f79dfe011ddcfe3f22dc68c29feff06e379ba0e9ed2ef0b1effb1747d44f3b1fd0d5ed2f78d0236c65cdf367c7e5fb0009858bf07cfd15f7bf082f4a3492473f96f19d8257b6df8f82e66cb05f55fbe223630ff6f797cbc98b3f67079527afe82319d17e1f6b7581a03fafdc693ccc7d7a0fb194b97da7bbb111b63f2af1bae9f0bd31810eb7cbd61612d1dd2bf94da671943c8cfe7af856d8c69be6e0563be594f2573fdd7b8bd2c1c763ded0f53c01392c7bb4ae6fdd3717d5db8c684fa4bbb134cdfa767f094e28180fba3e5c080fff15fc0b309f5ef9764d24ff13dfc43cae7a3e5d0807d6cf8782d47acbdfcfeed0b783ea1fad50ebca0ef6f3ed82079a32f30f2c5644f6c627f5acce7df655fd0e1e3930460a662dc3f1cc14beaaf40133ca178a8069bf47cdf90ccc74ff3c10e8de78dfa676c8afd09b564daff5982b1ff36a6f64c58ffd2fed40b7836a1fac504bc9c50fd6101c6fc97abc426e2b3700fc67911f3018cf33ac99d643e1edd198cf3176e07463da4fa0063bf8826be47bd53e7fe773965e345fded806db217eb1d8c78f29612b3f6923ea9603cbffb0663bf4949d7b38083c663b3022f68fceb7bb043f6118682a9ff8c02ec92bfcbe9fe7dba49f5c30d18fb636c9e2f2ce7ecf7144f2a6097e4bbe5c4ecf7140fcdc0b0b734018bfde03a784af3c53504cfb15f47dc0ffb0bbb8160ecbffc002fa95e58edc1d8bf1a4dc1163d2f36c1a8575495609c5f1a4aa6f3a134febd83e2ed2f376093faafa3e72fcc01f1f50b3c217ddd5660ac37ad63f00cfe5407cf69beef5230ea35c6026c60bfe55532e55b39d8a4eb6f73b0d8df20ee6f637fe04a32cdff03b043fd757b904cf9d9168c7ae7ed2299ce7b3692697fc898d8c2f99ddb128cf3b317f49f85fa6348f75f1a06d9afb604c37ff817b04dfa1c0ec10ee9bb4ef22ecd015d7fdd8047345eb5079e907e598e60d2d7b40363ffe3762598e2d5750e16e703d692297ffc128cf35768af897afb36108cfaee5c32d56b0f9269fe2e24f3f61731d880ff5125d37ed80558ac974c25d37ec09d64de7fe64132f73fea27d8a2f15732c9b4bea008a6f655a23fb1dfb28c24d3fe470d8c7ae1ed5132e95b2099cf8fa6e82fd4e3c32fc9b4bee3125b38ef7723ff641816d99b7d03dbe48fc22bd8a1f9f95a825d9adf4af28706eb1ede5eaf060fe97aaf133ca1fc5605237e6d8ee009e5bbd5198cf58b4efc1efb6fb71730f67bae66e025c5df8a09c6fecae020998fafd248a6f3ba909fd93b6f4f71025bb0af52329ddf9849e6cf533fc036e993924ba6f96726993f2fcec00ef57ff12e99e2c34a32ed7f0cc1f017d5bb649aef7cc9bc3f22f13c97fa4fc3f859388f5a6d25f3f69443c1d86f3b06e37c4be54ae6edd354c9bc7dd791643aefdc4aa67acf2b18e7f134f13dced325a4ef26d3379affc95f9826e2cb952a99c6f7153ca57835fd0463ff691108267fb579028b78c2001b34dee14532bf7f62814df88b4832d52f2ab085f59d0118eba3752899ecff2699eae307c9b43fb405431f9454329d2fbb97ccdb938cc02ee95b2adaebd2f8b590dfc279e448974ce3f12998e67b4d30ce074713c934ff403e0be72d2dba9fc5e607defeca014fc85f5413f094e2313b954cfea0114cfe467901233fd41792a99e6a49a6f527c198afd71bc9549fb9822dea8fba944cf9502799dad782b17e6d7592c9be6782495fea42321fdff8c7f77cbcb477b043fa1deb9229ff4904e37cc697641a7f0decd27828aa647abfc45032ade7b982495f13b25fcbc2fb0c944032d9cb93606abf5949a6f314cf60bc4fc00a24f3f6b79960d29f5a914cf11dfa53d87bf82999d6df303e16ceb755a4cf369b3fc8ff7660ec3f57de04933ff0f760ac5f665bc114df2b67c1a44f57156c507f5f1cc9b49ff3198cfdc69bab60aac7ac4f601be7fd22c1781fc95132ddaf95ccdbabd492b93e794f60e883229e87fd9ef959326fbf3a964cf9e00318fe5d9d4be6fda192fed916ce83a92f92a93dbe64ca8fd11f229e4c6f92f9f3938164ca1f4f82b1fe994ae6df871f60acf79a6bc9bc7f62f49785f3b1b75230d95775914cf30bfacfc279b22df90f47c413a621995f9f7be011f99b6d2b98e2136d021e4f683d63059e4cb83e7ae2fa19dd4f3b83e734df943118f581f22099cba33c8397549f592dc026d69b8f9279fb6f9f60e453d6156c537f5a63c9644f8160aa47695330fc8dee0aa6e7c5b964f28791648a6fe692297e580aa6fa6628da8bf8c3bc974cf9642118fa38954cf58f89649acf1692e93c27e9936361ffbdd149e6df2b9e609c1f7d96ccf549ad24d37974e887d0676721998f8fba924cf1fa9364b247713df687754f92e9fc672399ea45a23d581f35af92f9f7b9f81eef13885ac1181f4b32d5dfa10f16f6a3044bc974dee9158cfd3f892399fcbb2d993fff26fa6786fd3ba23f711ef146d7bbcc7e283f7b944ce7995ec0639aafab25784af671db0a9e52feb200cfc9fe320f2cec650f5e52beae7d49a6f319e2fe4bd457766083f453bf80b11fa878154cf6b2adc1585f37c4fde0af235530f251717fc45b9e90d7c17ca848a67add5530ad1f74a160aa8f76e279c8e7c34630f97f3b174cf2379a645abf247fe35a781f90ff2818f3c1443297571d49a67cfd4930cd87da1b58e8ff5630ece74b32cd1fa564aaef7982697dc87900633f73694ae6faa0be4aa6fd789a648aa724637fd25a32ed3f79924ceb3d3330f6f325ad64de1fd98364927f2598facbd42553fd3594ccafcf311e16cecbdf22c95c5e652a99de7f267e8ff3c9e1bb641a6f4732bf3efb008bfd812f92297eb32473794b31bec87fa30a2ccea3ee0493ff30f79269bfe23718f53e6b2099ea0377609c7f34be2453fc7b914cf91c1f2f63c0e6478a0fb6e019d58be207c1538aff8fe039e503712b99e6eb5c3297a750c04b1afff22618fb1922c1347fc73bc9b47f4630f2f9eda360b2efab2e98fcd1ea158cfd83452598f47f6b48e6cf8feec1a8b7a40bc1f05f3bc9bcffb61918f596f85d32d5e3447fbaa48ff94030f6ffdc24737bf267c416f6a7ac3f2453fe580bc67e99122cceeb9c24533d6b2299f4ad108cfce30773fd500cc9341f7792a9fe6b0ba6f5da6b2399ce372ec1d85f1d9d25f3efd59b60f89f3bc9bc3fd4a364f22f6f60ec97543792797fa8a960d8c74d32f9932918f61ed49269ff832d99e44d24f3f61a23c1d43f96fc1ef1fe1c8cf763448e645a3f16cfc3fe3d632899e2955832cdafd01f0be7d5ad4a32ad9f3792b9fcc64030ced3d792b93e9723c9b41feb02c6fe67732b99f68b7c4aa6faa3180f9c17f6499ffa032dc46bf098ec5d8f24d3fe08133ca1f530ed049e527eb7f50593ffb83c48a6fd570a7846f7d36b30e6fff25b32d5ab73c1145f28ef82299ed1e660d473b64f92a9def92698fcdd5a3cdf46fd24914cfbcd74c9b43e21e445fda611f7437cb1fe124cf65edcc02edd3f7225d3fb001e05d3fc5ebd108b7879bb93ccfbc72f05937e66a9605abf538e92493f56e021d99f6249a6fa5b2b98fc9f72914cedc3785a789f52f12698e42943c964ef17c9e40fe792697e1849e6f2648e60ac470660bc9f243b4aa6fd3fa1647ebda20826f9d24c32ef0ff55e32d5d7447f60fe2f9f25933f5a4aa6f8e62c18f9502299f40ffa61e1fd4b4a2899f6279492495ed19e29e297028cf795048d64dedef05530e29137c9e47fe4efb19f740cc6fed152134ced0f55c9fcfb488c17dedf74b9934cf64dfa3c326754ffab0cc1643f510ac67a78ba04633e77466083ecb309c026cdffa921998f476582b19fa7ba0aa6f93e5e0ba6fca6188051bf4b447bb1bf4aff00237ff60f92e9fd41f792e9bc7d2599e6f717c1d8cf247e8f7a5d160ba6fecf23c1b4bf21a0f86264e13c72f82499f2fd57c1f06727c954bfcec098df755b30d9ef7a2e98ecdf78974cf54cb447d47b3d5330e2cb0fc9b4df47dc0ffbd12ea9647a9fec1e2cde07f92e99f60b1c05239e3e4ba6f9df974cf9d74932ed9ffff17b2e5f70014f90ef288261df8664b25f5332bd6f0ae36be1fc4ef92499f22d4b3297ff593c0fefb7525dc9e4df3c30de5fa53a9229feb12553bc2ec66f46f2565f92c97f37609ca7b4df25d37e825a32adff89fba39eaafb92293fea24f3ebb7627cb13ebbfd944cfbadbf2453fe37154cf287a664d257d15e715e80fa6fcce673f2af117846f94076075e503d2188c1d88f9a9b82c91f2457c954cf38832df2279ba9647adfe70a8cfaecf62098e2ef6e2699ce27ed04533cb2d5c0d8efaa3c09a6fa46f12199ec5d3c0feba51dcd9f63517f5dbd0886bd3f4be6d76f7f30d59b62c164afde5432d5271f2453bdf0118c7abd77124ced4f1ac914afae2553bd5edc0ff3b9f32498ec6d1308a6f66c55c9341fdd83313f9ba23da8ef46a564dabf664aa6fd21f27b8a37e291643abfe249a6f9ce174cfb13a2028cf78b25b9647a1fd4a364f20fdf92c97f0c25d37a512599d607a03f22bf375ac994ffa49229ff78944cf94a2618fe48fe1ef59e4632bd3f270163becf2ac994bf8beb71fe4b0d2453bd27964cf552d13fa807da2f9269ff612499e627d13ed40f424330b55f13d763bfc6ed4332c50f37c1f0f78a64daff3d964cfb43c578637daf7a138cfd39429f719e6745fa30314df21f590ec6fedd32134cfbb10c5d30f98bcb8b64da2f3c01dbd87fbc174cf5c92001e37c4d25eee760fff1b7605a0fc8b792e9fc81b8bf43f149740263ff68fe2a989eb722fb9c8878201849a6f75f9e25d3f37cc974fee15532bdaf752898ecdd0904d37a475080512faf7e30e9432e18e7f56e82914f5482c91e0bf13ce4ff7e2698c627fb924cebcfe2f7d8ff1b3e80719eaa934cfaee3992491e717ff80f6f2699f22ff13dcecfa753c9e4bf0e92293f394aa6fd139660b2cfc8904cf9df4230e68b4a32add78bf1c0feda740ec6fbebcab3648a8f2792c95fd492299e1848a67ccd164cf25b2d58f887ab64f2379d64de3fea4132bd6f4efc7e8e7827944cfb7f1e2553bd4f134cfa6c799269ffb6781eea8df14432b57f2718ebe591645a2f8b05231f15bfc77e0f652699e229f13cbc7faa9a4ba6f361427fb03f5013fa8cf5e2c495ccbfd73dc924af180fec0fd33e24737922f17c9c6f6cc91ea626f69b5e13f082fccfe64d32d547bfc0385f565ec0886fba1cecd07a663394ccfb237b05633d627b144cf6779949a6f75fd682c93f06349f4dc5fa433d154cfaace982697d721b4aa6f3c11918f585742299fce5bd64aa67958229be5ac560ac27ac12c178bfd79b64da0ff1e37b7adf95fc3dcef70592a95ebb174cfe3a10cf47fda01c08c67e1b5f32bdcfb0134cfde12a92493ed17f585fc81f25d378dc49a6f8e253308d57249e3f417c7a904cfbcd7e30c5d382b11e982592797f24df82b1de954ba67aa6907f4af69baec138af6c8d24533d692f99ea733bc1e4ff3c0b2cde37be944cfe712499f2b1b964b2675732c52bd0670bfb45d54832e58fba64da0fb301e3fd8d4a2499d67f857ee0fc72f82d99be5f81713e3e194aa6fd49e27e588fb89ec1884fae13c9d4ffa27fb0bff0229e67537fae481f66e612fb2d776083ec3debc026eaa53618f18a3b0323fe580f04d3f5c98b64da7f63825df217852e99ce77907c33113f6c4dc134df6f1f24d37c9982b17ee04f05537b9a77c9148f88dfa3deb07a92ccfb7f73168cf365778229be48bf25537d19f28bf501e55e309d4fc94f92c97fcec158cf2b12c1e41fbb4fc9b43e3d104cf3f7f6158cf87ebb170cffe448267942c1e47fba05187f1f455049a6f5614330f4ff0d8cf3b88ab83fde3770d94ba6fafc12bca0f6a557c1c80f6dc9644fb964aa7f1492a99eb1934cf3f718bc44fd632199f2ab67c914bfd782518f16e389f78346a23dd8bfa58c25d379ba4030c95b5f2453fc5c824deacfec2299f6eb6c25d37ae74630e2b94632ad170bf9b13fb87b964cf514713df61bd4aa643a9f0f7bb31cecbf10fa28f6e3f89269bd83e2adb9399f52bd33032fa6fcfef9086cd07e8d95f81eeb1b97a964b2bf0dd8a2f958ff02dbb41fbbbb825d9a3f2eb5608a3fe28560caafb6141fcd45fdb11a83b11e180f05d37e5c5f114cfe669d8051ef6f3dc1a40fab108cf3d9e55a30ce3b1a60d4d78bab649a5fe5f7645f978364dededbb360f247452899ea616730d6e7d6779269fdfb4330f9bbd4148cf8e7058cf5b8e44932bdffe25e30f6835c24d3f9d1b964b27f713decdd16ed9b937fd2f792a99ed2082679a247b0380f33964cf3ab18af05c52f57d1df381f5baf2453bcff0046fcacfe60daaf6a4aa6f9ed4b30ce7fce25d3fedd1918f65f8af1c37e6d4f954cf9cf5a32c927fa17fbede254326faf22aec77c1bd582a9fd971d58ecef3524d3fe5ea1bfd84f97d1f82ec47a83be124cf5c8ca07dba4efbab8de9df2dffba44f0b51afeb5cc1747d32154cf61eecc043ccf74f9269ffd3098cf7495c1e25d3f9c14a30ad9f281f92693de2001ee3bcf34430e94f71114cfe259883f17ef6b52599de2f36144cfaa23c4aa6fafd188cfa79d60a267de832c1345f1786649a3f7e30cd97a2bdc86ff55232c54fb9648a6fc4f367e44fbaa1649a5f669269ffb7f87e4ef6915f2453beaf4ba6f9443c1feb655a2c99e47b944cfb532493ff6bef25d3f86ec1e2bc532318ef1712fa82f3cdc55e32b5ff1b0c7b5acd25d3df9fa04ba67ac25e32bd0f44b4cfc0f95ad13f787f759c08c6fb8f34c9141f6e2453fee80b46fe22fac7c2fbafef24933f17fa8efdf9590dc6fb8d4a8a079626ceb3d513b04bfa5a527cb664f645eb65067848f359fd8369bfec063cc27ae45532d5e31f25f3f15c3d83315f5d12c9544f740553fe1e6592a93f3dc158bfb88127145ffb9560b2873a96cce5d75f25537ce90ba6fa62f283a95e2ae49bd2f82b0f82c93ef385645a6f17ed453d39984aa6fac04c32fdfd5607c1a42ff14a30cdb7b74232e5a76f60e483fe5132cdafb960c4fb5f60c4aba52218ebaf7b30d69fb6e27b9c1f0ceec1d82f962b92c95f1d24537da7148cf93d05239f534f92e9bc8bb81fcefb1547c9544fabc1383fe68af1c67e92f807d3fe43213ff6af7662fcb19fdaa37cc410f5ebfc5e30cd1f6b07ecd2f85a347e06332faa8f1cc0d0efdb17784cf6e91a82499ff44ff004eb318f92693fdebd649adf5f05937efa67c1347fe91618e7bb6e7782112faa60ac8736a1601a8fac00a31ee98c05e37d155bc1347ff8aa647a1fc009bca0f1f21682c99f9ae2fe0b6acf360763fd62bb168cfcb0148cf7790879f1be9ad4954cf53cd17fd8bfe49f24533db1164cfdbd7d07e33cd346fc1efb17b789643a4f300423bf303760bcdfec42f669b27885ee47f38169e1bc977e124cf18d3706e3fd11fa163c22fdda9482a7b43e7805c3ff058660ba9f2b9e87f364d14632d5fb4792e9ef37fe02e33cd926028bf364efe039c9b712f747fdd9ad24d3f58231fee58b601affdb9b648a6f7230dedfe12d25d3fa760a467d3817f218145fd99f9269bda1924cefdf93df23fe7e009b349f98623c2c1a5ffb2298ee97d8609c3f32e6609c3f8b2cc9646f0bc914cf3f4aa6786607c6fe958ee20f8bcdafb43f81e20b165e93fe5c3e25d37e30f13dea3ddd093cc27ede2d18f5983804e3fd1d9a25989ed7168269ff61fa089e223f9e8167d47f862699d6f39e25d3fe68152ce2b70318e7c9ec67c9f4fe12138cf70f252918f1932b9e67507caf08f9f1be9938069b648fc15e308dbf32108cf7df88e7637f627c150cff7a0163ff42f000c6f99c88ec9b4d37a867d1fc62b3f1a3fd3c743f5b8c5ff102463cb2da82117fb4df9269bde12498ec510f25d3fef01c8cfcb8b425d37eaa5232bd5f2506235ed85a9269bda4154ce31d89f6cef17ea8037841f76b447b17d84fb6012fa9fd6b211fea49978b608a4f0c156c423f3bc9b49f3602c31e6f7bc1d0bf4a32c50fe44f6c1bfb3be22918e7e93a6287d907adb70ec063eacfd51b784afdb3d1c0c85f8a5232cd97afe0398ddf652d99fcf75130e5879d09c67c961482c97eae7bb049f74b3ac9349e86649a4f2692b93cb978be8df749b88229be509660eca7f39f24d3f922713dd6afaedf8269bcd690c7c6f9d755001e52bc5b533ceb5a63d29fab2199ce63edc1139a9f82083c25f9f5068cf745dd2cf082c6238d25d3fb1d378229bf503ec178dfce6a0946fce9bd0aa6fe5ccf04e37d0af27aca77ac1bd8a2e747df9229fe2dc136f98ffc4530e9f34a934cf9f10fa6e78be739387f48fde9daa8f7273c3e310716f67b260f9269ffde1318efefb91e24537dcd06e3fd79f6156ca0deb1904cf6a080d1fe6a2199e67b5f303d4fbb801dd8fb0a8cf8f9a611db78ff5dac8211df745f60d413133e7e2c389be17ccc183c27ff97459279ffac4b30de27947e0826f94c4532bd7f5d032fa9fd6d2a784af58e21d8a0f9e1aa48a6f53f5b30d58ffd6730de5f94ad89ed01d9ef86eb2b0b2eb0feac6fc04b92af7525d3fbcd8f6093fccde64532d9cb4d30c57fe1128cfd33eb77c1a41feb028cf7355a1f82e9f9ee1cec62ffea9b60f227892918e785f0bd8dfdafe9b3601a4f270463fda81980f17ea59adbbf3966fd41ef472dc14bf2075b1b6c60fdec4132d50f0bc9944f1cc126c693dad7bf5e9ff2075c6f63bd6b45fd33b1e6549fb8adc0580fdc7682c97fdd5ab035a5f74309c67961e50bec523c1de2f736eaf7f11c3ca4feaba8bfa6d664467fffdc080c7f53b492a97e6f08a6f686776013fab4964cf69982717ed224ff30b5b15fe81608c6fbd3ce60c48b2d8dd78cdd8ff2eb5430c5839b5730f2dff60086be74a4af33d6ff148fdd8391ff6a74bf390b30693de808b6917f64c436ce8fdf1230f6bfb7345e0b6b3a27fbe9c0f319bdaf8bfcc782a5f7e43f0f60cc4705f99f256b3fedf71c826d92ef3625b627349f68dcdf9b2c9f9b927f237d3458ffd1fc5b8327f007241f530f1aaf6b00467cad51ffb2f8674efd41fed5b6711ed0e4fac192cf39b57733022fe97ecf977feda32abf7d8c9f3e26ffa7827fa74fcf0afb9da5daaac3fe58ff6a0be8f3df21cb2f72b9ecf3bb5c0afe9b90afff77f7df5116d62247f5d81ffad87ddba87590cbfd87bfb3f1f9779605f20899fa6be8cfffb79fff167b71e9f393743ffadc1663f4e33aa96fbdedf8eccf3f18b9ffff65e16dfbc90e6009240d1fa9bf2b3bc9439ee0df4d1661eb3f64f9313a3f24f3e4e717cbfa7791e5379fecfefa91d758f05a8e94457a8a7f2b590235542335561335553335570b364ea55aa917b5669f86e951ab76ec7365b2de544dd5d99f15ff9dc67eb1fe379365a3aed827652391a85bf6b963d2ecd43dfbec982c07464726dd91fdfb4e3da9f74cce7bf5817d0c76e53ff4daff5b6479e43dfdc446e699fddb597d515fb94ebda9efea87faa906ec9a9449f8c524f85607ea501da96375a24ed5993a67d2fc1bc9c25a7a5637ec9f91ba607f02d8fd92c9f2cafe6929aafaa4284cc7be15431d2ba662b18fad380af31a8aa7f8ff3d92fcf7cc954aa0844aa4c44aa2a44aa6e44ccf5ca63d2dfbf4b6622a059b45064aa954ca45a9954669954eb92a3745537465a5acffe8b5ff37cab251b6ca9db253cf8aa2ec95036bf1513929f7ca83f2a83c29cfca5979515e9537e55df9503e952ff6dfbf9581325446ca589928d37f23596c65a6cc9505d3b393b26413cd83f261288661b044c0b00dc7700dcff08dc0088dc8888dc4488dccc88dc2288dcab8a87746fddf23c99f9345b58ca6ff23a390df6677a3353ae36adc0ccdd08d95b13636c6d6b83376c69efd391847e364dcb3cf897d8e8c1fd8e7d178329e8db3f162bc1a6fc6bbf1c1b4b0cf02685e757f9b797f9aadfe999ff8af6561527c1a5feccfb7313086c6c818315fd4186363624c8d194b9916c6b2370ad3304dd3326de3683aa68b8fc73ebe19b04f684666c465eaa53a9a31936a6726666a66666e16666956e6c5accdc66ccdcebc9a375333757365aecdcd2f33b1f2eb1cfcd764311a736bde3169becd9db9e7b21ccc8379344fe6bdf9603e9a4fe6b379365fcc57f3cd7c373fcc4ff38b7dbecd8139c467648ed967c23e63736aceccb9b960992a3334e3de322cd3b22cdb722cd7f22cdf0aacd08aacd84aacd4caacdc2aac12b9dc2f91c5ffaa2c56655dac4b3f2e566d0cad5a3d5b8dd55a9d75b56e9666e9d6ca5a5b1bd6d3f7ccd96ead3bd6522689b5b3f61677bfd6019f2393666a9dac7beb817d1ead27ebd93ab351da592fd6abf566bd5b1fd6274b98bf5884b0601e3d61b3e9c0faeea3cf1fd1d1bfa2634cb31a8bfe82f001fff74a89aca135b2c6d6c49a5a336b6e2d7acdb196cc74fa4a9ed18f85b5b34d48f2439643bf4c614e6ddb766cd77ab03ddbb7033bb42326cfc178b4633bb1533bb37336abda766197ea935dd997de92fecce74fc932307756cdc6646055aa67d77663b776675fed9badd9ba71303fec95bdb6376c249ef9676fed9924625414662bcc5e602bf766681bf6d6beb377f6de3eb0cfde3eda27fb9e8debde7eb01fed27fbd93eb319d7b35fec57656fbfb1d1b07efffcafc9f27cb16a66274cb78cc6f8b4df992c1ff6a7fd657fdb037bc8faf3c47a7864bbe6dc1edb137b6a2db924bb7e64fab161ff9cb1f6ce85fd9b91bdb0972c485698ddcc1dc3311d662c8eed384cd2bde33a9ee33b8113b218f5dd89545df17fcdecfe155954d7183ab113333bb1edda499cd4c9ec2f27778a5e0ea7640ff0ed3d6b55653d3b17361acf4cc706cc6216dc6ed8ff3b356b6be3b44ca6b9d3998173756e8e66f7938feeac9cb5b3b1b7ecf78eb365d21c8d9d73e7ec9cbd73708ecec9b9771e7ec9107ecb7a7eb6a03f234b2f09f3c683fe7ecea3f3e43c3b67e7c58cadb33db1ced6b33d6656cc3ece2b6b5dc5dab5c0a7f765ec63cfe9e374f8bc39efbd24f6d20e9d0f66fd47e7d3f9ea7fe954ce379366dffff5f6cec8e9ff5acca933b3eb9fe4f8576599ab9db3b05f9c25fba1e21a6ce2b08c23f34accd3bab6ebb8aebd702a73e17ab66b1f5d9ff9a8931b981fccdacfaca5f76ec86c2ae673e6d18ddcd84d98bde0e3746e6a7acc73b02b594fbcd93336be67377373b7704bb7722f6e6d176e63356e6b358ae67656f3afe8987a70afaaeddeecd6d55cdd5db96b3626cfeec6dd9a43f7ceddb97b3622dbde86dd837bb4576e6031ed331df7e4debb0feea3fbe43e1b817b765fdc472195fbeabeb9efec5707f7c3f9703fdd2ff7db1db84377c474f1c0fe7dec4edca93b73e7eec25daabd2f6091b8a7aa81f70fbdda9f91c533d8f46d79b6e778ae937b9e71b2179eef055ec8e4601fdbf0222ff612e6030eb6d1eb8c977a99977b85577a9577f16aaff15aaff3aedecdd33cdd5b796b36e7c7c6c9db785befce7a70471ebb0b1b5d9dfd3ff36fde8e59cec1db7b07efe89dbc7bb5f01e58467af31ebcc71f5af5bb1ff853b23c79cfded97bf15ebd37a730637362dbde3bd32f2e099368cbe6f229b39ae7de76bd0fefd3fbf2bebd8137f446ded89b78536fe6cdbd85b76441d7a3aff8866ffa966ffb8e71f45ddfb31e7c9ff9e8ad6df8811ff663e547ee8069e4831ffb899ffa198bd6be51bffd523c9189fe75599e2f7eee177ee957fec5af0d6603e6d46f7a49fc967d3aff6acead27ffd6cf77bee6ebfeca5ffb1b7febdff93b7fef1ffca37f62f966a2bef8f78aea3ff88ffe93ffec9ffd17ffd57ff3df8da3bdf03ffc4fff8bf9f485bd30c74ee57ffb037fe88f8cbd3ff627fed49ff9737fa1382c27fd6679f70f597ea97dfc99d8d25f066aa004060b112da65f6aff97c0f7fae5b7811d38fe3570cd0fe31478811f04411844411c24411a64411e14411954c14509839a7d1afb3d68838ee59af3e06a3f07b7400bf460c5fc48ef0d9560ddeb99ad30d906f6c27a0e36ecaedbe02ed8057ba50e0e4a191c8353708f0af54f35ab3f2d8b1d3c048fc153f01c9ccdd829ad73f012bcf6da15bc05ef81137c049fccf38c83afe03b1804c360148c8309fb330d66c19c49b47016c1325443253442d3188416fbc39c71e8865ee88741188651c86cc73a8709f3cb4698f29881c50f61d6fbfc300f8bb00cabf012d661e32fd421d3b41fb2387f94e5e77af6cf63d25f1db661175ec39b19875aa8b3bbafac636f27e13a5c33795e8c7b2f0d37e136bc0b77e13e3c84c7f014de870fe163f8143e8767f52d7c095fc337ab08dfc38ff033fc62d2982c22f6d97ff90e07e1301c8563e3184ed82cb40dd6e1943d63e6ee99fd7c9b53f6dfe7e1225c466aa428456444e68fcacdaf5a46b288ff862c28f1d4c8525fd5d7c88e1c7f19b9e673e41987c8376751c02375a61351c8e2f7cf88e524511c25511a65c62dca8347ab65f369cafe3c4645f01895aa1255d125aaa3266a5910d345d7e8166966678ccc75d4467ab48ad6d126da4677c629da452c82f0039ef778d68ecdb40bf6bc7d74888ed129ba77d2e8217aecefcdabed866af4d1eeaff6f2932c068fb043b77516ca2e7a8a9ea373f4629ea357f6a437e6750d16a79ca37773c2e6e8aad7eae823fa8cbea2ef68a0ce153f1a2aea8f2a2c7f9e1b8da27134096d2b8ca6d1cc8aa379b48896b11a2b56111b319bac629b85166eccbc3d9f73962c7f93b29843e33ef6e3200ea3fb388ae3f081f554cadbcafc5a1f25fe2c0b7ff68f7131d4f8f9e22cd4f73889d3388bf3b888cbb86277bcb0f87111d7d6dedd5b4f7c2639b959dcc46ddcc557ff515dfdb4f662cb3bbaca5875e25bacc5ba3f8b57f13adec4dbf82edec57ba5890fea323ec6a7f83e7e881fe327e3143fb3d866c9bc7380b86e689de373fc120ce2d76011bfc5effd88736b3055a38fdeff992c0ad34726cb6b9cb8adba8a3f4c23fe649db7641ec6b09ee3da665ed3fc0c33f6dcaff83b1ec4c378a456eaca7e51ee94713c862c3c1eecff9dfdb7493c55f57816cfe345bc4c54e3c17e4894c448ccc44aecc449dcc44bfc24484263efde9b3e8bd8d887e7a42c3b65f3d6d17c4da2244e92244db2a84872b1baf07765b1c886f8155b36bbb2fe65914fa2b8499194e69b71f26fd69e8dc9d9b998dff6c13ad953e39054c925a99326d6d5f7beea9db4ccca52f40d55c1d97d95bb385332bb4abae49adc12cd38252ceb4956c93ad924dbe42eba26bb641f1c9243724cd82c657a8ec272014364d94c9b4b2f4dee9387e4d158264f09b34ab146d2e722ff4c96e499f5e198e50e2bf6efe7e4257935dfad3e3f3f276f56ff8afa7df26ece8dfb709c7c249fc957f29d0c143d192a8b64c4abe3bdc7b4fbac8dc9c264b2df93713231de9269324be6c63159d8c76469c6a99a2aa9919aa995daa9e3dfa76eeaa5bef1603a2cbfe1b2f45910cb54b769601cd3308dd2384dd294cbc2d76dfa7cc4180aaff6932c96b0fe3453466e6b97cc8e9d344f8bb4343fd22a4c98f75a5afdfe8687f4621becee75daa46ddaa5d7d451f4a04b6fa996ea91c9fd3f978549c3644957e93adda4dbf42eddb15fedd3837d4c8fe9c9d8a7f7e943fa18fae953642b7a344c9fd373fa92bed2c8902c2ca7db4681719fbea5efe947fa997ef5feb197a56f7f9f5bfd2acb8f91e17a78607dbb5412ff2139a7dfce9069eb673ae86da5f7c54ee5fa696f8f553a4ac7e9249da6b3a4b50b65c3f42c5177fe23ef31361a7d0edad724d379ba4897999a29c63163f971b4efb3e3ccecb3e2649559999d39ea57ea0475e6665ee66781e9fa81a3a06ab0eb675096e1c5599845599c25ce23b3172e8b6af5b9d52fb2889a9add3f99d14efd4a064ccf952c553eb2cc74cc2fe61b077dcecbf477613d982316e37efaeb2ccf8aaccc2a61e7e45b98b34db24b56678d5dc763f53b6bb32ebb662c62f343d6df6ff6c2fd66de9c652c99661ce3a74ccf56d93adb306bd3b36d76e74efa5999c53363a603cf76bfcd8445369691edb23d93e5901db313d31d85db7491ddff268bf28b2ca67a973d3032b24743c99eb82ccc37f67d642ebcc4661146f69c9db397ec357bcbde852c1855577d4bdaec23fb8c9e93419a655fd97736c8d8e866a36cec8eb24936355da7cc66d9bcf7ebacbf17d93257734509552b377233b7723b77d8377d3d6dc29edad74398b7cedddccbfdec900779a828ff4496be024a7dabf8bd36f63edacc23c330ee982cbd97efed70c024619219f7799c27fe364ff32c3c30597eac4172bf95e779919779a556f925aff3266f8d63dee5d75eb7dc613f1ef9cdfdeeb3e25cb316f153aee7ab7cad9eed32dfe4dbfcced67396c1b09879c8729a4bafd9feb7719f29f93e3fe4c73cc88e4c9b1392c52afe812cbd0f559209d332db2ed5263f1926f32baed05ca6678eed5877ecbfbce6f7fe5dfe104cf347a3fd690d92d97afe943f671725cecff94bfe9abfe5ef7dd4937ff49909af719cddaf6cca73628dcd8871fe997fe5dff9404d9cc833f3613ecac7f1579ff1997dbc4c51b4cfee30c9a7f92cc9988e1d59a699f47e377c0bdffe200bb75792259fab7b854d65ea77be302c63cfd2fb1dd5bc481673943bf9b2500b8545f5b3e8814547b6dcabc0575793b1fa919f0ba33059b7d9ac557d2cbfe8f312ebaeb7e4c2e96b1785cb62ad53e1157e111461112923d52ee22229d22233f67d5ec365611ac6aecdd98cb92f8aa22caa3c2459faf6b398f5f597f9e5375958c6b34f6fcc62be8b0b7be4ce74a97227646177ae8ba6688b2e288a6b714bf25f7684303d53fc645268855eac8ab5710835e7b597a5d8b06cabaf6a7ef4d5be60cd243916dbe2aed815fbe2a0d8c5317b284ec57df1503c16cc3efa1a279764614e0b268f7128cec54bf15abcfd248b1aaa7f57164fcab22bde59fe742a3ed894b5efa33c5420875c9645f1597c15dfc5a01806398ba2c90bffd8555114a3625c4c8a692f4931ebd72c989ea8c5bc8f467b5b6677e03163b12cd5ecbb544287c540d7d250c2d22cadd22e9dd2354ebc22c2ae36c7f6a1f498cdc6a55f06e1ae64290dd731f7efc822d654c40cf3adb665c472b053191b2ecbef852cfb5e16f3cb3a9749999659996749745f163f564a7824669465599597b22e9b5e92b2cd34661b565f3b6371dc985bb4e10ffaaca7ecca6b79b3be4acd0a4a9d8d67c4a45995eb72536e992cbabdeda326368e5bebbecf64cabb7257ee7b591425cd7a6d28b552fb45961fd13ef773ea8dcd103b75c56439183e1bebc81c5b7d3d2cb0674e63cfcb63792aefcb87f2b17c6271ce86e527a398c594ca9d5d97cfe5b97c295fcbb7f29d79d12eef32adafee9bb3bebec13f337b5f7eb079bc2c3fcbaff2bb1c985d392c47e5b89c94d3c42d67e5bc5c944be3c45c7d156a7c4c0f665f1939564a655466d06746a7e0d4ef2ab2aadf62fedefb3059d8b7663f36c8d834bbaa2c26cbbd19b2deec97483a264b6b06c6a1b22bc79bc5e3a00996e5c4dc562e538ba86236cfa29545e5574115329fca66bb3ea736471513d73a313946fd9a4515dbdb2aa9d22aabf2aaa84a2bacaaea52d55553b5556745c1b1ba062b362e5ba7a355b57ebda3aff254b74aabf42467b21c83a36ad9f51f641151a5cf6571d488e9e246bd315559556b264bc4662c268b193269f64c96a37bf65a6fae2e2387e9eb5bb5a9b6d55db5abf6cab53a54c7ea54f575e17be6c717d681c5d5233e26a3fe2ebd3d570f4c96c7eaa97af646d5b97ab1aaead5dc556fd57bf5517d565ff128afabef5e966ac07ac2e5f5cf678bddb11a56a36a9ce4ce23c6c5339adf627e4bca6270efba60d1ee539ac5a36a524db98e912c51af654c965335f33a8f656bca3c34ccae9a87af9eaac6ac3f17d5f2a26637f7f5a25cb81fb615f38349d17f26b406c3ee7570377d7e75312fd6c5be38e1cbc5bd78179f8d897f092e6134b8449798c9d2b91fccbadefb159cde673059946a7449823e47f6d9c7fea32ca859283c96225912f549bdbfa4ec9e593fc6fdfa9c6df523d4af3d18a774e75d2fb9925e8ad0c8eefbbcfd525eaacbe5525f9a4b6b9c2edde56a6fcdd1e5165f98bd93244764f10773e445d68e5da55df4cbeab2b6c2cbe6b2bddc5d7655a7b697fde57039ba2fbd2c173633b1d8cde27fd5d684fde2fef27079e4b2a0adfd5add3f95256071f24d29c2faf27479eeb585d61bfb95a07ecd81e9d8a377f35545b3df7975c88ca6feec72bebc5c5ecdc4383afae58daf136d8235f75dbd7e8db92c7c3d96f5f196c5dd5333bebc5f3e2e9f97afcb777cbcf06a13d388e16578195dc66c869ddb6c66cd466c967db5ee7adbbf4c2ed3cb8ccba2f0bcc2fe5d16392f4096545373b5cdcf97f9657159f6eb90bdcdb2d8b85fd50accc08d8c83a7298f8a1fb4c620fca8d55a49b6b5519bc98ac9f9565bb56def1cc38bfaf99ecd8d336ef74cc7b8341e9b3146e6dcdef82cdeac9ddaadbddaaf83484b46e9ad0eeba88eeb84e5ca9fcce3796c6e9db008f4c9dd32590e755a67756e325990875bfd0aeaeff9cbcfb2287eaa2b6e5dd4a5f25557c68149c0bc0fb3dfa8978569716cc69eee2b6aa9cc422bfc8caa9a4590ec7f0d6b5beb7eb84347cdaf2c63af9cd73063f67faa22f6ebdeaff7d27875c746f9cbfc626d5cd6d7fa566bb55eafea35d36ca77c8af27a536fcdd8b9b23cdceb6318d6239bdec2eabb7a57efcb3d932515759e3fe695d8112074cc55efd44370523ae5b13e184cb3597e7f6fdbbc12cfda581f599b4ff57dfde0b6a1556d13b77eac9fea67e3549feb17a65b8bfab59f159cd728b02d1691ceeb37bfb1b7fe376fd994b220ca89acbdfb5abfd71ff56738a8bfeaef7a500fcba01e992ed3c27db17077aec3f29881cb324b63578feb493de5b2507ef20f7264f6a797a59ffb13f6ff0d9bfda7f5ac9ed70b9657b2fc8bc52e5b7b592f9d779bcdc98dda288de13f5a35f3ca1f8dd958c64363db47f6d9374e3f438693be6ed3fbb2c665ff34a2d0def09a9af1cb1ae0d074eb5be3357e1334a1f3d4444ddc244dcafae291e54977eeaec9ac2dfb158b429bbc299ab2a9b8bdd09ca8f42b763fcb42732397c5e4b364aa8cd2cc99c77a7369eaa6316377c3eefb7039352d0b8359d6e186c6aee99a6b738badd0b48a466b74fbc18c9b557aecc7c57c6fd64cdfc76c2c3efa5cbdd9345bebdcdcb9dbbe8283d53fac9c9b5ebfb3a4d935fbe6604d9a63736aee9b0726c363f3d43c3799bbeb6be64c2fe3e6dcbc34afcd9b948559c51f65a1d95ecaa2f1959bb5faa138cd7bf3c1a22ac7ff609e89d973bfa6686f9b4fe3e0dbcd57f31dbae167ad3483669828d60b7bde283359ae356bc66c961b46611f41369366dacc9ab971b296eeb6e1e3815566167d9b9ed3354b63efad5bb5555aa3355bcbe8ebd581396efb15c45d9f2b87ba71689dd66dbdd6ef63181e7719aadfaf09ff365752a5cfa4bdc2fdfa937a8bc76de03dc65d1b1afd4afdb658703fbbed6dba8d8c531bb7499b865ef5de666d9e9fdaa22ddbcad8370fed85595585fce4beaddba66ddbaebd5e5876dfded8bcf3ddd70ee4eabfefed5aaddf1de36baddeaeda755bb35f6dda6df0dede056f5ec89eb7734a63d7eedb437b6c4f52163f38fd41161bd97abff39945bc2c951e313ddbe5b9a2b7f7ed43fbc8b4f7686ffa9d05b5d53ef55adf326fdf9edb97f6d518861f4e5c44ed5bb269df59ccb3cf3b7bc9645ef5f949fbd17eb65fed773b6887eda865b3068b697aed123b19f67e906bf6b69db0acf8d44edb593b6751cb397875ed76d12e3bb59fdbeace38754a67746667c571922779af472c8e39fe4116e75759d84c99a94967770e93e6dab99d67192cd770d89cb063be56ef7c7b5b9f7d3753baa00bbba8da767197746997b1b0b8e8ca7e6dc8db75157bfea5abbbc6df756dd775d7eed6699ddeadfaac8e723b5ec95b326b687b8fe2fb4e65dce75db7ee36eeaedb76776c02d875fbe6397aef0eddb13b75f7dd43f7f8ab2cbfc563b40fdae2fbb87b59fabdb76ef7d43de7cfddb97be95e6bc738b9ae7de8ff1a4166c38eb3eddeba77964f9cba8feeb3fbeabe9d85fad80dba6137eac6d19d195b0b33f6b56ed24dbb5937ef16ddf2aa5e95ab71358d9dfbca7763f9bd1ce6d00ffa99fd6ad97bc7bada4cbe73b7bb322bb18ee1cadd5d5deffdea3109dfaffe35b886d7280fa302b66ffe1d1d13eb0b72bf196a7fdcef5de36b52b2d65d53ebe19ab119ef6c9dddcf7eb5f79ab3ff5a5ccb6bc5e29897ebe55a5bfeb5b9b6d7ee7acd27d7db55bb321d5533b30bdf8da69c5c57d7f57573dde6937efe655aa8f4750ce623a2be06c6f7638dd87c74ecfd38d515ade7de5aaa8171bcde5d77d7bdda3847b5edab2c5993353c07367f9c07f8afd7f89ca7ebe17a8cd953afa7eb3d3dddbf998b6641d1eef5e1fa787dba3e5fcfd797eb6bad3069deaeefd78febe7f5ebfa5d75d74139bc0eafa3eb987d26d7e975769d7b6bd60b8bcccccceb92dba2f5f327f2dd7d73c7fc1c27ebcc52c3a79b7263f955348c4c36f3b9aa6dbf33591cbebef31764b99937eb66df1cd6379ecb66877edf8bad140b2fb9b139d0b8f7b51b0b346f8152ddc25b748bd5db2db9a5b7ec96df8a68d025e15755df4a7377ab6e97f0e3c626c65b5bac6e9db1ef772df0fd16d6af1f5eafb0d86cc4246aee7236b3dcaeb7db4d4bc6d133cb2d44fefb87ddf3ffb52ce6e34dbfad6eeb86c5860d1b0d663515f3f8ecff6d8fc5eecc9fe593dbe6b6bdddd5a5fa62d7cae2b65386b7fdeda0d4ea58dd869f55773bde4eb7fbcbddede1f6787bba3ddfce51623f180fb71733643e7af24759983454afa4fbbfdede54f7f67efb48068a226ac97f7d7d3f2a6e9fb7afdbf76dc02b565f2cb35c58776c86d89a73162f6d6e43e3741bddc6b7c96d9abab759eadce6f1241ef77bf56f8bc80a5fa2eab6d4d4a8d394a85202f5ac199aa9599aadb1b16e5acdedade4e78fbbef3396c82759cc58f3345f0bb4508bf242d1d20ce3f287d3597fc25e1eb5584bb454cbfad981dd7b617e7a119385f624cdedad96f733a75668a5566917ad564325615ed0b65fe289b25322add15aadd3aedacdf84c1dd573979aa6e9da4a5b6b1b7ba16da99af0ebc8b03f2a8bb1ad7667dada9db653bba0b9bddbef2c7f37642dcfa1f8f22fc8926a7beda01db59376af3db008efce9cfa1f2c3bda71eb6451633568f92e43ed517bd29eb5b3f6a2bd46b935d2de8c85f61e4fb40f36269f2c216e94246ccb2767e999da97f6ad0d3436a6edeeefd98bf5dcee2c35f2b59136d6260a8bd955d72eed525db37111f562ef2fcbf2a84db59936d716da52578d7da8318f79673d9993b86e6fecb363518056b6bac26c79a71bbad92a9dab5bc64db77527327457c97596ee844e7fe622ce597e32d4033dd4233dd6133dedc7e0d74f98f5b2447e2f95bbd7333dcfebb2d20bf6fbfe0c84266b797c86ff2b3a16157aa957fa45aff5466ff5aedf11c3f2de39af8f322fa45ffb798faffbfaa6ebbe66817ed3355dd757fa5adfe85bfdcef850bff59dbe77c6d5413fe847fda4dfeb0ffaa3fe14bd07aece722db28dde4ef86e0bf3e78fe9e8e764adbfe8af4aa36ead86cdca34abf4f6eff075c43fbd8724c9f537fdbdb8ea1ffaa7fea57febcc07588affed6ed3ca56a3f7beea637afd3a561f4733895c33d687fa888dd0589fe8537da6cff585be5ca92b6565accc95e5eddd3c7ded778d38d5ca5e39b6e1eec90f0b0ff68b2cae7170dc95bbf2567e3c535f56415f310a4e2cdeea57df6a5a7bfb73b2048fab701505b355bc4a56e92a5be5ed78555807166b6efa5ccb3afe248bc9b28265dee5ceed8565b4b755b9aa5697555dcd568d3e5ab5b1c7f7c23129dcddaaeb76abab395e752c5bbbe3f66e626ef955166f7533e3b261f9d270a5b1f178e335567efeafaf2afd9571311f57fa6ab55a6bb362b8daacb6abbbcbc76ad75767d2a05f79b0b67d0ecf64796372ec983c0adfc570cff7819ef85efea3d8cf6bdcbbdf76e87ff8cd6abf3aac8ead1d7cb84edffa7e9e679aa6b63b6627bfcae2af4eab7b9643ad570fcdfbea919fce727f3a052c4f69fca971795a3dafceab176db67ad5ebd5dbea7df5b1fa8cbff26ef595f615a31fbbddf98749f7c177bc0f9d57f6795b7daf06d17e35147b2cfbbdbccd9339ee7739b58bd5a8d72e173b9358e3acdf65b1ceab717d67ec5693d574355bcd51c3b7708ec1fdf3314c92af16abe55a5d2b6b439badcdb5b5b6d7ceda5d7bc69e45cffb1f7bdefb489eaffb32097a7b62b3105fc7e3fba9f9beea7e36627e6318266b7f1dacc3c0091cbecb91452c6431bd17f85d967e7473dbd8d7efeb681dab77e20c2d9745f9b16be9cff8b1f03198af933c5d5bc1789daeb375be2ed6e5ba5a5fd6b5b5b437741601fbf7fbd5b30fbe57a25f6bb15a16fc34ceba757416dfb3e83e9ce9d77ecd807df6ebceefd6cc62bc50c8d2eeb411f366bfd90bd7d26374b7beadb53573e4b2fee5fed5793f628aba5eaf37ebedfa6ebd5befd787f5717d5adfaf1fd68feba790c5fdd69eef5ac1b8b04fbf9ef76a7e704b3e584bbedb9f5950bffba8f7e2eb7e97fcb1df83b63eaf5f02d736cc28effa73246c8e1feb193f73d2e7373edfafe4b23c69bb7e5dbf35cafa7dfdc1e617c8f2f7f78ffdf38ff3283f69566595d196e7f5e7fa6bfdbd1eac87eb11d335bea38c568b980e4db0afbf8fa6c6acc7cffc04c6b2dfadd7cbe90f7a7bea77569a43967505d5e0a69a713e6171d79d36d1f3f5b8f776eb49bfa3b61f93cb389f38de7aba9eade7eabdd8d32b674be7afc8f2d3d9621ecf798f6a11dcaf179774bdcc5f36ea46d9181bb37faead164ebf368979c230a77db5439cb4602336661ab91436d3dc39174ba1fd0a2caa7f6511e4ae0f0b36569fdfacc6cce59f8ce3c6c9271b77e36dfc4d607da94f56f35b9bfed2b8fc7eb6381a2a9ee2da55972acd26dc449b78936cd24db6c9f9aa0bcb6eac27ffdbf68bbc782effdf76ae6549552488eee733a6f615fdba7dbb6356a899203e5a6db51f3b4444f0c14b1489987f9faa8202a4bd37b457331113b9d010943a661645669d93b6d9e37b5a6207f5ce54d90a7b630ee6244ed8f3c2d4532060d9afca32ad349d280e4d481246103617866ae8b10a11c3b2b36c86248e1fe983506f36cb7bd7f59cde1344592e9dd23decc91c0e90c0115250a0014d680104cf80a691efb672cf7c667bc1191af13a6a6c8d2ed758790ea8a041fba8a546ca6681e23a2c67047dffd9b4a1130fb9e20cbad0833e2ce34747a706bc2c0e85fef98baee722bfd4f4404187dc51957668dcd0c2d0b660004318c12b8c61025378f3347fb13bb0acbe5df0f8ab3a31cdd0e01d3ee0136ee036e9c2ddb1ed7437f7e95459c13d7169c0bcfd003fe0117eb2bb700a4ff08c94def1b9eef5e9337dca1557dfc052a8ea8aefae6ed98c216b9d45ef4ffa485524aebeeaa181333471eeaa5edbb7f71bff47100423b4421517519a70a1686ff7106f632dbe471b97ebe0a027b3a4874ec8a276354cdffc603e255ca59dee228325a4b8c2354b719e8d29bbca113774bcb961e319c8f15c1f6327bd3884873ca043ee1bdcda7dce35430f7d0c30740718e10e636fed2f7ddd7f0cc2861b3aa1161991827b3cecfa8d66ec6112bce2115354f693204dfadb96d559cd6ccab25f967cd21655d61b3627a2d61336b0892d72a03dc20e53978ef868d8fa229f5faee75a7fe935c07eb745b764495b08ec7d0311d5f514356ca3bffd70224ff774bfb3f1822818bb5ad8461d3bd8c5de6e837df6fe0507fb088787258ef015c7d68bd0fa1a7cc79ef3f0a8623d21573237714a0f6bb636061dba66de58d0211dac1b76bfe293ef6039b59ad281736c393795d713791dceebf80ee712f96e3009ddd07544a5d179e13613e6e4967d435ca3ec245389a0cad56bfd58aad7bf7aee9fc122ff178e852391e3f3ba9c7d9399eff23a234758aeb7d96b869def6fe7fb0f468e60216ac18678a2378b9890bd31a42ee18c42f1d27b720dcf09969c1fb0909d7904e76ec356026184f0baafc89d66956e3da5fecbf6f6f369d67545d6b5c5d924df135a7ec542cb5e26e49a7cbfc201afa191da8093df3604f79408ae9ab0ad576031ca9ca3caca1635c83935653d22cfb448ce3bcf6adc752c32e62a9eb9443352aa19aaaae7e288acea1ab4729f2cb50e052bf5d4871cf952b02732ae47d9db635ea9689b453c57bc2062244752ad5f5e84c592fcc3e1ee4c949995795bc152fdbea830d827ffc84c20e9088f91d2fb395e4b665b520152c3422492ebf27dce3a1163b10a2cc60916c11710bad85b6ed69a7320cdc09db863ceee0a1533e20c1ccef6c814cd995eb334f9fc9ecf4b7ebda988b5c23b67b1108e04dff03d63da7fc32f8b9a5f4caeec2fc7c9c7e6f5bc5e154b795ce2e596e3679fca7dd222b624e3bc58134fe3a1e0bbcd199677fcb81c4b3d6a7ea7d6aeb0fb7e71ceb9a3f5738b7cbeda2ba7de3ba79caf57e52fff15fb1fcbbfd3fefcfbaf3ffe0193cc32fd - + diff --git a/chalk/sdk/kis_global.h b/chalk/sdk/kis_global.h index 249d312e..19acb216 100644 --- a/chalk/sdk/kis_global.h +++ b/chalk/sdk/kis_global.h @@ -57,7 +57,7 @@ enum enumResourceTypes { /* * Most wacom pads have 512 levels of pressure; TQt only supports 256, and even * this is downscaled to 127 levels because the line would be too jittery, and - * the amount of tqmasks take too much memory otherwise. + * the amount of masks take too much memory otherwise. */ const TQ_INT32 PRESSURE_LEVELS= 127; const double PRESSURE_MIN = 0.0; diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 01ca372e..8ad09df3 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -304,23 +304,23 @@ void KisCanvasWidget::initX11Support() Display *x11Display = TQApplication::desktop()->x11Display(); - // Look at the modifier mapping and get the correct tqmasks for alt/meta + // Look at the modifier mapping and get the correct masks for alt/meta XModifierKeymap *map = XGetModifierMapping(x11Display); if (map) { int mapIndex = 0; - for (int tqmaskIndex = 0; tqmaskIndex < 8; tqmaskIndex++) { + for (int maskIndex = 0; maskIndex < 8; maskIndex++) { for (int i = 0; i < map->max_keypermod; i++) { if (map->modifiermap[mapIndex]) { KeySym sym = XKeycodeToKeysym(x11Display, map->modifiermap[mapIndex], 0); if (X11AltMask == 0 && (sym == XK_Alt_L || sym == XK_Alt_R)) { - X11AltMask = 1 << tqmaskIndex; + X11AltMask = 1 << maskIndex; } if (X11MetaMask == 0 && (sym == XK_Meta_L || sym == XK_Meta_R)) { - X11MetaMask = 1 << tqmaskIndex; + X11MetaMask = 1 << maskIndex; } } diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index ea36f8a9..be698ae2 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -140,7 +140,7 @@ protected: static bool X11SupportInitialised; - // Modifier tqmasks for alt/meta - detected at run-time + // Modifier masks for alt/meta - detected at run-time static long X11AltMask; static long X11MetaMask; diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc index 33c6ae04..ca899da8 100644 --- a/chalk/ui/kis_cursor.cc +++ b/chalk/ui/kis_cursor.cc @@ -344,7 +344,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) TQBitmap tqmask(cursorImage.width(), cursorImage.height()); TQPainter bitmapPainter(&bitmap); - TQPainter tqmaskPainter(&tqmask); + TQPainter maskPainter(&tqmask); for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) { for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) { @@ -353,9 +353,9 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) if (tqAlpha(pixel) < 128) { bitmapPainter.setPen(TQt::color0); - tqmaskPainter.setPen(TQt::color0); + maskPainter.setPen(TQt::color0); } else { - tqmaskPainter.setPen(TQt::color1); + maskPainter.setPen(TQt::color1); if (tqGray(pixel) < 128) { bitmapPainter.setPen(TQt::color1); @@ -365,7 +365,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) } bitmapPainter.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); } } diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index e60e6524..1fc1c9c9 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -137,8 +137,8 @@ namespace { } -KisDoc::KisDoc(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : - super(tqparentWidget, widgetName, tqparent, name, singleViewMode) +KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : + super(parentWidget, widgetName, tqparent, name, singleViewMode) { m_undo = false; @@ -182,7 +182,7 @@ DCOPObject *KisDoc::dcopObject() return m_dcop; } -bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) +bool KisDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget) { if (!init()) return false; @@ -203,7 +203,7 @@ bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) file, dlgtype, "chalk_template", - tqparentWidget); + parentWidget); setUndo(false); if (ret == KoTemplateChooseDia::Template) { diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h index 47eeaa0f..222e9da6 100644 --- a/chalk/ui/kis_doc.h +++ b/chalk/ui/kis_doc.h @@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter { TQ_OBJECT public: - KisDoc(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); + KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); virtual ~KisDoc(); public: @@ -62,7 +62,7 @@ public: virtual bool completeLoading(KoStore *store); virtual bool completeSaving(KoStore*); virtual DCOPObject* dcopObject(); - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* ); virtual bool saveOasis( KoStore*, KoXmlWriter* ); virtual bool loadChildren( KoStore* store); diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index 0924420d..aa84aa61 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -78,13 +78,13 @@ KisFactory::~KisFactory() /** * Create the document */ -KParts::Part* KisFactory::createPartObject( TQWidget *tqparentWidget, +KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KisDoc *doc = new KisDoc( tqparentWidget, + KisDoc *doc = new KisDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); Q_CHECK_PTR(doc); diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index d20070c5..da9d3e40 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -41,7 +41,7 @@ public: KisFactory( TQObject* tqparent = 0, const char* name = 0 ); ~KisFactory(); - virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0, + virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index a21f49aa..a5b145da 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -289,7 +289,7 @@ bool KisFilterManager::apply() return false; } else { - if (dev->tqparentLayer()) dev->tqparentLayer()->setDirty(rect); + if (dev->parentLayer()) dev->parentLayer()->setDirty(rect); m_doc->setModified(true); if (img->undo() && cmd) img->undoAdapter()->addCommand(cmd); return true; diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 703fd3be..e257e2b0 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -229,15 +229,15 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP) { - int tqparentID = layer->tqparent()->id(); + int parentID = layer->tqparent()->id(); if (layer->tqparent() == m_image->rootLayer()) - tqparentID = -1; + parentID = -1; int siblingID = -1; if (layer->prevSibling()) siblingID = layer->prevSibling()->id(); - list()->moveLayer(layer->id(), tqparentID, siblingID); + list()->moveLayer(layer->id(), parentID, siblingID); markModified(layer->tqparent()); markModified(wasParent); diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h index f0c587dd..5b74acea 100644 --- a/chalk/ui/kis_layerlist.h +++ b/chalk/ui/kis_layerlist.h @@ -35,9 +35,9 @@ class KisLayerList: public LayerList signals: void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry ); - void requestNewObjectLayer( int tqparentID, int afterID, const KoDocumentEntry &entry ); + void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry ); void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after ); - void requestNewAdjustmentLayer( int tqparentID, int afterID ); + void requestNewAdjustmentLayer( int parentID, int afterID ); public: KisLayerList( TQWidget *tqparent = 0, const char *name = 0 ); diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index b989df12..ca238b60 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -206,5 +206,5 @@ spinboxValueChanged() - + diff --git a/chalk/ui/kis_opengl_image_context.h b/chalk/ui/kis_opengl_image_context.h index 03833cd2..2798f0f8 100644 --- a/chalk/ui/kis_opengl_image_context.h +++ b/chalk/ui/kis_opengl_image_context.h @@ -141,7 +141,7 @@ private: int m_numImageTextureTileColumns; // We create a single OpenGL context and share it between all views - // in the process. Aptqparently with some OpenGL implementations, only + // in the process. Apparently with some OpenGL implementations, only // one context will be hardware accelerated. static TQGLWidget *SharedContextWidget; static int SharedContextWidgetRefCount; diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index 401721b5..459770d1 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -83,7 +83,7 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) TQRect rect = extent(); m_activated = true; setDirty(rect); - TQPtrList views = child->tqparentDocument()->views(); + TQPtrList views = child->parentDocument()->views(); Q_ASSERT(views.count()); // XXX iterate over views connect(views.at(0), TQT_SIGNAL(activated(bool)), @@ -97,7 +97,7 @@ 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 if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { - TQPtrList views = m_doc->tqparentDocument()->views(); + TQPtrList views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); m_activated = false; diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index c9c2a766..c534384a 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -333,8 +333,8 @@ void KisPreviewWidget::runFilterHelper() { if (m_origDevice->image()) { m_scaledImage = new KisImage(*m_origDevice->image()); - if(!m_origDevice->tqparentLayer()) return; - TQString layerName = m_origDevice->tqparentLayer()->name(); + if(!m_origDevice->parentLayer()) return; + TQString layerName = m_origDevice->parentLayer()->name(); KisPaintLayerSP pl = ::tqqt_cast(m_scaledImage->findLayer(layerName)); if(!pl) return; scaledDevice = pl->paintDevice(); @@ -356,7 +356,7 @@ void KisPreviewWidget::runFilterHelper() { 0.0, 0.0, 0.0, 0, 0, NULL, &strategy); tw.run(); scaledDevice->setSelection(select); - select->setParentLayer(scaledDevice->tqparentLayer()); + select->setParentLayer(scaledDevice->parentLayer()); } // Crop by the zoom value instead of cropping by rectangle. It gives better results diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index 6ee64019..f1b52244 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -260,7 +260,7 @@ 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + imageviewer.h kpushbutton.h diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index fe30eb50..5885c433 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -255,9 +255,9 @@ void KisToolFreehand::endPaint() m_dirtyRect.width(), m_dirtyRect.height()); KisLayerSupportsIndirectPainting* layer = - dynamic_cast(m_source->tqparentLayer()); + dynamic_cast(m_source->parentLayer()); layer->setTemporaryTarget(0); - m_source->tqparentLayer()->setDirty(m_dirtyRect); + m_source->parentLayer()->setDirty(m_dirtyRect); if (m_currentImage->undo()) { m_currentImage->undoAdapter()->addCommand(painter.endTransaction()); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 61966928..e3500f97 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -646,11 +646,11 @@ void KisView::setupActions() m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask"); - m_tqmaskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), + m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskFromSelection()), actionCollection(), - "tqmask_fromsel"); - m_tqmaskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMaskToSelection()), actionCollection(), "tqmask_tosel"); + "mask_fromsel"); + m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), + TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), actionCollection(), "apply_tqmask"); m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), @@ -3185,7 +3185,7 @@ void KisView::connectCurrentImg() connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * ))); connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(tqmaskUpdated())); + connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated())); connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated())); connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); @@ -3198,7 +3198,7 @@ void KisView::connectCurrentImg() connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(handlePartLayerAdded(KisLayerSP))); - tqmaskUpdated(); + maskUpdated(); #ifdef HAVE_GL if (m_OpenGLImageContext != 0) { connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect))); @@ -3933,7 +3933,7 @@ void KisView::slotMaskFromSelection() { if (!layer) return; - KNamedCommand *cmd = layer->tqmaskFromSelectionCommand(); + KNamedCommand *cmd = layer->maskFromSelectionCommand(); cmd->execute(); if (undoAdapter() && undoAdapter()->undo()) { undoAdapter()->addCommand(cmd); @@ -3945,7 +3945,7 @@ void KisView::slotMaskToSelection() { if (!layer) return; - KNamedCommand *cmd = layer->tqmaskToSelectionCommand(); + KNamedCommand *cmd = layer->maskToSelectionCommand(); cmd->execute(); if (undoAdapter() && undoAdapter()->undo()) { undoAdapter()->addCommand(cmd); @@ -3992,7 +3992,7 @@ void KisView::slotShowMask() { layer->setRenderMask(m_showMask->isChecked()); } -void KisView::tqmaskUpdated() { +void KisView::maskUpdated() { KisPaintLayer* layer = dynamic_cast(currentImg()->activeLayer().data()); if (!layer) { m_createMask->setEnabled(false); @@ -4003,8 +4003,8 @@ void KisView::tqmaskUpdated() { return; } m_createMask->setEnabled(!layer->hasMask()); - m_tqmaskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection? - m_tqmaskToSelection->setEnabled(layer->hasMask()); + m_maskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection? + m_maskToSelection->setEnabled(layer->hasMask()); m_applyMask->setEnabled(layer->hasMask()); m_removeMask->setEnabled(layer->hasMask()); diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h index 1f197f87..71bb9065 100644 --- a/chalk/ui/kis_view.h +++ b/chalk/ui/kis_view.h @@ -428,7 +428,7 @@ private: private slots: void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers. - void tqmaskUpdated(); // To update the enabled or disabled status of the tqmask entries + void maskUpdated(); // To update the enabled or disabled status of the tqmask entries void slotSetFGQColor(const TQColor & c); void slotSetBGQColor(const TQColor & c); @@ -560,8 +560,8 @@ private: KAction *m_layerTop; KAction *m_createMask; - KAction *m_tqmaskFromSelection; - KAction *m_tqmaskToSelection; + KAction *m_maskFromSelection; + KAction *m_maskToSelection; KAction *m_applyMask; KAction *m_removeMask; KToggleAction *m_editMask; diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 886b27e4..059d4e35 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -128,7 +128,7 @@ public: m_pos = pos; LayerItem *prev = m_item; m_item = static_cast(m_list->itemAt( m_pos )); - if( TQToolTip::tqparentWidget() && m_list->showToolTips() && m_item ) + if( TQToolTip::parentWidget() && m_list->showToolTips() && m_item ) { if( m_item != prev ) hideTip(); @@ -216,7 +216,7 @@ public: void position() { - const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() ); + const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); const TQSize size = tqsizeHint(); const int width = size.width(), height = size.height(); const TQRect tmp = m_item->rect(); @@ -228,7 +228,7 @@ public: else y = kMax( drect.top(), irect.top() - height ); - int x = kMax( drect.x(), TQToolTip::tqparentWidget()->mapToGlobal( m_pos ).x() - width/2 ); + int x = kMax( drect.x(), TQToolTip::parentWidget()->mapToGlobal( m_pos ).x() - width/2 ); if( x + width > drect.right() ) x = drect.right() - width; @@ -617,9 +617,9 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem * return 0; } -LayerItem *LayerList::addLayerToParent( const TQString &displayName, int tqparentID, int afterID, int id ) //SLOT +LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentID, int afterID, int id ) //SLOT { - return addLayerToParent( displayName, folder( tqparentID ), layer( afterID ), id ); + return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id ); } void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT @@ -643,9 +643,9 @@ void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *aft setCurrentItem( current ); //HACK, sometimes TQt changes this under us } -void LayerList::moveLayer( int id, int tqparentID, int afterID ) //SLOT +void LayerList::moveLayer( int id, int parentID, int afterID ) //SLOT { - moveLayer( layer( id ), folder( tqparentID ), layer( afterID ) ); + moveLayer( layer( id ), folder( parentID ), layer( afterID ) ); } void LayerList::removeLayer( LayerItem *layer ) //SLOT @@ -723,7 +723,7 @@ void LayerList::hideTip() void LayerList::maybeTip() { - d->tooltip->maybeTip( d->tooltip->TQToolTip::tqparentWidget()->mapFromGlobal( TQCursor::pos() ) ); + d->tooltip->maybeTip( d->tooltip->TQToolTip::parentWidget()->mapFromGlobal( TQCursor::pos() ) ); } void LayerList::constructMenu( LayerItem *layer ) diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 129baa7c..58c2a4bb 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -98,10 +98,10 @@ public slots: LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 ); LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); - LayerItem *addLayerToParent( const TQString &displayName, int tqparentID, int afterID = -1, int id = -1 ); + LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 ); void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); - void moveLayer( int id, int tqparentID, int afterID ); + void moveLayer( int id, int parentID, int afterID ); void removeLayer( LayerItem *layer ); void removeLayer( int id ); @@ -117,13 +117,13 @@ signals: void propertyChanged( int id, const TQString &name, bool on ); void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); - void layerMoved( int id, int tqparentID, int afterID ); + void layerMoved( int id, int parentID, int afterID ); void requestNewLayer( LayerItem *tqparent, LayerItem *after ); - void requestNewLayer( int tqparentID, int afterID ); + void requestNewLayer( int parentID, int afterID ); void requestNewFolder( LayerItem *tqparent, LayerItem *after ); - void requestNewFolder( int tqparentID, int afterID ); + void requestNewFolder( int parentID, int afterID ); void requestRemoveLayer( LayerItem *layer ); void requestRemoveLayer( int id ); diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui index 35674162..5227d7fb 100644 --- a/chalk/ui/wdgapplyprofile.ui +++ b/chalk/ui/wdgapplyprofile.ui @@ -168,5 +168,5 @@ cmbProfile - + diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index a8aa02e0..00683ca9 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -351,5 +351,5 @@ 89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082 - + diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 59875f87..94a8a137 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -392,7 +392,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kcolorbutton.h diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 77f03131..2b2b7910 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -23,9 +23,9 @@ Overview - + - + @@ -296,7 +296,7 @@ zoomPlus() BarIcon - + ktoolbar.h knuminput.h diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 3d2def86..6f9e41e6 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -346,7 +346,7 @@ The different rendering intent methods will affect only what is shown on screen, 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082 - + kis_cmb_idlist.h kcombobox.h diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index 78c77be3..6dca8768 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -195,5 +195,5 @@ - + diff --git a/chalk/ui/wdgcustompalette.ui b/chalk/ui/wdgcustompalette.ui index c5cbe9dc..ec0881bc 100644 --- a/chalk/ui/wdgcustompalette.ui +++ b/chalk/ui/wdgcustompalette.ui @@ -81,7 +81,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082 - + kis_palette_view.h diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index d195f670..7936f20b 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -152,5 +152,5 @@ - + diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 990f316b..64b33f16 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -86,5 +86,5 @@ - + diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 051cf795..53f3ef90 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -176,7 +176,7 @@ - + knuminput.h diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index a89574d1..18c1f528 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -448,7 +448,7 @@ 89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082 - + kcolorbutton.h kcolorbutton.h diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index 9bfe5760..d977802e 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -295,5 +295,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + diff --git a/chalk/ui/wdglayerproperties.ui b/chalk/ui/wdglayerproperties.ui index 35eb01ad..bfbcc0ce 100644 --- a/chalk/ui/wdglayerproperties.ui +++ b/chalk/ui/wdglayerproperties.ui @@ -166,5 +166,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082 - + diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index 5e3b89a6..dd310483 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -421,7 +421,7 @@ sliderOpacity txtDescription - + knuminput.h knuminput.h diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 553cd62b..3654031b 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -101,5 +101,5 @@ reject() - + diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index 0bce88e9..c8e4404b 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -138,7 +138,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be - + knuminput.h knuminput.h diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 41ead6a9..90f59a33 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -62,5 +62,5 @@ - + diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index 39846fa3..ca71ee01 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -60,5 +60,5 @@ - + diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index c0e6338b..563c7dbc 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -94,5 +94,5 @@ - + diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index 59cad307..f9dfaac6 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -189,5 +189,5 @@ - + diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index ad4dc7bf..29ff9dbb 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -100,5 +100,5 @@ - + diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 562a62f9..5e5d5dac 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -151,7 +151,7 @@ boldButtonClicked() - + klineedit.h diff --git a/example/example_factory.cc b/example/example_factory.cc index eaba7ee4..ebba090d 100644 --- a/example/example_factory.cc +++ b/example/example_factory.cc @@ -44,14 +44,14 @@ ExampleFactory::~ExampleFactory() s_global = 0L; } -KParts::Part* ExampleFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - ExamplePart *part = new ExamplePart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); + // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. + ExamplePart *part = new ExamplePart( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/example/example_factory.h b/example/example_factory.h index d7fa0e72..4ecc8b3a 100644 --- a/example/example_factory.h +++ b/example/example_factory.h @@ -33,7 +33,7 @@ public: ExampleFactory( TQObject* tqparent = 0, const char* name = 0 ); ~ExampleFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/example/example_part.cc b/example/example_part.cc index 7d695a9b..f71ff4f4 100644 --- a/example/example_part.cc +++ b/example/example_part.cc @@ -23,13 +23,13 @@ #include -ExamplePart::ExamplePart( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ) +ExamplePart::ExamplePart( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) { setInstance( ExampleFactory::global(), false ); } -bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) +bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* parentWidget) { // If nothing is loaded, do initialize here // Most KOffice applications use the template dialog here, with code like: diff --git a/example/example_part.h b/example/example_part.h index 4b28e71a..4f551982 100644 --- a/example/example_part.h +++ b/example/example_part.h @@ -27,11 +27,11 @@ class ExamplePart : public KoDocument Q_OBJECT TQ_OBJECT public: - ExamplePart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + ExamplePart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); virtual bool loadXML( TQIODevice *, const TQDomDocument & ); virtual TQDomDocument saveXML(); diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui index 06c39edc..cb405324 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -145,5 +145,5 @@ Enabling progressive will cause the image to be displayed by the browser even wh - + diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 19da5d15..697a3e30 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -308,7 +308,7 @@ intWidth intHeight - + kcombobox.h knuminput.h diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui index 405db2fe..ec5e0ba8 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -179,5 +179,5 @@ You can uncheck the box if you are not using transparency and you want to make t - + diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui index d6080a01..26115762 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -492,5 +492,5 @@ bnPreview radioAutomatic - + diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index 3ffc1bd4..d840dc8d 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -732,7 +732,7 @@ You can uncheck the box if you are not using transparancy and you want to make t kComboBoxFaxMode compressionLevelPixarLog - + kcombobox.h kcombobox.h diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc index 07b6a145..cf1152c6 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cc +++ b/filters/chalk/xcf/xcf/xcf-load.cc @@ -756,11 +756,11 @@ xcf_load_channel_props (XcfInfo * info, case PROP_SHOW_MASKED: { - bool show_tqmasked; + bool show_masked; info->cp += - xcf_read_int32 (info->fp, (TQ_INT32 *) & show_tqmasked, 1); - gimp_channel_set_show_tqmasked (*channel, show_tqmasked); + xcf_read_int32 (info->fp, (TQ_INT32 *) & show_masked, 1); + gimp_channel_set_show_masked (*channel, show_masked); } break; @@ -833,7 +833,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) KisLayer *layer; GimpLayerMask *layer_tqmask; TQ_INT32 hierarchy_offset; - TQ_INT32 layer_tqmask_offset; + TQ_INT32 layer_mask_offset; bool apply_tqmask = TRUE; bool edit_tqmask = FALSE; bool show_tqmask = FALSE; @@ -887,7 +887,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) /* read the hierarchy and layer tqmask offsets */ info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1); - info->cp += xcf_read_int32 (info->fp, &layer_tqmask_offset, 1); + info->cp += xcf_read_int32 (info->fp, &layer_mask_offset, 1); /* read in the hierarchy */ if (!xcf_seek_pos (info, hierarchy_offset, NULL)) @@ -897,9 +897,9 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) goto error; /* read in the layer tqmask */ - if (layer_tqmask_offset != 0) + if (layer_mask_offset != 0) { - if (!xcf_seek_pos (info, layer_tqmask_offset, NULL)) + if (!xcf_seek_pos (info, layer_mask_offset, NULL)) goto error; layer_tqmask = xcf_load_layer_tqmask (info, gimage); @@ -998,7 +998,7 @@ xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage) info->cp += xcf_read_string (info->fp, &name, 1); /* create a new layer tqmask */ - layer_tqmask = gimp_layer_tqmask_new (gimage, width, height, name, &color); + layer_tqmask = gimp_layer_mask_new (gimage, width, height, name, &color); g_free (name); if (!layer_tqmask) return NULL; diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc index 50e5fb17..c9043738 100644 --- a/filters/chalk/xcf/xcf/xcf-save.cc +++ b/filters/chalk/xcf/xcf/xcf-save.cc @@ -585,7 +585,7 @@ xcf_save_channel_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_LINKED, error, gimp_item_get_linked (GIMP_ITEM (channel)))); xcf_check_error (xcf_save_prop (info, gimage, PROP_SHOW_MASKED, error, - channel->show_tqmasked)); + channel->show_masked)); gimp_rgb_get_uchar (&channel->color, &col[0], &col[1], &col[2]); xcf_check_error (xcf_save_prop (info, gimage, PROP_COLOR, error, col)); @@ -774,14 +774,14 @@ xcf_save_prop (XcfInfo *info, case PROP_SHOW_MASKED: { - TQ_INT32 show_tqmasked; + TQ_INT32 show_masked; - show_tqmasked = va_arg (args, TQ_INT32); + show_masked = va_arg (args, TQ_INT32); size = 4; xcf_write_prop_type_check_error (info, prop_type); xcf_write_int32_check_error (info, &size, 1); - xcf_write_int32_check_error (info, &show_tqmasked, 1); + xcf_write_int32_check_error (info, &show_masked, 1); } break; diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index a31d80a4..d571762b 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -229,10 +229,10 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename } void -OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& tqparentobject ) +OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) { // parse all objects - for( TQDomNode object = tqparentobject.firstChild(); !object.isNull(); object = object.nextSibling() ) + for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() ) { TQDomElement o = object.toElement(); if( o.namespaceURI() != ooNS::draw ) continue; @@ -636,7 +636,7 @@ OoDrawImport::fillStyleStack( const TQDomElement& object ) void OoDrawImport::addStyles( const TQDomElement* style ) { - // this function is necessary as tqparent styles can have tqparents themself + // this function is necessary as tqparent styles can have parents themself if( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] ); diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc index 09dda268..228024f3 100644 --- a/filters/karbon/xaml/xamlexport.cc +++ b/filters/karbon/xaml/xamlexport.cc @@ -220,7 +220,7 @@ XAMLExport::getColorStops( const TQPtrVector &colorStops ) *m_defs << "color ); *m_defs << "\" Offset=\"" << TQString().setNum( colorStops.at( i )->rampPoint ); - // XAML uses ARGB values and other methods such as tqmasks for Transparency/Opacity # aa rrggbb + // XAML uses ARGB values and other methods such as masks for Transparency/Opacity # aa rrggbb // *m_defs << "\" stop-opacity=\"" << colorStops.at( i )->color.opacity() << "\"" << " />" << endl; // Maybe this only applies to gradients, need to check. } diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui index 86fef7a7..41d73a4c 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -194,8 +194,8 @@ - - + + kcombobox.h kcombobox.h diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index 75042fc3..d40cd608 100644 --- a/filters/kpresenter/kword/kprkword.cc +++ b/filters/kpresenter/kword/kprkword.cc @@ -413,10 +413,10 @@ void KprKword::convert() if ( !outFormatsElem.firstChild().isNull() ) // Do we have formats to save ? parag.appendChild( outFormatsElem ); - TQDomElement tqlayoutElem = outdoc.createElement( "LAYOUT" ); - parag.appendChild( tqlayoutElem ); + TQDomElement layoutElem = outdoc.createElement( "LAYOUT" ); + parag.appendChild( layoutElem ); TQDomElement nameElem = outdoc.createElement( "NAME" ); - tqlayoutElem.appendChild( nameElem ); + layoutElem.appendChild( nameElem ); nameElem.setAttribute( "value", isTitle ? titleStyleName : TQString("Standard") ); TQDomElement align=outdoc.createElement("FLOW"); if(p.hasAttribute("align")) @@ -438,25 +438,25 @@ void KprKword::convert() } } if(!counter.isNull() ) - tqlayoutElem.appendChild( counter ); + layoutElem.appendChild( counter ); if(!indent.isNull()) - tqlayoutElem.appendChild( indent ); + layoutElem.appendChild( indent ); if(!lineSpacing.isNull()) - tqlayoutElem.appendChild( lineSpacing ); + layoutElem.appendChild( lineSpacing ); if(!offset.isNull()) - tqlayoutElem.appendChild( offset); + layoutElem.appendChild( offset); if(!leftBorder.isNull()) - tqlayoutElem.appendChild(leftBorder); + layoutElem.appendChild(leftBorder); if(!rightBorder.isNull()) - tqlayoutElem.appendChild(rightBorder); + layoutElem.appendChild(rightBorder); if(!topBorder.isNull()) - tqlayoutElem.appendChild(topBorder); + layoutElem.appendChild(topBorder); if(!bottomBorder.isNull()) - tqlayoutElem.appendChild(bottomBorder); + layoutElem.appendChild(bottomBorder); if(!align.isNull()) - tqlayoutElem.appendChild(align); + layoutElem.appendChild(align); if(!shadow.isNull()) - tqlayoutElem.appendChild(shadow); + layoutElem.appendChild(shadow); // Only the first parag of the top text object is set to the 'title' style isTitle = false; } diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp index 9e933380..b87b8635 100644 --- a/filters/kpresenter/libimageexport/imageexport.cpp +++ b/filters/kpresenter/libimageexport/imageexport.cpp @@ -70,9 +70,9 @@ ImageExport::convert(const TQCString& from, const TQCString& to) kdWarning() << "Invalid document mimetype " << kpresenterdoc->mimeType() << endl; return KoFilter::NotImplemented; } - KoPageLayout tqlayoutPage= kpresenterdoc->pageLayout(); - width = int( tqlayoutPage.ptWidth ); - height = int( tqlayoutPage.ptHeight ); + KoPageLayout layoutPage= kpresenterdoc->pageLayout(); + width = int( layoutPage.ptWidth ); + height = int( layoutPage.ptHeight ); if (extraImageAttribute()) { KPrView* view = static_cast( kpresenterdoc->views().getFirst()); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index 8ca41b2a..0c286fb5 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -2029,7 +2029,7 @@ void OoImpressImport::fillStyleStack( const TQDomElement& object, bool sticky ) void OoImpressImport::addStyles( const TQDomElement* style ) { kdDebug(30518)<<" addStyle :" << style->attributeNS( ooNS::style, "name", TQString() ) <hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) { //kdDebug(30518)<<"m_styles[style->attribute( style:tqparent-style-name )] :"<attributeNS( ooNS::style, "tqparent-style-name", TQString() )]<tqlayoutGeom = 0; - d->tqlayoutPlaceholderId1 = 0; - d->tqlayoutPlaceholderId2 = 0; - d->tqlayoutPlaceholderId3 = 0; - d->tqlayoutPlaceholderId4 = 0; - d->tqlayoutPlaceholderId5 = 0; - d->tqlayoutPlaceholderId6 = 0; - d->tqlayoutPlaceholderId7 = 0; - d->tqlayoutPlaceholderId8 = 0; + d->layoutGeom = 0; + d->layoutPlaceholderId1 = 0; + d->layoutPlaceholderId2 = 0; + d->layoutPlaceholderId3 = 0; + d->layoutPlaceholderId4 = 0; + d->layoutPlaceholderId5 = 0; + d->layoutPlaceholderId6 = 0; + d->layoutPlaceholderId7 = 0; + d->layoutPlaceholderId8 = 0; d->masterId = 0; d->notesId = 0; d->flags = 0; @@ -3573,39 +3573,39 @@ SlideAtom::~SlideAtom() delete d; } -int SlideAtom::tqlayoutGeom() const +int SlideAtom::layoutGeom() const { - return d->tqlayoutGeom; + return d->layoutGeom; } -void SlideAtom::setLayoutGeom(int tqlayoutGeom ) +void SlideAtom::setLayoutGeom(int layoutGeom ) { - d->tqlayoutGeom = tqlayoutGeom; + d->layoutGeom = layoutGeom; } -int SlideAtom::tqlayoutPlaceholderId() const +int SlideAtom::layoutPlaceholderId() const { - return d->tqlayoutPlaceholderId1; - return d->tqlayoutPlaceholderId2; - return d->tqlayoutPlaceholderId3; - return d->tqlayoutPlaceholderId4; - return d->tqlayoutPlaceholderId5; - return d->tqlayoutPlaceholderId6; - return d->tqlayoutPlaceholderId7; - return d->tqlayoutPlaceholderId8; + return d->layoutPlaceholderId1; + return d->layoutPlaceholderId2; + return d->layoutPlaceholderId3; + return d->layoutPlaceholderId4; + return d->layoutPlaceholderId5; + return d->layoutPlaceholderId6; + return d->layoutPlaceholderId7; + return d->layoutPlaceholderId8; } -void SlideAtom::setLayoutPlaceholderId(int tqlayoutPlaceholderId1, int tqlayoutPlaceholderId2,int tqlayoutPlaceholderId3,int tqlayoutPlaceholderId4,int tqlayoutPlaceholderId5,int tqlayoutPlaceholderId6,int tqlayoutPlaceholderId7,int tqlayoutPlaceholderId8) +void SlideAtom::setLayoutPlaceholderId(int layoutPlaceholderId1, int layoutPlaceholderId2,int layoutPlaceholderId3,int layoutPlaceholderId4,int layoutPlaceholderId5,int layoutPlaceholderId6,int layoutPlaceholderId7,int layoutPlaceholderId8) { - d->tqlayoutPlaceholderId1 = tqlayoutPlaceholderId1; - d->tqlayoutPlaceholderId2 = tqlayoutPlaceholderId2; - d->tqlayoutPlaceholderId3 = tqlayoutPlaceholderId3; - d->tqlayoutPlaceholderId4 = tqlayoutPlaceholderId4; - d->tqlayoutPlaceholderId5 = tqlayoutPlaceholderId5; - d->tqlayoutPlaceholderId6 = tqlayoutPlaceholderId6; - d->tqlayoutPlaceholderId7 = tqlayoutPlaceholderId7; - d->tqlayoutPlaceholderId8 = tqlayoutPlaceholderId8; + d->layoutPlaceholderId1 = layoutPlaceholderId1; + d->layoutPlaceholderId2 = layoutPlaceholderId2; + d->layoutPlaceholderId3 = layoutPlaceholderId3; + d->layoutPlaceholderId4 = layoutPlaceholderId4; + d->layoutPlaceholderId5 = layoutPlaceholderId5; + d->layoutPlaceholderId6 = layoutPlaceholderId6; + d->layoutPlaceholderId7 = layoutPlaceholderId7; + d->layoutPlaceholderId8 = layoutPlaceholderId8; } int SlideAtom::masterId() const @@ -3650,16 +3650,16 @@ void SlideAtom::setData( unsigned , const unsigned char* data ) void SlideAtom::dump( std::ostream& out ) const { out << "SlideAtom" << std::endl; - out << "tqlayoutGeom " << tqlayoutGeom() << std::endl; - // out << "tqlayoutPlaceholderId " << tqlayoutPlaceholderId() <tqlayoutPlaceholderId1 <tqlayoutPlaceholderId2 <tqlayoutPlaceholderId3 <tqlayoutPlaceholderId4 <tqlayoutPlaceholderId5 <tqlayoutPlaceholderId6 <tqlayoutPlaceholderId7 <tqlayoutPlaceholderId8 <layoutPlaceholderId1 <layoutPlaceholderId2 <layoutPlaceholderId3 <layoutPlaceholderId4 <layoutPlaceholderId5 <layoutPlaceholderId6 <layoutPlaceholderId7 <layoutPlaceholderId8 <mimeType() << endl; return KoFilter::NotImplemented; } - KoPageLayout tqlayoutPage= kpresenterdoc->pageLayout(); - int width = int( tqlayoutPage.ptWidth ); - int height = int( tqlayoutPage.ptHeight ); + KoPageLayout layoutPage= kpresenterdoc->pageLayout(); + int width = int( layoutPage.ptWidth ); + int height = int( layoutPage.ptHeight ); TQPicture picture; TQPainter painter(&picture); diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 7cf0d28c..8c3a72cf 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -545,7 +545,7 @@ - + kcombobox.h klineedit.h diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 9b38a41f..45eb6914 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -502,7 +502,7 @@ - + kcombobox.h klineedit.h diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 99ac0eaa..7d128a5b 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -4175,7 +4175,7 @@ public: unsigned formatIndex; bool locked; bool formulaHidden; - unsigned tqparentStyle; + unsigned parentStyle; unsigned horizontalAlignment; unsigned verticalAlignment; bool textWrap; @@ -4207,7 +4207,7 @@ XFRecord::XFRecord(): Record() d->formatIndex = 0; d->locked = false; d->formulaHidden = false; - d->tqparentStyle = 0; + d->parentStyle = 0; d->horizontalAlignment = Left; d->verticalAlignment = VCentered; d->textWrap = false; @@ -4249,7 +4249,7 @@ XFRecord& XFRecord::operator=( const XFRecord& xf ) d->formatIndex = xf.formatIndex(); d->locked = xf.locked(); d->formulaHidden = xf.formulaHidden(); - d->tqparentStyle = xf.tqparentStyle(); + d->parentStyle = xf.parentStyle(); d->horizontalAlignment = xf.horizontalAlignment(); d->verticalAlignment = xf.verticalAlignment(); d->textWrap = xf.textWrap(); @@ -4315,14 +4315,14 @@ void XFRecord::setFormulaHidden( bool f ) d->formulaHidden = f; } -unsigned XFRecord::tqparentStyle() const +unsigned XFRecord::parentStyle() const { - return d->tqparentStyle; + return d->parentStyle; } void XFRecord::setParentStyle( unsigned p ) { - d->tqparentStyle = p; + d->parentStyle = p; } unsigned XFRecord::horizontalAlignment() const @@ -4657,7 +4657,7 @@ void XFRecord::setData( unsigned size, const unsigned char* data ) void XFRecord::dump( std::ostream& out ) const { out << "XF" << std::endl; - out << " Parent Style : " << tqparentStyle() << std::endl; + out << " Parent Style : " << parentStyle() << std::endl; out << " Font Index : " << fontIndex() << std::endl; out << " Format Index : " << formatIndex() << std::endl; out << " Locked : " << (locked()?"Yes":"No") << std::endl; diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index 51c9efcd..8450d643 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -2783,14 +2783,14 @@ public: * * \sa setParentStyle */ - unsigned tqparentStyle() const; + unsigned parentStyle() const; /** * Sets the index of the tqparent stlye of this format. * This refers to the index of the XFormat table which is constructed * from a series of XFormat records. * - * \sa tqparentStyle + * \sa parentStyle */ void setParentStyle( unsigned ps ); diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd index d9ab545b..04949083 100644 --- a/filters/kspread/gnumeric/gnumeric.xsd +++ b/filters/kspread/gnumeric/gnumeric.xsd @@ -801,7 +801,7 @@ - diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index 5089efa1..7bd198cc 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -128,7 +128,7 @@ support it.)
Jul 15, 2001 - Preliminary support for background patterns.
Aug 21, 2002 - text/number formats, border, patters, page/print info, comments
Aug 21, 2002 - font family, wrap text, number formating, precisions -
Sep 05, 2002 - bugfixes, default sizes, row and column tqlayouts +
Sep 05, 2002 - bugfixes, default sizes, row and column layouts
Sep 07, 2002 - bugfixes, preliminery date/time support
Feb 03, 2005 - export area name
Feb 06, 2005 - cells merged diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index 0c92ae60..df5dcc90 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -301,7 +301,7 @@ - + kurlrequester.h klineedit.h diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index 043e3ce6..d9d28d55 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -237,7 +237,7 @@ - + klistview.h diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 677329da..8c3835ed 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -659,7 +659,7 @@ addLanguage() removeLanguage() - + knuminput.h knuminput.h diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 1f8e6b50..5316749e 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -972,7 +972,7 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table ) /* * TODO: Test: do we need to copy the cells, too? - * if so we will probably also need to copy them for repeated col tqlayouts. + * if so we will probably also need to copy them for repeated col layouts. for ( j = 1; j <= columns; ++j ) { Cell* cell = table->cellAt( j, backupRow ); diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html index e2d667ad..dfaed8a4 100644 --- a/filters/kspread/opencalc/status.html +++ b/filters/kspread/opencalc/status.html @@ -47,10 +47,10 @@ KOffice filters status:   OpenOffice.org Calc Links (e-mail, files, web)
cell content
Datatypes: float, percentage, (date), times, booleans (miss some kspread support)
- Formating: indents, bold, italic, tqalignments, colors...
+ Formating: indents, bold, italic, alignments, colors...
Borders, background colors
column width, row width
- column tqlayouts, row tqlayouts
+ column layouts, row layouts
page tqlayout (size, border)
OpenCalc style import, default style
format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc index 14a059eb..1687e958 100644 --- a/filters/kword/abiword/ImportFormatting.cc +++ b/filters/kword/abiword/ImportFormatting.cc @@ -186,14 +186,14 @@ void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem, TQDomDocume } } -void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, +void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, StackItem* stackItem, TQDomDocument& mainDocument, const AbiPropsMap& abiPropsMap, const int level, const bool isStyle) { TQDomElement element; element=mainDocument.createElement("NAME"); element.setAttribute("value",strStyleName); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); TQString strFollowing=abiPropsMap["followedby"].getValue(); TQDomElement followingElement=mainDocument.createElement("FOLLOWING"); @@ -206,7 +206,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { // We are a style, so we need a default followingElement.setAttribute("name","Normal"); - tqlayoutElement.appendChild(followingElement); + layoutElement.appendChild(followingElement); } // Else: we are a tqlayout, so we leave the work to KWord (from the style) } @@ -214,7 +214,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { // Following style is defined // TODO: we should be sure that this style is defined! - tqlayoutElement.appendChild(followingElement); + layoutElement.appendChild(followingElement); } TQString strFlow=abiPropsMap["text-align"].getValue(); @@ -227,7 +227,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { element.setAttribute("align","left"); } - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); int kwordDepth; int kwordNumberingType; @@ -258,7 +258,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("bullet",64); element.setAttribute("bulletfont","Symbol"); element.setAttribute("customdef",""); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); TQString strLeftMargin=abiPropsMap["margin-left"].getValue(); TQString strRightMargin=abiPropsMap["margin-right"].getValue(); @@ -275,7 +275,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("right",ValueWithLengthUnit(strRightMargin)); if (!strTextIndent.isEmpty()) element.setAttribute("first",ValueWithLengthUnit(strTextIndent)); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strTopMargin=abiPropsMap["margin-top"].getValue(); @@ -290,7 +290,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("after",margin_bottom); if (!strTopMargin.isEmpty()) element.setAttribute("before",margin_top); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strLineHeight=abiPropsMap["line-height"].getValue(); @@ -351,7 +351,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute( "spacingvalue", lineHeight ); } } - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strTab=abiPropsMap["tabstops"].getValue(); @@ -397,12 +397,12 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("type",type); element.setAttribute("filling",filling); element.setAttribute("width",width); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } } TQDomElement formatElementOut=mainDocument.createElement("FORMAT"); - tqlayoutElement.appendChild(formatElementOut); + layoutElement.appendChild(formatElementOut); AddFormat(formatElementOut, stackItem, mainDocument); } diff --git a/filters/kword/abiword/ImportFormatting.h b/filters/kword/abiword/ImportFormatting.h index 31b26b3f..f26f5f01 100644 --- a/filters/kword/abiword/ImportFormatting.h +++ b/filters/kword/abiword/ImportFormatting.h @@ -103,7 +103,7 @@ public: */ /** * for tables (\, \): defines the widths of the columns. - * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the tqparents + * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the parents */ TQMemArray m_doubleArray; }; @@ -122,7 +122,7 @@ void PopulateProperties(StackItem* stackItem, const TQString& strStyleProps, const bool allowInit); void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem, TQDomDocument& mainDocument); -void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, +void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, StackItem* stackItem, TQDomDocument& mainDocument, const AbiPropsMap& abiPropsMap, const int level, const bool isStyle); void AddStyle(TQDomElement& styleElement, const TQString& strStyleName, diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 281f5d7e..c48b3c27 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -115,7 +115,7 @@ private: const FormatData& formatData); TQString textFormatToAbiProps(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force) const; - TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin, + TQString layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const; TQString escapeAbiWordText(const TQString& strText) const; bool makeTable(const FrameAnchor& anchor); @@ -718,12 +718,12 @@ void AbiWordWorker::processParagraphData ( const TQString ¶Text, } } -TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, +TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const { TQString props; - if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) { // Check if the current tqalignment is a valid one for AbiWord. if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right") @@ -748,7 +748,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, #if 0 // DEPRECATED! if (!tqlayout.tabulator.isEmpty() - && (force || (tqlayoutOrigin.tabulator!=tqlayout.tabulator))) + && (force || (layoutOrigin.tabulator!=tqlayout.tabulator))) { props += "tabstops:"; props += tqlayout.tabulator; @@ -756,7 +756,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } #endif if (!tqlayout.tabulatorList.isEmpty() - && (force || (tqlayoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) { props += "tabstops:"; bool first=true; @@ -790,18 +790,18 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.indentLeft>=0.0) - && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))) + && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) { props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); } if ((tqlayout.indentRight>=0.0) - && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight))) + && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) { props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); } - if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) { props += "text-indent: "; props += TQString::number(tqlayout.indentFirst); @@ -809,20 +809,20 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.marginBottom>=0.0) - && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) { props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); } if ((tqlayout.marginTop>=0.0) - && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) ) + && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) { props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); } if (force - || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) { switch ( tqlayout.lineSpacingType ) { @@ -881,7 +881,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } // Add all AbiWord properties collected in the element - props += textFormatToAbiProps(tqlayoutOrigin.formatData.text,tqlayout.formatData.text,force); + props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force); return props; } @@ -893,7 +893,7 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& const LayoutData& styleLayout=m_styleMap[style]; - TQString props=tqlayoutToCss(styleLayout,tqlayout,false); + TQString props=layoutToCss(styleLayout,tqlayout,false); *m_streamOut << "=0) diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 9533d5df..2d0697ba 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -364,10 +364,10 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent, stackItem->pos=0; // No text characters yet // Now we populate the tqlayout - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); - AddLayout(strStyle,tqlayoutElement, stackItem, mainDocument, abiPropsMap, level, false); + AddLayout(strStyle,layoutElement, stackItem, mainDocument, abiPropsMap, level, false); return true; } @@ -1114,7 +1114,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu TQStringList widthList; widthList.split('/', attributes.value("table-column-props"), false); const uint columns = widthList.size(); - stackItem->m_doubleArray.detach(); // Be sure not to modify tqparents + stackItem->m_doubleArray.detach(); // Be sure not to modify parents stackItem->m_doubleArray.resize(columns+1); // All left positions but the last right one stackItem->m_doubleArray[0] = 0.0; TQStringList::ConstIterator it; @@ -1160,12 +1160,12 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu stackItem->pos=1; // Just # // Now we populate the tqlayout - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); AbiPropsMap abiPropsMap; styleDataMap.useOrCreateStyle("Normal"); // We might have to create the "Normal" style. - AddLayout("Normal", tqlayoutElement, stackItem, mainDocument, abiPropsMap, 0, false); + AddLayout("Normal", layoutElement, stackItem, mainDocument, abiPropsMap, 0, false); #else stackItem->elementType=ElementTypeIgnore; #endif diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 2cef87d5..8f66942c 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -152,7 +152,7 @@ radioEndOfLineCRLF radioEndOfLineCR - + kcombobox.h klineedit.h diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index a67a43c2..fd124062 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -141,7 +141,7 @@ - + kcombobox.h klineedit.h diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index ceb93582..a04da78f 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -370,7 +370,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum TQDomElement& mainFramesetElement) // Strategy: // - end a paragraph when a line ends with a point or similar punctuation. -// - search the punctuation at the end of the line, even if the sentence is quoted or in tqparentheses. +// - search the punctuation at the end of the line, even if the sentence is quoted or in parentheses. // - an empty line also ends the paragraph // TODO/FIXME: we have a little problem with empty lines. Perhaps we should not allow empty paragraphs! { @@ -471,13 +471,13 @@ void ASCIIImport::writeOutParagraph(TQDomDocument& mainDocument, paragraphElementOut.appendChild(textElement); //TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS"); //paragraphElementOut.appendChild(formatsPluralElementOut); - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); TQDomElement element; element=mainDocument.createElement("NAME"); element.setAttribute("value",name); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); double size; element=mainDocument.createElement("INDENTS"); diff --git a/filters/kword/ascii/status.html b/filters/kword/ascii/status.html index e8af7c5d..6b53717d 100644 --- a/filters/kword/ascii/status.html +++ b/filters/kword/ascii/status.html @@ -98,7 +98,7 @@ (Recommended strategy)
Sentence:
- a paragraph ends when a line ends with a point or similar punctuation.
- - the punctuation is searched at the end of the line, even if the sentence is quoted or in tqparentheses.
+ - the punctuation is searched at the end of the line, even if the sentence is quoted or in parentheses.
- an empty line also ends the paragraph.
Old Way: (similar to KOffice 1.1.x)
- a paragraph ends at an empty line.
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 51c4da91..057cdd86 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -308,12 +308,12 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi return strResult; } -TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, +TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const { TQString strLayout; - if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) { if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) @@ -331,37 +331,37 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.indentLeft>=0.0) - && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))) + && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) { strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); } if ((tqlayout.indentRight>=0.0) - && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight))) + && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) { strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); } - if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) { strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst); } if ((tqlayout.marginBottom>=0.0) - && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) { strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); } if ((tqlayout.marginTop>=0.0) - && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) ) + && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) { strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); } if (force - || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) { switch ( tqlayout.lineSpacingType ) { @@ -430,8 +430,8 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, // TODO: Konqueror/KHTML does not support "text-shadow" if (!force - && ( tqlayoutOrigin.shadowDirection == tqlayout.shadowDirection ) - && ( tqlayoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) + && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection ) + && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) { // Do nothing! } @@ -518,7 +518,7 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, // TODO: borders // This must remain last, as the last property does not have a semi-colon - strLayout+=textFormatToCss(tqlayoutOrigin.formatData.text, + strLayout+=textFormatToCss(layoutOrigin.formatData.text, tqlayout.formatData.text,force); return strLayout; @@ -535,7 +535,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag, *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName); *m_streamOut << "\""; - TQString strStyle=tqlayoutToCss(styleLayout,tqlayout,false); + TQString strStyle=layoutToCss(styleLayout,tqlayout,false); if (!strStyle.isEmpty()) { *m_streamOut << " style=\"" << strStyle; @@ -689,7 +689,7 @@ bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout) // the style could be forced on

by the tqlayout. *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName); - *m_streamOut << "\n{\n " << tqlayoutToCss(tqlayout,tqlayout,true) << "\n}\n"; + *m_streamOut << "\n{\n " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n"; return true; } diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h index acbf20cc..358ea688 100644 --- a/filters/kword/html/export/ExportCss.h +++ b/filters/kword/html/export/ExportCss.h @@ -54,7 +54,7 @@ protected: virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: - TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin,const LayoutData& tqlayout, + TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout, const bool force) const; TQString escapeCssIdentifier(const TQString& strText) const; TQString textFormatToCss(const TextFormatting& formatOrigin, diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index 474d2912..cbdc4fc2 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -279,7 +279,7 @@ radioModeLight radioModeEnhanced - + kcombobox.h klineedit.h diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index 225a51ea..4a4cd64d 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -384,22 +384,22 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) { - const uint tqlayoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0! + const uint layoutDepth=tqlayout.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 (tqlayoutDepth>listDepth) + if (layoutDepth>listDepth) { ListInfo newList; newList.m_typeList=tqlayout.counter.style; - for (uint i=listDepth; itqlayoutDepth; i--) + for (uint i=listDepth; i>layoutDepth; i--) { ListInfo oldList=m_listStack.pop(); if (oldList.m_orderedList) diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp index 1df58edf..6e134e38 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/khtmlreader.cpp @@ -236,7 +236,7 @@ void KHTMLReader::parse_head(DOM::Element e) state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\ if (!(_writer->getText(state()->paragraph).isEmpty())) \ startNewParagraph(false,false); \ - _writer->tqlayoutAttribute(state()->paragraph, #a,#b,#c); \ + _writer->layoutAttribute(state()->paragraph, #a,#b,#c); \ return true; \ } \ } @@ -317,11 +317,11 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) TQString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type"); if ((!ct.isNull()) && (ct != "0")) { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","0"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","0"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt(); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); } } @@ -353,12 +353,12 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e) // example:

{ kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl; - _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); + _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); } if ( e.getAttribute("class").string()=="Standard" ) { kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl; - _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); + _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); } kdDebug(30503) << "leaving parse_CommonAttributes" << endl; return true; @@ -509,7 +509,7 @@ void KHTMLReader::parseStyle(DOM::Element e) if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") ) { state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout); - _writer->tqlayoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); + _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); } // done @@ -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->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent startNewLayout(); } for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) @@ -692,21 +692,21 @@ bool KHTMLReader::parse_ul(DOM::Element e) if (items.nodeName().string().lower() == "li") { if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout(); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","."); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","."); if (e.tagName().string().lower() == "ol") { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","."); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","."); } else { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","10"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","10"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); } - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent } parseNode(items); } diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index d2e4c450..23211ecc 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) { void KWDWriter::createHR(TQDomElement paragraph, int width) { - tqlayoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width)); + layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width)); } void KWDWriter::finishTable(int tableno,TQRect rect) { @@ -353,16 +353,16 @@ TQRect getRect(TQDomElement frameset) { } -TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayoutToClone) { +TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) { TQDomElement paragraph=_doc->createElement("PARAGRAPH"); TQDomElement formats=_doc->createElement("FORMATS"); TQDomElement tqlayout; - if (tqlayoutToClone.isNull()) { + if (layoutToClone.isNull()) { tqlayout=_doc->createElement("LAYOUT"); } else { - tqlayout=tqlayoutToClone.cloneNode().toElement(); + tqlayout=layoutToClone.cloneNode().toElement(); } TQDomElement text=_doc->createElement("TEXT"); TQDomText t=_doc->createTextNode(TQString("")); @@ -371,7 +371,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayou paragraph.appendChild(text); tqparent.appendChild(paragraph); paragraph.appendChild(tqlayout); - tqlayoutAttribute(paragraph,"NAME","value","Standard"); + layoutAttribute(paragraph,"NAME","value","Standard"); return paragraph; } @@ -403,9 +403,9 @@ TQString KWDWriter::getLayoutAttribute(TQDomElement paragraph, TQString name, TQ return TQString(); } -TQDomElement KWDWriter::tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) +TQDomElement KWDWriter::layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) { - kdDebug() << "Entering KWDWriter::tqlayoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl; + kdDebug() << "Entering KWDWriter::layoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl; TQDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement(); TQDomNodeList qdnl= currentLayout.elementsByTagName(name); diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 2fc888c4..59694e8d 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -131,7 +131,7 @@ public: /** * adds/changes an attribute to/of the current tqlayout **/ - TQDomElement tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); + TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); /** * creates a new format in the current paragraph. do this before adding text diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index c6dce3d5..00d8290d 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -106,7 +106,7 @@ bool KWord13Parser::startElementFormatOneProperty( const TQString& name, const T } else { - kdError(30520) << "Wrong tqparents for FORMAT property: " << name << endl; + kdError(30520) << "Wrong parents for FORMAT property: " << name << endl; return false; } } diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 677329da..8c3835ed 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -659,7 +659,7 @@ addLanguage() removeLanguage() - + knuminput.h knuminput.h diff --git a/filters/kword/libexport/TagProcessing.cc b/filters/kword/libexport/TagProcessing.cc index ca47f1ef..b70d58d9 100644 --- a/filters/kword/libexport/TagProcessing.cc +++ b/filters/kword/libexport/TagProcessing.cc @@ -42,15 +42,15 @@ // #define DEBUG_KWORD_IGNORED_TAGS -void ProcessSubtags ( const TQDomNode &tqparentNode, +void ProcessSubtags ( const TQDomNode &parentNode, TQValueList &tagProcessingList, KWEFKWordLeader *leader) { - //kdDebug(30508) << "Starting ProcessSubtags for node: " << tqparentNode.nodeName() << endl; + //kdDebug(30508) << "Starting ProcessSubtags for node: " << parentNode.nodeName() << endl; TQDomNode childNode; - for ( childNode = tqparentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () ) + for ( childNode = parentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () ) { if ( childNode.isElement () ) { @@ -74,7 +74,7 @@ void ProcessSubtags ( const TQDomNode &tqparentNode, else { kdDebug(30508) << "Ignoring " << childNode.nodeName () - << " tag in " << tqparentNode.nodeName () << endl; + << " tag in " << parentNode.nodeName () << endl; } #endif break; @@ -84,11 +84,11 @@ void ProcessSubtags ( const TQDomNode &tqparentNode, if ( !found ) { kdDebug(30508) << "Unexpected tag " << childNode.nodeName () - << " in " << tqparentNode.nodeName () << "!" << endl; + << " in " << parentNode.nodeName () << "!" << endl; } } } - //kdDebug(30508) << "Ending ProcessSubtags for node: " << tqparentNode.nodeName() << endl; + //kdDebug(30508) << "Ending ProcessSubtags for node: " << parentNode.nodeName() << endl; } void AllowNoSubtags ( const TQDomNode& myNode, KWEFKWordLeader *leader ) diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h index 01080d50..27512bfd 100644 --- a/filters/kword/libexport/TagProcessing.h +++ b/filters/kword/libexport/TagProcessing.h @@ -76,7 +76,7 @@ class TagProcessing void *data; }; -void ProcessSubtags ( const TQDomNode &tqparentNode, +void ProcessSubtags ( const TQDomNode &parentNode, TQValueList &tagProcessingList, KWEFKWordLeader *leader); diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp index 4b221051..83dae4ab 100644 --- a/filters/kword/msword/conversion.cpp +++ b/filters/kword/msword/conversion.cpp @@ -81,7 +81,7 @@ int Conversion::fillPatternStyle( int ipat ) { // See $TQTDIR/doc/html/qbrush.html#setStyle switch( ipat ) { - case 0: // Automatic (Aptqparently it means Solid from background color instead of foreground) + case 0: // Automatic (Apparently it means Solid from background color instead of foreground) case 1: // Solid return TQt::SolidPattern; case 2: // 5% diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp index f5737200..5044f023 100644 --- a/filters/kword/msword/document.cpp +++ b/filters/kword/msword/document.cpp @@ -371,9 +371,9 @@ void Document::slotTableCellEnd() m_textHandler->setFrameSetElement( TQDomElement() ); } -TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ) +TQDomElement Document::createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ) { - TQDomElement frameElementOut = tqparentFramesetElem.ownerDocument().createElement("FRAME"); + TQDomElement frameElementOut = parentFramesetElem.ownerDocument().createElement("FRAME"); frameElementOut.setAttribute( "left", left ); frameElementOut.setAttribute( "right", right ); frameElementOut.setAttribute( "top", top ); @@ -382,7 +382,7 @@ TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, d // AutoExtendFrame for header/footer/footnote/endnote, AutoCreateNewFrame for body text frameElementOut.setAttribute( "autoCreateNewFrame", autoExtend ? 0 : 1 ); frameElementOut.setAttribute( "newFrameBehavior", nfb ); - tqparentFramesetElem.appendChild( frameElementOut ); + parentFramesetElem.appendChild( frameElementOut ); return frameElementOut; } @@ -405,7 +405,7 @@ void Document::generateFrameBorder( TQDomElement& frameElementOut, const wvWare: // If ipat = 0 (solid fill), icoBack is the background color. // But otherwise, icoFore is the one we need to set as bkColor // (and icoBack is usually white; it's the other colour of the pattern, - // something that we can't set in TQt aptqparently). + // something that we can't set in TQt apparently). int bkColor = shd.ipat ? shd.cvFore : shd.cvBack; kdDebug(30513) << "generateFrameBorder: " << " icoFore=" << shd.cvFore << " icoBack=" << shd.cvBack << " ipat=" << shd.ipat << " -> bkColor=" << bkColor << endl; diff --git a/filters/kword/msword/document.h b/filters/kword/msword/document.h index 0e79065a..af527e2a 100644 --- a/filters/kword/msword/document.h +++ b/filters/kword/msword/document.h @@ -113,7 +113,7 @@ private: void processStyles(); void processAssociatedStrings(); enum NewFrameBehavior { Reconnect=0, NoFollowup=1, Copy=2 }; - TQDomElement createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ); + TQDomElement createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ); void generateFrameBorder( TQDomElement& frameElementOut, const wvWare::Word97::BRC& brcTop, const wvWare::Word97::BRC& brcBottom, const wvWare::Word97::BRC& brcLeft, const wvWare::Word97::BRC& brcRight, const wvWare::Word97::SHD& shd ); TQDomDocument& m_mainDocument; diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 0dcffdbb..e58ffead 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -315,7 +315,7 @@ void KWordTextHandler::runOfText( const wvWare::UString& text, wvWare::SharedPtr } -void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ) +void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ) { TQDomElement format( mainDocument().createElement( "FORMAT" ) ); format.setAttribute( "id", formatId ); @@ -471,7 +471,7 @@ void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare: } if ( pChildElement || !format.firstChild().isNull() ) // Don't save an empty format tag, unless the caller asked for it - tqparentElement.appendChild( format ); + parentElement.appendChild( format ); if ( pChildElement ) *pChildElement = format; } @@ -551,34 +551,34 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr textElement.setAttribute( "xml:space", "preserve" ); paragraphElementOut.appendChild(textElement); paragraphElementOut.appendChild( m_formats ); - TQDomElement tqlayoutElement=mainDocument().createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument().createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); TQDomElement nameElement = mainDocument().createElement("NAME"); nameElement.setAttribute("value", styleName); - tqlayoutElement.appendChild(nameElement); + layoutElement.appendChild(nameElement); if ( m_paragraphProperties ) { // Write out the properties of the paragraph - writeLayout( tqlayoutElement, *m_paragraphProperties, m_currentStyle ); + writeLayout( layoutElement, *m_paragraphProperties, m_currentStyle ); } textElement.appendChild(mainDocument().createTextNode(text)); m_paragraph = TQString( "" ); m_index = 0; - m_oldLayout = tqlayoutElement; // Keep a reference to the old tqlayout for some hacks + m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks } -void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) +void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) { const wvWare::Word97::PAP& pap = paragraphProperties.pap(); // Always write out the tqalignment, it's required TQDomElement flowElement = mainDocument().createElement("FLOW"); TQString tqalignment = Conversion::tqalignment( pap.jc ); flowElement.setAttribute( "align", tqalignment ); - tqparentElement.appendChild( flowElement ); + parentElement.appendChild( flowElement ); //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl; @@ -589,14 +589,14 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: indentsElement.setAttribute( "first", (double)pap.dxaLeft1 / 20.0 ); indentsElement.setAttribute( "left", (double)pap.dxaLeft / 20.0 ); indentsElement.setAttribute( "right", (double)pap.dxaRight / 20.0 ); - tqparentElement.appendChild( indentsElement ); + parentElement.appendChild( indentsElement ); } if ( pap.dyaBefore || pap.dyaAfter ) { TQDomElement offsetsElement = mainDocument().createElement("OFFSETS"); offsetsElement.setAttribute( "before", (double)pap.dyaBefore / 20.0 ); offsetsElement.setAttribute( "after", (double)pap.dyaAfter / 20.0 ); - tqparentElement.appendChild( offsetsElement ); + parentElement.appendChild( offsetsElement ); } // Linespacing @@ -605,7 +605,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: { TQDomElement lineSpacingElem = mainDocument().createElement( "LINESPACING" ); lineSpacingElem.setAttribute("value", lineSpacing ); - tqparentElement.appendChild( lineSpacingElem ); + parentElement.appendChild( lineSpacingElem ); } if ( pap.fKeep || pap.fKeepFollow || pap.fPageBreakBefore ) @@ -617,7 +617,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: pageBreak.setAttribute("hardFrameBreak", "true" ); if ( pap.fKeepFollow ) pageBreak.setAttribute("keepWithNext", "true" ); - tqparentElement.appendChild( pageBreak ); + parentElement.appendChild( pageBreak ); } // Borders @@ -625,25 +625,25 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: { TQDomElement borderElement = mainDocument().createElement( "TOPBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcTop ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcBottom.brcType ) { TQDomElement borderElement = mainDocument().createElement( "BOTTOMBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcBottom ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcLeft.brcType ) { TQDomElement borderElement = mainDocument().createElement( "LEFTBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcLeft ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcRight.brcType ) { TQDomElement borderElement = mainDocument().createElement( "RIGHTBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcRight ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } // Tabulators @@ -674,17 +674,17 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: } tabElement.setAttribute( "filling", filling ); tabElement.setAttribute( "width", width ); - tqparentElement.appendChild( tabElement ); + parentElement.appendChild( tabElement ); } } if ( pap.ilfo > 0 ) { - writeCounter( tqparentElement, paragraphProperties, style ); + writeCounter( parentElement, paragraphProperties, style ); } } -void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) +void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) { const wvWare::ListInfo* listInfo = paragraphProperties.listInfo(); if ( !listInfo ) @@ -820,7 +820,7 @@ void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare else m_previousEnumLSID = listInfo->lsid(); counterElement.setAttribute( "numberingtype", numberingType ); - tqparentElement.appendChild( counterElement ); + parentElement.appendChild( counterElement ); } void KWordTextHandler::setFrameSetElement( const TQDomElement& frameset ) diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h index 3075803b..ebea5202 100644 --- a/filters/kword/msword/texthandler.h +++ b/filters/kword/msword/texthandler.h @@ -86,10 +86,10 @@ public: // Write a tag from the given CHP // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended) - void writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ); + void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ); // Write the _contents_ (tqchildren) of a or