Port away from kdebug to qcdebug

Desktop / KDE / Calligra - Boudewijn Rempt [valdyas.org] - 4 September 2015 09:24 UTC

The approach taken is a bit different from what's in the porting scripts or in pigment: I've moved kis_debug to libglobal and adapted the dbgKrita etc. defines to use qcDebug etc. I've kept the old category numbers for now. I've also ported all places where we used kDebug() etc. directly, and not a few places where qDebug() etc were used directly.

89b5391 Port away from kdebug to qcdebug
krita/benchmarks/kis_composition_benchmark.cpp | 42 +++---
.../benchmarks/kis_filter_selections_benchmark.cpp | 18 +--
krita/benchmarks/kis_low_memory_benchmark.cpp | 4 +-
krita/benchmarks/kis_painter_benchmark.cpp | 2 +-
krita/benchmarks/kis_random_iterator_benchmark.cpp | 2 +-
krita/benchmarks/kis_stroke_benchmark.cpp | 14 +-
krita/crashreporter/main.cpp | 2 +-
krita/crashreporter/mainwindow.cpp | 16 +--
krita/gemini/MainWindow.cpp | 6 +-
krita/image/CMakeLists.txt | 2 -
krita/image/brushengine/kis_paint_information.cc | 6 +-
krita/image/brushengine/kis_paint_information.h | 2 +-
.../image/brushengine/kis_paintop_config_widget.h | 2 +-
krita/image/brushengine/kis_paintop_preset.cpp | 8 +-
krita/image/brushengine/kis_paintop_registry.cc | 2 +-
krita/image/floodfill/kis_fill_interval.h | 2 +-
krita/image/kis_algebra_2d.cpp | 14 +-
krita/image/kis_async_merger.cpp | 4 +-
krita/image/kis_base_rects_walker.h | 2 +-
.../image/kis_brush_mask_applicator_factories.cpp | 4 +-
krita/image/kis_cached_gradient_shape_strategy.cpp | 16 +--
krita/image/kis_cage_transform_worker.cpp | 2 +-
krita/image/kis_config_widget.cpp | 2 +-
krita/image/kis_convolution_worker_fft.h | 4 +-
krita/image/kis_debug.cpp | 60 --------
krita/image/kis_debug.h | 150 --------------------
krita/image/kis_distance_information.cpp | 2 +-
krita/image/kis_dom_utils.cpp | 6 +-
krita/image/kis_dom_utils.h | 4 +-
krita/image/kis_fill_painter.cc | 2 +-
krita/image/kis_filter_weights_buffer.h | 26 ++--
krita/image/kis_grid_interpolation_tools.h | 2 +-
krita/image/kis_image.cc | 2 +-
krita/image/kis_image_config.cpp | 6 +-
krita/image/kis_layer_composition.cpp | 4 +-
krita/image/kis_liquify_transform_worker.cpp | 16 +--
krita/image/kis_node_filter_interface.cpp | 10 +-
krita/image/kis_paint_device.cc | 20 +++
krita/image/kis_paint_device.h | 45 ++++++
krita/image/kis_painter.cc | 2 +-
.../kis_polygonal_gradient_shape_strategy.cpp | 14 +-
krita/image/kis_recalculate_transform_mask_job.cpp | 2 +-
krita/image/kis_shared_ptr.h | 14 +-
krita/image/kis_simple_update_queue.cpp | 6 +-
.../kis_stroke_strategy_undo_command_based.cpp | 2 +-
krita/image/kis_transaction_data.cpp | 2 +-
krita/image/kis_transform_mask.cpp | 10 +-
.../image/kis_transform_mask_params_interface.cpp | 6 +-
krita/image/kis_update_job_item.h | 2 +-
krita/image/kis_update_scheduler.cpp | 2 +-
krita/image/kis_wrapped_line_iterator_base.h | 4 +-
.../kis_layer_style_filter_projection_plane.cpp | 6 +-
.../layerstyles/kis_ls_bevel_emboss_filter.cpp | 4 +-
.../layerstyles/kis_ls_drop_shadow_filter.cpp | 10 +-
krita/image/layerstyles/kis_ls_utils.cpp | 4 +-
krita/image/metadata/kis_meta_data_entry.h | 2 +-
krita/image/metadata/kis_meta_data_schema.cc | 2 +-
krita/image/metadata/kis_meta_data_schema.h | 2 +-
.../kis_transform_processing_visitor.cpp | 2 +-
krita/image/recorder/kis_node_query_path.cc | 4 +-
krita/image/tests/kis_async_merger_test.cpp | 4 +-
krita/image/tests/kis_bsplines_test.cpp | 28 ++--
.../image/tests/kis_cage_transform_worker_test.cpp | 2 +-
krita/image/tests/kis_clone_layer_test.cpp | 2 +-
krita/image/tests/kis_convolution_painter_test.cpp | 6 +-
krita/image/tests/kis_cs_conversion_test.cpp | 2 +-
.../tests/kis_filter_weights_applicator_test.cpp | 28 ++--
.../image/tests/kis_filter_weights_buffer_test.cpp | 10 +-
krita/image/tests/kis_fixed_paint_device_test.cpp | 2 +-
krita/image/tests/kis_gradient_painter_test.cpp | 14 +-
krita/image/tests/kis_image_test.cpp | 18 +--
krita/image/tests/kis_iterator_benchmark.cpp | 20 +--
krita/image/tests/kis_iterator_test.cpp | 6 +-
krita/image/tests/kis_iterators_ng_test.cpp | 2 +-
.../kis_layer_style_projection_plane_test.cpp | 8 +-
.../tests/kis_liquify_transform_worker_test.cpp | 2 +-
krita/image/tests/kis_node_test.cpp | 6 +-
krita/image/tests/kis_paint_device_test.cpp | 8 +-
krita/image/tests/kis_paint_information_test.cpp | 2 +-
krita/image/tests/kis_painter_test.cpp | 12 +-
krita/image/tests/kis_pattern_test.cpp | 14 +-
.../image/tests/kis_processing_applicator_test.cpp | 2 +-
krita/image/tests/kis_processings_test.cpp | 2 +-
krita/image/tests/kis_projection_leaf_test.cpp | 34 ++---
krita/image/tests/kis_scanline_fill_test.cpp | 6 +-
...kis_stroke_strategy_undo_command_based_test.cpp | 2 +-
krita/image/tests/kis_transform_mask_test.cpp | 22 +--
krita/image/tests/kis_transform_worker_test.cpp | 14 +-
krita/image/tests/kis_transparency_mask_test.cpp | 10 +-
krita/image/tests/kis_update_scheduler_test.cpp | 12 +-
krita/image/tests/kis_updater_context_test.cpp | 2 +-
krita/image/tests/kis_walkers_test.cpp | 20 +--
.../image/tests/kis_warp_transform_worker_test.cpp | 6 +-
krita/image/tests/scheduler_utils.h | 4 +-
krita/image/tiles3/kis_memento_item.h | 2 +-
krita/image/tiles3/kis_memory_pool.h | 2 +-
krita/image/tiles3/kis_random_accessor.cc | 2 +-
krita/image/tiles3/kis_tile_data.cc | 10 +-
krita/image/tiles3/kis_tile_data_pooler.cc | 16 +--
krita/image/tiles3/kis_tile_data_store.cc | 12 +-
krita/image/tiles3/kis_tile_hash_table_p.h | 10 +-
krita/image/tiles3/swap/kis_chunk_allocator.cpp | 18 +--
krita/image/tiles3/swap/kis_chunk_allocator.h | 2 +-
krita/image/tiles3/swap/kis_memory_window.cpp | 2 +-
krita/image/tiles3/swap/kis_tile_data_swapper.cpp | 6 +-
krita/image/tiles3/tests/CMakeLists.txt | 4 +-
.../tiles3/tests/kis_chunk_allocator_test.cpp | 12 +-
krita/image/tiles3/tests/kis_compression_tests.cpp | 10 +-
.../image/tiles3/tests/kis_lockless_stack_test.cpp | 2 +-
krita/image/tiles3/tests/kis_low_memory_tests.cpp | 8 +-
.../image/tiles3/tests/kis_memory_window_test.cpp | 4 +-
.../tiles3/tests/kis_swapped_data_store_test.cpp | 2 +-
.../tiles3/tests/kis_tile_compressors_test.cpp | 4 +-
.../tiles3/tests/kis_tile_data_pooler_test.cpp | 2 +-
.../tiles3/tests/kis_tiled_data_manager_test.cpp | 8 +-
krita/image/tiles3/tests/tiles_test_utils.h | 3 +-
krita/integration/kimgio/kra.cpp | 2 +-
krita/integration/kimgio/ora.cpp | 2 +-
krita/kis_crash_handler.cpp | 6 +-
krita/libbrush/abrStructv2.cpp | 20 +--
krita/libbrush/abr_struct_parser.cpp | 24 ++--
krita/libbrush/abrbrush.cpp | 28 ++--
krita/libbrush/kis_abr_brush_collection.cpp | 10 +-
krita/libbrush/kis_abr_brush_collection.h | 2 +-
krita/libbrush/kis_abr_translator.cpp | 18 +--
krita/libbrush/kis_auto_brush.cpp | 2 +-
krita/libbrush/kis_gbr_brush.cpp | 2 +-
krita/libbrush/kis_png_brush.cpp | 2 +-
krita/libbrush/kis_qimage_pyramid.cpp | 6 +-
krita/libbrush/kis_text_brush.cpp | 2 +-
krita/libbrush/tests/kis_imagepipe_brush_test.cpp | 2 +-
krita/libcolor/CMakeLists.txt | 4 +-
krita/libcolor/colord/CMakeLists.txt | 2 +-
krita/libcolor/colord/KisColord.cpp | 24 ++--
krita/libcolor/linux/kis_color_manager.cpp | 4 +-
krita/libglobal/CMakeLists.txt | 5 +
krita/libglobal/config-debug.h.cmake | 1 +
krita/libglobal/kis_debug.cpp | 112 +++++++++++++++
krita/libglobal/kis_debug.h | 143 +++++++++++++++++++
krita/libglobal/kritaglobal_export.h | 59 ++++++++
krita/libpsd/CMakeLists.txt | 2 +-
.../libpsd/asl/kis_asl_callback_object_catcher.cpp | 4 +-
krita/libpsd/asl/kis_asl_object_catcher.cpp | 28 ++--
krita/libpsd/asl/kis_asl_reader.cpp | 54 +++----
krita/libpsd/asl/kis_asl_writer.cpp | 4 +-
krita/libpsd/asl/kis_asl_writer_utils.cpp | 10 +-
krita/libpsd/asl/kis_asl_xml_parser.cpp | 46 +++---
krita/libpsd/asl/kis_asl_xml_writer.cpp | 6 +-
krita/libpsd/asl/kis_offset_keeper.h | 2 +-
krita/libpsd/asl/kis_offset_on_exit_verifier.h | 6 +-
krita/libpsd/psd.cpp | 6 +-
krita/libpsd/psd.h | 2 +-
krita/libpsd/psd_pattern.cpp | 6 +-
krita/libpsd/psd_utils.cpp | 2 +-
krita/libpsd/tests/kis_asl_parser_test.cpp | 23 +--
krita/main.cc | 4 +-
.../RulerAssistant/InfiniteRulerAssistant.cc | 2 +-
.../RulerAssistant/ParallelRulerAssistant.cc | 2 +-
.../RulerAssistant/VanishingPointAssistant.cc | 2 +-
.../plugins/colorspaces/extensions/CMakeLists.txt | 2 +-
.../extensions/kis_burnhighlights_adjustment.cpp | 4 +-
.../extensions/kis_burnmidtones_adjustment.cpp | 4 +-
.../extensions/kis_burnshadows_adjustment.cpp | 4 +-
.../extensions/kis_color_balance_adjustment.cpp | 4 +-
.../extensions/kis_desaturate_adjustment.cpp | 4 +-
.../extensions/kis_dodgehighlights_adjustment.cpp | 4 +-
.../extensions/kis_dodgemidtones_adjustment.cpp | 4 +-
.../extensions/kis_dodgeshadows_adjustment.cpp | 4 +-
.../colorspaces/extensions/kis_hsv_adjustment.cpp | 4 +-
krita/plugins/extensions/bigbrother/bigbrother.cc | 2 +-
.../advancedcolorselector/kis_color_selector.cpp | 2 +-
.../kis_color_selector_combo_box.cpp | 4 +-
.../kis_color_selector_simple.cpp | 2 +-
.../kis_color_selector_triangle.cpp | 2 +-
.../kis_my_paint_shade_selector.cpp | 6 +-
.../colorslider/kis_color_slider_widget.cpp | 6 +-
.../compositiondocker/compositiondocker_dock.cpp | 2 +-
.../dockers/imagedocker/image_strip_scene.cpp | 6 +-
.../extensions/dockers/lut/lutdocker_dock.cpp | 2 +-
.../extensions/dockers/lut/ocio_display_filter.cpp | 8 +-
.../lut/tests/kis_ocio_display_filter_test.cpp | 28 ++--
krita/plugins/extensions/gmic/Command.cpp | 2 +-
krita/plugins/extensions/gmic/gmicparser.cpp | 4 +-
.../extensions/gmic/kis_filter_preview_widget.cpp | 2 +-
.../extensions/gmic/kis_gmic_blacklister.cpp | 2 +-
.../gmic/kis_gmic_filter_proxy_model.cpp | 2 +-
.../extensions/gmic/kis_gmic_simple_convertor.cpp | 10 +-
.../extensions/gmic/tests/kis_gmic_tests.cpp | 76 +++++-----
krita/plugins/extensions/imagesplit/imagesplit.cpp | 2 +-
.../extensions/imagesplit/wdg_imagesplit.cpp | 2 +-
krita/plugins/extensions/layersplit/layersplit.cpp | 4 +-
.../extensions/layersplit/wdg_layersplit.cpp | 2 +-
.../plugins/extensions/offsetimage/offsetimage.cpp | 4 +-
.../resourcemanager/dlg_create_bundle.cpp | 2 +-
.../extensions/resourcemanager/resourcebundle.cpp | 120 ++++++++--------
.../resourcemanager/resourcebundle_manifest.cpp | 2 +-
.../extensions/resourcemanager/resourcemanager.cpp | 4 +-
.../plugins/filters/colors/kis_color_to_alpha.cpp | 4 +-
.../colorsfilters/kis_perchannel_filter.cpp | 6 +-
.../filters/levelfilter/kis_level_filter.cpp | 4 +-
.../kis_phong_bumpmap_config_widget.cpp | 2 +-
.../phongbumpmap/kis_phong_bumpmap_filter.cpp | 2 +-
.../plugins/filters/tests/kis_all_filter_test.cpp | 40 +++---
.../filters/tests/kis_crash_filter_test.cpp | 6 +-
krita/plugins/formats/exr/exr_converter.cc | 12 +-
krita/plugins/formats/odg/kis_odg_import.cc | 2 +-
.../psd/psd_additional_layer_info_block.cpp | 4 +-
krita/plugins/formats/psd/psd_header.h | 2 +-
krita/plugins/formats/psd/psd_image_data.cpp | 2 +-
krita/plugins/formats/psd/psd_layer_section.cpp | 4 +-
krita/plugins/formats/psd/psd_loader.cpp | 2 +-
krita/plugins/formats/psd/psd_resource_block.h | 2 +-
krita/plugins/formats/psd/psd_resource_section.cpp | 2 +-
krita/plugins/formats/psd/tests/CMakeLists.txt | 10 +-
.../plugins/formats/psd/tests/compression_test.cpp | 14 +-
krita/plugins/formats/psd/tests/kis_psd_test.cpp | 12 +-
krita/plugins/formats/psd/tests/psd_utils_test.cpp | 4 +-
krita/plugins/formats/qml/qml_export.cc | 4 +-
krita/plugins/formats/tga/kis_tga_import.cpp | 8 +-
.../plugins/formats/tiff/kis_dlg_options_tiff.cpp | 2 +-
.../formats/tiff/kis_tiff_writer_visitor.cpp | 2 +-
krita/plugins/formats/tiff/tests/kis_tiff_test.cpp | 2 +-
krita/plugins/paintops/curvebrush/curve_brush.cpp | 2 +-
.../defaultpaintops/duplicate/kis_duplicateop_p.h | 2 +-
.../paintops/gridbrush/kis_grid_paintop.cpp | 2 +-
krita/plugins/paintops/hairy/hairy_brush.cpp | 2 +-
krita/plugins/paintops/hatching/hatching_brush.cpp | 6 +-
.../hatching/kis_hatching_paintop_settings.cpp | 2 +-
.../kis_hatching_paintop_settings_widget.cpp | 6 +-
.../libpaintop/kis_current_outline_fetcher.cpp | 2 +
.../paintops/libpaintop/kis_curve_option.cpp | 26 ++--
.../libpaintop/kis_multi_sensors_model_p.cpp | 2 +-
.../paintops/libpaintop/kis_texture_option.cpp | 2 +-
krita/plugins/paintops/spray/kis_spray_paintop.cpp | 2 +-
.../tangentnormal/kis_tangent_tilt_option.cpp | 2 +-
.../kis_free_transform_strategy_gsl_helpers.cpp | 8 +-
.../strokes/transform_stroke_strategy.cpp | 4 +-
krita/sdk/tests/filestest.h | 10 +-
krita/sdk/tests/qimage_based_test.h | 2 +-
krita/sdk/tests/stroke_testing_utils.cpp | 2 +-
krita/sdk/tests/testutil.h | 44 +++---
krita/sketch/CurveEditorItem.cpp | 2 +-
krita/sketch/KisSelectionExtras.cpp | 2 +-
krita/sketch/KisSketchView.cpp | 2 +-
krita/sketch/MainWindow.cpp | 4 +-
krita/sketch/SketchApplication.cpp | 2 +-
krita/sketch/Theme.cpp | 16 +--
krita/sketch/models/LayerModel.cpp | 34 ++---
krita/ui/KisApplication.cpp | 10 +-
krita/ui/KisAutoSaveRecoveryDialog.cpp | 2 +-
krita/ui/KisDocument.cpp | 77 +++++-----
krita/ui/KisDocumentEntry.cpp | 16 +--
krita/ui/KisFilterChain.cpp | 34 ++---
krita/ui/KisFilterChainLink.cpp | 8 +-
krita/ui/KisFilterEdge.cpp | 4 +-
krita/ui/KisFilterEntry.cpp | 8 +-
krita/ui/KisFilterGraph.cpp | 10 +-
krita/ui/KisFilterVertex.cpp | 2 +-
krita/ui/KisImportExportFilter.cpp | 2 +-
krita/ui/KisImportExportManager.cpp | 36 ++---
krita/ui/KisMainWindow.cpp | 60 ++++----
krita/ui/KisOpenPane.cpp | 2 +-
krita/ui/KisPart.cpp | 16 +--
krita/ui/KisTemplate.cpp | 4 +-
krita/ui/KisTemplateCreateDia.cpp | 14 +-
krita/ui/KisTemplateGroup.cpp | 2 +-
krita/ui/KisTemplateTree.cpp | 40 +++---
krita/ui/KisView.cpp | 2 +-
krita/ui/KisViewManager.cpp | 2 +-
krita/ui/PriorityQueue_p.h | 8 +-
krita/ui/canvas/kis_canvas2.cpp | 2 +-
krita/ui/canvas/kis_display_color_converter.cpp | 2 +-
.../ui/canvas/kis_perspective_grid_decoration.cpp | 2 +-
krita/ui/canvas/kis_prescaled_projection.cpp | 2 +-
krita/ui/canvas/kis_qpainter_canvas.cpp | 2 +-
krita/ui/dialogs/KisShortcutsEditorItem.cpp | 8 +-
krita/ui/dialogs/kis_about_application.cpp | 2 +-
krita/ui/dialogs/kis_dlg_layer_style.cpp | 2 +-
krita/ui/dialogs/kis_dlg_preferences.cc | 4 +-
krita/ui/flake/kis_shape_layer.cc | 14 +-
krita/ui/flake/kis_shape_selection.cpp | 20 +--
.../ui/input/config/kis_action_shortcuts_model.cpp | 2 +-
krita/ui/input/kis_extended_modifiers_mapper.cpp | 2 +-
krita/ui/input/kis_input_manager.cpp | 10 +-
krita/ui/input/kis_input_profile_manager.cpp | 2 +-
krita/ui/input/kis_pan_action.cpp | 2 +-
krita/ui/input/kis_select_layer_action.cpp | 2 +-
krita/ui/input/kis_shortcut_matcher.cpp | 6 +-
krita/ui/input/kis_tablet_debugger.cpp | 2 +-
krita/ui/input/kis_tool_invocation_action.cpp | 2 +-
krita/ui/input/kis_zoom_action.cpp | 2 +-
.../ui/input/wintab/kis_tablet_event_rate_logger.h | 12 +-
krita/ui/input/wintab/kis_tablet_support.h | 2 +-
krita/ui/input/wintab/kis_tablet_support_win.cpp | 76 +++++-----
krita/ui/input/wintab/kis_tablet_support_x11.cpp | 30 ++--
krita/ui/kis_action.h | 2 +-
krita/ui/kis_asl_layer_style_serializer.cpp | 24 ++--
krita/ui/kis_config.cc | 32 ++---
krita/ui/kis_favorite_resource_manager.cpp | 2 +-
krita/ui/kis_file_layer.cpp | 2 +-
krita/ui/kis_filter_manager.cc | 2 +-
krita/ui/kis_import_catcher.cc | 2 +-
krita/ui/kis_layer_manager.cc | 2 +-
krita/ui/kis_md5_generator.cpp | 6 +-
krita/ui/kis_min_heap.h | 2 +-
krita/ui/kis_node_manager.cpp | 4 +-
krita/ui/kis_paintop_box.cc | 4 +-
krita/ui/kis_popup_palette.cpp | 2 +-
krita/ui/kis_psd_layer_style_resource.cpp | 6 +-
krita/ui/kis_resource_server_provider.cpp | 2 +-
krita/ui/kis_safe_document_loader.cpp | 14 +-
krita/ui/kis_selection_decoration.cc | 2 +-
krita/ui/kis_splash_screen.cpp | 2 +-
krita/ui/kis_tooltip_manager.cpp | 2 +-
krita/ui/kis_zoom_manager.cc | 2 +-
krita/ui/kisexiv2/kis_exif_io.cpp | 4 +-
krita/ui/kisexiv2/kis_iptc_io.cpp | 2 +-
krita/ui/kisexiv2/kis_xmp_io.cpp | 6 +-
krita/ui/kra/kis_kra_load_visitor.cpp | 2 +-
krita/ui/kra/kis_kra_loader.cpp | 4 +-
krita/ui/kra/kis_kra_savexml_visitor.cpp | 2 +-
krita/ui/opengl/kis_opengl_canvas2.cpp | 38 ++---
krita/ui/opengl/kis_opengl_canvas2_p.h | 30 ++--
krita/ui/opengl/kis_opengl_image_textures.cpp | 26 ++--
krita/ui/opengl/kis_texture_tile.cpp | 2 +-
krita/ui/qtsingleapplication/qtlocalpeer.cpp | 2 +-
krita/ui/tests/kis_action_manager_test.cpp | 2 +-
.../tests/kis_asl_layer_style_serializer_test.cpp | 6 +-
krita/ui/tests/kis_coordinates_converter_test.cpp | 2 +-
krita/ui/tests/kis_model_index_converter_test.cpp | 14 +-
krita/ui/tests/kis_selection_manager_test.cpp | 6 +-
krita/ui/tests/kis_zoom_and_pan_test.cpp | 106 +++++++-------
krita/ui/tests/modeltest.cpp | 16 +--
krita/ui/tests/scratchpad/scratchpad.cpp | 2 +-
krita/ui/tool/kis_tool.cc | 4 +-
krita/ui/tool/kis_tool.h | 4 +-
krita/ui/tool/kis_tool_freehand_helper.cpp | 4 +-
krita/ui/tool/kis_tool_paint.cc | 2 +-
krita/ui/tool/kis_tool_select_base.h | 2 +-
.../widgets/kis_advanced_color_space_selector.cc | 4 +-
krita/ui/widgets/kis_color_space_selector.cc | 3 +-
krita/ui/widgets/kis_custom_image_widget.cc | 8 +-
krita/ui/widgets/kis_filter_selector_widget.h | 2 +-
krita/ui/widgets/kis_gradient_slider.cpp | 2 +-
krita/ui/widgets/kis_progress_widget.cpp | 2 +-
krita/ui/widgets/squeezedcombobox.cpp | 2 +-
346 files changed, 1841 insertions(+), 1650 deletions(-)

Upstream: quickgit.kde.org

  • Share