Merge branch 'master' into akamakin/T9268-scheduler-optimization
f485c81c1e48
Actions

Authored by lieroz on Aug 6 2018, 6:16 PM.

Description

Merge branch 'master' into akamakin/T9268-scheduler-optimization

Details

Committed

Aug 6 2018, 6:16 PM

Parents

R37:1c4b3614fcae: Removed commented ou code and changed write locks for mutexes.
R37:2d24e9a09f79: Fix some more EBN issues not spotted during the previous round

Branches

Unknown

Tags

Unknown

lieroz committed R37:f485c81c1e48: Merge branch 'master' into akamakin/T9268-scheduler-optimization (authored by lieroz).Aug 6 2018, 6:16 PM

Merged Changes

Commit		Author	Details	Committed
2d24e9a09f79		yurchor	Fix some more EBN issues not spotted during the previous round	Aug 6 2018
f8a5db52876b		rempt	Remove obsolete test	Aug 6 2018
1d2c5ac2773b	D14589	rempt	Typo fixes	Aug 5 2018
254eda261a3a		yurchor	Fix some more EBN issues	Aug 5 2018
42ea558a9e29		yurchor	Fix some more EBN issues with i18n	Aug 5 2018
bab06f3a11af		yurchor	Fix some EBN issues	Aug 5 2018

Changes (222)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			README_PACKAGERS.md
	M			krita/doc/strokes/strokes_documentation.org
	M			krita/main.cc
	M			libs/brush/kis_abr_brush_collection.cpp
	M			libs/color/colord/org.freedesktop.ColorManager.Device.xml
	M			libs/flake/KoFlake.cpp
	M			libs/flake/KoShape.cpp
	M			libs/flake/KoShapeSavingContext.cpp
	M			libs/flake/KoToolBase.h
	M			libs/flake/commands/KoShapeAlignCommand.h
	M			libs/flake/commands/KoShapeReorderCommand.cpp
	M			libs/flake/resources/KoSvgSymbolCollectionResource.h
	M			libs/flake/svg/SvgParser.h
	M			libs/flake/svg/SvgSavingContext.cpp
	M			libs/flake/svg/SvgSavingContext.h
	M			libs/flake/tests/TestImageCollection.cpp
	M			libs/flake/tests/TestPointMergeCommand.cpp
	M			libs/flake/tests/TestSvgText.cpp
	M			libs/flake/text/KoSvgTextShape.cpp
	M			libs/flake/tools/KoZoomStrategy.h
	M			libs/global/kis_global.h
	M			libs/global/kis_pointer_utils.h
	M			libs/image/kis_edge_detection_kernel.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/kis_paint_device.h
	M			libs/image/kis_repeat_iterators_pixel.h
	M			libs/image/kis_selection_filters.cpp
	M			libs/image/kis_transform_worker.cc
	M			libs/image/layerstyles/kis_layer_style_filter_environment.cpp
	M			libs/image/lazybrush/KisWatershedWorker.h
	M			libs/image/lazybrush/kis_colorize_stroke_strategy.cpp
	M			libs/image/lazybrush/kis_lazy_fill_tools.cpp
	M			libs/image/lazybrush/patched_boykov_kolmogorov_max_flow.hpp
	M			libs/image/metadata/kis_meta_data_value.cc
	M			libs/image/tests/kis_gradient_painter_test.cpp
	M			libs/image/tests/kis_image_test.cpp
	M			libs/image/tests/kis_paint_information_test.cpp
	M			libs/image/tests/kis_walkers_test.h
	M			libs/image/tiles3/kis_memento_manager.cc
	M			libs/libkis/Document.cpp
	M			libs/libkis/FillLayer.h
	M			libs/libkis/Filter.cpp
	M			libs/libkis/Krita.cpp
	M			libs/libkis/Selection.cpp
	M			libs/libkis/tests/TestDocument.cpp
	M			libs/libkis/tests/TestFilter.cpp
	M			libs/libqml/plugins/components/CategorySwitcher.qml
	M			libs/libqml/plugins/components/DropShadow.qml
	M			libs/libqml/plugins/components/PageStack.qml
	M			libs/libqml/qml/HelpPage.qml
	M			libs/libqml/qml/panels/PanelDropArea.qml
	M			libs/pigment/KoColorProfileStorage.h
	M			libs/pigment/resources/KoStopGradient.h
	M			libs/pigment/tests/CCSGraph.cpp
	M			libs/psd/psd_utils.cpp
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisImportExportFilter.h
	M			libs/ui/KisImportExportManager.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisResourceBundle.cpp
	M			libs/ui/KisResourceBundleServerProvider.cpp
	M			libs/ui/KisResourceServerProvider.cpp
	M			libs/ui/KisTemplateCreateDia.cpp
	M			libs/ui/KisView.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/actions/KisPasteActionFactory.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas_widget_base.cpp
	M			libs/ui/canvas/kis_guides_manager.cpp
	M			libs/ui/canvas/kis_qpainter_canvas.cpp
	M			libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.h
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer_canvas.cpp
	M			libs/ui/input/kis_input_manager_p.h
	M			libs/ui/input/kis_tablet_debugger.cpp
	M			libs/ui/kis_action_manager.cpp
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_control_frame.cpp
	M			libs/ui/kis_import_catcher.cc
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/kis_png_converter.cpp
	M			libs/ui/kis_selection_manager.cc
	M			libs/ui/kis_tooltip_manager.cpp
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/tests/CMakeLists.txt
	D			libs/ui/tests/ResourceBundleTest.cpp
	D			libs/ui/tests/ResourceBundleTest.h
	M			libs/ui/tests/kis_action_manager_test.cpp
	M			libs/ui/tests/kis_animation_exporter_test.cpp
	M			libs/ui/tests/kis_coordinates_converter_test.cpp
	M			libs/ui/tests/kis_doc2_test.cpp
	M			libs/ui/tests/kis_exiv2_test.cpp
	M			libs/ui/tests/kis_prescaled_projection_test.cpp
	M			libs/ui/tests/modeltest.cpp
	M			libs/ui/tests/util.h
	M			libs/ui/thememanager.cpp
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/widgets/KoFillConfigWidget.cpp
	M			libs/ui/widgets/KoStrokeConfigWidget.cpp
	M			libs/ui/widgets/kis_cmb_composite.cc
	M			libs/ui/widgets/kis_curve_widget.cpp
	M			libs/ui/widgets/kis_gradient_chooser.cc
	M			libs/ui/widgets/kis_paintop_preset_icon_library.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_preset_live_preview_view.h
	M			libs/ui/widgets/kis_tool_options_popup.cpp
	M			libs/ui/widgets/kis_widget_chooser.cpp
	M			libs/widgets/KisColorsetChooser.cpp
	M			libs/widgets/KisVisualColorSelector.cpp
	M			libs/widgets/KisVisualColorSelectorShape.cpp
	M			libs/widgets/KisVisualEllipticalSelectorShape.cpp
	M			libs/widgets/KisVisualRectangleSelectorShape.cpp
	M			libs/widgets/KisVisualTriangleSelectorShape.cpp
	M			libs/widgets/KoResourceServerProvider.h
	M			libs/widgets/KoUnitDoubleSpinBox.h
	M			libs/widgets/kis_double_parse_unit_spin_box.h
	M			libs/widgets/kis_int_parse_spin_box.cpp
	M			libs/widgetutils/xmlgui/kactioncollection.cpp
	M			libs/widgetutils/xmlgui/kbugreport.cpp
	M			libs/widgetutils/xmlgui/khelpmenu.h
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/channeldocker/channeldocker_dock.cpp
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/touchdocker/TouchDockerDock.cpp
	M			plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
	M			plugins/extensions/colorspaceconversion/dlg_colorspaceconversion.cc
	M			plugins/extensions/imagesize/dlg_canvassize.cc
	M			plugins/extensions/imagesplit/imagesplit.cpp
	M			plugins/extensions/pykrita/plugin/version_checker.h
	M			plugins/extensions/pykrita/tests/actionTests/filter_test.py
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/resourcemanager/resourcemanager.cpp
	M			plugins/filters/blur/kis_gaussian_blur_filter.cpp
	M			plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp
	M			plugins/filters/edgedetection/kis_edge_detection_filter.cpp
	M			plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
	M			plugins/filters/halftone/kis_halftone_filter.h
	M			plugins/flake/artistictextshape/ArtisticTextShape.cpp
	M			plugins/flake/artistictextshape/ArtisticTextTool.cpp
	M			plugins/flake/textshape/ShrinkToFitShapeContainer.h
	M			plugins/flake/textshape/TextShape.cpp
	M			plugins/flake/textshape/TextTool.cpp
	M			plugins/flake/textshape/dialogs/StyleManager.cpp
	M			plugins/flake/textshape/kotext/KoInlineObject.h
	M			plugins/flake/textshape/kotext/KoSectionModel.h
	M			plugins/flake/textshape/kotext/KoTextEditor_undo.cpp
	M			plugins/flake/textshape/kotext/KoTextLocator.h
	M			plugins/flake/textshape/kotext/KoTextRange.cpp
	M			plugins/flake/textshape/kotext/Mainpage.dox
	M			plugins/flake/textshape/kotext/commands/ChangeTrackedDeleteCommand.cpp
	M			plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp
	M			plugins/flake/textshape/kotext/styles/KoListLevelProperties.h
	M			plugins/flake/textshape/textlayout/KoTextDocumentLayout.cpp
	M			plugins/flake/textshape/textlayout/ListItemsHelper.cpp
	M			plugins/flake/textshape/textlayout/Mainpage.dox
	M			plugins/impex/csv/tests/kis_csv_test.cpp
	M			plugins/impex/jpeg/kis_jpeg_converter.cc
	M			plugins/impex/jpeg/kis_jpeg_converter.h
	M			plugins/impex/jpeg/kis_jpeg_export.cc
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/tests/kis_kra_loader_test.cpp
	M			plugins/impex/libkra/tests/kis_kra_saver_test.cpp
	M			plugins/impex/libkra/tests/kis_kra_savexml_visitor_test.cpp
	M			plugins/impex/libkra/tests/util.h
	M			plugins/impex/pdf/kis_pdf_import.cpp
	M			plugins/impex/png/kis_png_export.cc
	M			plugins/impex/psd/psd_resource_block.h
	M			plugins/impex/psd/psd_resource_section.cpp
	M			plugins/impex/psd/psd_saver.cpp
	M			plugins/impex/psd/tests/compression_test.cpp
	M			plugins/impex/psd/tests/psd_colormode_block_test.cpp
	M			plugins/impex/psd/tests/psd_header_test.cpp
	M			plugins/impex/psd/tests/psd_utils_test.cpp
	M			plugins/impex/qml/qml_converter.cc
	M			plugins/impex/spriter/kis_spriter_export.cpp
	M			plugins/impex/tiff/kis_tiff_writer_visitor.h
	M			plugins/impex/tiff/tests/kis_tiff_test.cpp
	M			plugins/impex/xcf/3rdparty/xcftools/utils.c
	M			plugins/impex/xcf/3rdparty/xcftools/xcf-general.c
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
	M			plugins/paintops/colorsmudge/kis_smudge_radius_option.cpp
	M			plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
	M			plugins/paintops/deform/kis_deform_paintop_settings.cpp
	M			plugins/paintops/filterop/kis_filterop_settings_widget.cpp
	M			plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.h
	M			plugins/paintops/particle/kis_particle_paintop_settings.cpp
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings_widget.cpp
	M			plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.cpp
	M			plugins/python/comics_project_management_tools/comics_export_dialog.py
	M			plugins/python/comics_project_management_tools/comics_exporter.py
	M			plugins/python/comics_project_management_tools/comics_project_manager_docker.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_ACBF_XML_Exporter.py
	M			plugins/python/quick_settings_docker/quick_settings_docker.py
	M			plugins/tools/basictools/kis_tool_gradient.cc
	M			plugins/tools/basictools/kis_tool_move.cc
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
	M			plugins/tools/karbonplugins/tools/CalligraphyTool/BUGS
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp
	M			plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
	M			plugins/tools/tool_transform2/kis_animated_transform_parameters.cpp
	M			plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
	M			sdk/tests/KisRectsCollisionsTracker.h
	M			sdk/tests/testutil.h
	M			sdk/tests/ui_manager_test.h