From 9baa9f5bf917b84a59dced3fd0c8c56a3dcb37de Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 9 Mar 2023 11:10:47 +0100 Subject: [PATCH] Clang-Format: Allow empty functions to be single-line For example OIIOOutputDriver::~OIIOOutputDriver() { } becomes OIIOOutputDriver::~OIIOOutputDriver() {} Saves quite some vertical space, which is especially handy for constructors. --- .clang-format | 2 +- intern/cycles/app/oiio_output_driver.cpp | 4 +- intern/cycles/app/opengl/display_driver.cpp | 4 +- intern/cycles/app/opengl/shader.cpp | 4 +- intern/cycles/blender/curves.cpp | 8 +- intern/cycles/blender/id_map.h | 8 +- intern/cycles/blender/mesh.cpp | 4 +- intern/cycles/blender/output_driver.cpp | 8 +- intern/cycles/blender/sync.cpp | 4 +- intern/cycles/blender/util.h | 4 +- intern/cycles/bvh/binning.cpp | 16 +- intern/cycles/bvh/binning.h | 4 +- intern/cycles/bvh/build.cpp | 4 +- intern/cycles/bvh/bvh.h | 4 +- intern/cycles/bvh/bvh2.cpp | 4 +- intern/cycles/bvh/node.h | 4 +- intern/cycles/bvh/params.h | 8 +- intern/cycles/bvh/split.h | 12 +- intern/cycles/bvh/unaligned.cpp | 4 +- intern/cycles/device/cpu/kernel_function.h | 4 +- intern/cycles/device/denoise.cpp | 4 +- intern/cycles/device/device.cpp | 8 +- intern/cycles/device/device.h | 12 +- intern/cycles/device/dummy/device.cpp | 28 +- intern/cycles/device/memory.h | 4 +- intern/cycles/device/metal/device.mm | 4 +- intern/cycles/device/optix/queue.cpp | 4 +- intern/cycles/device/queue.h | 4 +- intern/cycles/graph/node.cpp | 8 +- intern/cycles/graph/node_type.cpp | 4 +- intern/cycles/hydra/camera.cpp | 4 +- intern/cycles/hydra/curves.cpp | 4 +- intern/cycles/hydra/display_driver.cpp | 4 +- intern/cycles/hydra/field.cpp | 8 +- intern/cycles/hydra/file_reader.cpp | 12 +- intern/cycles/hydra/instancer.cpp | 4 +- intern/cycles/hydra/light.cpp | 4 +- intern/cycles/hydra/material.cpp | 8 +- intern/cycles/hydra/material.h | 4 +- intern/cycles/hydra/mesh.cpp | 4 +- intern/cycles/hydra/plugin.cpp | 4 +- intern/cycles/hydra/pointcloud.cpp | 4 +- intern/cycles/hydra/render_buffer.cpp | 12 +- intern/cycles/hydra/render_delegate.cpp | 4 +- intern/cycles/hydra/render_pass.cpp | 4 +- intern/cycles/hydra/session.cpp | 4 +- intern/cycles/hydra/volume.cpp | 4 +- .../cycles/integrator/adaptive_sampling.cpp | 4 +- .../cycles/integrator/path_trace_display.cpp | 4 +- intern/cycles/integrator/path_trace_work.cpp | 4 +- intern/cycles/integrator/path_trace_work.h | 4 +- .../cycles/integrator/path_trace_work_cpu.cpp | 4 +- .../cycles/integrator/work_tile_scheduler.cpp | 4 +- .../cycles/kernel/closure/bsdf_diffuse_ramp.h | 4 +- intern/cycles/kernel/osl/services_gpu.h | 68 +--- .../kernel/osl/shaders/node_holdout.osl | 4 +- intern/cycles/scene/alembic.cpp | 4 +- intern/cycles/scene/attribute.cpp | 12 +- intern/cycles/scene/background.cpp | 4 +- intern/cycles/scene/bake.cpp | 8 +- intern/cycles/scene/camera.cpp | 4 +- intern/cycles/scene/film.cpp | 8 +- intern/cycles/scene/geometry.cpp | 4 +- intern/cycles/scene/hair.cpp | 4 +- intern/cycles/scene/image.cpp | 8 +- intern/cycles/scene/image_oiio.cpp | 8 +- intern/cycles/scene/image_vdb.cpp | 8 +- intern/cycles/scene/integrator.cpp | 8 +- intern/cycles/scene/light_tree.h | 8 +- intern/cycles/scene/mesh.cpp | 4 +- intern/cycles/scene/mesh_subdivision.cpp | 16 +- intern/cycles/scene/object.cpp | 8 +- intern/cycles/scene/osl.cpp | 60 +--- intern/cycles/scene/particles.cpp | 12 +- intern/cycles/scene/pass.cpp | 4 +- intern/cycles/scene/pointcloud.cpp | 8 +- intern/cycles/scene/procedural.cpp | 12 +- intern/cycles/scene/shader.cpp | 4 +- intern/cycles/scene/shader_graph.h | 8 +- intern/cycles/scene/shader_nodes.cpp | 316 +++++------------- intern/cycles/scene/shader_nodes.h | 4 +- intern/cycles/scene/stats.cpp | 44 +-- intern/cycles/scene/svm.cpp | 12 +- intern/cycles/session/buffers.cpp | 8 +- intern/cycles/session/merge.cpp | 4 +- intern/cycles/session/tile.cpp | 4 +- intern/cycles/session/tile.h | 4 +- intern/cycles/subd/dice.cpp | 4 +- intern/cycles/subd/patch.h | 4 +- intern/cycles/subd/split.cpp | 4 +- .../test/render_graph_finalize_test.cpp | 4 +- intern/cycles/test/util_task_test.cpp | 4 +- intern/cycles/util/array.h | 4 +- intern/cycles/util/boundbox.h | 16 +- intern/cycles/util/guarded_allocator.h | 12 +- intern/cycles/util/half.h | 8 +- intern/cycles/util/ies.h | 4 +- intern/cycles/util/log.h | 8 +- intern/cycles/util/md5.cpp | 4 +- intern/cycles/util/path.cpp | 12 +- intern/cycles/util/profiling.cpp | 4 +- intern/cycles/util/projection.h | 4 +- intern/cycles/util/semaphore.h | 4 +- intern/cycles/util/stack_allocator.h | 8 +- intern/cycles/util/stats.h | 8 +- intern/cycles/util/task.cpp | 4 +- intern/cycles/util/time.h | 4 +- intern/cycles/util/types_float3.h | 4 +- intern/cycles/util/types_float3_impl.h | 12 +- intern/cycles/util/types_float4_impl.h | 8 +- intern/cycles/util/types_float8_impl.h | 12 +- intern/cycles/util/types_int3.h | 4 +- intern/cycles/util/types_int3_impl.h | 12 +- intern/cycles/util/types_int4_impl.h | 12 +- intern/cycles/util/types_int8_impl.h | 12 +- intern/cycles/util/types_uint3.h | 4 +- intern/dualcon/intern/MemoryAllocator.h | 4 +- intern/dualcon/intern/Projections.h | 4 +- intern/dualcon/intern/dualcon_c_api.cpp | 4 +- intern/ghost/GHOST_IContext.h | 4 +- intern/ghost/GHOST_IEvent.h | 4 +- intern/ghost/GHOST_IEventConsumer.h | 4 +- intern/ghost/GHOST_ISystem.h | 8 +- intern/ghost/GHOST_ISystemPaths.h | 8 +- intern/ghost/GHOST_ITimerTask.h | 4 +- intern/ghost/GHOST_IWindow.h | 4 +- intern/ghost/GHOST_Rect.h | 4 +- intern/ghost/intern/GHOST_Buttons.cpp | 4 +- .../intern/GHOST_CallbackEventConsumer.h | 4 +- intern/ghost/intern/GHOST_Context.h | 8 +- intern/ghost/intern/GHOST_ContextNone.h | 4 +- intern/ghost/intern/GHOST_DisplayManager.cpp | 8 +- .../ghost/intern/GHOST_DisplayManagerCocoa.mm | 4 +- .../intern/GHOST_DisplayManagerWin32.cpp | 4 +- intern/ghost/intern/GHOST_DropTargetWin32.cpp | 4 +- intern/ghost/intern/GHOST_EventManager.cpp | 4 +- intern/ghost/intern/GHOST_ImeWin32.cpp | 4 +- intern/ghost/intern/GHOST_ModifierKeys.cpp | 4 +- intern/ghost/intern/GHOST_NDOFManager.h | 4 +- intern/ghost/intern/GHOST_SystemCocoa.mm | 4 +- intern/ghost/intern/GHOST_SystemPaths.h | 8 +- intern/ghost/intern/GHOST_SystemPathsCocoa.mm | 8 +- intern/ghost/intern/GHOST_SystemPathsUnix.cpp | 8 +- .../ghost/intern/GHOST_SystemPathsWin32.cpp | 8 +- intern/ghost/intern/GHOST_TimerManager.cpp | 4 +- intern/ghost/test/multitest/stubs.c | 8 +- intern/guardedalloc/MEM_guardedalloc.h | 4 +- .../intern/mallocn_lockfree_impl.c | 12 +- intern/iksolver/intern/IK_QJacobian.cpp | 8 +- intern/iksolver/intern/IK_QJacobianSolver.h | 4 +- intern/iksolver/intern/IK_QSegment.cpp | 8 +- intern/iksolver/intern/IK_QSegment.h | 16 +- intern/iksolver/intern/IK_QTask.h | 8 +- intern/iksolver/intern/IK_Solver.cpp | 4 +- intern/memutil/MEM_Allocator.h | 16 +- intern/memutil/MEM_RefCounted.h | 8 +- intern/mikktspace/mikk_atomic_hash_set.hh | 4 +- intern/mikktspace/mikk_float3.hh | 20 +- intern/mikktspace/mikktspace.hh | 8 +- intern/opencolorio/fallback_impl.cc | 28 +- intern/opencolorio/ocio_impl.h | 16 +- .../internal/base/opensubdiv_capi.cc | 8 +- .../internal/evaluator/eval_output.h | 24 +- .../evaluator/evaluator_cache_impl.cc | 4 +- .../evaluator/gl_compute_evaluator.cc | 8 +- .../internal/topology/mesh_topology.cc | 8 +- .../topology/topology_refiner_impl.cc | 4 +- .../stub/opensubdiv_evaluator_stub.cc | 8 +- intern/opensubdiv/stub/opensubdiv_stub.cc | 8 +- .../stub/opensubdiv_topology_refiner_stub.cc | 4 +- .../asset_system/intern/asset_catalog_path.cc | 12 +- .../blendthumb/src/blendthumb_win32.cc | 4 +- source/blender/blenfont/intern/blf.c | 4 +- source/blender/blenkernel/BKE_attribute.hh | 36 +- .../blender/blenkernel/BKE_attribute_math.hh | 8 +- source/blender/blenkernel/BKE_curves.hh | 4 +- .../blender/blenkernel/BKE_geometry_fields.hh | 8 +- .../blenkernel/BKE_image_partial_update.hh | 12 +- .../blender/blenkernel/BKE_image_wrappers.hh | 8 +- source/blender/blenkernel/BKE_pbvh_pixels.hh | 8 +- .../blender/blenkernel/intern/cryptomatte.cc | 4 +- .../blenkernel/intern/curves_geometry.cc | 8 +- .../intern/geometry_component_curves.cc | 4 +- .../intern/geometry_component_instances.cc | 4 +- .../intern/geometry_component_mesh.cc | 4 +- .../intern/geometry_component_pointcloud.cc | 4 +- .../intern/geometry_component_volume.cc | 4 +- .../blender/blenkernel/intern/geometry_set.cc | 4 +- .../blenkernel/intern/idprop_serialize.cc | 4 +- source/blender/blenkernel/intern/lattice.c | 4 +- .../blenkernel/intern/mesh_calc_edges.cc | 4 +- .../blenkernel/intern/node_tree_update.cc | 4 +- .../blenkernel/intern/object_update.cc | 4 +- source/blender/blenkernel/intern/ocean.c | 8 +- .../blenkernel/intern/outliner_treehash.cc | 4 +- .../blenkernel/intern/pbvh_uv_islands.cc | 4 +- source/blender/blenkernel/intern/rigidbody.c | 64 +--- source/blender/blenkernel/intern/sound.c | 116 ++----- .../intern/subdiv_converter_mesh.cc | 4 +- .../blender/blenkernel/intern/undo_system.cc | 4 +- source/blender/blenkernel/intern/writeavi.c | 8 +- source/blender/blenlib/BLI_array.hh | 8 +- source/blender/blenlib/BLI_bit_span.hh | 20 +- source/blender/blenlib/BLI_bit_vector.hh | 4 +- source/blender/blenlib/BLI_dot_export.hh | 20 +- .../blenlib/BLI_enumerable_thread_specific.hh | 8 +- source/blender/blenlib/BLI_function_ref.hh | 4 +- source/blender/blenlib/BLI_generic_array.hh | 12 +- source/blender/blenlib/BLI_generic_pointer.hh | 20 +- source/blender/blenlib/BLI_generic_span.hh | 20 +- .../blender/blenlib/BLI_generic_value_map.hh | 4 +- .../blenlib/BLI_generic_virtual_array.hh | 4 +- .../BLI_generic_virtual_vector_array.hh | 4 +- .../blender/blenlib/BLI_implicit_sharing.hh | 8 +- .../blenlib/BLI_implicit_sharing_ptr.hh | 4 +- source/blender/blenlib/BLI_index_mask.hh | 12 +- source/blender/blenlib/BLI_index_range.hh | 4 +- .../blender/blenlib/BLI_listbase_wrapper.hh | 8 +- source/blender/blenlib/BLI_map.hh | 8 +- .../blender/blenlib/BLI_math_matrix_types.hh | 4 +- .../blender/blenlib/BLI_math_vector_types.hh | 4 +- source/blender/blenlib/BLI_memory_utils.hh | 4 +- source/blender/blenlib/BLI_mesh_intersect.hh | 8 +- .../blender/blenlib/BLI_probing_strategies.hh | 4 +- source/blender/blenlib/BLI_serialize.hh | 20 +- source/blender/blenlib/BLI_set.hh | 8 +- source/blender/blenlib/BLI_span.hh | 16 +- source/blender/blenlib/BLI_stack.hh | 4 +- source/blender/blenlib/BLI_string_ref.hh | 16 +- source/blender/blenlib/BLI_vector.hh | 12 +- source/blender/blenlib/BLI_vector_set.hh | 4 +- source/blender/blenlib/BLI_virtual_array.hh | 16 +- source/blender/blenlib/intern/delaunay_2d.cc | 8 +- .../blenlib/intern/generic_virtual_array.cc | 12 +- .../blender/blenlib/intern/mesh_intersect.cc | 24 +- source/blender/blenlib/intern/threads.cc | 4 +- .../tests/BLI_implicit_sharing_test.cc | 4 +- .../blenlib/tests/BLI_memory_utils_test.cc | 4 +- .../blender/blenlib/tests/BLI_string_test.cc | 4 +- .../blender/blenlib/tests/BLI_vector_test.cc | 12 +- source/blender/blenloader/intern/readfile.cc | 4 +- .../compositor/intern/COM_CPUDevice.cc | 4 +- .../compositor/intern/COM_ChunkOrderHotspot.h | 4 +- source/blender/compositor/intern/COM_Device.h | 4 +- .../compositor/intern/COM_ExecutionModel.h | 4 +- .../compositor/intern/COM_NodeConverter.cc | 4 +- .../blender/compositor/intern/COM_NodeGraph.h | 4 +- .../compositor/intern/COM_NodeOperation.h | 12 +- .../intern/COM_NodeOperationBuilder.h | 4 +- .../compositor/nodes/COM_AlphaOverNode.h | 4 +- .../compositor/nodes/COM_AntiAliasingNode.h | 4 +- .../compositor/nodes/COM_CombineColorNode.cc | 4 +- .../nodes/COM_CombineColorNodeLegacy.cc | 4 +- .../nodes/COM_CombineColorNodeLegacy.h | 16 +- .../compositor/nodes/COM_CombineXYZNode.cc | 4 +- .../compositor/nodes/COM_ConvertAlphaNode.h | 4 +- .../compositor/nodes/COM_CornerPinNode.cc | 4 +- .../blender/compositor/nodes/COM_MathNode.h | 4 +- .../compositor/nodes/COM_SeparateColorNode.cc | 4 +- .../nodes/COM_SeparateColorNodeLegacy.cc | 4 +- .../nodes/COM_SeparateColorNodeLegacy.h | 16 +- .../compositor/nodes/COM_SetAlphaNode.h | 4 +- .../compositor/nodes/COM_ZCombineNode.h | 4 +- .../operations/COM_ConvertOperation.cc | 4 +- .../operations/COM_DenoiseOperation.cc | 20 +- .../operations/COM_GaussianXBlurOperation.cc | 4 +- .../operations/COM_GaussianYBlurOperation.cc | 4 +- .../operations/COM_GlareFogGlowOperation.h | 4 +- .../operations/COM_GlareGhostOperation.h | 4 +- .../operations/COM_GlareSimpleStarOperation.h | 4 +- .../operations/COM_GlareStreaksOperation.h | 4 +- .../operations/COM_PlaneTrackOperation.h | 8 +- .../operations/COM_ScaleOperation.cc | 12 +- .../operations/COM_TranslateOperation.cc | 4 +- .../intern/compile_state.cc | 4 +- .../realtime_compositor/intern/context.cc | 4 +- .../realtime_compositor/intern/domain.cc | 4 +- .../realtime_compositor/intern/evaluator.cc | 4 +- .../realtime_compositor/intern/operation.cc | 4 +- .../intern/simple_operation.cc | 4 +- .../intern/texture_pool.cc | 4 +- .../intern/builder/deg_builder_cache.cc | 8 +- .../intern/builder/deg_builder_relations.cc | 4 +- .../intern/builder/deg_builder_rna.cc | 4 +- .../intern/builder/deg_builder_stack.h | 20 +- .../depsgraph/intern/debug/deg_time_average.h | 4 +- .../depsgraph/intern/depsgraph_query_iter.cc | 4 +- .../depsgraph/intern/depsgraph_type.cc | 4 +- .../eval/deg_eval_runtime_backup_animation.cc | 4 +- .../eval/deg_eval_runtime_backup_gpencil.cc | 8 +- .../eval/deg_eval_runtime_backup_sequencer.cc | 4 +- .../eval/deg_eval_runtime_backup_volume.cc | 4 +- .../blender/depsgraph/intern/node/deg_node.h | 8 +- .../depsgraph/intern/node/deg_node_id.cc | 4 +- .../intern/node/deg_node_operation.cc | 4 +- .../draw/engines/eevee/eevee_subsurface.c | 4 +- .../eevee_depth_of_field_filter_comp.glsl | 4 +- .../eevee_depth_of_field_stabilize_comp.glsl | 8 +- .../draw/engines/external/external_engine.c | 4 +- .../draw/engines/image/image_batches.hh | 4 +- .../draw/engines/image/image_drawing_mode.hh | 4 +- .../draw/engines/image/image_space_image.hh | 4 +- .../draw/engines/image/image_space_node.hh | 4 +- .../draw/engines/overlay/overlay_facing.cc | 4 +- .../draw/engines/overlay/overlay_fade.cc | 4 +- source/blender/draw/intern/DRW_gpu_wrapper.hh | 4 +- .../draw/intern/draw_cache_extract_mesh.cc | 4 +- source/blender/draw/intern/draw_common.c | 4 +- source/blender/draw/intern/draw_pbvh.cc | 4 +- .../blender/editors/armature/meshlaplacian.cc | 16 +- .../editors/asset/intern/asset_indexer.cc | 16 +- .../blender/editors/asset/intern/asset_ops.cc | 4 +- .../asset/intern/asset_temp_id_consumer.cc | 4 +- .../editors/interface/interface_icons.cc | 4 +- .../editors/interface/interface_templates.cc | 4 +- .../interface/views/abstract_view_item.cc | 8 +- .../editors/interface/views/grid_view.cc | 12 +- source/blender/editors/metaball/mball_edit.c | 4 +- source/blender/editors/object/object_add.cc | 4 +- .../blender/editors/render/render_preview.cc | 8 +- .../editors/sculpt_paint/curves_sculpt_add.cc | 4 +- .../sculpt_paint/curves_sculpt_comb.cc | 4 +- .../sculpt_paint/curves_sculpt_delete.cc | 4 +- .../sculpt_paint/curves_sculpt_density.cc | 8 +- .../sculpt_paint/curves_sculpt_grow_shrink.cc | 16 +- .../sculpt_paint/curves_sculpt_pinch.cc | 8 +- .../sculpt_paint/curves_sculpt_puff.cc | 4 +- .../curves_sculpt_selection_paint.cc | 4 +- .../sculpt_paint/curves_sculpt_slide.cc | 4 +- .../sculpt_paint/curves_sculpt_smooth.cc | 4 +- .../sculpt_paint/curves_sculpt_snake_hook.cc | 4 +- source/blender/editors/sculpt_paint/sculpt.cc | 4 +- source/blender/editors/space_api/spacetypes.c | 4 +- .../blender/editors/space_clip/space_clip.cc | 8 +- .../editors/space_console/space_console.c | 4 +- .../blender/editors/space_info/space_info.c | 4 +- source/blender/editors/space_node/drawnode.cc | 4 +- .../editors/space_outliner/space_outliner.cc | 8 +- .../space_outliner/tree/tree_display.hh | 4 +- .../tree/tree_display_view_layer.cc | 4 +- .../space_outliner/tree/tree_element.hh | 8 +- .../editors/space_script/space_script.c | 4 +- .../editors/space_sequencer/space_sequencer.c | 4 +- .../space_spreadsheet/space_spreadsheet.cc | 20 +- .../editors/space_statusbar/space_statusbar.c | 16 +- .../blender/editors/space_text/space_text.c | 4 +- source/blender/editors/space_text/text_draw.c | 4 +- .../editors/space_topbar/space_topbar.c | 16 +- .../editors/space_userpref/space_userpref.c | 28 +- .../editors/space_view3d/space_view3d.cc | 4 +- .../intern/application/AppCanvas.cpp | 4 +- .../blender_interface/BlenderStrokeRenderer.h | 4 +- .../blender_interface/BlenderStyleModule.h | 8 +- .../blender_interface/FRS_freestyle.cpp | 4 +- .../freestyle/intern/geometry/GeomCleaner.h | 12 +- .../blender/freestyle/intern/geometry/Grid.h | 28 +- .../freestyle/intern/geometry/HashGrid.h | 4 +- .../blender/freestyle/intern/geometry/Noise.h | 4 +- .../freestyle/intern/geometry/Polygon.h | 16 +- .../freestyle/intern/geometry/SweepLine.h | 20 +- .../freestyle/intern/geometry/VecMat.h | 64 +--- source/blender/freestyle/intern/image/Image.h | 4 +- .../freestyle/intern/image/ImagePyramid.h | 8 +- .../intern/scene_graph/DrawingStyle.h | 4 +- .../intern/scene_graph/FrsMaterial.h | 4 +- .../freestyle/intern/scene_graph/Node.h | 8 +- .../intern/scene_graph/NodeCamera.cpp | 4 +- .../freestyle/intern/scene_graph/NodeCamera.h | 4 +- .../intern/scene_graph/NodeDrawingStyle.h | 8 +- .../freestyle/intern/scene_graph/NodeGroup.h | 8 +- .../freestyle/intern/scene_graph/NodeLight.h | 4 +- .../freestyle/intern/scene_graph/NodeShape.h | 4 +- .../intern/scene_graph/NodeTransform.h | 4 +- .../intern/scene_graph/NodeViewLayer.h | 4 +- .../intern/scene_graph/OrientedLineRep.h | 20 +- .../freestyle/intern/scene_graph/SceneHash.h | 4 +- .../intern/scene_graph/SceneVisitor.h | 28 +- .../intern/scene_graph/TriangleRep.h | 4 +- .../freestyle/intern/scene_graph/VertexRep.h | 4 +- .../intern/stroke/AdvancedFunctions1D.h | 8 +- .../intern/stroke/AdvancedStrokeShaders.h | 20 +- .../intern/stroke/BasicStrokeShaders.h | 24 +- .../freestyle/intern/stroke/Canvas.cpp | 4 +- .../intern/stroke/ChainingIterators.h | 8 +- .../freestyle/intern/stroke/CurveIterators.h | 4 +- .../freestyle/intern/stroke/Modifiers.h | 12 +- .../freestyle/intern/stroke/Operators.h | 4 +- .../freestyle/intern/stroke/Predicates0D.h | 16 +- .../freestyle/intern/stroke/Predicates1D.h | 20 +- .../intern/stroke/StrokeAdvancedIterators.h | 8 +- .../freestyle/intern/stroke/StrokeIterators.h | 8 +- .../freestyle/intern/stroke/StrokeLayer.h | 4 +- .../freestyle/intern/stroke/StrokeRep.h | 8 +- .../freestyle/intern/stroke/StrokeShader.h | 4 +- .../intern/stroke/StrokeTesselator.h | 4 +- .../freestyle/intern/stroke/StyleModule.h | 4 +- .../freestyle/intern/system/BaseIterator.h | 8 +- .../freestyle/intern/system/BaseObject.h | 4 +- .../freestyle/intern/system/Interpreter.h | 4 +- .../freestyle/intern/system/Iterator.h | 4 +- .../freestyle/intern/system/ProgressBar.h | 4 +- .../freestyle/intern/system/PseudoNoise.h | 4 +- .../freestyle/intern/system/RenderMonitor.h | 4 +- .../freestyle/intern/system/TimeStamp.h | 4 +- .../freestyle/intern/system/TimeUtils.h | 8 +- .../freestyle/intern/view_map/AutoPtrHelper.h | 8 +- .../intern/view_map/FEdgeXDetector.h | 4 +- .../freestyle/intern/view_map/Functions0D.h | 4 +- .../freestyle/intern/view_map/Functions1D.h | 68 +--- .../intern/view_map/GridDensityProvider.h | 12 +- .../freestyle/intern/view_map/Interface0D.h | 8 +- .../freestyle/intern/view_map/Silhouette.h | 12 +- .../intern/view_map/ViewEdgeXBuilder.h | 4 +- .../freestyle/intern/view_map/ViewMap.h | 12 +- .../view_map/ViewMapAdvancedIterators.h | 36 +- .../intern/view_map/ViewMapIterators.h | 16 +- .../intern/view_map/ViewMapTesselator.h | 20 +- .../freestyle/intern/winged_edge/Curvature.h | 4 +- .../freestyle/intern/winged_edge/WEdge.h | 8 +- .../freestyle/intern/winged_edge/WFillGrid.h | 4 +- .../freestyle/intern/winged_edge/WSFillGrid.h | 4 +- .../freestyle/intern/winged_edge/WXEdge.h | 12 +- .../intern/winged_edge/WXEdgeBuilder.h | 8 +- source/blender/functions/FN_field.hh | 12 +- source/blender/functions/FN_lazy_function.hh | 4 +- source/blender/functions/FN_multi_function.hh | 4 +- .../functions/FN_multi_function_context.hh | 4 +- .../functions/FN_multi_function_data_type.hh | 4 +- .../functions/FN_multi_function_params.hh | 4 +- .../intern/lazy_function_graph_executor.cc | 4 +- .../intern/multi_function_procedure.cc | 4 +- .../multi_function_procedure_executor.cc | 16 +- .../blender/functions/tests/FN_field_test.cc | 4 +- .../geometry/intern/realize_instances.cc | 4 +- source/blender/gpu/intern/gpu_codegen.cc | 4 +- source/blender/gpu/metal/mtl_batch.mm | 4 +- source/blender/gpu/metal/mtl_immediate.mm | 4 +- .../blender/gpu/metal/mtl_uniform_buffer.mm | 4 +- source/blender/gpu/metal/mtl_vertex_buffer.mm | 4 +- source/blender/gpu/opengl/gl_debug.cc | 4 +- source/blender/gpu/tests/gpu_testing.hh | 12 +- .../tests/shaders/gpu_compute_dummy_test.glsl | 4 +- source/blender/gpu/vulkan/vk_backend.cc | 24 +- source/blender/gpu/vulkan/vk_batch.cc | 8 +- source/blender/gpu/vulkan/vk_context.cc | 8 +- source/blender/gpu/vulkan/vk_debug.cc | 12 +- .../blender/gpu/vulkan/vk_descriptor_pools.cc | 4 +- .../blender/gpu/vulkan/vk_descriptor_set.hh | 12 +- source/blender/gpu/vulkan/vk_drawlist.cc | 8 +- source/blender/gpu/vulkan/vk_fence.cc | 8 +- source/blender/gpu/vulkan/vk_index_buffer.cc | 12 +- source/blender/gpu/vulkan/vk_query.cc | 16 +- source/blender/gpu/vulkan/vk_shader.cc | 8 +- source/blender/gpu/vulkan/vk_state_manager.cc | 32 +- .../blender/gpu/vulkan/vk_storage_buffer.cc | 4 +- source/blender/gpu/vulkan/vk_texture.cc | 20 +- source/blender/gpu/vulkan/vk_texture.hh | 4 +- .../blender/gpu/vulkan/vk_uniform_buffer.cc | 16 +- .../blender/gpu/vulkan/vk_uniform_buffer.hh | 4 +- source/blender/gpu/vulkan/vk_vertex_buffer.cc | 24 +- source/blender/imbuf/intern/dds/Color.h | 20 +- source/blender/imbuf/intern/dds/Image.cpp | 4 +- source/blender/imbuf/intern/dds/Stream.h | 4 +- .../imbuf/intern/oiio/openimageio_support.cc | 4 +- .../imbuf/intern/openexr/openexr_api.cpp | 8 +- .../imbuf/intern/openexr/openexr_stub.cpp | 20 +- .../io/alembic/exporter/abc_custom_props.cc | 4 +- .../alembic/exporter/abc_subdiv_disabler.cc | 4 +- .../io/alembic/exporter/abc_writer_camera.cc | 4 +- .../io/alembic/exporter/abc_writer_curves.cc | 4 +- .../io/alembic/exporter/abc_writer_mesh.cc | 4 +- .../io/alembic/exporter/abc_writer_nurbs.cc | 4 +- .../io/alembic/exporter/abc_writer_points.cc | 4 +- .../blender/io/collada/BCAnimationCurve.cpp | 4 +- .../blender/io/collada/BCAnimationSampler.h | 4 +- source/blender/io/collada/BCSampleData.h | 4 +- .../blender/io/collada/DocumentExporter.cpp | 4 +- .../blender/io/collada/DocumentImporter.cpp | 4 +- source/blender/io/collada/ErrorHandler.cpp | 4 +- source/blender/io/collada/MaterialExporter.h | 4 +- source/blender/io/collada/MeshImporter.cpp | 8 +- source/blender/io/collada/SkinInfo.cpp | 4 +- .../intern/abstract_hierarchy_iterator.cc | 4 +- .../common/intern/object_identifier_test.cc | 8 +- .../ply/exporter/ply_export_load_plydata.hh | 4 +- .../io/usd/intern/usd_writer_camera.cc | 4 +- .../blender/io/usd/intern/usd_writer_hair.cc | 4 +- .../blender/io/usd/intern/usd_writer_light.cc | 4 +- .../blender/io/usd/intern/usd_writer_mesh.cc | 4 +- .../io/usd/intern/usd_writer_metaball.cc | 4 +- .../io/usd/intern/usd_writer_transform.cc | 4 +- .../io/usd/intern/usd_writer_volume.cc | 4 +- .../wavefront_obj/exporter/obj_export_io.hh | 4 +- source/blender/makesdna/DNA_defs.h | 4 +- source/blender/makesrna/intern/rna_access.cc | 4 +- source/blender/makesrna/intern/rna_mesh_api.c | 4 +- source/blender/makesrna/intern/rna_nodetree.c | 12 +- source/blender/makesrna/intern/rna_object.c | 4 +- source/blender/makesrna/intern/rna_space.c | 4 +- source/blender/makesrna/intern/rna_volume.c | 4 +- source/blender/modifiers/intern/MOD_ocean.cc | 4 +- .../blender/nodes/NOD_geometry_nodes_log.hh | 4 +- .../blender/nodes/NOD_socket_declarations.hh | 24 +- .../nodes/node_geo_input_instance_rotation.cc | 4 +- .../nodes/node_geo_input_instance_scale.cc | 4 +- .../nodes/geometry/nodes/node_geo_points.cc | 4 +- .../nodes/texture/node_texture_tree.cc | 4 +- source/blender/python/intern/stubs.c | 8 +- source/blender/render/intern/pipeline.cc | 20 +- .../blender/render/intern/texture_margin.cc | 4 +- .../render/intern/texture_pointdensity.c | 4 +- source/blender/sequencer/intern/effects.c | 24 +- .../intern/ConstrainedConjugateGradient.h | 12 +- .../blender/simulation/intern/eigen_utils.h | 16 +- .../simulation/intern/implicit_eigen.cpp | 16 +- .../windowmanager/intern/wm_keymap_utils.c | 4 +- .../blender/windowmanager/intern/wm_utils.c | 4 +- 517 files changed, 1114 insertions(+), 3340 deletions(-) diff --git a/.clang-format b/.clang-format index 967cb046a11..71ce9e68e44 100644 --- a/.clang-format +++ b/.clang-format @@ -130,7 +130,7 @@ PenaltyReturnTypeOnItsOwnLine: 10000 # PenaltyBreakAssignment: 100 -AllowShortFunctionsOnASingleLine: None +AllowShortFunctionsOnASingleLine: Empty SortIncludes: true diff --git a/intern/cycles/app/oiio_output_driver.cpp b/intern/cycles/app/oiio_output_driver.cpp index d7677276981..9bd164fb953 100644 --- a/intern/cycles/app/oiio_output_driver.cpp +++ b/intern/cycles/app/oiio_output_driver.cpp @@ -17,9 +17,7 @@ OIIOOutputDriver::OIIOOutputDriver(const string_view filepath, { } -OIIOOutputDriver::~OIIOOutputDriver() -{ -} +OIIOOutputDriver::~OIIOOutputDriver() {} void OIIOOutputDriver::write_render_tile(const Tile &tile) { diff --git a/intern/cycles/app/opengl/display_driver.cpp b/intern/cycles/app/opengl/display_driver.cpp index d9c72c07ae4..383f56a8a98 100644 --- a/intern/cycles/app/opengl/display_driver.cpp +++ b/intern/cycles/app/opengl/display_driver.cpp @@ -22,9 +22,7 @@ OpenGLDisplayDriver::OpenGLDisplayDriver(const function &gl_context_enab { } -OpenGLDisplayDriver::~OpenGLDisplayDriver() -{ -} +OpenGLDisplayDriver::~OpenGLDisplayDriver() {} /* -------------------------------------------------------------------- * Update procedure. diff --git a/intern/cycles/app/opengl/shader.cpp b/intern/cycles/app/opengl/shader.cpp index 906e1979438..edb10d55c80 100644 --- a/intern/cycles/app/opengl/shader.cpp +++ b/intern/cycles/app/opengl/shader.cpp @@ -149,9 +149,7 @@ void OpenGLShader::bind(int width, int height) glUniform2f(fullscreen_location_, width, height); } -void OpenGLShader::unbind() -{ -} +void OpenGLShader::unbind() {} uint OpenGLShader::get_shader_program() { diff --git a/intern/cycles/blender/curves.cpp b/intern/cycles/blender/curves.cpp index 6158ed78598..c246eeaf631 100644 --- a/intern/cycles/blender/curves.cpp +++ b/intern/cycles/blender/curves.cpp @@ -20,13 +20,9 @@ CCL_NAMESPACE_BEGIN -ParticleCurveData::ParticleCurveData() -{ -} +ParticleCurveData::ParticleCurveData() {} -ParticleCurveData::~ParticleCurveData() -{ -} +ParticleCurveData::~ParticleCurveData() {} static float shaperadius(float shape, float root, float tip, float time) { diff --git a/intern/cycles/blender/id_map.h b/intern/cycles/blender/id_map.h index 5fb17bb0d50..173d60a4b62 100644 --- a/intern/cycles/blender/id_map.h +++ b/intern/cycles/blender/id_map.h @@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN template class id_map { public: - id_map(Scene *scene_) : scene(scene_) - { - } + id_map(Scene *scene_) : scene(scene_) {} ~id_map() { @@ -262,9 +260,7 @@ struct GeometryKey { void *id; Geometry::Type geometry_type; - GeometryKey(void *id, Geometry::Type geometry_type) : id(id), geometry_type(geometry_type) - { - } + GeometryKey(void *id, Geometry::Type geometry_type) : id(id), geometry_type(geometry_type) {} bool operator<(const GeometryKey &k) const { diff --git a/intern/cycles/blender/mesh.cpp b/intern/cycles/blender/mesh.cpp index 3cd762bbf05..38911338816 100644 --- a/intern/cycles/blender/mesh.cpp +++ b/intern/cycles/blender/mesh.cpp @@ -649,9 +649,7 @@ static void attr_create_subd_uv_map(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, /* Compare vertices by sum of their coordinates. */ class VertexAverageComparator { public: - VertexAverageComparator(const array &verts) : verts_(verts) - { - } + VertexAverageComparator(const array &verts) : verts_(verts) {} bool operator()(const int &vert_idx_a, const int &vert_idx_b) { diff --git a/intern/cycles/blender/output_driver.cpp b/intern/cycles/blender/output_driver.cpp index c147da9ea40..9c48470461c 100644 --- a/intern/cycles/blender/output_driver.cpp +++ b/intern/cycles/blender/output_driver.cpp @@ -5,13 +5,9 @@ CCL_NAMESPACE_BEGIN -BlenderOutputDriver::BlenderOutputDriver(BL::RenderEngine &b_engine) : b_engine_(b_engine) -{ -} +BlenderOutputDriver::BlenderOutputDriver(BL::RenderEngine &b_engine) : b_engine_(b_engine) {} -BlenderOutputDriver::~BlenderOutputDriver() -{ -} +BlenderOutputDriver::~BlenderOutputDriver() {} bool BlenderOutputDriver::read_render_tile(const Tile &tile) { diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp index 8defad43afd..0170eb20572 100644 --- a/intern/cycles/blender/sync.cpp +++ b/intern/cycles/blender/sync.cpp @@ -67,9 +67,7 @@ BlenderSync::BlenderSync(BL::RenderEngine &b_engine, max_subdivisions = RNA_int_get(&cscene, "max_subdivisions"); } -BlenderSync::~BlenderSync() -{ -} +BlenderSync::~BlenderSync() {} void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene) { diff --git a/intern/cycles/blender/util.h b/intern/cycles/blender/util.h index 9a4b8c5cc64..7394fa5ba51 100644 --- a/intern/cycles/blender/util.h +++ b/intern/cycles/blender/util.h @@ -702,9 +702,7 @@ static inline bool object_need_motion_attribute(BObjectInfo &b_ob_info, Scene *s class EdgeMap { public: - EdgeMap() - { - } + EdgeMap() {} void clear() { diff --git a/intern/cycles/bvh/binning.cpp b/intern/cycles/bvh/binning.cpp index 5ac7f9c782a..fb00da4bdfa 100644 --- a/intern/cycles/bvh/binning.cpp +++ b/intern/cycles/bvh/binning.cpp @@ -16,18 +16,10 @@ CCL_NAMESPACE_BEGIN /* SSE replacements */ -__forceinline void prefetch_L1(const void * /*ptr*/) -{ -} -__forceinline void prefetch_L2(const void * /*ptr*/) -{ -} -__forceinline void prefetch_L3(const void * /*ptr*/) -{ -} -__forceinline void prefetch_NTA(const void * /*ptr*/) -{ -} +__forceinline void prefetch_L1(const void * /*ptr*/) {} +__forceinline void prefetch_L2(const void * /*ptr*/) {} +__forceinline void prefetch_L3(const void * /*ptr*/) {} +__forceinline void prefetch_NTA(const void * /*ptr*/) {} template __forceinline float extract(const int4 &b) { diff --git a/intern/cycles/bvh/binning.h b/intern/cycles/bvh/binning.h index 50420da391b..55966e22aee 100644 --- a/intern/cycles/bvh/binning.h +++ b/intern/cycles/bvh/binning.h @@ -23,9 +23,7 @@ class BVHBuild; class BVHObjectBinning : public BVHRange { public: - __forceinline BVHObjectBinning() : leafSAH(FLT_MAX) - { - } + __forceinline BVHObjectBinning() : leafSAH(FLT_MAX) {} BVHObjectBinning(const BVHRange &job, BVHReference *prims, diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp index 89d4ad84bb7..83c54bed664 100644 --- a/intern/cycles/bvh/build.cpp +++ b/intern/cycles/bvh/build.cpp @@ -49,9 +49,7 @@ BVHBuild::BVHBuild(const vector &objects_, spatial_min_overlap = 0.0f; } -BVHBuild::~BVHBuild() -{ -} +BVHBuild::~BVHBuild() {} /* Adding References */ diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index 19ebf7f68ba..34461ff92ff 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -70,9 +70,7 @@ class BVH { const vector &geometry, const vector &objects, Device *device); - virtual ~BVH() - { - } + virtual ~BVH() {} virtual void replace_geometry(const vector &geometry, const vector &objects) diff --git a/intern/cycles/bvh/bvh2.cpp b/intern/cycles/bvh/bvh2.cpp index cd1d51d19ec..e9556ffe5be 100644 --- a/intern/cycles/bvh/bvh2.cpp +++ b/intern/cycles/bvh/bvh2.cpp @@ -18,9 +18,7 @@ CCL_NAMESPACE_BEGIN -BVHStackEntry::BVHStackEntry(const BVHNode *n, int i) : node(n), idx(i) -{ -} +BVHStackEntry::BVHStackEntry(const BVHNode *n, int i) : node(n), idx(i) {} int BVHStackEntry::encodeIdx() const { diff --git a/intern/cycles/bvh/node.h b/intern/cycles/bvh/node.h index 29460f5a753..04989ac7aac 100644 --- a/intern/cycles/bvh/node.h +++ b/intern/cycles/bvh/node.h @@ -211,9 +211,7 @@ class LeafNode : public BVHNode { this->visibility = visibility; } - LeafNode(const LeafNode &other) : BVHNode(other), lo(other.lo), hi(other.hi) - { - } + LeafNode(const LeafNode &other) : BVHNode(other), lo(other.lo), hi(other.hi) {} bool is_leaf() const { diff --git a/intern/cycles/bvh/params.h b/intern/cycles/bvh/params.h index 8f4739de067..d4a4f67ac6c 100644 --- a/intern/cycles/bvh/params.h +++ b/intern/cycles/bvh/params.h @@ -183,9 +183,7 @@ class BVHParams { class BVHReference { public: - __forceinline BVHReference() - { - } + __forceinline BVHReference() {} __forceinline BVHReference(const BoundBox &bounds_, int prim_index_, @@ -307,9 +305,7 @@ struct BVHSpatialBin { int enter; int exit; - __forceinline BVHSpatialBin() - { - } + __forceinline BVHSpatialBin() {} }; /* BVH Spatial Storage diff --git a/intern/cycles/bvh/split.h b/intern/cycles/bvh/split.h index 9f60fa3dfa7..45fc7220e8c 100644 --- a/intern/cycles/bvh/split.h +++ b/intern/cycles/bvh/split.h @@ -26,9 +26,7 @@ class BVHObjectSplit { BoundBox left_bounds; BoundBox right_bounds; - BVHObjectSplit() - { - } + BVHObjectSplit() {} BVHObjectSplit(BVHBuild *builder, BVHSpatialStorage *storage, const BVHRange &range, @@ -64,9 +62,7 @@ class BVHSpatialSplit { int dim; float pos; - BVHSpatialSplit() : sah(FLT_MAX), dim(0), pos(0.0f), storage_(NULL), references_(NULL) - { - } + BVHSpatialSplit() : sah(FLT_MAX), dim(0), pos(0.0f), storage_(NULL), references_(NULL) {} BVHSpatialSplit(const BVHBuild &builder, BVHSpatialStorage *storage, const BVHRange &range, @@ -181,9 +177,7 @@ class BVHMixedSplit { BoundBox bounds; - BVHMixedSplit() - { - } + BVHMixedSplit() {} __forceinline BVHMixedSplit(BVHBuild *builder, BVHSpatialStorage *storage, diff --git a/intern/cycles/bvh/unaligned.cpp b/intern/cycles/bvh/unaligned.cpp index add1e885379..b793b722e02 100644 --- a/intern/cycles/bvh/unaligned.cpp +++ b/intern/cycles/bvh/unaligned.cpp @@ -14,9 +14,7 @@ CCL_NAMESPACE_BEGIN -BVHUnaligned::BVHUnaligned(const vector &objects) : objects_(objects) -{ -} +BVHUnaligned::BVHUnaligned(const vector &objects) : objects_(objects) {} Transform BVHUnaligned::compute_aligned_space(const BVHObjectBinning &range, const BVHReference *references) const diff --git a/intern/cycles/device/cpu/kernel_function.h b/intern/cycles/device/cpu/kernel_function.h index 4875f66f8a8..5f14cee10d7 100644 --- a/intern/cycles/device/cpu/kernel_function.h +++ b/intern/cycles/device/cpu/kernel_function.h @@ -40,9 +40,7 @@ template class CPUKernelFunction { * pointer. */ class KernelInfo { public: - KernelInfo() : KernelInfo("", nullptr) - { - } + KernelInfo() : KernelInfo("", nullptr) {} /* TODO(sergey): Use string view, to have higher-level functionality (i.e. comparison) without * memory allocation. */ diff --git a/intern/cycles/device/denoise.cpp b/intern/cycles/device/denoise.cpp index 8318c3bd567..17cff92e2f1 100644 --- a/intern/cycles/device/denoise.cpp +++ b/intern/cycles/device/denoise.cpp @@ -70,8 +70,6 @@ NODE_DEFINE(DenoiseParams) return type; } -DenoiseParams::DenoiseParams() : Node(get_node_type()) -{ -} +DenoiseParams::DenoiseParams() : Node(get_node_type()) {} CCL_NAMESPACE_END diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index b06a81ca5fd..0ef080a0c00 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -45,9 +45,7 @@ uint Device::devices_initialized_mask = 0; /* Device */ -Device::~Device() noexcept(false) -{ -} +Device::~Device() noexcept(false) {} void Device::build_bvh(BVH *bvh, Progress &progress, bool refit) { @@ -452,9 +450,7 @@ void *Device::get_cpu_osl_memory() return nullptr; } -GPUDevice::~GPUDevice() noexcept(false) -{ -} +GPUDevice::~GPUDevice() noexcept(false) {} bool GPUDevice::load_texture_info() { diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index b6e481f3c14..0ff946b3db9 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -178,9 +178,7 @@ class Device { } /* Request cancellation of any long-running work. */ - virtual void cancel() - { - } + virtual void cancel() {} /* Report status and return true if device is ready for rendering. */ virtual bool is_ready(string & /*status*/) const @@ -218,9 +216,7 @@ class Device { } /* Called after kernel texture setup, and prior to integrator state setup. */ - virtual void optimize_for_scene(Scene * /*scene*/) - { - } + virtual void optimize_for_scene(Scene * /*scene*/) {} virtual bool is_resident(device_ptr /*key*/, Device *sub_device) { @@ -350,9 +346,7 @@ class GPUDevice : public Device { typedef unsigned long long texMemObject; typedef unsigned long long arrayMemObject; struct Mem { - Mem() : texobject(0), array(0), use_mapped_host(false) - { - } + Mem() : texobject(0), array(0), use_mapped_host(false) {} texMemObject texobject; arrayMemObject array; diff --git a/intern/cycles/device/dummy/device.cpp b/intern/cycles/device/dummy/device.cpp index 7a2a9f64fbe..7a477e0536f 100644 --- a/intern/cycles/device/dummy/device.cpp +++ b/intern/cycles/device/dummy/device.cpp @@ -18,38 +18,24 @@ class DummyDevice : public Device { error_msg = info.error_msg; } - ~DummyDevice() - { - } + ~DummyDevice() {} virtual BVHLayoutMask get_bvh_layout_mask() const override { return 0; } - virtual void mem_alloc(device_memory &) override - { - } + virtual void mem_alloc(device_memory &) override {} - virtual void mem_copy_to(device_memory &) override - { - } + virtual void mem_copy_to(device_memory &) override {} - virtual void mem_copy_from(device_memory &, size_t, size_t, size_t, size_t) override - { - } + virtual void mem_copy_from(device_memory &, size_t, size_t, size_t, size_t) override {} - virtual void mem_zero(device_memory &) override - { - } + virtual void mem_zero(device_memory &) override {} - virtual void mem_free(device_memory &) override - { - } + virtual void mem_free(device_memory &) override {} - virtual void const_copy_to(const char *, void *, size_t) override - { - } + virtual void const_copy_to(const char *, void *, size_t) override {} }; Device *device_dummy_create(const DeviceInfo &info, Stats &stats, Profiler &profiler) diff --git a/intern/cycles/device/memory.h b/intern/cycles/device/memory.h index 57b07be408d..636d9331d91 100644 --- a/intern/cycles/device/memory.h +++ b/intern/cycles/device/memory.h @@ -305,9 +305,7 @@ template class device_only_memory : public device_memory { data_elements = max(device_type_traits::num_elements, size_t(1)); } - device_only_memory(device_only_memory &&other) noexcept : device_memory(std::move(other)) - { - } + device_only_memory(device_only_memory &&other) noexcept : device_memory(std::move(other)) {} virtual ~device_only_memory() { diff --git a/intern/cycles/device/metal/device.mm b/intern/cycles/device/metal/device.mm index b55ecf146cc..8bad96db4ce 100644 --- a/intern/cycles/device/metal/device.mm +++ b/intern/cycles/device/metal/device.mm @@ -93,9 +93,7 @@ bool device_metal_init() return false; } -void device_metal_info(vector &devices) -{ -} +void device_metal_info(vector &devices) {} string device_metal_capabilities() { diff --git a/intern/cycles/device/optix/queue.cpp b/intern/cycles/device/optix/queue.cpp index 1bfd154d449..b45bb72c22b 100644 --- a/intern/cycles/device/optix/queue.cpp +++ b/intern/cycles/device/optix/queue.cpp @@ -15,9 +15,7 @@ CCL_NAMESPACE_BEGIN /* CUDADeviceQueue */ -OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device) -{ -} +OptiXDeviceQueue::OptiXDeviceQueue(OptiXDevice *device) : CUDADeviceQueue(device) {} void OptiXDeviceQueue::init_execution() { diff --git a/intern/cycles/device/queue.h b/intern/cycles/device/queue.h index 3e73724408e..ee35a42289e 100644 --- a/intern/cycles/device/queue.h +++ b/intern/cycles/device/queue.h @@ -36,9 +36,7 @@ struct DeviceKernelArguments { size_t sizes[MAX_ARGS]; size_t count = 0; - DeviceKernelArguments() - { - } + DeviceKernelArguments() {} template DeviceKernelArguments(const T *arg) { diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp index e9bbdd6e922..a1525336dea 100644 --- a/intern/cycles/graph/node.cpp +++ b/intern/cycles/graph/node.cpp @@ -13,9 +13,7 @@ CCL_NAMESPACE_BEGIN /* Node Type */ -NodeOwner::~NodeOwner() -{ -} +NodeOwner::~NodeOwner() {} Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_) { @@ -35,9 +33,7 @@ Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_) } } -Node::~Node() -{ -} +Node::~Node() {} #ifndef NDEBUG static bool is_socket_float3(const SocketType &socket) diff --git a/intern/cycles/graph/node_type.cpp b/intern/cycles/graph/node_type.cpp index f271be69ac3..4dc0746091d 100644 --- a/intern/cycles/graph/node_type.cpp +++ b/intern/cycles/graph/node_type.cpp @@ -131,9 +131,7 @@ NodeType::NodeType(Type type, const NodeType *base) : type(type), base(base) } } -NodeType::~NodeType() -{ -} +NodeType::~NodeType() {} void NodeType::register_input(ustring name, ustring ui_name, diff --git a/intern/cycles/hydra/camera.cpp b/intern/cycles/hydra/camera.cpp index 8b76afb2e44..e469c61604a 100644 --- a/intern/cycles/hydra/camera.cpp +++ b/intern/cycles/hydra/camera.cpp @@ -51,9 +51,7 @@ HdCyclesCamera::HdCyclesCamera(const SdfPath &sprimId) : HdCamera(sprimId) #endif } -HdCyclesCamera::~HdCyclesCamera() -{ -} +HdCyclesCamera::~HdCyclesCamera() {} HdDirtyBits HdCyclesCamera::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/curves.cpp b/intern/cycles/hydra/curves.cpp index 2007a5d09ca..771ec42c725 100644 --- a/intern/cycles/hydra/curves.cpp +++ b/intern/cycles/hydra/curves.cpp @@ -25,9 +25,7 @@ HdCyclesCurves::HdCyclesCurves(const SdfPath &rprimId { } -HdCyclesCurves::~HdCyclesCurves() -{ -} +HdCyclesCurves::~HdCyclesCurves() {} HdDirtyBits HdCyclesCurves::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/display_driver.cpp b/intern/cycles/hydra/display_driver.cpp index 711542e0a3f..df624637d8c 100644 --- a/intern/cycles/hydra/display_driver.cpp +++ b/intern/cycles/hydra/display_driver.cpp @@ -112,9 +112,7 @@ void HdCyclesDisplayDriver::gl_context_dispose() #endif } -void HdCyclesDisplayDriver::next_tile_begin() -{ -} +void HdCyclesDisplayDriver::next_tile_begin() {} bool HdCyclesDisplayDriver::update_begin(const Params ¶ms, int texture_width, diff --git a/intern/cycles/hydra/field.cpp b/intern/cycles/hydra/field.cpp index e72d86c216c..a88d2657e41 100644 --- a/intern/cycles/hydra/field.cpp +++ b/intern/cycles/hydra/field.cpp @@ -37,13 +37,9 @@ class HdCyclesVolumeLoader : public VDBImageLoader { }; #endif -HdCyclesField::HdCyclesField(const SdfPath &bprimId, const TfToken &typeId) : HdField(bprimId) -{ -} +HdCyclesField::HdCyclesField(const SdfPath &bprimId, const TfToken &typeId) : HdField(bprimId) {} -HdCyclesField::~HdCyclesField() -{ -} +HdCyclesField::~HdCyclesField() {} HdDirtyBits HdCyclesField::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/file_reader.cpp b/intern/cycles/hydra/file_reader.cpp index 8925626d8c3..6d9c0e871e5 100644 --- a/intern/cycles/hydra/file_reader.cpp +++ b/intern/cycles/hydra/file_reader.cpp @@ -32,17 +32,11 @@ class DummyHdTask : public HdTask { } protected: - void Sync(HdSceneDelegate *delegate, HdTaskContext *ctx, HdDirtyBits *dirtyBits) override - { - } + void Sync(HdSceneDelegate *delegate, HdTaskContext *ctx, HdDirtyBits *dirtyBits) override {} - void Prepare(HdTaskContext *ctx, HdRenderIndex *render_index) override - { - } + void Prepare(HdTaskContext *ctx, HdRenderIndex *render_index) override {} - void Execute(HdTaskContext *ctx) override - { - } + void Execute(HdTaskContext *ctx) override {} const TfTokenVector &GetRenderTags() const override { diff --git a/intern/cycles/hydra/instancer.cpp b/intern/cycles/hydra/instancer.cpp index ade5141cd19..6b25a298a95 100644 --- a/intern/cycles/hydra/instancer.cpp +++ b/intern/cycles/hydra/instancer.cpp @@ -26,9 +26,7 @@ HdCyclesInstancer::HdCyclesInstancer(HdSceneDelegate *delegate, { } -HdCyclesInstancer::~HdCyclesInstancer() -{ -} +HdCyclesInstancer::~HdCyclesInstancer() {} #if PXR_VERSION > 2011 void HdCyclesInstancer::Sync(HdSceneDelegate *sceneDelegate, diff --git a/intern/cycles/hydra/light.cpp b/intern/cycles/hydra/light.cpp index 36ef6cdc390..a9fff581dc6 100644 --- a/intern/cycles/hydra/light.cpp +++ b/intern/cycles/hydra/light.cpp @@ -29,9 +29,7 @@ HdCyclesLight::HdCyclesLight(const SdfPath &sprimId, const TfToken &lightType) { } -HdCyclesLight::~HdCyclesLight() -{ -} +HdCyclesLight::~HdCyclesLight() {} HdDirtyBits HdCyclesLight::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/material.cpp b/intern/cycles/hydra/material.cpp index b613cee0b01..92d7d675c11 100644 --- a/intern/cycles/hydra/material.cpp +++ b/intern/cycles/hydra/material.cpp @@ -183,13 +183,9 @@ TfStaticData sUsdToCyles; } // namespace -HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId) -{ -} +HdCyclesMaterial::HdCyclesMaterial(const SdfPath &sprimId) : HdMaterial(sprimId) {} -HdCyclesMaterial::~HdCyclesMaterial() -{ -} +HdCyclesMaterial::~HdCyclesMaterial() {} HdDirtyBits HdCyclesMaterial::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/material.h b/intern/cycles/hydra/material.h index 5e08fd5c99e..0da00ebb7c5 100644 --- a/intern/cycles/hydra/material.h +++ b/intern/cycles/hydra/material.h @@ -22,9 +22,7 @@ class HdCyclesMaterial final : public PXR_NS::HdMaterial { PXR_NS::HdDirtyBits *dirtyBits) override; #if PXR_VERSION < 2011 - void Reload() override - { - } + void Reload() override {} #endif void Finalize(PXR_NS::HdRenderParam *renderParam) override; diff --git a/intern/cycles/hydra/mesh.cpp b/intern/cycles/hydra/mesh.cpp index 155843458ef..aef0d16dcc6 100644 --- a/intern/cycles/hydra/mesh.cpp +++ b/intern/cycles/hydra/mesh.cpp @@ -94,9 +94,7 @@ HdCyclesMesh::HdCyclesMesh(const SdfPath &rprimId { } -HdCyclesMesh::~HdCyclesMesh() -{ -} +HdCyclesMesh::~HdCyclesMesh() {} HdDirtyBits HdCyclesMesh::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/plugin.cpp b/intern/cycles/hydra/plugin.cpp index 2cbe232334a..fcfb12cdb7a 100644 --- a/intern/cycles/hydra/plugin.cpp +++ b/intern/cycles/hydra/plugin.cpp @@ -35,9 +35,7 @@ HdCyclesPlugin::HdCyclesPlugin() #endif } -HdCyclesPlugin::~HdCyclesPlugin() -{ -} +HdCyclesPlugin::~HdCyclesPlugin() {} bool HdCyclesPlugin::IsSupported() const { diff --git a/intern/cycles/hydra/pointcloud.cpp b/intern/cycles/hydra/pointcloud.cpp index 8d43fd8bfcd..2d274f190a2 100644 --- a/intern/cycles/hydra/pointcloud.cpp +++ b/intern/cycles/hydra/pointcloud.cpp @@ -25,9 +25,7 @@ HdCyclesPoints::HdCyclesPoints(const SdfPath &rprimId { } -HdCyclesPoints::~HdCyclesPoints() -{ -} +HdCyclesPoints::~HdCyclesPoints() {} HdDirtyBits HdCyclesPoints::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/hydra/render_buffer.cpp b/intern/cycles/hydra/render_buffer.cpp index 4d8b21d1e61..7a13502e14b 100644 --- a/intern/cycles/hydra/render_buffer.cpp +++ b/intern/cycles/hydra/render_buffer.cpp @@ -11,13 +11,9 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE -HdCyclesRenderBuffer::HdCyclesRenderBuffer(const SdfPath &bprimId) : HdRenderBuffer(bprimId) -{ -} +HdCyclesRenderBuffer::HdCyclesRenderBuffer(const SdfPath &bprimId) : HdRenderBuffer(bprimId) {} -HdCyclesRenderBuffer::~HdCyclesRenderBuffer() -{ -} +HdCyclesRenderBuffer::~HdCyclesRenderBuffer() {} void HdCyclesRenderBuffer::Finalize(HdRenderParam *renderParam) { @@ -94,9 +90,7 @@ bool HdCyclesRenderBuffer::IsMapped() const return _mapped != 0; } -void HdCyclesRenderBuffer::Resolve() -{ -} +void HdCyclesRenderBuffer::Resolve() {} bool HdCyclesRenderBuffer::IsConverged() const { diff --git a/intern/cycles/hydra/render_delegate.cpp b/intern/cycles/hydra/render_delegate.cpp index 208deaae92d..28c23e4f21b 100644 --- a/intern/cycles/hydra/render_delegate.cpp +++ b/intern/cycles/hydra/render_delegate.cpp @@ -131,9 +131,7 @@ HdCyclesDelegate::HdCyclesDelegate(const HdRenderSettingsMap &settingsMap, } } -HdCyclesDelegate::~HdCyclesDelegate() -{ -} +HdCyclesDelegate::~HdCyclesDelegate() {} void HdCyclesDelegate::SetDrivers(const HdDriverVector &drivers) { diff --git a/intern/cycles/hydra/render_pass.cpp b/intern/cycles/hydra/render_pass.cpp index 82fd6eff004..be787382158 100644 --- a/intern/cycles/hydra/render_pass.cpp +++ b/intern/cycles/hydra/render_pass.cpp @@ -176,8 +176,6 @@ void HdCyclesRenderPass::_Execute(const HdRenderPassStateSharedPtr &renderPassSt session->draw(); } -void HdCyclesRenderPass::_MarkCollectionDirty() -{ -} +void HdCyclesRenderPass::_MarkCollectionDirty() {} HDCYCLES_NAMESPACE_CLOSE_SCOPE diff --git a/intern/cycles/hydra/session.cpp b/intern/cycles/hydra/session.cpp index 91853dc1104..04f6949f3ae 100644 --- a/intern/cycles/hydra/session.cpp +++ b/intern/cycles/hydra/session.cpp @@ -32,9 +32,7 @@ SceneLock::SceneLock(const HdRenderParam *renderParam) { } -SceneLock::~SceneLock() -{ -} +SceneLock::~SceneLock() {} HdCyclesSession::HdCyclesSession(Session *session_, const bool keep_nodes) : session(session_), keep_nodes(true), _ownCyclesSession(false) diff --git a/intern/cycles/hydra/volume.cpp b/intern/cycles/hydra/volume.cpp index 7b965c613ed..f2bac15d3b5 100644 --- a/intern/cycles/hydra/volume.cpp +++ b/intern/cycles/hydra/volume.cpp @@ -30,9 +30,7 @@ HdCyclesVolume::HdCyclesVolume(const SdfPath &rprimId { } -HdCyclesVolume::~HdCyclesVolume() -{ -} +HdCyclesVolume::~HdCyclesVolume() {} HdDirtyBits HdCyclesVolume::GetInitialDirtyBitsMask() const { diff --git a/intern/cycles/integrator/adaptive_sampling.cpp b/intern/cycles/integrator/adaptive_sampling.cpp index 57cc1ca6dc6..151e550fd2f 100644 --- a/intern/cycles/integrator/adaptive_sampling.cpp +++ b/intern/cycles/integrator/adaptive_sampling.cpp @@ -7,9 +7,7 @@ CCL_NAMESPACE_BEGIN -AdaptiveSampling::AdaptiveSampling() -{ -} +AdaptiveSampling::AdaptiveSampling() {} int AdaptiveSampling::align_samples(int start_sample, int num_samples) const { diff --git a/intern/cycles/integrator/path_trace_display.cpp b/intern/cycles/integrator/path_trace_display.cpp index a2143ff4b92..79b4a1903d4 100644 --- a/intern/cycles/integrator/path_trace_display.cpp +++ b/intern/cycles/integrator/path_trace_display.cpp @@ -9,9 +9,7 @@ CCL_NAMESPACE_BEGIN -PathTraceDisplay::PathTraceDisplay(unique_ptr driver) : driver_(move(driver)) -{ -} +PathTraceDisplay::PathTraceDisplay(unique_ptr driver) : driver_(move(driver)) {} void PathTraceDisplay::reset(const BufferParams &buffer_params, const bool reset_rendering) { diff --git a/intern/cycles/integrator/path_trace_work.cpp b/intern/cycles/integrator/path_trace_work.cpp index a5f98b5475a..40f47cc822b 100644 --- a/intern/cycles/integrator/path_trace_work.cpp +++ b/intern/cycles/integrator/path_trace_work.cpp @@ -44,9 +44,7 @@ PathTraceWork::PathTraceWork(Device *device, { } -PathTraceWork::~PathTraceWork() -{ -} +PathTraceWork::~PathTraceWork() {} RenderBuffers *PathTraceWork::get_render_buffers() { diff --git a/intern/cycles/integrator/path_trace_work.h b/intern/cycles/integrator/path_trace_work.h index e31a6ef8819..79ad859be49 100644 --- a/intern/cycles/integrator/path_trace_work.h +++ b/intern/cycles/integrator/path_trace_work.h @@ -142,9 +142,7 @@ class PathTraceWork { #ifdef WITH_PATH_GUIDING /* Initializes the per-thread guiding kernel data. */ - virtual void guiding_init_kernel_globals(void *, void *, const bool) - { - } + virtual void guiding_init_kernel_globals(void *, void *, const bool) {} #endif protected: diff --git a/intern/cycles/integrator/path_trace_work_cpu.cpp b/intern/cycles/integrator/path_trace_work_cpu.cpp index 188ec28cf65..dce21c89326 100644 --- a/intern/cycles/integrator/path_trace_work_cpu.cpp +++ b/intern/cycles/integrator/path_trace_work_cpu.cpp @@ -189,9 +189,7 @@ void PathTraceWorkCPU::copy_to_display(PathTraceDisplay *display, display->unmap_texture_buffer(); } -void PathTraceWorkCPU::destroy_gpu_resources(PathTraceDisplay * /*display*/) -{ -} +void PathTraceWorkCPU::destroy_gpu_resources(PathTraceDisplay * /*display*/) {} bool PathTraceWorkCPU::copy_render_buffers_from_device() { diff --git a/intern/cycles/integrator/work_tile_scheduler.cpp b/intern/cycles/integrator/work_tile_scheduler.cpp index 4bc8c0c4396..1837cd57538 100644 --- a/intern/cycles/integrator/work_tile_scheduler.cpp +++ b/intern/cycles/integrator/work_tile_scheduler.cpp @@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN -WorkTileScheduler::WorkTileScheduler() -{ -} +WorkTileScheduler::WorkTileScheduler() {} void WorkTileScheduler::set_accelerated_rt(bool accelerated_rt) { diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h index 6721f497646..35e59c97aac 100644 --- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h +++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h @@ -43,9 +43,7 @@ ccl_device int bsdf_diffuse_ramp_setup(DiffuseRampBsdf *bsdf) return SD_BSDF | SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_diffuse_ramp_blur(ccl_private ShaderClosure *sc, float roughness) -{ -} +ccl_device void bsdf_diffuse_ramp_blur(ccl_private ShaderClosure *sc, float roughness) {} ccl_device Spectrum bsdf_diffuse_ramp_eval(ccl_private const ShaderClosure *sc, const float3 wi, diff --git a/intern/cycles/kernel/osl/services_gpu.h b/intern/cycles/kernel/osl/services_gpu.h index 2fa4299d3f9..fe027c939b0 100644 --- a/intern/cycles/kernel/osl/services_gpu.h +++ b/intern/cycles/kernel/osl/services_gpu.h @@ -256,13 +256,9 @@ ccl_device_extern ccl_private OSLClosure *osl_allocate_weighted_closure_componen #include "kernel/svm/math_util.h" #include "kernel/util/color.h" -ccl_device_extern void osl_error(ccl_private ShaderGlobals *sg, const char *format, void *args) -{ -} +ccl_device_extern void osl_error(ccl_private ShaderGlobals *sg, const char *format, void *args) {} -ccl_device_extern void osl_printf(ccl_private ShaderGlobals *sg, const char *format, void *args) -{ -} +ccl_device_extern void osl_printf(ccl_private ShaderGlobals *sg, const char *format, void *args) {} ccl_device_extern void osl_warning(ccl_private ShaderGlobals *sg, const char *format, void *args) { @@ -1456,65 +1452,35 @@ ccl_device_extern void osl_texture_set_firstchannel(ccl_private OSLTextureOption { } -ccl_device_extern void osl_texture_set_swrap_code(ccl_private OSLTextureOptions *opt, int mode) -{ -} +ccl_device_extern void osl_texture_set_swrap_code(ccl_private OSLTextureOptions *opt, int mode) {} -ccl_device_extern void osl_texture_set_twrap_code(ccl_private OSLTextureOptions *opt, int mode) -{ -} +ccl_device_extern void osl_texture_set_twrap_code(ccl_private OSLTextureOptions *opt, int mode) {} -ccl_device_extern void osl_texture_set_rwrap_code(ccl_private OSLTextureOptions *opt, int mode) -{ -} +ccl_device_extern void osl_texture_set_rwrap_code(ccl_private OSLTextureOptions *opt, int mode) {} -ccl_device_extern void osl_texture_set_stwrap_code(ccl_private OSLTextureOptions *opt, int mode) -{ -} +ccl_device_extern void osl_texture_set_stwrap_code(ccl_private OSLTextureOptions *opt, int mode) {} -ccl_device_extern void osl_texture_set_sblur(ccl_private OSLTextureOptions *opt, float blur) -{ -} +ccl_device_extern void osl_texture_set_sblur(ccl_private OSLTextureOptions *opt, float blur) {} -ccl_device_extern void osl_texture_set_tblur(ccl_private OSLTextureOptions *opt, float blur) -{ -} +ccl_device_extern void osl_texture_set_tblur(ccl_private OSLTextureOptions *opt, float blur) {} -ccl_device_extern void osl_texture_set_rblur(ccl_private OSLTextureOptions *opt, float blur) -{ -} +ccl_device_extern void osl_texture_set_rblur(ccl_private OSLTextureOptions *opt, float blur) {} -ccl_device_extern void osl_texture_set_stblur(ccl_private OSLTextureOptions *opt, float blur) -{ -} +ccl_device_extern void osl_texture_set_stblur(ccl_private OSLTextureOptions *opt, float blur) {} -ccl_device_extern void osl_texture_set_swidth(ccl_private OSLTextureOptions *opt, float width) -{ -} +ccl_device_extern void osl_texture_set_swidth(ccl_private OSLTextureOptions *opt, float width) {} -ccl_device_extern void osl_texture_set_twidth(ccl_private OSLTextureOptions *opt, float width) -{ -} +ccl_device_extern void osl_texture_set_twidth(ccl_private OSLTextureOptions *opt, float width) {} -ccl_device_extern void osl_texture_set_rwidth(ccl_private OSLTextureOptions *opt, float width) -{ -} +ccl_device_extern void osl_texture_set_rwidth(ccl_private OSLTextureOptions *opt, float width) {} -ccl_device_extern void osl_texture_set_stwidth(ccl_private OSLTextureOptions *opt, float width) -{ -} +ccl_device_extern void osl_texture_set_stwidth(ccl_private OSLTextureOptions *opt, float width) {} -ccl_device_extern void osl_texture_set_fill(ccl_private OSLTextureOptions *opt, float fill) -{ -} +ccl_device_extern void osl_texture_set_fill(ccl_private OSLTextureOptions *opt, float fill) {} -ccl_device_extern void osl_texture_set_time(ccl_private OSLTextureOptions *opt, float time) -{ -} +ccl_device_extern void osl_texture_set_time(ccl_private OSLTextureOptions *opt, float time) {} -ccl_device_extern void osl_texture_set_interp_code(ccl_private OSLTextureOptions *opt, int mode) -{ -} +ccl_device_extern void osl_texture_set_interp_code(ccl_private OSLTextureOptions *opt, int mode) {} ccl_device_extern void osl_texture_set_subimage(ccl_private OSLTextureOptions *opt, int subimage) { diff --git a/intern/cycles/kernel/osl/shaders/node_holdout.osl b/intern/cycles/kernel/osl/shaders/node_holdout.osl index d7e748ad740..6f769b99316 100644 --- a/intern/cycles/kernel/osl/shaders/node_holdout.osl +++ b/intern/cycles/kernel/osl/shaders/node_holdout.osl @@ -3,6 +3,4 @@ #include "stdcycles.h" -shader node_holdout(output closure color Holdout = holdout()) -{ -} +shader node_holdout(output closure color Holdout = holdout()) {} diff --git a/intern/cycles/scene/alembic.cpp b/intern/cycles/scene/alembic.cpp index e6f39bf8625..672216341ba 100644 --- a/intern/cycles/scene/alembic.cpp +++ b/intern/cycles/scene/alembic.cpp @@ -433,9 +433,7 @@ AlembicObject::AlembicObject() : Node(get_node_type()) schema_type = INVALID; } -AlembicObject::~AlembicObject() -{ -} +AlembicObject::~AlembicObject() {} void AlembicObject::set_object(Object *object_) { diff --git a/intern/cycles/scene/attribute.cpp b/intern/cycles/scene/attribute.cpp index 9300094ee39..5a9bec6af46 100644 --- a/intern/cycles/scene/attribute.cpp +++ b/intern/cycles/scene/attribute.cpp @@ -460,9 +460,7 @@ AttributeSet::AttributeSet(Geometry *geometry, AttributePrimitive prim) { } -AttributeSet::~AttributeSet() -{ -} +AttributeSet::~AttributeSet() {} Attribute *AttributeSet::add(ustring name, TypeDesc type, AttributeElement element) { @@ -842,13 +840,9 @@ AttributeRequest::AttributeRequest(AttributeStandard std_) /* AttributeRequestSet */ -AttributeRequestSet::AttributeRequestSet() -{ -} +AttributeRequestSet::AttributeRequestSet() {} -AttributeRequestSet::~AttributeRequestSet() -{ -} +AttributeRequestSet::~AttributeRequestSet() {} bool AttributeRequestSet::modified(const AttributeRequestSet &other) { diff --git a/intern/cycles/scene/background.cpp b/intern/cycles/scene/background.cpp index d29a4c02423..9e7696fa133 100644 --- a/intern/cycles/scene/background.cpp +++ b/intern/cycles/scene/background.cpp @@ -116,9 +116,7 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene clear_modified(); } -void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/) -{ -} +void Background::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {} void Background::tag_update(Scene *scene) { diff --git a/intern/cycles/scene/bake.cpp b/intern/cycles/scene/bake.cpp index 768e723b587..fdec5fcb4e7 100644 --- a/intern/cycles/scene/bake.cpp +++ b/intern/cycles/scene/bake.cpp @@ -19,9 +19,7 @@ BakeManager::BakeManager() use_camera_ = false; } -BakeManager::~BakeManager() -{ -} +BakeManager::~BakeManager() {} bool BakeManager::get_baking() const { @@ -85,9 +83,7 @@ void BakeManager::device_update(Device * /*device*/, need_update_ = false; } -void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/) -{ -} +void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/) {} void BakeManager::tag_update() { diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp index 6eda0b7ab55..9710a9878b3 100644 --- a/intern/cycles/scene/camera.cpp +++ b/intern/cycles/scene/camera.cpp @@ -188,9 +188,7 @@ Camera::Camera() : Node(get_node_type()) memset((void *)&kernel_camera, 0, sizeof(kernel_camera)); } -Camera::~Camera() -{ -} +Camera::~Camera() {} void Camera::compute_auto_viewplane() { diff --git a/intern/cycles/scene/film.cpp b/intern/cycles/scene/film.cpp index 67439b25868..1861dae2590 100644 --- a/intern/cycles/scene/film.cpp +++ b/intern/cycles/scene/film.cpp @@ -123,13 +123,9 @@ NODE_DEFINE(Film) return type; } -Film::Film() : Node(get_node_type()), filter_table_offset_(TABLE_OFFSET_INVALID) -{ -} +Film::Film() : Node(get_node_type()), filter_table_offset_(TABLE_OFFSET_INVALID) {} -Film::~Film() -{ -} +Film::~Film() {} void Film::add_default(Scene *scene) { diff --git a/intern/cycles/scene/geometry.cpp b/intern/cycles/scene/geometry.cpp index a9981a2e222..4bcffdc2197 100644 --- a/intern/cycles/scene/geometry.cpp +++ b/intern/cycles/scene/geometry.cpp @@ -301,9 +301,7 @@ GeometryManager::GeometryManager() need_flags_update = true; } -GeometryManager::~GeometryManager() -{ -} +GeometryManager::~GeometryManager() {} void GeometryManager::update_osl_globals(Device *device, Scene *scene) { diff --git a/intern/cycles/scene/hair.cpp b/intern/cycles/scene/hair.cpp index a1890544300..47737baeff7 100644 --- a/intern/cycles/scene/hair.cpp +++ b/intern/cycles/scene/hair.cpp @@ -313,9 +313,7 @@ Hair::Hair() : Geometry(get_node_type(), Geometry::HAIR) curve_shape = CURVE_RIBBON; } -Hair::~Hair() -{ -} +Hair::~Hair() {} void Hair::resize_curves(int numcurves, int numkeys) { diff --git a/intern/cycles/scene/image.cpp b/intern/cycles/scene/image.cpp index 925583f88b5..441ccafd83a 100644 --- a/intern/cycles/scene/image.cpp +++ b/intern/cycles/scene/image.cpp @@ -80,9 +80,7 @@ const char *name_from_type(ImageDataType type) /* Image Handle */ -ImageHandle::ImageHandle() : manager(NULL) -{ -} +ImageHandle::ImageHandle() : manager(NULL) {} ImageHandle::ImageHandle(const ImageHandle &other) : tile_slots(other.tile_slots), manager(other.manager) @@ -290,9 +288,7 @@ void ImageMetaData::detect_colorspace() /* Image Loader */ -ImageLoader::ImageLoader() -{ -} +ImageLoader::ImageLoader() {} ustring ImageLoader::osl_filepath() const { diff --git a/intern/cycles/scene/image_oiio.cpp b/intern/cycles/scene/image_oiio.cpp index a5824eeb267..536ab79ff14 100644 --- a/intern/cycles/scene/image_oiio.cpp +++ b/intern/cycles/scene/image_oiio.cpp @@ -9,13 +9,9 @@ CCL_NAMESPACE_BEGIN -OIIOImageLoader::OIIOImageLoader(const string &filepath) : filepath(filepath) -{ -} +OIIOImageLoader::OIIOImageLoader(const string &filepath) : filepath(filepath) {} -OIIOImageLoader::~OIIOImageLoader() -{ -} +OIIOImageLoader::~OIIOImageLoader() {} bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/, ImageMetaData &metadata) diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp index 059eb09fef4..df1c45eaae6 100644 --- a/intern/cycles/scene/image_vdb.cpp +++ b/intern/cycles/scene/image_vdb.cpp @@ -87,13 +87,9 @@ VDBImageLoader::VDBImageLoader(openvdb::GridBase::ConstPtr grid_, const string & } #endif -VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name) -{ -} +VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name) {} -VDBImageLoader::~VDBImageLoader() -{ -} +VDBImageLoader::~VDBImageLoader() {} bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMetaData &metadata) { diff --git a/intern/cycles/scene/integrator.cpp b/intern/cycles/scene/integrator.cpp index 8fdec524d66..27a17ffe0ac 100644 --- a/intern/cycles/scene/integrator.cpp +++ b/intern/cycles/scene/integrator.cpp @@ -139,13 +139,9 @@ NODE_DEFINE(Integrator) return type; } -Integrator::Integrator() : Node(get_node_type()) -{ -} +Integrator::Integrator() : Node(get_node_type()) {} -Integrator::~Integrator() -{ -} +Integrator::~Integrator() {} void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene) { diff --git a/intern/cycles/scene/light_tree.h b/intern/cycles/scene/light_tree.h index 5bfb9d1b4d7..0a83fe9f986 100644 --- a/intern/cycles/scene/light_tree.h +++ b/intern/cycles/scene/light_tree.h @@ -23,9 +23,7 @@ struct OrientationBounds { float theta_o; /* angle bounding the normals */ float theta_e; /* angle bounding the light emissions */ - __forceinline OrientationBounds() - { - } + __forceinline OrientationBounds() {} __forceinline OrientationBounds(const float3 &axis_, float theta_o_, float theta_e_) : axis(axis_), theta_o(theta_o_), theta_e(theta_e_) @@ -69,9 +67,7 @@ struct LightTreePrimitivesMeasure { __forceinline LightTreePrimitivesMeasure() = default; - __forceinline LightTreePrimitivesMeasure(empty_t) - { - } + __forceinline LightTreePrimitivesMeasure(empty_t) {} __forceinline LightTreePrimitivesMeasure(const BoundBox &bbox, const OrientationBounds &bcone, diff --git a/intern/cycles/scene/mesh.cpp b/intern/cycles/scene/mesh.cpp index c1942d712d9..befff8a6eba 100644 --- a/intern/cycles/scene/mesh.cpp +++ b/intern/cycles/scene/mesh.cpp @@ -192,9 +192,7 @@ Mesh::Mesh(const NodeType *node_type, Type geom_type_) patch_table = NULL; } -Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH) -{ -} +Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH) {} Mesh::~Mesh() { diff --git a/intern/cycles/scene/mesh_subdivision.cpp b/intern/cycles/scene/mesh_subdivision.cpp index 0c598cdc516..31ac22c96ba 100644 --- a/intern/cycles/scene/mesh_subdivision.cpp +++ b/intern/cycles/scene/mesh_subdivision.cpp @@ -150,9 +150,7 @@ using namespace OpenSubdiv; template struct OsdValue { T value; - OsdValue() - { - } + OsdValue() {} void Clear(void * = 0) { @@ -182,9 +180,7 @@ class OsdData { Far::PatchMap *patch_map; public: - OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL) - { - } + OsdData() : mesh(NULL), refiner(NULL), patch_table(NULL), patch_map(NULL) {} ~OsdData() { @@ -353,12 +349,8 @@ class OsdData { struct OsdPatch : Patch { OsdData *osd_data; - OsdPatch() - { - } - OsdPatch(OsdData *data) : osd_data(data) - { - } + OsdPatch() {} + OsdPatch(OsdData *data) : osd_data(data) {} void eval(float3 *P, float3 *dPdu, float3 *dPdv, float3 *N, float u, float v) { diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp index dc98389575a..36830dca87c 100644 --- a/intern/cycles/scene/object.cpp +++ b/intern/cycles/scene/object.cpp @@ -113,9 +113,7 @@ Object::Object() : Node(get_node_type()) intersects_volume = false; } -Object::~Object() -{ -} +Object::~Object() {} void Object::update_motion() { @@ -380,9 +378,7 @@ ObjectManager::ObjectManager() need_flags_update = true; } -ObjectManager::~ObjectManager() -{ -} +ObjectManager::~ObjectManager() {} static float object_volume_density(const Transform &tfm, Geometry *geom) { diff --git a/intern/cycles/scene/osl.cpp b/intern/cycles/scene/osl.cpp index 9b65b780fe4..1ee7dfadd96 100644 --- a/intern/cycles/scene/osl.cpp +++ b/intern/cycles/scene/osl.cpp @@ -1348,57 +1348,31 @@ void OSLCompiler::parameter_texture_ies(const char *name, int svm_slot) #else -void OSLCompiler::add(ShaderNode * /*node*/, const char * /*name*/, bool /*isfilepath*/) -{ -} +void OSLCompiler::add(ShaderNode * /*node*/, const char * /*name*/, bool /*isfilepath*/) {} -void OSLCompiler::parameter(ShaderNode * /*node*/, const char * /*name*/) -{ -} +void OSLCompiler::parameter(ShaderNode * /*node*/, const char * /*name*/) {} -void OSLCompiler::parameter(const char * /*name*/, float /*f*/) -{ -} +void OSLCompiler::parameter(const char * /*name*/, float /*f*/) {} -void OSLCompiler::parameter_color(const char * /*name*/, float3 /*f*/) -{ -} +void OSLCompiler::parameter_color(const char * /*name*/, float3 /*f*/) {} -void OSLCompiler::parameter_vector(const char * /*name*/, float3 /*f*/) -{ -} +void OSLCompiler::parameter_vector(const char * /*name*/, float3 /*f*/) {} -void OSLCompiler::parameter_point(const char * /*name*/, float3 /*f*/) -{ -} +void OSLCompiler::parameter_point(const char * /*name*/, float3 /*f*/) {} -void OSLCompiler::parameter_normal(const char * /*name*/, float3 /*f*/) -{ -} +void OSLCompiler::parameter_normal(const char * /*name*/, float3 /*f*/) {} -void OSLCompiler::parameter(const char * /*name*/, int /*f*/) -{ -} +void OSLCompiler::parameter(const char * /*name*/, int /*f*/) {} -void OSLCompiler::parameter(const char * /*name*/, const char * /*s*/) -{ -} +void OSLCompiler::parameter(const char * /*name*/, const char * /*s*/) {} -void OSLCompiler::parameter(const char * /*name*/, ustring /*s*/) -{ -} +void OSLCompiler::parameter(const char * /*name*/, ustring /*s*/) {} -void OSLCompiler::parameter(const char * /*name*/, const Transform & /*tfm*/) -{ -} +void OSLCompiler::parameter(const char * /*name*/, const Transform & /*tfm*/) {} -void OSLCompiler::parameter_array(const char * /*name*/, const float /*f*/[], int /*arraylen*/) -{ -} +void OSLCompiler::parameter_array(const char * /*name*/, const float /*f*/[], int /*arraylen*/) {} -void OSLCompiler::parameter_color_array(const char * /*name*/, const array & /*f*/) -{ -} +void OSLCompiler::parameter_color_array(const char * /*name*/, const array & /*f*/) {} void OSLCompiler::parameter_texture(const char * /* name */, ustring /* filename */, @@ -1406,13 +1380,9 @@ void OSLCompiler::parameter_texture(const char * /* name */, { } -void OSLCompiler::parameter_texture(const char * /* name */, const ImageHandle & /*handle*/) -{ -} +void OSLCompiler::parameter_texture(const char * /* name */, const ImageHandle & /*handle*/) {} -void OSLCompiler::parameter_texture_ies(const char * /* name */, int /* svm_slot */) -{ -} +void OSLCompiler::parameter_texture_ies(const char * /* name */, int /* svm_slot */) {} #endif /* WITH_OSL */ diff --git a/intern/cycles/scene/particles.cpp b/intern/cycles/scene/particles.cpp index b527dd0ebe8..35a7b655f26 100644 --- a/intern/cycles/scene/particles.cpp +++ b/intern/cycles/scene/particles.cpp @@ -23,13 +23,9 @@ NODE_DEFINE(ParticleSystem) return type; } -ParticleSystem::ParticleSystem() : Node(get_node_type()) -{ -} +ParticleSystem::ParticleSystem() : Node(get_node_type()) {} -ParticleSystem::~ParticleSystem() -{ -} +ParticleSystem::~ParticleSystem() {} void ParticleSystem::tag_update(Scene *scene) { @@ -43,9 +39,7 @@ ParticleSystemManager::ParticleSystemManager() need_update_ = true; } -ParticleSystemManager::~ParticleSystemManager() -{ -} +ParticleSystemManager::~ParticleSystemManager() {} void ParticleSystemManager::device_update_particles(Device *, DeviceScene *dscene, diff --git a/intern/cycles/scene/pass.cpp b/intern/cycles/scene/pass.cpp index 06923b2c757..582e59c2889 100644 --- a/intern/cycles/scene/pass.cpp +++ b/intern/cycles/scene/pass.cpp @@ -134,9 +134,7 @@ NODE_DEFINE(Pass) return type; } -Pass::Pass() : Node(get_node_type()), is_auto_(false) -{ -} +Pass::Pass() : Node(get_node_type()), is_auto_(false) {} PassInfo Pass::get_info() const { diff --git a/intern/cycles/scene/pointcloud.cpp b/intern/cycles/scene/pointcloud.cpp index 609cff11aa8..e6f702ce113 100644 --- a/intern/cycles/scene/pointcloud.cpp +++ b/intern/cycles/scene/pointcloud.cpp @@ -93,13 +93,9 @@ NODE_DEFINE(PointCloud) return type; } -PointCloud::PointCloud() : Geometry(node_type, Geometry::POINTCLOUD) -{ -} +PointCloud::PointCloud() : Geometry(node_type, Geometry::POINTCLOUD) {} -PointCloud::~PointCloud() -{ -} +PointCloud::~PointCloud() {} void PointCloud::resize(int numpoints) { diff --git a/intern/cycles/scene/procedural.cpp b/intern/cycles/scene/procedural.cpp index 2fa0148acc1..df7f69496a5 100644 --- a/intern/cycles/scene/procedural.cpp +++ b/intern/cycles/scene/procedural.cpp @@ -16,22 +16,16 @@ NODE_ABSTRACT_DEFINE(Procedural) return type; } -Procedural::Procedural(const NodeType *type) : Node(type) -{ -} +Procedural::Procedural(const NodeType *type) : Node(type) {} -Procedural::~Procedural() -{ -} +Procedural::~Procedural() {} ProceduralManager::ProceduralManager() { need_update_ = true; } -ProceduralManager::~ProceduralManager() -{ -} +ProceduralManager::~ProceduralManager() {} void ProceduralManager::update(Scene *scene, Progress &progress) { diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp index da8c5719fa2..6fb7de44547 100644 --- a/intern/cycles/scene/shader.cpp +++ b/intern/cycles/scene/shader.cpp @@ -397,9 +397,7 @@ ShaderManager::ShaderManager() init_xyz_transforms(); } -ShaderManager::~ShaderManager() -{ -} +ShaderManager::~ShaderManager() {} ShaderManager *ShaderManager::create(int shadingsystem, Device *device) { diff --git a/intern/cycles/scene/shader_graph.h b/intern/cycles/scene/shader_graph.h index fb4f8f71a29..70fd1f4af75 100644 --- a/intern/cycles/scene/shader_graph.h +++ b/intern/cycles/scene/shader_graph.h @@ -160,15 +160,11 @@ class ShaderNode : public Node { virtual void compile(OSLCompiler &compiler) = 0; /* Expand node into additional nodes. */ - virtual void expand(ShaderGraph * /* graph */) - { - } + virtual void expand(ShaderGraph * /* graph */) {} /* ** Node optimization ** */ /* Check whether the node can be replaced with single constant. */ - virtual void constant_fold(const ConstantFolder & /*folder*/) - { - } + virtual void constant_fold(const ConstantFolder & /*folder*/) {} /* Simplify settings used by artists to the ones which are simpler to * evaluate in the kernel but keep the final result unchanged. diff --git a/intern/cycles/scene/shader_nodes.cpp b/intern/cycles/scene/shader_nodes.cpp index 7d1cb4aeec1..dcaece5af97 100644 --- a/intern/cycles/scene/shader_nodes.cpp +++ b/intern/cycles/scene/shader_nodes.cpp @@ -64,9 +64,7 @@ CCL_NAMESPACE_BEGIN mapping_projection_enum.insert("sphere", TextureMapping::SPHERE); \ SOCKET_ENUM(tex_mapping.projection, "Projection", mapping_projection_enum, TextureMapping::FLAT); -TextureMapping::TextureMapping() -{ -} +TextureMapping::TextureMapping() {} Transform TextureMapping::compute_transform() { @@ -873,9 +871,7 @@ NODE_DEFINE(SkyTextureNode) return type; } -SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type()) -{ -} +SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type()) {} void SkyTextureNode::compile(SVMCompiler &compiler) { @@ -1055,9 +1051,7 @@ NODE_DEFINE(GradientTextureNode) return type; } -GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type()) -{ -} +GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type()) {} void GradientTextureNode::compile(SVMCompiler &compiler) { @@ -1112,9 +1106,7 @@ NODE_DEFINE(NoiseTextureNode) return type; } -NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type()) -{ -} +NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type()) {} void NoiseTextureNode::compile(SVMCompiler &compiler) { @@ -1205,9 +1197,7 @@ NODE_DEFINE(VoronoiTextureNode) return type; } -VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type()) -{ -} +VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type()) {} void VoronoiTextureNode::compile(SVMCompiler &compiler) { @@ -1376,9 +1366,7 @@ NODE_DEFINE(WhiteNoiseTextureNode) return type; } -WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type()) -{ -} +WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type()) {} void WhiteNoiseTextureNode::compile(SVMCompiler &compiler) { @@ -1441,9 +1429,7 @@ NODE_DEFINE(MusgraveTextureNode) return type; } -MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type()) -{ -} +MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type()) {} void MusgraveTextureNode::compile(SVMCompiler &compiler) { @@ -1539,9 +1525,7 @@ NODE_DEFINE(WaveTextureNode) return type; } -WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type()) -{ -} +WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type()) {} void WaveTextureNode::compile(SVMCompiler &compiler) { @@ -1616,9 +1600,7 @@ NODE_DEFINE(MagicTextureNode) return type; } -MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type()) -{ -} +MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type()) {} void MagicTextureNode::compile(SVMCompiler &compiler) { @@ -1669,9 +1651,7 @@ NODE_DEFINE(CheckerTextureNode) return type; } -CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type()) -{ -} +CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type()) {} void CheckerTextureNode::compile(SVMCompiler &compiler) { @@ -1735,9 +1715,7 @@ NODE_DEFINE(BrickTextureNode) return type; } -BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type()) -{ -} +BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type()) {} void BrickTextureNode::compile(SVMCompiler &compiler) { @@ -1828,13 +1806,9 @@ NODE_DEFINE(PointDensityTextureNode) return type; } -PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type()) -{ -} +PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type()) {} -PointDensityTextureNode::~PointDensityTextureNode() -{ -} +PointDensityTextureNode::~PointDensityTextureNode() {} ShaderNode *PointDensityTextureNode::clone(ShaderGraph *graph) const { @@ -1945,9 +1919,7 @@ NODE_DEFINE(NormalNode) return type; } -NormalNode::NormalNode() : ShaderNode(get_node_type()) -{ -} +NormalNode::NormalNode() : ShaderNode(get_node_type()) {} void NormalNode::compile(SVMCompiler &compiler) { @@ -1992,9 +1964,7 @@ NODE_DEFINE(MappingNode) return type; } -MappingNode::MappingNode() : ShaderNode(get_node_type()) -{ -} +MappingNode::MappingNode() : ShaderNode(get_node_type()) {} void MappingNode::constant_fold(const ConstantFolder &folder) { @@ -2047,9 +2017,7 @@ NODE_DEFINE(RGBToBWNode) return type; } -RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type()) -{ -} +RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type()) {} void RGBToBWNode::constant_fold(const ConstantFolder &folder) { @@ -2295,9 +2263,7 @@ bool BsdfBaseNode::has_bump() /* BSDF Closure */ -BsdfNode::BsdfNode(const NodeType *node_type) : BsdfBaseNode(node_type) -{ -} +BsdfNode::BsdfNode(const NodeType *node_type) : BsdfBaseNode(node_type) {} void BsdfNode::compile(SVMCompiler &compiler, ShaderInput *param1, @@ -3176,9 +3142,7 @@ NODE_DEFINE(EmissionNode) return type; } -EmissionNode::EmissionNode() : ShaderNode(get_node_type()) -{ -} +EmissionNode::EmissionNode() : ShaderNode(get_node_type()) {} void EmissionNode::compile(SVMCompiler &compiler) { @@ -3225,9 +3189,7 @@ NODE_DEFINE(BackgroundNode) return type; } -BackgroundNode::BackgroundNode() : ShaderNode(get_node_type()) -{ -} +BackgroundNode::BackgroundNode() : ShaderNode(get_node_type()) {} void BackgroundNode::compile(SVMCompiler &compiler) { @@ -3273,9 +3235,7 @@ NODE_DEFINE(HoldoutNode) return type; } -HoldoutNode::HoldoutNode() : ShaderNode(get_node_type()) -{ -} +HoldoutNode::HoldoutNode() : ShaderNode(get_node_type()) {} void HoldoutNode::compile(SVMCompiler &compiler) { @@ -3311,9 +3271,7 @@ NODE_DEFINE(AmbientOcclusionNode) return type; } -AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type()) -{ -} +AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type()) {} void AmbientOcclusionNode::compile(SVMCompiler &compiler) { @@ -3883,9 +3841,7 @@ NODE_DEFINE(TextureCoordinateNode) return type; } -TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type()) -{ -} +TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type()) {} void TextureCoordinateNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4030,9 +3986,7 @@ NODE_DEFINE(UVMapNode) return type; } -UVMapNode::UVMapNode() : ShaderNode(get_node_type()) -{ -} +UVMapNode::UVMapNode() : ShaderNode(get_node_type()) {} void UVMapNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4119,9 +4073,7 @@ NODE_DEFINE(LightPathNode) return type; } -LightPathNode::LightPathNode() : ShaderNode(get_node_type()) -{ -} +LightPathNode::LightPathNode() : ShaderNode(get_node_type()) {} void LightPathNode::compile(SVMCompiler &compiler) { @@ -4219,9 +4171,7 @@ NODE_DEFINE(LightFalloffNode) return type; } -LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type()) -{ -} +LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type()) {} void LightFalloffNode::compile(SVMCompiler &compiler) { @@ -4277,9 +4227,7 @@ NODE_DEFINE(ObjectInfoNode) return type; } -ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type()) -{ -} +ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type()) {} void ObjectInfoNode::compile(SVMCompiler &compiler) { @@ -4340,9 +4288,7 @@ NODE_DEFINE(ParticleInfoNode) return type; } -ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type()) -{ -} +ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type()) {} void ParticleInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4445,9 +4391,7 @@ NODE_DEFINE(HairInfoNode) return type; } -HairInfoNode::HairInfoNode() : ShaderNode(get_node_type()) -{ -} +HairInfoNode::HairInfoNode() : ShaderNode(get_node_type()) {} void HairInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4523,9 +4467,7 @@ NODE_DEFINE(PointInfoNode) return type; } -PointInfoNode::PointInfoNode() : ShaderNode(get_node_type()) -{ -} +PointInfoNode::PointInfoNode() : ShaderNode(get_node_type()) {} void PointInfoNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4577,9 +4519,7 @@ NODE_DEFINE(VolumeInfoNode) return type; } -VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type()) -{ -} +VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type()) {} /* The requested attributes are not updated after node expansion. * So we explicitly request the required attributes. @@ -4639,13 +4579,9 @@ void VolumeInfoNode::expand(ShaderGraph *graph) } } -void VolumeInfoNode::compile(SVMCompiler &) -{ -} +void VolumeInfoNode::compile(SVMCompiler &) {} -void VolumeInfoNode::compile(OSLCompiler &) -{ -} +void VolumeInfoNode::compile(OSLCompiler &) {} NODE_DEFINE(VertexColorNode) { @@ -4658,9 +4594,7 @@ NODE_DEFINE(VertexColorNode) return type; } -VertexColorNode::VertexColorNode() : ShaderNode(get_node_type()) -{ -} +VertexColorNode::VertexColorNode() : ShaderNode(get_node_type()) {} void VertexColorNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -4739,9 +4673,7 @@ NODE_DEFINE(ValueNode) return type; } -ValueNode::ValueNode() : ShaderNode(get_node_type()) -{ -} +ValueNode::ValueNode() : ShaderNode(get_node_type()) {} void ValueNode::constant_fold(const ConstantFolder &folder) { @@ -4773,9 +4705,7 @@ NODE_DEFINE(ColorNode) return type; } -ColorNode::ColorNode() : ShaderNode(get_node_type()) -{ -} +ColorNode::ColorNode() : ShaderNode(get_node_type()) {} void ColorNode::constant_fold(const ConstantFolder &folder) { @@ -4910,9 +4840,7 @@ NODE_DEFINE(MixClosureWeightNode) return type; } -MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type()) -{ -} +MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type()) {} void MixClosureWeightNode::compile(SVMCompiler &compiler) { @@ -4947,9 +4875,7 @@ NODE_DEFINE(InvertNode) return type; } -InvertNode::InvertNode() : ShaderNode(get_node_type()) -{ -} +InvertNode::InvertNode() : ShaderNode(get_node_type()) {} void InvertNode::constant_fold(const ConstantFolder &folder) { @@ -5024,9 +4950,7 @@ NODE_DEFINE(MixNode) return type; } -MixNode::MixNode() : ShaderNode(get_node_type()) -{ -} +MixNode::MixNode() : ShaderNode(get_node_type()) {} void MixNode::compile(SVMCompiler &compiler) { @@ -5103,9 +5027,7 @@ NODE_DEFINE(MixColorNode) return type; } -MixColorNode::MixColorNode() : ShaderNode(get_node_type()) -{ -} +MixColorNode::MixColorNode() : ShaderNode(get_node_type()) {} void MixColorNode::compile(SVMCompiler &compiler) { @@ -5161,9 +5083,7 @@ NODE_DEFINE(MixFloatNode) return type; } -MixFloatNode::MixFloatNode() : ShaderNode(get_node_type()) -{ -} +MixFloatNode::MixFloatNode() : ShaderNode(get_node_type()) {} void MixFloatNode::compile(SVMCompiler &compiler) { @@ -5218,9 +5138,7 @@ NODE_DEFINE(MixVectorNode) return type; } -MixVectorNode::MixVectorNode() : ShaderNode(get_node_type()) -{ -} +MixVectorNode::MixVectorNode() : ShaderNode(get_node_type()) {} void MixVectorNode::compile(SVMCompiler &compiler) { @@ -5274,9 +5192,7 @@ NODE_DEFINE(MixVectorNonUniformNode) return type; } -MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type()) -{ -} +MixVectorNonUniformNode::MixVectorNonUniformNode() : ShaderNode(get_node_type()) {} void MixVectorNonUniformNode::compile(SVMCompiler &compiler) { @@ -5332,9 +5248,7 @@ NODE_DEFINE(CombineColorNode) return type; } -CombineColorNode::CombineColorNode() : ShaderNode(get_node_type()) -{ -} +CombineColorNode::CombineColorNode() : ShaderNode(get_node_type()) {} void CombineColorNode::constant_fold(const ConstantFolder &folder) { @@ -5383,9 +5297,7 @@ NODE_DEFINE(CombineRGBNode) return type; } -CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type()) -{ -} +CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type()) {} void CombineRGBNode::constant_fold(const ConstantFolder &folder) { @@ -5431,9 +5343,7 @@ NODE_DEFINE(CombineXYZNode) return type; } -CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type()) -{ -} +CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type()) {} void CombineXYZNode::constant_fold(const ConstantFolder &folder) { @@ -5479,9 +5389,7 @@ NODE_DEFINE(CombineHSVNode) return type; } -CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type()) -{ -} +CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type()) {} void CombineHSVNode::constant_fold(const ConstantFolder &folder) { @@ -5522,9 +5430,7 @@ NODE_DEFINE(GammaNode) return type; } -GammaNode::GammaNode() : ShaderNode(get_node_type()) -{ -} +GammaNode::GammaNode() : ShaderNode(get_node_type()) {} void GammaNode::constant_fold(const ConstantFolder &folder) { @@ -5578,9 +5484,7 @@ NODE_DEFINE(BrightContrastNode) return type; } -BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type()) -{ -} +BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type()) {} void BrightContrastNode::constant_fold(const ConstantFolder &folder) { @@ -5629,9 +5533,7 @@ NODE_DEFINE(SeparateColorNode) return type; } -SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type()) -{ -} +SeparateColorNode::SeparateColorNode() : ShaderNode(get_node_type()) {} void SeparateColorNode::constant_fold(const ConstantFolder &folder) { @@ -5687,9 +5589,7 @@ NODE_DEFINE(SeparateRGBNode) return type; } -SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type()) -{ -} +SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type()) {} void SeparateRGBNode::constant_fold(const ConstantFolder &folder) { @@ -5740,9 +5640,7 @@ NODE_DEFINE(SeparateXYZNode) return type; } -SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type()) -{ -} +SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type()) {} void SeparateXYZNode::constant_fold(const ConstantFolder &folder) { @@ -5793,9 +5691,7 @@ NODE_DEFINE(SeparateHSVNode) return type; } -SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type()) -{ -} +SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type()) {} void SeparateHSVNode::constant_fold(const ConstantFolder &folder) { @@ -5847,9 +5743,7 @@ NODE_DEFINE(HSVNode) return type; } -HSVNode::HSVNode() : ShaderNode(get_node_type()) -{ -} +HSVNode::HSVNode() : ShaderNode(get_node_type()) {} void HSVNode::compile(SVMCompiler &compiler) { @@ -5890,9 +5784,7 @@ NODE_DEFINE(AttributeNode) return type; } -AttributeNode::AttributeNode() : ShaderNode(get_node_type()) -{ -} +AttributeNode::AttributeNode() : ShaderNode(get_node_type()) {} void AttributeNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -5978,9 +5870,7 @@ NODE_DEFINE(CameraNode) return type; } -CameraNode::CameraNode() : ShaderNode(get_node_type()) -{ -} +CameraNode::CameraNode() : ShaderNode(get_node_type()) {} void CameraNode::compile(SVMCompiler &compiler) { @@ -6014,9 +5904,7 @@ NODE_DEFINE(FresnelNode) return type; } -FresnelNode::FresnelNode() : ShaderNode(get_node_type()) -{ -} +FresnelNode::FresnelNode() : ShaderNode(get_node_type()) {} void FresnelNode::compile(SVMCompiler &compiler) { @@ -6052,9 +5940,7 @@ NODE_DEFINE(LayerWeightNode) return type; } -LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type()) -{ -} +LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type()) {} void LayerWeightNode::compile(SVMCompiler &compiler) { @@ -6100,9 +5986,7 @@ NODE_DEFINE(WireframeNode) return type; } -WireframeNode::WireframeNode() : ShaderNode(get_node_type()) -{ -} +WireframeNode::WireframeNode() : ShaderNode(get_node_type()) {} void WireframeNode::compile(SVMCompiler &compiler) { @@ -6148,9 +6032,7 @@ NODE_DEFINE(WavelengthNode) return type; } -WavelengthNode::WavelengthNode() : ShaderNode(get_node_type()) -{ -} +WavelengthNode::WavelengthNode() : ShaderNode(get_node_type()) {} void WavelengthNode::compile(SVMCompiler &compiler) { @@ -6178,9 +6060,7 @@ NODE_DEFINE(BlackbodyNode) return type; } -BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type()) -{ -} +BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type()) {} void BlackbodyNode::constant_fold(const ConstantFolder &folder) { @@ -6271,9 +6151,7 @@ NODE_DEFINE(MapRangeNode) return type; } -MapRangeNode::MapRangeNode() : ShaderNode(get_node_type()) -{ -} +MapRangeNode::MapRangeNode() : ShaderNode(get_node_type()) {} void MapRangeNode::expand(ShaderGraph *graph) { @@ -6365,13 +6243,9 @@ NODE_DEFINE(VectorMapRangeNode) return type; } -VectorMapRangeNode::VectorMapRangeNode() : ShaderNode(get_node_type()) -{ -} +VectorMapRangeNode::VectorMapRangeNode() : ShaderNode(get_node_type()) {} -void VectorMapRangeNode::expand(ShaderGraph * /*graph*/) -{ -} +void VectorMapRangeNode::expand(ShaderGraph * /*graph*/) {} void VectorMapRangeNode::compile(SVMCompiler &compiler) { @@ -6426,9 +6300,7 @@ NODE_DEFINE(ClampNode) return type; } -ClampNode::ClampNode() : ShaderNode(get_node_type()) -{ -} +ClampNode::ClampNode() : ShaderNode(get_node_type()) {} void ClampNode::constant_fold(const ConstantFolder &folder) { @@ -6579,9 +6451,7 @@ NODE_DEFINE(MathNode) return type; } -MathNode::MathNode() : ShaderNode(get_node_type()) -{ -} +MathNode::MathNode() : ShaderNode(get_node_type()) {} void MathNode::expand(ShaderGraph *graph) { @@ -6686,9 +6556,7 @@ NODE_DEFINE(VectorMathNode) return type; } -VectorMathNode::VectorMathNode() : ShaderNode(get_node_type()) -{ -} +VectorMathNode::VectorMathNode() : ShaderNode(get_node_type()) {} void VectorMathNode::constant_fold(const ConstantFolder &folder) { @@ -6776,9 +6644,7 @@ NODE_DEFINE(VectorRotateNode) return type; } -VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type()) -{ -} +VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type()) {} void VectorRotateNode::compile(SVMCompiler &compiler) { @@ -6832,9 +6698,7 @@ NODE_DEFINE(VectorTransformNode) return type; } -VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type()) -{ -} +VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type()) {} void VectorTransformNode::compile(SVMCompiler &compiler) { @@ -6936,9 +6800,7 @@ void BumpNode::constant_fold(const ConstantFolder &folder) /* Curves node */ -CurvesNode::CurvesNode(const NodeType *node_type) : ShaderNode(node_type) -{ -} +CurvesNode::CurvesNode(const NodeType *node_type) : ShaderNode(node_type) {} void CurvesNode::constant_fold(const ConstantFolder &folder, ShaderInput *value_in) { @@ -7030,9 +6892,7 @@ NODE_DEFINE(RGBCurvesNode) return type; } -RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type()) -{ -} +RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type()) {} void RGBCurvesNode::constant_fold(const ConstantFolder &folder) { @@ -7068,9 +6928,7 @@ NODE_DEFINE(VectorCurvesNode) return type; } -VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type()) -{ -} +VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type()) {} void VectorCurvesNode::constant_fold(const ConstantFolder &folder) { @@ -7106,9 +6964,7 @@ NODE_DEFINE(FloatCurveNode) return type; } -FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type()) -{ -} +FloatCurveNode::FloatCurveNode() : ShaderNode(get_node_type()) {} void FloatCurveNode::constant_fold(const ConstantFolder &folder) { @@ -7185,9 +7041,7 @@ NODE_DEFINE(RGBRampNode) return type; } -RGBRampNode::RGBRampNode() : ShaderNode(get_node_type()) -{ -} +RGBRampNode::RGBRampNode() : ShaderNode(get_node_type()) {} void RGBRampNode::constant_fold(const ConstantFolder &folder) { @@ -7258,9 +7112,7 @@ NODE_DEFINE(SetNormalNode) return type; } -SetNormalNode::SetNormalNode() : ShaderNode(get_node_type()) -{ -} +SetNormalNode::SetNormalNode() : ShaderNode(get_node_type()) {} void SetNormalNode::compile(SVMCompiler &compiler) { @@ -7379,9 +7231,7 @@ NODE_DEFINE(NormalMapNode) return type; } -NormalMapNode::NormalMapNode() : ShaderNode(get_node_type()) -{ -} +NormalMapNode::NormalMapNode() : ShaderNode(get_node_type()) {} void NormalMapNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -7469,9 +7319,7 @@ NODE_DEFINE(TangentNode) return type; } -TangentNode::TangentNode() : ShaderNode(get_node_type()) -{ -} +TangentNode::TangentNode() : ShaderNode(get_node_type()) {} void TangentNode::attributes(Shader *shader, AttributeRequestSet *attributes) { @@ -7539,9 +7387,7 @@ NODE_DEFINE(BevelNode) return type; } -BevelNode::BevelNode() : ShaderNode(get_node_type()) -{ -} +BevelNode::BevelNode() : ShaderNode(get_node_type()) {} void BevelNode::compile(SVMCompiler &compiler) { @@ -7584,9 +7430,7 @@ NODE_DEFINE(DisplacementNode) return type; } -DisplacementNode::DisplacementNode() : ShaderNode(get_node_type()) -{ -} +DisplacementNode::DisplacementNode() : ShaderNode(get_node_type()) {} void DisplacementNode::constant_fold(const ConstantFolder &folder) { @@ -7643,9 +7487,7 @@ NODE_DEFINE(VectorDisplacementNode) return type; } -VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type()) -{ -} +VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type()) {} void VectorDisplacementNode::constant_fold(const ConstantFolder &folder) { diff --git a/intern/cycles/scene/shader_nodes.h b/intern/cycles/scene/shader_nodes.h index 0c36d17107c..e52b4bebdd6 100644 --- a/intern/cycles/scene/shader_nodes.h +++ b/intern/cycles/scene/shader_nodes.h @@ -53,9 +53,7 @@ class TextureMapping { class TextureNode : public ShaderNode { public: - explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type) - { - } + explicit TextureNode(const NodeType *node_type) : ShaderNode(node_type) {} TextureMapping tex_mapping; NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, translation) NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, rotation) diff --git a/intern/cycles/scene/stats.cpp b/intern/cycles/scene/stats.cpp index 65174027489..6970934952e 100644 --- a/intern/cycles/scene/stats.cpp +++ b/intern/cycles/scene/stats.cpp @@ -40,27 +40,17 @@ bool namedSampleCountPairComparator(const NamedSampleCountPair &a, const NamedSa } // namespace -NamedSizeEntry::NamedSizeEntry() : name(""), size(0) -{ -} +NamedSizeEntry::NamedSizeEntry() : name(""), size(0) {} -NamedSizeEntry::NamedSizeEntry(const string &name, size_t size) : name(name), size(size) -{ -} +NamedSizeEntry::NamedSizeEntry(const string &name, size_t size) : name(name), size(size) {} -NamedTimeEntry::NamedTimeEntry() : name(""), time(0) -{ -} +NamedTimeEntry::NamedTimeEntry() : name(""), time(0) {} -NamedTimeEntry::NamedTimeEntry(const string &name, double time) : name(name), time(time) -{ -} +NamedTimeEntry::NamedTimeEntry(const string &name, double time) : name(name), time(time) {} /* Named size statistics. */ -NamedSizeStats::NamedSizeStats() : total_size(0) -{ -} +NamedSizeStats::NamedSizeStats() : total_size(0) {} void NamedSizeStats::add_entry(const NamedSizeEntry &entry) { @@ -104,9 +94,7 @@ string NamedTimeStats::full_report(int indent_level) /* Named time sample statistics. */ -NamedNestedSampleStats::NamedNestedSampleStats() : name(""), self_samples(0), sum_samples(0) -{ -} +NamedNestedSampleStats::NamedNestedSampleStats() : name(""), self_samples(0), sum_samples(0) {} NamedNestedSampleStats::NamedNestedSampleStats(const string &name, uint64_t samples) : name(name), self_samples(samples), sum_samples(samples) @@ -164,9 +152,7 @@ NamedSampleCountPair::NamedSampleCountPair(const ustring &name, uint64_t samples { } -NamedSampleCountStats::NamedSampleCountStats() -{ -} +NamedSampleCountStats::NamedSampleCountStats() {} void NamedSampleCountStats::add(const ustring &name, uint64_t samples, uint64_t hits) { @@ -213,9 +199,7 @@ string NamedSampleCountStats::full_report(int indent_level) /* Mesh statistics. */ -MeshStats::MeshStats() -{ -} +MeshStats::MeshStats() {} string MeshStats::full_report(int indent_level) { @@ -227,9 +211,7 @@ string MeshStats::full_report(int indent_level) /* Image statistics. */ -ImageStats::ImageStats() -{ -} +ImageStats::ImageStats() {} string ImageStats::full_report(int indent_level) { @@ -313,18 +295,14 @@ string RenderStats::full_report() return result; } -NamedTimeStats::NamedTimeStats() : total_time(0.0) -{ -} +NamedTimeStats::NamedTimeStats() : total_time(0.0) {} string UpdateTimeStats::full_report(int indent_level) { return times.full_report(indent_level + 1); } -SceneUpdateStats::SceneUpdateStats() -{ -} +SceneUpdateStats::SceneUpdateStats() {} string SceneUpdateStats::full_report() { diff --git a/intern/cycles/scene/svm.cpp b/intern/cycles/scene/svm.cpp index 0a71ed962b0..7b2f267b609 100644 --- a/intern/cycles/scene/svm.cpp +++ b/intern/cycles/scene/svm.cpp @@ -22,17 +22,11 @@ CCL_NAMESPACE_BEGIN /* Shader Manager */ -SVMShaderManager::SVMShaderManager() -{ -} +SVMShaderManager::SVMShaderManager() {} -SVMShaderManager::~SVMShaderManager() -{ -} +SVMShaderManager::~SVMShaderManager() {} -void SVMShaderManager::reset(Scene * /*scene*/) -{ -} +void SVMShaderManager::reset(Scene * /*scene*/) {} void SVMShaderManager::device_update_shader(Scene *scene, Shader *shader, diff --git a/intern/cycles/session/buffers.cpp b/intern/cycles/session/buffers.cpp index e060e0c6829..c447952754a 100644 --- a/intern/cycles/session/buffers.cpp +++ b/intern/cycles/session/buffers.cpp @@ -56,9 +56,7 @@ NODE_DEFINE(BufferPass) return type; } -BufferPass::BufferPass() : Node(get_node_type()) -{ -} +BufferPass::BufferPass() : Node(get_node_type()) {} BufferPass::BufferPass(const Pass *scene_pass) : Node(get_node_type()), @@ -262,9 +260,7 @@ bool BufferParams::modified(const BufferParams &other) const * Render Buffers. */ -RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE) -{ -} +RenderBuffers::RenderBuffers(Device *device) : buffer(device, "RenderBuffers", MEM_READ_WRITE) {} RenderBuffers::~RenderBuffers() { diff --git a/intern/cycles/session/merge.cpp b/intern/cycles/session/merge.cpp index e8e1dd62b4a..d9d189ebd2b 100644 --- a/intern/cycles/session/merge.cpp +++ b/intern/cycles/session/merge.cpp @@ -563,9 +563,7 @@ static void read_layer_samples(vector &images, } /* Image Merger */ -ImageMerger::ImageMerger() -{ -} +ImageMerger::ImageMerger() {} bool ImageMerger::run() { diff --git a/intern/cycles/session/tile.cpp b/intern/cycles/session/tile.cpp index 371ca4728d4..b21015f5462 100644 --- a/intern/cycles/session/tile.cpp +++ b/intern/cycles/session/tile.cpp @@ -319,9 +319,7 @@ TileManager::TileManager() to_string(tile_manager_id); } -TileManager::~TileManager() -{ -} +TileManager::~TileManager() {} int TileManager::compute_render_tile_size(const int suggested_tile_size) const { diff --git a/intern/cycles/session/tile.h b/intern/cycles/session/tile.h index 381fd31e37e..1f54b6e6ab5 100644 --- a/intern/cycles/session/tile.h +++ b/intern/cycles/session/tile.h @@ -25,9 +25,7 @@ class Tile { int window_x = 0, window_y = 0; int window_width = 0, window_height = 0; - Tile() - { - } + Tile() {} }; /* -------------------------------------------------------------------- diff --git a/intern/cycles/subd/dice.cpp b/intern/cycles/subd/dice.cpp index 79df93032cf..0a264683c8f 100644 --- a/intern/cycles/subd/dice.cpp +++ b/intern/cycles/subd/dice.cpp @@ -115,9 +115,7 @@ void EdgeDice::stitch_triangles(Subpatch &sub, int edge) /* QuadDice */ -QuadDice::QuadDice(const SubdParams ¶ms_) : EdgeDice(params_) -{ -} +QuadDice::QuadDice(const SubdParams ¶ms_) : EdgeDice(params_) {} float2 QuadDice::map_uv(Subpatch &sub, float u, float v) { diff --git a/intern/cycles/subd/patch.h b/intern/cycles/subd/patch.h index fad1f18d0b9..84950665b1a 100644 --- a/intern/cycles/subd/patch.h +++ b/intern/cycles/subd/patch.h @@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN class Patch { public: - Patch() : patch_index(0), shader(0), from_ngon(false) - { - } + Patch() : patch_index(0), shader(0), from_ngon(false) {} virtual ~Patch() = default; diff --git a/intern/cycles/subd/split.cpp b/intern/cycles/subd/split.cpp index 2c76205d4ff..a9a5b4c990b 100644 --- a/intern/cycles/subd/split.cpp +++ b/intern/cycles/subd/split.cpp @@ -22,9 +22,7 @@ CCL_NAMESPACE_BEGIN #define STITCH_NGON_CENTER_VERT_INDEX_OFFSET 0x60000000 #define STITCH_NGON_SPLIT_EDGE_CENTER_VERT_TAG (0x60000000 - 1) -DiagSplit::DiagSplit(const SubdParams ¶ms_) : params(params_) -{ -} +DiagSplit::DiagSplit(const SubdParams ¶ms_) : params(params_) {} float3 DiagSplit::to_world(Patch *patch, float2 uv) { diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index 66d5f0afbab..ced55d152ae 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -160,9 +160,7 @@ class RenderGraph : public testing::Test { ShaderGraph graph; ShaderGraphBuilder builder; - RenderGraph() : testing::Test(), builder(&graph) - { - } + RenderGraph() : testing::Test(), builder(&graph) {} virtual void SetUp() { diff --git a/intern/cycles/test/util_task_test.cpp b/intern/cycles/test/util_task_test.cpp index fe4e09f3b98..aaf14f69db7 100644 --- a/intern/cycles/test/util_task_test.cpp +++ b/intern/cycles/test/util_task_test.cpp @@ -9,9 +9,7 @@ CCL_NAMESPACE_BEGIN namespace { -void task_run() -{ -} +void task_run() {} } // namespace diff --git a/intern/cycles/util/array.h b/intern/cycles/util/array.h index 335ec42e159..c6bc7e5ebb9 100644 --- a/intern/cycles/util/array.h +++ b/intern/cycles/util/array.h @@ -23,9 +23,7 @@ CCL_NAMESPACE_BEGIN template class array { public: - array() : data_(NULL), datasize_(0), capacity_(0) - { - } + array() : data_(NULL), datasize_(0), capacity_(0) {} explicit array(size_t newsize) { diff --git a/intern/cycles/util/boundbox.h b/intern/cycles/util/boundbox.h index afddb24d5ac..914effe2e8b 100644 --- a/intern/cycles/util/boundbox.h +++ b/intern/cycles/util/boundbox.h @@ -20,17 +20,11 @@ class BoundBox { public: float3 min, max; - __forceinline BoundBox() - { - } + __forceinline BoundBox() {} - __forceinline BoundBox(const float3 &pt) : min(pt), max(pt) - { - } + __forceinline BoundBox(const float3 &pt) : min(pt), max(pt) {} - __forceinline BoundBox(const float3 &min_, const float3 &max_) : min(min_), max(max_) - { - } + __forceinline BoundBox(const float3 &min_, const float3 &max_) : min(min_), max(max_) {} enum empty_t { empty = 0 }; @@ -199,9 +193,7 @@ class BoundBox2D { float bottom; float top; - BoundBox2D() : left(0.0f), right(1.0f), bottom(0.0f), top(1.0f) - { - } + BoundBox2D() : left(0.0f), right(1.0f), bottom(0.0f), top(1.0f) {} bool operator==(const BoundBox2D &other) const { diff --git a/intern/cycles/util/guarded_allocator.h b/intern/cycles/util/guarded_allocator.h index d2330dc6d83..68bbecb5424 100644 --- a/intern/cycles/util/guarded_allocator.h +++ b/intern/cycles/util/guarded_allocator.h @@ -29,12 +29,8 @@ template class GuardedAllocator { typedef const T &const_reference; typedef T value_type; - GuardedAllocator() - { - } - GuardedAllocator(const GuardedAllocator &) - { - } + GuardedAllocator() {} + GuardedAllocator(const GuardedAllocator &) {} T *allocate(size_t n, const void *hint = 0) { @@ -97,9 +93,7 @@ template class GuardedAllocator { typedef GuardedAllocator other; }; - template GuardedAllocator(const GuardedAllocator &) - { - } + template GuardedAllocator(const GuardedAllocator &) {} template GuardedAllocator &operator=(const GuardedAllocator &) { diff --git a/intern/cycles/util/half.h b/intern/cycles/util/half.h index 5665dd4c075..48c15872e31 100644 --- a/intern/cycles/util/half.h +++ b/intern/cycles/util/half.h @@ -40,12 +40,8 @@ ccl_device_inline float half_to_float(half h_in) * unsigned shorts. */ class half { public: - half() : v(0) - { - } - half(const unsigned short &i) : v(i) - { - } + half() : v(0) {} + half(const unsigned short &i) : v(i) {} operator unsigned short() { return v; diff --git a/intern/cycles/util/ies.h b/intern/cycles/util/ies.h index cb414c77faf..c47afa2d772 100644 --- a/intern/cycles/util/ies.h +++ b/intern/cycles/util/ies.h @@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN class IESFile { public: - IESFile() - { - } + IESFile() {} ~IESFile(); int packed_size(); diff --git a/intern/cycles/util/log.h b/intern/cycles/util/log.h index 3780d03c0d1..7e87b54a788 100644 --- a/intern/cycles/util/log.h +++ b/intern/cycles/util/log.h @@ -24,12 +24,8 @@ class StubStream { class LogMessageVoidify { public: - LogMessageVoidify() - { - } - void operator&(const StubStream &) - { - } + LogMessageVoidify() {} + void operator&(const StubStream &) {} }; # define LOG_SUPPRESS() (true) ? ((void)0) : LogMessageVoidify() & StubStream() diff --git a/intern/cycles/util/md5.cpp b/intern/cycles/util/md5.cpp index 3342d7a509a..62a9e62652d 100644 --- a/intern/cycles/util/md5.cpp +++ b/intern/cycles/util/md5.cpp @@ -249,9 +249,7 @@ MD5Hash::MD5Hash() abcd[3] = 0x10325476; } -MD5Hash::~MD5Hash() -{ -} +MD5Hash::~MD5Hash() {} void MD5Hash::append(const uint8_t *data, int nbytes) { diff --git a/intern/cycles/util/path.cpp b/intern/cycles/util/path.cpp index cb6b8d7a740..d822ff83327 100644 --- a/intern/cycles/util/path.cpp +++ b/intern/cycles/util/path.cpp @@ -80,9 +80,7 @@ class directory_iterator { const WIN32_FIND_DATAW &find_data_; }; - directory_iterator() : path_info_("", find_data_), h_find_(INVALID_HANDLE_VALUE) - { - } + directory_iterator() : path_info_("", find_data_), h_find_(INVALID_HANDLE_VALUE) {} explicit directory_iterator(const string &path) : path_(path), path_info_(path, find_data_) { @@ -163,9 +161,7 @@ class directory_iterator { public: class path_info { public: - explicit path_info(const string &path) : path_(path), entry_(NULL) - { - } + explicit path_info(const string &path) : path_(path), entry_(NULL) {} string path() { @@ -182,9 +178,7 @@ class directory_iterator { const struct dirent *entry_; }; - directory_iterator() : path_info_(""), name_list_(NULL), num_entries_(-1), cur_entry_(-1) - { - } + directory_iterator() : path_info_(""), name_list_(NULL), num_entries_(-1), cur_entry_(-1) {} explicit directory_iterator(const string &path) : path_(path), path_info_(path_), cur_entry_(0) { diff --git a/intern/cycles/util/profiling.cpp b/intern/cycles/util/profiling.cpp index 6bee5c08da3..599a9b60ac4 100644 --- a/intern/cycles/util/profiling.cpp +++ b/intern/cycles/util/profiling.cpp @@ -8,9 +8,7 @@ CCL_NAMESPACE_BEGIN -Profiler::Profiler() : do_stop_worker(true), worker(NULL) -{ -} +Profiler::Profiler() : do_stop_worker(true), worker(NULL) {} Profiler::~Profiler() { diff --git a/intern/cycles/util/projection.h b/intern/cycles/util/projection.h index 0f078f1537c..4cd16b4a7b9 100644 --- a/intern/cycles/util/projection.h +++ b/intern/cycles/util/projection.h @@ -14,9 +14,7 @@ typedef struct ProjectionTransform { float4 x, y, z, w; /* rows */ #ifndef __KERNEL_GPU__ - ProjectionTransform() - { - } + ProjectionTransform() {} explicit ProjectionTransform(const Transform &tfm) : x(tfm.x), y(tfm.y), z(tfm.z), w(make_float4(0.0f, 0.0f, 0.0f, 1.0f)) diff --git a/intern/cycles/util/semaphore.h b/intern/cycles/util/semaphore.h index 7506ae264cf..46e52ed5eab 100644 --- a/intern/cycles/util/semaphore.h +++ b/intern/cycles/util/semaphore.h @@ -15,9 +15,7 @@ CCL_NAMESPACE_BEGIN class thread_counting_semaphore { public: - explicit thread_counting_semaphore(const int count) : count(count) - { - } + explicit thread_counting_semaphore(const int count) : count(count) {} thread_counting_semaphore(const thread_counting_semaphore &) = delete; diff --git a/intern/cycles/util/stack_allocator.h b/intern/cycles/util/stack_allocator.h index 285a6596ae4..ff9b602e2bb 100644 --- a/intern/cycles/util/stack_allocator.h +++ b/intern/cycles/util/stack_allocator.h @@ -23,13 +23,9 @@ template class ccl_try_align(16) StackAllocator /* Allocator construction/destruction. */ - StackAllocator() : pointer_(0), use_stack_(true) - { - } + StackAllocator() : pointer_(0), use_stack_(true) {} - StackAllocator(const StackAllocator &) : pointer_(0), use_stack_(true) - { - } + StackAllocator(const StackAllocator &) : pointer_(0), use_stack_(true) {} template StackAllocator(const StackAllocator &) : pointer_(0), use_stack_(false) diff --git a/intern/cycles/util/stats.h b/intern/cycles/util/stats.h index 2e266d135ca..e51974e81b6 100644 --- a/intern/cycles/util/stats.h +++ b/intern/cycles/util/stats.h @@ -13,12 +13,8 @@ class Stats { public: enum static_init_t { static_init = 0 }; - Stats() : mem_used(0), mem_peak(0) - { - } - explicit Stats(static_init_t) - { - } + Stats() : mem_used(0), mem_peak(0) {} + explicit Stats(static_init_t) {} void mem_alloc(size_t size) { diff --git a/intern/cycles/util/task.cpp b/intern/cycles/util/task.cpp index 12f661f752d..0b85d4070d3 100644 --- a/intern/cycles/util/task.cpp +++ b/intern/cycles/util/task.cpp @@ -11,9 +11,7 @@ CCL_NAMESPACE_BEGIN /* Task Pool */ -TaskPool::TaskPool() : start_time(time_dt()), num_tasks_pushed(0) -{ -} +TaskPool::TaskPool() : start_time(time_dt()), num_tasks_pushed(0) {} TaskPool::~TaskPool() { diff --git a/intern/cycles/util/time.h b/intern/cycles/util/time.h index db23e4ac51f..f0c21760758 100644 --- a/intern/cycles/util/time.h +++ b/intern/cycles/util/time.h @@ -52,9 +52,7 @@ class scoped_callback_timer { public: using callback_type = function; - explicit scoped_callback_timer(callback_type cb) : cb(cb) - { - } + explicit scoped_callback_timer(callback_type cb) : cb(cb) {} ~scoped_callback_timer() { diff --git a/intern/cycles/util/types_float3.h b/intern/cycles/util/types_float3.h index 34430945c38..6c97f87576f 100644 --- a/intern/cycles/util/types_float3.h +++ b/intern/cycles/util/types_float3.h @@ -70,9 +70,7 @@ typedef float3 packed_float3; struct packed_float3 { ccl_device_inline_method packed_float3(){}; - ccl_device_inline_method packed_float3(const float3 &a) : x(a.x), y(a.y), z(a.z) - { - } + ccl_device_inline_method packed_float3(const float3 &a) : x(a.x), y(a.y), z(a.z) {} ccl_device_inline_method operator float3() const { diff --git a/intern/cycles/util/types_float3_impl.h b/intern/cycles/util/types_float3_impl.h index da76ab2ab2a..bd7da6d6578 100644 --- a/intern/cycles/util/types_float3_impl.h +++ b/intern/cycles/util/types_float3_impl.h @@ -11,17 +11,11 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_NATIVE_VECTOR_TYPES__ # ifdef __KERNEL_SSE__ -__forceinline float3::float3() -{ -} +__forceinline float3::float3() {} -__forceinline float3::float3(const float3 &a) : m128(a.m128) -{ -} +__forceinline float3::float3(const float3 &a) : m128(a.m128) {} -__forceinline float3::float3(const __m128 &a) : m128(a) -{ -} +__forceinline float3::float3(const __m128 &a) : m128(a) {} __forceinline float3::operator const __m128 &() const { diff --git a/intern/cycles/util/types_float4_impl.h b/intern/cycles/util/types_float4_impl.h index 420d9316926..04771e9f8a8 100644 --- a/intern/cycles/util/types_float4_impl.h +++ b/intern/cycles/util/types_float4_impl.h @@ -11,13 +11,9 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_NATIVE_VECTOR_TYPES__ # ifdef __KERNEL_SSE__ -__forceinline float4::float4() -{ -} +__forceinline float4::float4() {} -__forceinline float4::float4(const __m128 &a) : m128(a) -{ -} +__forceinline float4::float4(const __m128 &a) : m128(a) {} __forceinline float4::operator const __m128 &() const { diff --git a/intern/cycles/util/types_float8_impl.h b/intern/cycles/util/types_float8_impl.h index 9f42e0f663c..889212d56b9 100644 --- a/intern/cycles/util/types_float8_impl.h +++ b/intern/cycles/util/types_float8_impl.h @@ -11,17 +11,11 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_AVX__ -__forceinline vfloat8::vfloat8() -{ -} +__forceinline vfloat8::vfloat8() {} -__forceinline vfloat8::vfloat8(const vfloat8 &f) : m256(f.m256) -{ -} +__forceinline vfloat8::vfloat8(const vfloat8 &f) : m256(f.m256) {} -__forceinline vfloat8::vfloat8(const __m256 &f) : m256(f) -{ -} +__forceinline vfloat8::vfloat8(const __m256 &f) : m256(f) {} __forceinline vfloat8::operator const __m256 &() const { diff --git a/intern/cycles/util/types_int3.h b/intern/cycles/util/types_int3.h index 55b67289403..83920009d9a 100644 --- a/intern/cycles/util/types_int3.h +++ b/intern/cycles/util/types_int3.h @@ -65,9 +65,7 @@ struct packed_int3 { ccl_device_inline_method packed_int3(const int px, const int py, const int pz) : x(px), y(py), z(pz){}; - ccl_device_inline_method packed_int3(const int3 &a) : x(a.x), y(a.y), z(a.z) - { - } + ccl_device_inline_method packed_int3(const int3 &a) : x(a.x), y(a.y), z(a.z) {} ccl_device_inline_method operator int3() const { diff --git a/intern/cycles/util/types_int3_impl.h b/intern/cycles/util/types_int3_impl.h index 18cd21cef4b..48d8bed18e7 100644 --- a/intern/cycles/util/types_int3_impl.h +++ b/intern/cycles/util/types_int3_impl.h @@ -11,17 +11,11 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_NATIVE_VECTOR_TYPES__ # ifdef __KERNEL_SSE__ -__forceinline int3::int3() -{ -} +__forceinline int3::int3() {} -__forceinline int3::int3(const __m128i &a) : m128(a) -{ -} +__forceinline int3::int3(const __m128i &a) : m128(a) {} -__forceinline int3::int3(const int3 &a) : m128(a.m128) -{ -} +__forceinline int3::int3(const int3 &a) : m128(a.m128) {} __forceinline int3::operator const __m128i &() const { diff --git a/intern/cycles/util/types_int4_impl.h b/intern/cycles/util/types_int4_impl.h index 067794e67b4..4a803e28294 100644 --- a/intern/cycles/util/types_int4_impl.h +++ b/intern/cycles/util/types_int4_impl.h @@ -11,17 +11,11 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_NATIVE_VECTOR_TYPES__ # ifdef __KERNEL_SSE__ -__forceinline int4::int4() -{ -} +__forceinline int4::int4() {} -__forceinline int4::int4(const int4 &a) : m128(a.m128) -{ -} +__forceinline int4::int4(const int4 &a) : m128(a.m128) {} -__forceinline int4::int4(const __m128i &a) : m128(a) -{ -} +__forceinline int4::int4(const __m128i &a) : m128(a) {} __forceinline int4::operator const __m128i &() const { diff --git a/intern/cycles/util/types_int8_impl.h b/intern/cycles/util/types_int8_impl.h index 080bcaa6a2b..1c37d9a69a5 100644 --- a/intern/cycles/util/types_int8_impl.h +++ b/intern/cycles/util/types_int8_impl.h @@ -10,17 +10,11 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_AVX__ -__forceinline vint8::vint8() -{ -} +__forceinline vint8::vint8() {} -__forceinline vint8::vint8(const vint8 &a) : m256(a.m256) -{ -} +__forceinline vint8::vint8(const vint8 &a) : m256(a.m256) {} -__forceinline vint8::vint8(const __m256i &a) : m256(a) -{ -} +__forceinline vint8::vint8(const __m256i &a) : m256(a) {} __forceinline vint8::operator const __m256i &() const { diff --git a/intern/cycles/util/types_uint3.h b/intern/cycles/util/types_uint3.h index dfdf8bd0261..67206fed6cb 100644 --- a/intern/cycles/util/types_uint3.h +++ b/intern/cycles/util/types_uint3.h @@ -37,9 +37,7 @@ struct packed_uint3 { ccl_device_inline_method packed_uint3(const uint px, const uint py, const uint pz) : x(px), y(py), z(pz){}; - ccl_device_inline_method packed_uint3(const uint3 &a) : x(a.x), y(a.y), z(a.z) - { - } + ccl_device_inline_method packed_uint3(const uint3 &a) : x(a.x), y(a.y), z(a.z) {} ccl_device_inline_method operator uint3() const { diff --git a/intern/dualcon/intern/MemoryAllocator.h b/intern/dualcon/intern/MemoryAllocator.h index 9900e3f5828..73aeb9bfc8d 100644 --- a/intern/dualcon/intern/MemoryAllocator.h +++ b/intern/dualcon/intern/MemoryAllocator.h @@ -20,9 +20,7 @@ */ class VirtualMemoryAllocator { public: - virtual ~VirtualMemoryAllocator() - { - } + virtual ~VirtualMemoryAllocator() {} virtual void *allocate() = 0; virtual void deallocate(void *obj) = 0; diff --git a/intern/dualcon/intern/Projections.h b/intern/dualcon/intern/Projections.h index 1a92e9e4b7c..305fbb9c152 100644 --- a/intern/dualcon/intern/Projections.h +++ b/intern/dualcon/intern/Projections.h @@ -75,9 +75,7 @@ class CubeTriangleIsect { CubeProjection cubeProj[NUM_AXES]; public: - CubeTriangleIsect() - { - } + CubeTriangleIsect() {} /** * Construction from a cube (axes aligned) and triangle diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp index 5cfafdd1917..01cbc3f428a 100644 --- a/intern/dualcon/intern/dualcon_c_api.cpp +++ b/intern/dualcon/intern/dualcon_c_api.cpp @@ -131,9 +131,7 @@ class DualConInputReader : public ModelReader { } /* stubs */ - void printInfo() - { - } + void printInfo() {} int getMemory() { return sizeof(DualConInputReader); diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.h index aee06b9604c..9c020654c34 100644 --- a/intern/ghost/GHOST_IContext.h +++ b/intern/ghost/GHOST_IContext.h @@ -22,9 +22,7 @@ class GHOST_IContext { /** * Destructor. */ - virtual ~GHOST_IContext() - { - } + virtual ~GHOST_IContext() {} /** * Activates the drawing context. diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index 89e3c140574..7d974ec15ab 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -28,9 +28,7 @@ class GHOST_IEvent { /** * Destructor. */ - virtual ~GHOST_IEvent() - { - } + virtual ~GHOST_IEvent() {} /** * Returns the event type. diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h index e1d35c23a25..eb07a3fde05 100644 --- a/intern/ghost/GHOST_IEventConsumer.h +++ b/intern/ghost/GHOST_IEventConsumer.h @@ -23,9 +23,7 @@ class GHOST_IEventConsumer { /** * Destructor. */ - virtual ~GHOST_IEventConsumer() - { - } + virtual ~GHOST_IEventConsumer() {} /** * This method is called by the system when it has events to dispatch. diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index ca5c4645c5e..83828fb43c6 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -154,17 +154,13 @@ class GHOST_ISystem { * Constructor. * Protected default constructor to force use of static createSystem member. */ - GHOST_ISystem() - { - } + GHOST_ISystem() {} /** * Destructor. * Protected default constructor to force use of static dispose member. */ - virtual ~GHOST_ISystem() - { - } + virtual ~GHOST_ISystem() {} public: /*************************************************************************************** diff --git a/intern/ghost/GHOST_ISystemPaths.h b/intern/ghost/GHOST_ISystemPaths.h index f8d93ef8e73..b2abf6fe999 100644 --- a/intern/ghost/GHOST_ISystemPaths.h +++ b/intern/ghost/GHOST_ISystemPaths.h @@ -34,17 +34,13 @@ class GHOST_ISystemPaths { * Constructor. * Protected default constructor to force use of static createSystem member. */ - GHOST_ISystemPaths() - { - } + GHOST_ISystemPaths() {} /** * Destructor. * Protected default constructor to force use of static dispose member. */ - virtual ~GHOST_ISystemPaths() - { - } + virtual ~GHOST_ISystemPaths() {} public: /** diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index 5e77fc8d0c2..5a3dc6479cd 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -27,9 +27,7 @@ class GHOST_ITimerTask { /** * Destructor. */ - virtual ~GHOST_ITimerTask() - { - } + virtual ~GHOST_ITimerTask() {} /** * Returns the timer callback. diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 7f6e6e8d202..a8092c40ea7 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -35,9 +35,7 @@ class GHOST_IWindow { /** * Destructor. */ - virtual ~GHOST_IWindow() - { - } + virtual ~GHOST_IWindow() {} /** * Returns indication as to whether the window is valid. diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index 15fa546fb07..4d0ae4ab085 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -34,9 +34,7 @@ class GHOST_Rect { /** * Destructor. */ - virtual ~GHOST_Rect() - { - } + virtual ~GHOST_Rect() {} /** * Access to rectangle width. diff --git a/intern/ghost/intern/GHOST_Buttons.cpp b/intern/ghost/intern/GHOST_Buttons.cpp index 6382729c579..a5b3a8fb524 100644 --- a/intern/ghost/intern/GHOST_Buttons.cpp +++ b/intern/ghost/intern/GHOST_Buttons.cpp @@ -74,6 +74,4 @@ void GHOST_Buttons::clear() m_Button7 = false; } -GHOST_Buttons::~GHOST_Buttons() -{ -} +GHOST_Buttons::~GHOST_Buttons() {} diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 8637594c3ce..cb8676c6f2e 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -28,9 +28,7 @@ class GHOST_CallbackEventConsumer : public GHOST_IEventConsumer { /** * Destructor. */ - ~GHOST_CallbackEventConsumer() - { - } + ~GHOST_CallbackEventConsumer() {} /** * This method is called by an event producer when an event is available. diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.h index 9350493d30d..d0db91a9db2 100644 --- a/intern/ghost/intern/GHOST_Context.h +++ b/intern/ghost/intern/GHOST_Context.h @@ -21,16 +21,12 @@ class GHOST_Context : public GHOST_IContext { * Constructor. * \param stereoVisual: Stereo visual for quad buffered stereo. */ - GHOST_Context(bool stereoVisual) : m_stereoVisual(stereoVisual) - { - } + GHOST_Context(bool stereoVisual) : m_stereoVisual(stereoVisual) {} /** * Destructor. */ - virtual ~GHOST_Context() - { - } + virtual ~GHOST_Context() {} /** * Swaps front and back buffers of a window. diff --git a/intern/ghost/intern/GHOST_ContextNone.h b/intern/ghost/intern/GHOST_ContextNone.h index c9cb97d57b5..0dff09cef92 100644 --- a/intern/ghost/intern/GHOST_ContextNone.h +++ b/intern/ghost/intern/GHOST_ContextNone.h @@ -13,9 +13,7 @@ class GHOST_ContextNone : public GHOST_Context { public: - GHOST_ContextNone(bool stereoVisual) : GHOST_Context(stereoVisual), m_swapInterval(1) - { - } + GHOST_ContextNone(bool stereoVisual) : GHOST_Context(stereoVisual), m_swapInterval(1) {} /** * Dummy function diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp index 55f4b29e009..dfc1dd9aa49 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.cpp +++ b/intern/ghost/intern/GHOST_DisplayManager.cpp @@ -12,13 +12,9 @@ #include "GHOST_DisplayManager.h" #include "GHOST_Debug.h" -GHOST_DisplayManager::GHOST_DisplayManager() : m_settingsInitialized(false) -{ -} +GHOST_DisplayManager::GHOST_DisplayManager() : m_settingsInitialized(false) {} -GHOST_DisplayManager::~GHOST_DisplayManager() -{ -} +GHOST_DisplayManager::~GHOST_DisplayManager() {} GHOST_TSuccess GHOST_DisplayManager::initialize() { diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index e277382c766..fba0795ee2b 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -8,9 +8,7 @@ // We do not support multiple monitors at the moment -GHOST_DisplayManagerCocoa::GHOST_DisplayManagerCocoa(void) -{ -} +GHOST_DisplayManagerCocoa::GHOST_DisplayManagerCocoa(void) {} GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(uint8_t &numDisplays) const { diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp index ee79792bb7e..ce107016877 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp @@ -16,9 +16,7 @@ #include -GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void) -{ -} +GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void) {} GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplays(uint8_t &numDisplays) const { diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp index a26377ca6d1..c2c58d1867c 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp +++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp @@ -25,9 +25,7 @@ GHOST_DropTargetWin32::GHOST_DropTargetWin32(GHOST_WindowWin32 *window, GHOST_Sy m_draggedObjectType = GHOST_kDragnDropTypeUnknown; } -GHOST_DropTargetWin32::~GHOST_DropTargetWin32() -{ -} +GHOST_DropTargetWin32::~GHOST_DropTargetWin32() {} /* * IUnknown::QueryInterface diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 184052aa6ab..90897b0e54c 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -13,9 +13,7 @@ #include "GHOST_Debug.h" #include -GHOST_EventManager::GHOST_EventManager() -{ -} +GHOST_EventManager::GHOST_EventManager() {} GHOST_EventManager::~GHOST_EventManager() { diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cpp index 764a6a1e241..ccc25b0ec28 100644 --- a/intern/ghost/intern/GHOST_ImeWin32.cpp +++ b/intern/ghost/intern/GHOST_ImeWin32.cpp @@ -30,9 +30,7 @@ GHOST_ImeWin32::GHOST_ImeWin32() { } -GHOST_ImeWin32::~GHOST_ImeWin32() -{ -} +GHOST_ImeWin32::~GHOST_ImeWin32() {} void GHOST_ImeWin32::UpdateInputLanguage() { diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index 5ecbae77f46..86f483c2d14 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -17,9 +17,7 @@ GHOST_ModifierKeys::GHOST_ModifierKeys() clear(); } -GHOST_ModifierKeys::~GHOST_ModifierKeys() -{ -} +GHOST_ModifierKeys::~GHOST_ModifierKeys() {} GHOST_TKey GHOST_ModifierKeys::getModifierKeyCode(GHOST_TModifierKey mask) { diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h index 34ee9d71fba..26b0138cffa 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.h +++ b/intern/ghost/intern/GHOST_NDOFManager.h @@ -101,9 +101,7 @@ typedef enum { class GHOST_NDOFManager { public: GHOST_NDOFManager(GHOST_System &); - virtual ~GHOST_NDOFManager() - { - } + virtual ~GHOST_NDOFManager() {} /** * Whether multi-axis functionality is available (via the OS or driver) diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index fc1032bfe3e..1451f2ed62d 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -530,9 +530,7 @@ GHOST_SystemCocoa::GHOST_SystemCocoa() m_last_warp_timestamp = 0; } -GHOST_SystemCocoa::~GHOST_SystemCocoa() -{ -} +GHOST_SystemCocoa::~GHOST_SystemCocoa() {} GHOST_TSuccess GHOST_SystemCocoa::init() { diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h index 03fc0ecfba7..f22b08d4589 100644 --- a/intern/ghost/intern/GHOST_SystemPaths.h +++ b/intern/ghost/intern/GHOST_SystemPaths.h @@ -15,17 +15,13 @@ class GHOST_SystemPaths : public GHOST_ISystemPaths { * Constructor. * Protected default constructor to force use of static createSystem member. */ - GHOST_SystemPaths() - { - } + GHOST_SystemPaths() {} /** * Destructor. * Protected default constructor to force use of static dispose member. */ - virtual ~GHOST_SystemPaths() - { - } + virtual ~GHOST_SystemPaths() {} public: /** diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm index 46a91b36c61..04daba63c86 100644 --- a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm @@ -8,13 +8,9 @@ #pragma mark initialization/finalization -GHOST_SystemPathsCocoa::GHOST_SystemPathsCocoa() -{ -} +GHOST_SystemPathsCocoa::GHOST_SystemPathsCocoa() {} -GHOST_SystemPathsCocoa::~GHOST_SystemPathsCocoa() -{ -} +GHOST_SystemPathsCocoa::~GHOST_SystemPathsCocoa() {} #pragma mark Base directories retrieval diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp index 7e1d3d868c6..eba10c3c1c8 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp @@ -26,13 +26,9 @@ static const char *static_path = PREFIX "/share"; static const char *static_path = nullptr; #endif -GHOST_SystemPathsUnix::GHOST_SystemPathsUnix() -{ -} +GHOST_SystemPathsUnix::GHOST_SystemPathsUnix() {} -GHOST_SystemPathsUnix::~GHOST_SystemPathsUnix() -{ -} +GHOST_SystemPathsUnix::~GHOST_SystemPathsUnix() {} const char *GHOST_SystemPathsUnix::getSystemDir(int /*version*/, const char *versionstr) const { diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp index 1a29497d2d6..2a5d83e4256 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp @@ -14,13 +14,9 @@ #include "utfconv.h" #include -GHOST_SystemPathsWin32::GHOST_SystemPathsWin32() -{ -} +GHOST_SystemPathsWin32::GHOST_SystemPathsWin32() {} -GHOST_SystemPathsWin32::~GHOST_SystemPathsWin32() -{ -} +GHOST_SystemPathsWin32::~GHOST_SystemPathsWin32() {} const char *GHOST_SystemPathsWin32::getSystemDir(int, const char *versionstr) const { diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index 0cdaad20611..ca881c74acd 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -15,9 +15,7 @@ #include "GHOST_TimerTask.h" -GHOST_TimerManager::GHOST_TimerManager() -{ -} +GHOST_TimerManager::GHOST_TimerManager() {} GHOST_TimerManager::~GHOST_TimerManager() { diff --git a/intern/ghost/test/multitest/stubs.c b/intern/ghost/test/multitest/stubs.c index 7261c1fe2a1..da9c0782858 100644 --- a/intern/ghost/test/multitest/stubs.c +++ b/intern/ghost/test/multitest/stubs.c @@ -9,9 +9,7 @@ struct ColorSpace; struct ImBuf; -void IMB_freeImBuf(struct ImBuf *UNUSED(ibuf)) -{ -} +void IMB_freeImBuf(struct ImBuf *UNUSED(ibuf)) {} void IMB_colormanagement_display_to_scene_linear_v3(float UNUSED(pixel[3]), struct ColorManagedDisplay *UNUSED(display)) { @@ -27,9 +25,7 @@ bool IMB_colormanagement_space_is_data(struct ColorSpace *colorspace) return false; } -void BKE_material_defaults_free_gpu(void) -{ -} +void BKE_material_defaults_free_gpu(void) {} /* Variables. */ int G; diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 69221877f15..059e0b05755 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -362,9 +362,7 @@ template inline T *MEM_cnew(const char *allocation_name, const T &ot } \ /* This is the matching delete operator to the placement-new operator above. Both parameters \ * will have the same value. Without this, we get the warning C4291 on windows. */ \ - void operator delete(void * /*ptr_to_free*/, void * /*ptr*/) \ - { \ - } + void operator delete(void * /*ptr_to_free*/, void * /*ptr*/) {} #endif /* __cplusplus */ diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index 681710e7f5b..0fca1ff0ac2 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -332,13 +332,9 @@ void *MEM_lockfree_mallocN_aligned(size_t len, size_t alignment, const char *str return NULL; } -void MEM_lockfree_printmemlist_pydict(void) -{ -} +void MEM_lockfree_printmemlist_pydict(void) {} -void MEM_lockfree_printmemlist(void) -{ -} +void MEM_lockfree_printmemlist(void) {} /* unused */ void MEM_lockfree_callbackmemlist(void (*func)(void *)) @@ -406,7 +402,5 @@ const char *MEM_lockfree_name_ptr(void *vmemh) return "MEM_lockfree_name_ptr(NULL)"; } -void MEM_lockfree_name_ptr_set(void *UNUSED(vmemh), const char *UNUSED(str)) -{ -} +void MEM_lockfree_name_ptr_set(void *UNUSED(vmemh), const char *UNUSED(str)) {} #endif /* NDEBUG */ diff --git a/intern/iksolver/intern/IK_QJacobian.cpp b/intern/iksolver/intern/IK_QJacobian.cpp index ea659414b73..accec23e5c0 100644 --- a/intern/iksolver/intern/IK_QJacobian.cpp +++ b/intern/iksolver/intern/IK_QJacobian.cpp @@ -7,13 +7,9 @@ #include "IK_QJacobian.h" -IK_QJacobian::IK_QJacobian() : m_sdls(true), m_min_damp(1.0) -{ -} +IK_QJacobian::IK_QJacobian() : m_sdls(true), m_min_damp(1.0) {} -IK_QJacobian::~IK_QJacobian() -{ -} +IK_QJacobian::~IK_QJacobian() {} void IK_QJacobian::ArmMatrices(int dof, int task_size) { diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index 11b8a8ee99c..1b9af09ee95 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -23,9 +23,7 @@ class IK_QJacobianSolver { public: IK_QJacobianSolver(); - ~IK_QJacobianSolver() - { - } + ~IK_QJacobianSolver() {} // setup pole vector constraint void SetPoleVectorConstraint( diff --git a/intern/iksolver/intern/IK_QSegment.cpp b/intern/iksolver/intern/IK_QSegment.cpp index 84c1b0619eb..4240fe1173c 100644 --- a/intern/iksolver/intern/IK_QSegment.cpp +++ b/intern/iksolver/intern/IK_QSegment.cpp @@ -339,9 +339,7 @@ void IK_QSphericalSegment::UpdateAngleApply() // IK_QNullSegment -IK_QNullSegment::IK_QNullSegment() : IK_QSegment(0, false) -{ -} +IK_QNullSegment::IK_QNullSegment() : IK_QSegment(0, false) {} // IK_QRevoluteSegment @@ -427,9 +425,7 @@ void IK_QRevoluteSegment::SetWeight(int axis, double weight) // IK_QSwingSegment -IK_QSwingSegment::IK_QSwingSegment() : IK_QSegment(2, false), m_limit_x(false), m_limit_z(false) -{ -} +IK_QSwingSegment::IK_QSwingSegment() : IK_QSegment(2, false), m_limit_x(false), m_limit_z(false) {} void IK_QSwingSegment::SetBasis(const Matrix3d &basis) { diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index afb85321d70..7dbe1c36c13 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -154,20 +154,14 @@ class IK_QSegment { // update the angles using the dTheta's computed using the jacobian matrix virtual bool UpdateAngle(const IK_QJacobian &, Vector3d &, bool *) = 0; - virtual void Lock(int, IK_QJacobian &, Vector3d &) - { - } + virtual void Lock(int, IK_QJacobian &, Vector3d &) {} virtual void UpdateAngleApply() = 0; // set joint limits - virtual void SetLimit(int, double, double) - { - } + virtual void SetLimit(int, double, double) {} // set joint weights (per axis) - virtual void SetWeight(int, double) - { - } + virtual void SetWeight(int, double) {} virtual void SetBasis(const Matrix3d &basis) { @@ -251,9 +245,7 @@ class IK_QNullSegment : public IK_QSegment { { return false; } - void UpdateAngleApply() - { - } + void UpdateAngleApply() {} Vector3d Axis(int) const { diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h index 7a68a8d3cc0..19c543150ff 100644 --- a/intern/iksolver/intern/IK_QTask.h +++ b/intern/iksolver/intern/IK_QTask.h @@ -14,9 +14,7 @@ class IK_QTask { public: IK_QTask(int size, bool primary, bool active, const IK_QSegment *segment); - virtual ~IK_QTask() - { - } + virtual ~IK_QTask() {} int Id() const { @@ -62,9 +60,7 @@ class IK_QTask { return false; } - virtual void Scale(double) - { - } + virtual void Scale(double) {} protected: int m_id; diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 3aea4422d41..43cf1d1c8be 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -17,9 +17,7 @@ using namespace std; class IK_QSolver { public: EIGEN_MAKE_ALIGNED_OPERATOR_NEW - IK_QSolver() : root(NULL) - { - } + IK_QSolver() : root(NULL) {} IK_QJacobianSolver solver; IK_QSegment *root; diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index 9182b3358d9..4dabf143540 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -23,20 +23,12 @@ template struct MEM_Allocator { typedef MEM_Allocator<_Tp1> other; }; - MEM_Allocator() throw() - { - } - MEM_Allocator(const MEM_Allocator &) throw() - { - } + MEM_Allocator() throw() {} + MEM_Allocator(const MEM_Allocator &) throw() {} - template MEM_Allocator(const MEM_Allocator<_Tp1>) throw() - { - } + template MEM_Allocator(const MEM_Allocator<_Tp1>) throw() {} - ~MEM_Allocator() throw() - { - } + ~MEM_Allocator() throw() {} pointer address(reference __x) const { diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h index 42bfea568db..3d9fbe436b2 100644 --- a/intern/memutil/MEM_RefCounted.h +++ b/intern/memutil/MEM_RefCounted.h @@ -27,9 +27,7 @@ class MEM_RefCounted { /** * Constructs a shared object. */ - MEM_RefCounted() : m_refCount(1) - { - } + MEM_RefCounted() : m_refCount(1) {} /** * Returns the reference count of this object. @@ -55,9 +53,7 @@ class MEM_RefCounted { * Destructs a shared object. * The destructor is protected to force the use of incRef and decRef. */ - virtual ~MEM_RefCounted() - { - } + virtual ~MEM_RefCounted() {} protected: /** The reference count. */ diff --git a/intern/mikktspace/mikk_atomic_hash_set.hh b/intern/mikktspace/mikk_atomic_hash_set.hh index 11d2a659966..367f68faf3b 100644 --- a/intern/mikktspace/mikk_atomic_hash_set.hh +++ b/intern/mikktspace/mikk_atomic_hash_set.hh @@ -89,9 +89,7 @@ class AtomicHashSet { size_t capacity; // if positive, overrides maxLoadFactor // Cannot have constexpr ctor because some compilers rightly complain. - Config() : emptyKey((KeyT)-1), maxLoadFactor(0.8), growthFactor(-1), capacity(0) - { - } + Config() : emptyKey((KeyT)-1), maxLoadFactor(0.8), growthFactor(-1), capacity(0) {} }; /* Instead of a mess of arguments, we take a max size and a Config struct to diff --git a/intern/mikktspace/mikk_float3.hh b/intern/mikktspace/mikk_float3.hh index 1340aa08356..fc70b5f5fc5 100644 --- a/intern/mikktspace/mikk_float3.hh +++ b/intern/mikktspace/mikk_float3.hh @@ -15,25 +15,15 @@ struct float3 { float3() = default; - float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]} - { - } + float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]} {} - float3(const float (*ptr)[3]) : float3((const float *)ptr) - { - } + float3(const float (*ptr)[3]) : float3((const float *)ptr) {} - explicit float3(float value) : x(value), y(value), z(value) - { - } + explicit float3(float value) : x(value), y(value), z(value) {} - explicit float3(int value) : x((float)value), y((float)value), z((float)value) - { - } + explicit float3(int value) : x((float)value), y((float)value), z((float)value) {} - float3(float x_, float y_, float z_) : x{x_}, y{y_}, z{z_} - { - } + float3(float x_, float y_, float z_) : x{x_}, y{y_}, z{z_} {} static float3 zero() { diff --git a/intern/mikktspace/mikktspace.hh b/intern/mikktspace/mikktspace.hh index 9bfa6881f0d..2b356ee1251 100644 --- a/intern/mikktspace/mikktspace.hh +++ b/intern/mikktspace/mikktspace.hh @@ -145,9 +145,7 @@ template class Mikktspace { bool isParallel; public: - Mikktspace(Mesh &mesh_) : mesh(mesh_) - { - } + Mikktspace(Mesh &mesh_) : mesh(mesh_) {} void genTangSpace() { @@ -580,9 +578,7 @@ template class Mikktspace { struct NeighborShard { struct Entry { - Entry(uint32_t key_, uint data_) : key(key_), data(data_) - { - } + Entry(uint32_t key_, uint data_) : key(key_), data(data_) {} uint key, data; }; std::vector entries; diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc index 9e5c107ab92..d74e5255f93 100644 --- a/intern/opencolorio/fallback_impl.cc +++ b/intern/opencolorio/fallback_impl.cc @@ -39,13 +39,9 @@ typedef struct OCIO_PackedImageDescription { } OCIO_PackedImageDescription; struct FallbackTransform { - FallbackTransform() : type(TRANSFORM_UNKNOWN), scale(1.0f), exponent(1.0f) - { - } + FallbackTransform() : type(TRANSFORM_UNKNOWN), scale(1.0f), exponent(1.0f) {} - virtual ~FallbackTransform() - { - } + virtual ~FallbackTransform() {} void applyRGB(float *pixel) { @@ -90,9 +86,7 @@ struct FallbackTransform { }; struct FallbackProcessor { - FallbackProcessor(const FallbackTransform &transform) : transform(transform) - { - } + FallbackProcessor(const FallbackTransform &transform) : transform(transform) {} void applyRGB(float *pixel) { @@ -114,9 +108,7 @@ OCIO_ConstConfigRcPtr *FallbackImpl::getCurrentConfig() return CONFIG_DEFAULT; } -void FallbackImpl::setCurrentConfig(const OCIO_ConstConfigRcPtr * /*config*/) -{ -} +void FallbackImpl::setCurrentConfig(const OCIO_ConstConfigRcPtr * /*config*/) {} OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromEnv() { @@ -128,9 +120,7 @@ OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char * /*filenam return CONFIG_DEFAULT; } -void FallbackImpl::configRelease(OCIO_ConstConfigRcPtr * /*config*/) -{ -} +void FallbackImpl::configRelease(OCIO_ConstConfigRcPtr * /*config*/) {} int FallbackImpl::configGetNumColorSpaces(OCIO_ConstConfigRcPtr * /*config*/) { @@ -277,9 +267,7 @@ const char *FallbackImpl::lookGetProcessSpace(OCIO_ConstLookRcPtr * /*look*/) return NULL; } -void FallbackImpl::lookRelease(OCIO_ConstLookRcPtr * /*look*/) -{ -} +void FallbackImpl::lookRelease(OCIO_ConstLookRcPtr * /*look*/) {} int FallbackImpl::colorSpaceIsInvertible(OCIO_ConstColorSpaceRcPtr * /*cs*/) { @@ -310,9 +298,7 @@ void FallbackImpl::colorSpaceIsBuiltin(OCIO_ConstConfigRcPtr * /*config*/, } } -void FallbackImpl::colorSpaceRelease(OCIO_ConstColorSpaceRcPtr * /*cs*/) -{ -} +void FallbackImpl::colorSpaceRelease(OCIO_ConstColorSpaceRcPtr * /*cs*/) {} OCIO_ConstProcessorRcPtr *FallbackImpl::configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config, const char *srcName, diff --git a/intern/opencolorio/ocio_impl.h b/intern/opencolorio/ocio_impl.h index 2c00eff6d6c..40b38f5c350 100644 --- a/intern/opencolorio/ocio_impl.h +++ b/intern/opencolorio/ocio_impl.h @@ -8,9 +8,7 @@ class IOCIOImpl { public: - virtual ~IOCIOImpl() - { - } + virtual ~IOCIOImpl() {} virtual OCIO_ConstConfigRcPtr *getCurrentConfig(void) = 0; virtual void setCurrentConfig(const OCIO_ConstConfigRcPtr *config) = 0; @@ -118,12 +116,8 @@ class IOCIOImpl { { return false; } - virtual void gpuDisplayShaderUnbind(void) - { - } - virtual void gpuCacheFree(void) - { - } + virtual void gpuDisplayShaderUnbind(void) {} + virtual void gpuCacheFree(void) {} virtual const char *getVersionString(void) = 0; virtual int getVersionHex(void) = 0; @@ -131,9 +125,7 @@ class IOCIOImpl { class FallbackImpl : public IOCIOImpl { public: - FallbackImpl() - { - } + FallbackImpl() {} OCIO_ConstConfigRcPtr *getCurrentConfig(void); void setCurrentConfig(const OCIO_ConstConfigRcPtr *config); diff --git a/intern/opensubdiv/internal/base/opensubdiv_capi.cc b/intern/opensubdiv/internal/base/opensubdiv_capi.cc index db302e3d5de..7088a9424b7 100644 --- a/intern/opensubdiv/internal/base/opensubdiv_capi.cc +++ b/intern/opensubdiv/internal/base/opensubdiv_capi.cc @@ -22,13 +22,9 @@ #include "internal/base/util.h" -void openSubdiv_init() -{ -} +void openSubdiv_init() {} -void openSubdiv_cleanup() -{ -} +void openSubdiv_cleanup() {} int openSubdiv_getVersionHex() { diff --git a/intern/opensubdiv/internal/evaluator/eval_output.h b/intern/opensubdiv/internal/evaluator/eval_output.h index 7c1d263a430..3d1746ae78c 100644 --- a/intern/opensubdiv/internal/evaluator/eval_output.h +++ b/intern/opensubdiv/internal/evaluator/eval_output.h @@ -91,25 +91,15 @@ class EvalOutputAPI::EvalOutput { // data structure. They need to be overridden in the specific instances of the EvalOutput derived // classes if needed, while the interfaces above are overridden through VolatileEvalOutput. - virtual void fillPatchArraysBuffer(OpenSubdiv_Buffer * /*patch_arrays_buffer*/) - { - } + virtual void fillPatchArraysBuffer(OpenSubdiv_Buffer * /*patch_arrays_buffer*/) {} - virtual void wrapPatchIndexBuffer(OpenSubdiv_Buffer * /*patch_index_buffer*/) - { - } + virtual void wrapPatchIndexBuffer(OpenSubdiv_Buffer * /*patch_index_buffer*/) {} - virtual void wrapPatchParamBuffer(OpenSubdiv_Buffer * /*patch_param_buffer*/) - { - } + virtual void wrapPatchParamBuffer(OpenSubdiv_Buffer * /*patch_param_buffer*/) {} - virtual void wrapSrcBuffer(OpenSubdiv_Buffer * /*src_buffer*/) - { - } + virtual void wrapSrcBuffer(OpenSubdiv_Buffer * /*src_buffer*/) {} - virtual void wrapSrcVertexDataBuffer(OpenSubdiv_Buffer * /*src_buffer*/) - { - } + virtual void wrapSrcVertexDataBuffer(OpenSubdiv_Buffer * /*src_buffer*/) {} virtual void fillFVarPatchArraysBuffer(const int /*face_varying_channel*/, OpenSubdiv_Buffer * /*patch_arrays_buffer*/) @@ -143,9 +133,7 @@ namespace { // storage. template class RawDataWrapperBuffer { public: - RawDataWrapperBuffer(T *data) : data_(data) - { - } + RawDataWrapperBuffer(T *data) : data_(data) {} T *BindCpuBuffer() { diff --git a/intern/opensubdiv/internal/evaluator/evaluator_cache_impl.cc b/intern/opensubdiv/internal/evaluator/evaluator_cache_impl.cc index efac0926fef..a0ee9cb81a5 100644 --- a/intern/opensubdiv/internal/evaluator/evaluator_cache_impl.cc +++ b/intern/opensubdiv/internal/evaluator/evaluator_cache_impl.cc @@ -18,9 +18,7 @@ #include "internal/evaluator/eval_output_gpu.h" -OpenSubdiv_EvaluatorCacheImpl::OpenSubdiv_EvaluatorCacheImpl() -{ -} +OpenSubdiv_EvaluatorCacheImpl::OpenSubdiv_EvaluatorCacheImpl() {} OpenSubdiv_EvaluatorCacheImpl::~OpenSubdiv_EvaluatorCacheImpl() { diff --git a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc index 148770b0d39..76b03843952 100644 --- a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc +++ b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc @@ -570,9 +570,7 @@ bool GLComputeEvaluator::EvalPatches(GLuint srcBuffer, } // --------------------------------------------------------------------------- -GLComputeEvaluator::_StencilKernel::_StencilKernel() : program(0) -{ -} +GLComputeEvaluator::_StencilKernel::_StencilKernel() : program(0) {} GLComputeEvaluator::_StencilKernel::~_StencilKernel() { if (program) { @@ -617,9 +615,7 @@ bool GLComputeEvaluator::_StencilKernel::Compile(BufferDescriptor const &srcDesc // --------------------------------------------------------------------------- -GLComputeEvaluator::_PatchKernel::_PatchKernel() : program(0) -{ -} +GLComputeEvaluator::_PatchKernel::_PatchKernel() : program(0) {} GLComputeEvaluator::_PatchKernel::~_PatchKernel() { if (program) { diff --git a/intern/opensubdiv/internal/topology/mesh_topology.cc b/intern/opensubdiv/internal/topology/mesh_topology.cc index 461a85fbdfb..dbe4baefe8b 100644 --- a/intern/opensubdiv/internal/topology/mesh_topology.cc +++ b/intern/opensubdiv/internal/topology/mesh_topology.cc @@ -23,13 +23,9 @@ namespace blender { namespace opensubdiv { -MeshTopology::MeshTopology() : num_vertices_(0), num_edges_(0), num_faces_(0) -{ -} +MeshTopology::MeshTopology() : num_vertices_(0), num_edges_(0), num_faces_(0) {} -MeshTopology::~MeshTopology() -{ -} +MeshTopology::~MeshTopology() {} //////////////////////////////////////////////////////////////////////////////// // Vertices. diff --git a/intern/opensubdiv/internal/topology/topology_refiner_impl.cc b/intern/opensubdiv/internal/topology/topology_refiner_impl.cc index fe14d42ac33..d9fccb6f676 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_impl.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_impl.cc @@ -21,9 +21,7 @@ namespace blender { namespace opensubdiv { -TopologyRefinerImpl::TopologyRefinerImpl() : topology_refiner(nullptr) -{ -} +TopologyRefinerImpl::TopologyRefinerImpl() : topology_refiner(nullptr) {} TopologyRefinerImpl::~TopologyRefinerImpl() { diff --git a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc index bc39326b57d..b14e96c729a 100644 --- a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc +++ b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc @@ -28,18 +28,14 @@ OpenSubdiv_Evaluator *openSubdiv_createEvaluatorFromTopologyRefiner( return NULL; } -void openSubdiv_deleteEvaluator(OpenSubdiv_Evaluator * /*evaluator*/) -{ -} +void openSubdiv_deleteEvaluator(OpenSubdiv_Evaluator * /*evaluator*/) {} OpenSubdiv_EvaluatorCache *openSubdiv_createEvaluatorCache(eOpenSubdivEvaluator /*evaluator_type*/) { return NULL; } -void openSubdiv_deleteEvaluatorCache(OpenSubdiv_EvaluatorCache * /*evaluator_cache*/) -{ -} +void openSubdiv_deleteEvaluatorCache(OpenSubdiv_EvaluatorCache * /*evaluator_cache*/) {} const char *openSubdiv_getGLSLPatchBasisSource() { diff --git a/intern/opensubdiv/stub/opensubdiv_stub.cc b/intern/opensubdiv/stub/opensubdiv_stub.cc index 5eaa2df9a27..959b2f8db3f 100644 --- a/intern/opensubdiv/stub/opensubdiv_stub.cc +++ b/intern/opensubdiv/stub/opensubdiv_stub.cc @@ -20,13 +20,9 @@ #include -void openSubdiv_init() -{ -} +void openSubdiv_init() {} -void openSubdiv_cleanup() -{ -} +void openSubdiv_cleanup() {} int openSubdiv_getVersionHex() { diff --git a/intern/opensubdiv/stub/opensubdiv_topology_refiner_stub.cc b/intern/opensubdiv/stub/opensubdiv_topology_refiner_stub.cc index a20f6df6a22..58644285ffb 100644 --- a/intern/opensubdiv/stub/opensubdiv_topology_refiner_stub.cc +++ b/intern/opensubdiv/stub/opensubdiv_topology_refiner_stub.cc @@ -26,9 +26,7 @@ OpenSubdiv_TopologyRefiner *openSubdiv_createTopologyRefinerFromConverter( return NULL; } -void openSubdiv_deleteTopologyRefiner(OpenSubdiv_TopologyRefiner * /*topology_refiner*/) -{ -} +void openSubdiv_deleteTopologyRefiner(OpenSubdiv_TopologyRefiner * /*topology_refiner*/) {} bool openSubdiv_topologyRefinerCompareWithConverter( const OpenSubdiv_TopologyRefiner * /*topology_refiner*/, diff --git a/source/blender/asset_system/intern/asset_catalog_path.cc b/source/blender/asset_system/intern/asset_catalog_path.cc index fe835c555a8..5b972b55634 100644 --- a/source/blender/asset_system/intern/asset_catalog_path.cc +++ b/source/blender/asset_system/intern/asset_catalog_path.cc @@ -12,17 +12,11 @@ namespace blender::asset_system { const char AssetCatalogPath::SEPARATOR = '/'; -AssetCatalogPath::AssetCatalogPath(std::string path) : path_(std::move(path)) -{ -} +AssetCatalogPath::AssetCatalogPath(std::string path) : path_(std::move(path)) {} -AssetCatalogPath::AssetCatalogPath(StringRef path) : path_(path) -{ -} +AssetCatalogPath::AssetCatalogPath(StringRef path) : path_(path) {} -AssetCatalogPath::AssetCatalogPath(const char *path) : path_(path) -{ -} +AssetCatalogPath::AssetCatalogPath(const char *path) : path_(path) {} AssetCatalogPath::AssetCatalogPath(AssetCatalogPath &&other_path) noexcept : path_(std::move(other_path.path_)) diff --git a/source/blender/blendthumb/src/blendthumb_win32.cc b/source/blender/blendthumb/src/blendthumb_win32.cc index 9edcd618168..f9f5665f3e1 100644 --- a/source/blender/blendthumb/src/blendthumb_win32.cc +++ b/source/blender/blendthumb/src/blendthumb_win32.cc @@ -26,9 +26,7 @@ */ class CBlendThumb : public IInitializeWithStream, public IThumbnailProvider { public: - CBlendThumb() : _cRef(1), _pStream(nullptr) - { - } + CBlendThumb() : _cRef(1), _pStream(nullptr) {} virtual ~CBlendThumb() { diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 30246fa224b..1ea294d26c7 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -867,9 +867,7 @@ void blf_draw_buffer__start(FontBLF *font) srgb_to_linearrgb_v4(buf_info->col_float, buf_info->col_init); } } -void blf_draw_buffer__end(void) -{ -} +void blf_draw_buffer__end(void) {} void BLF_draw_buffer_ex(int fontid, const char *str, diff --git a/source/blender/blenkernel/BKE_attribute.hh b/source/blender/blenkernel/BKE_attribute.hh index afa9f1fba23..ac984cc5c87 100644 --- a/source/blender/blenkernel/BKE_attribute.hh +++ b/source/blender/blenkernel/BKE_attribute.hh @@ -88,9 +88,7 @@ struct AttributeInit { MoveArray, }; Type type; - AttributeInit(const Type type) : type(type) - { - } + AttributeInit(const Type type) : type(type) {} }; /** @@ -98,18 +96,14 @@ struct AttributeInit { * if all attribute element values will be set by the caller after creating the attribute. */ struct AttributeInitConstruct : public AttributeInit { - AttributeInitConstruct() : AttributeInit(Type::Construct) - { - } + AttributeInitConstruct() : AttributeInit(Type::Construct) {} }; /** * Create an attribute using the default value for the data type (almost always "zero"). */ struct AttributeInitDefaultValue : public AttributeInit { - AttributeInitDefaultValue() : AttributeInit(Type::DefaultValue) - { - } + AttributeInitDefaultValue() : AttributeInit(Type::DefaultValue) {} }; /** @@ -119,9 +113,7 @@ struct AttributeInitDefaultValue : public AttributeInit { struct AttributeInitVArray : public AttributeInit { GVArray varray; - AttributeInitVArray(GVArray varray) : AttributeInit(Type::VArray), varray(std::move(varray)) - { - } + AttributeInitVArray(GVArray varray) : AttributeInit(Type::VArray), varray(std::move(varray)) {} }; /** @@ -138,9 +130,7 @@ struct AttributeInitVArray : public AttributeInit { struct AttributeInitMoveArray : public AttributeInit { void *data = nullptr; - AttributeInitMoveArray(void *data) : AttributeInit(Type::MoveArray), data(data) - { - } + AttributeInitMoveArray(void *data) : AttributeInit(Type::MoveArray), data(data) {} }; /* Returns false when the iteration should be stopped. */ @@ -824,21 +814,13 @@ class CustomDataAttributes { inline AttributeIDRef::AttributeIDRef() = default; -inline AttributeIDRef::AttributeIDRef(StringRef name) : name_(name) -{ -} +inline AttributeIDRef::AttributeIDRef(StringRef name) : name_(name) {} -inline AttributeIDRef::AttributeIDRef(StringRefNull name) : name_(name) -{ -} +inline AttributeIDRef::AttributeIDRef(StringRefNull name) : name_(name) {} -inline AttributeIDRef::AttributeIDRef(const char *name) : name_(name) -{ -} +inline AttributeIDRef::AttributeIDRef(const char *name) : name_(name) {} -inline AttributeIDRef::AttributeIDRef(const std::string &name) : name_(name) -{ -} +inline AttributeIDRef::AttributeIDRef(const std::string &name) : name_(name) {} /* The anonymous id is only borrowed, the caller has to keep a reference to it. */ inline AttributeIDRef::AttributeIDRef(const AnonymousAttributeID &anonymous_id) diff --git a/source/blender/blenkernel/BKE_attribute_math.hh b/source/blender/blenkernel/BKE_attribute_math.hh index 9056356da4a..ef0744f21a6 100644 --- a/source/blender/blenkernel/BKE_attribute_math.hh +++ b/source/blender/blenkernel/BKE_attribute_math.hh @@ -368,13 +368,9 @@ class BooleanPropagationMixer { /** * Does not do anything, since the mixing is trivial. */ - void finalize() - { - } + void finalize() {} - void finalize(const IndexMask /*mask*/) - { - } + void finalize(const IndexMask /*mask*/) {} }; /** diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh index e4a5bf8b733..16b0c212a6c 100644 --- a/source/blender/blenkernel/BKE_curves.hh +++ b/source/blender/blenkernel/BKE_curves.hh @@ -416,9 +416,7 @@ class CurvesEditHints { */ std::optional> deform_mats; - CurvesEditHints(const Curves &curves_id_orig) : curves_id_orig(curves_id_orig) - { - } + CurvesEditHints(const Curves &curves_id_orig) : curves_id_orig(curves_id_orig) {} /** * The edit hints have to correspond to the original curves, i.e. the number of deformed points diff --git a/source/blender/blenkernel/BKE_geometry_fields.hh b/source/blender/blenkernel/BKE_geometry_fields.hh index 019ff41184b..5e1f8c71ab0 100644 --- a/source/blender/blenkernel/BKE_geometry_fields.hh +++ b/source/blender/blenkernel/BKE_geometry_fields.hh @@ -62,9 +62,7 @@ class PointCloudFieldContext : public fn::FieldContext { const PointCloud &pointcloud_; public: - PointCloudFieldContext(const PointCloud &pointcloud) : pointcloud_(pointcloud) - { - } + PointCloudFieldContext(const PointCloud &pointcloud) : pointcloud_(pointcloud) {} const PointCloud &pointcloud() const { @@ -77,9 +75,7 @@ class InstancesFieldContext : public fn::FieldContext { const Instances &instances_; public: - InstancesFieldContext(const Instances &instances) : instances_(instances) - { - } + InstancesFieldContext(const Instances &instances) : instances_(instances) {} const Instances &instances() const { diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 8e914940b3a..99194021796 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -121,17 +121,11 @@ class AbstractTileData { */ class NoTileData : AbstractTileData { public: - NoTileData(Image * /*image*/, ImageUser * /*image_user*/) - { - } + NoTileData(Image * /*image*/, ImageUser * /*image_user*/) {} - void init_data(TileNumber /*new_tile_number*/) override - { - } + void init_data(TileNumber /*new_tile_number*/) override {} - void free_data() override - { - } + void free_data() override {} }; /** diff --git a/source/blender/blenkernel/BKE_image_wrappers.hh b/source/blender/blenkernel/BKE_image_wrappers.hh index fe01d9e1e62..d7bc36f8b2a 100644 --- a/source/blender/blenkernel/BKE_image_wrappers.hh +++ b/source/blender/blenkernel/BKE_image_wrappers.hh @@ -21,9 +21,7 @@ using TileNumber = int32_t; struct ImageTileWrapper { ImageTile *image_tile; - ImageTileWrapper(ImageTile *image_tile) : image_tile(image_tile) - { - } + ImageTileWrapper(ImageTile *image_tile) : image_tile(image_tile) {} TileNumber get_tile_number() const { @@ -53,9 +51,7 @@ template struct ImageBufferAccessor { ImBuf &image_buffer; - ImageBufferAccessor(ImBuf &image_buffer) : image_buffer(image_buffer) - { - } + ImageBufferAccessor(ImBuf &image_buffer) : image_buffer(image_buffer) {} float4 read_pixel(const int2 coordinate) { diff --git a/source/blender/blenkernel/BKE_pbvh_pixels.hh b/source/blender/blenkernel/BKE_pbvh_pixels.hh index 9110ba4f8f9..30699b2a058 100644 --- a/source/blender/blenkernel/BKE_pbvh_pixels.hh +++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh @@ -169,9 +169,7 @@ struct UDIMTileUndo { short tile_number; rcti region; - UDIMTileUndo(short tile_number, rcti ®ion) : tile_number(tile_number), region(region) - { - } + UDIMTileUndo(short tile_number, rcti ®ion) : tile_number(tile_number), region(region) {} }; struct NodeData { @@ -344,9 +342,7 @@ struct CopyPixelTile { Vector groups; Vector command_deltas; - CopyPixelTile(image::TileNumber tile_number) : tile_number(tile_number) - { - } + CopyPixelTile(image::TileNumber tile_number) : tile_number(tile_number) {} void copy_pixels(ImBuf &tile_buffer, IndexRange group_range) const { diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc index 7c2e45d2f84..0fe7aa1b6cb 100644 --- a/source/blender/blenkernel/intern/cryptomatte.cc +++ b/source/blender/blenkernel/intern/cryptomatte.cc @@ -501,9 +501,7 @@ StringRef BKE_cryptomatte_extract_layer_name(const StringRef render_pass_name) return render_pass_name.substr(0, last_token); } -CryptomatteHash::CryptomatteHash(uint32_t hash) : hash(hash) -{ -} +CryptomatteHash::CryptomatteHash(uint32_t hash) : hash(hash) {} CryptomatteHash CryptomatteHash::from_hex_encoded(blender::StringRef hex_encoded) { diff --git a/source/blender/blenkernel/intern/curves_geometry.cc b/source/blender/blenkernel/intern/curves_geometry.cc index 108841b0bcc..7e3626da5ef 100644 --- a/source/blender/blenkernel/intern/curves_geometry.cc +++ b/source/blender/blenkernel/intern/curves_geometry.cc @@ -48,9 +48,7 @@ static const std::string ATTR_SURFACE_UV_COORDINATE = "surface_uv_coordinate"; /** \name Constructors/Destructor * \{ */ -CurvesGeometry::CurvesGeometry() : CurvesGeometry(0, 0) -{ -} +CurvesGeometry::CurvesGeometry() : CurvesGeometry(0, 0) {} CurvesGeometry::CurvesGeometry(const int point_num, const int curve_num) { @@ -981,9 +979,7 @@ void CurvesGeometry::tag_normals_changed() { this->runtime->evaluated_normal_cache.tag_dirty(); } -void CurvesGeometry::tag_radii_changed() -{ -} +void CurvesGeometry::tag_radii_changed() {} static void translate_positions(MutableSpan positions, const float3 &translation) { diff --git a/source/blender/blenkernel/intern/geometry_component_curves.cc b/source/blender/blenkernel/intern/geometry_component_curves.cc index 7401546c19d..0552b15df2d 100644 --- a/source/blender/blenkernel/intern/geometry_component_curves.cc +++ b/source/blender/blenkernel/intern/geometry_component_curves.cc @@ -22,9 +22,7 @@ using blender::GVArray; /** \name Geometry Component Implementation * \{ */ -CurveComponent::CurveComponent() : GeometryComponent(GEO_COMPONENT_TYPE_CURVE) -{ -} +CurveComponent::CurveComponent() : GeometryComponent(GEO_COMPONENT_TYPE_CURVE) {} CurveComponent::~CurveComponent() { diff --git a/source/blender/blenkernel/intern/geometry_component_instances.cc b/source/blender/blenkernel/intern/geometry_component_instances.cc index 0c8c6620668..8ea6264e6f3 100644 --- a/source/blender/blenkernel/intern/geometry_component_instances.cc +++ b/source/blender/blenkernel/intern/geometry_component_instances.cc @@ -37,9 +37,7 @@ using blender::bke::Instances; /** \name Geometry Component Implementation * \{ */ -InstancesComponent::InstancesComponent() : GeometryComponent(GEO_COMPONENT_TYPE_INSTANCES) -{ -} +InstancesComponent::InstancesComponent() : GeometryComponent(GEO_COMPONENT_TYPE_INSTANCES) {} InstancesComponent::~InstancesComponent() { diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index 7541c4a8f09..f6d06ba17a4 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -25,9 +25,7 @@ extern "C" MDeformVert *BKE_object_defgroup_data_create(ID *id); /** \name Geometry Component Implementation * \{ */ -MeshComponent::MeshComponent() : GeometryComponent(GEO_COMPONENT_TYPE_MESH) -{ -} +MeshComponent::MeshComponent() : GeometryComponent(GEO_COMPONENT_TYPE_MESH) {} MeshComponent::~MeshComponent() { diff --git a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc index 41966fe868a..edc9baa2fbd 100644 --- a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc +++ b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc @@ -12,9 +12,7 @@ /** \name Geometry Component Implementation * \{ */ -PointCloudComponent::PointCloudComponent() : GeometryComponent(GEO_COMPONENT_TYPE_POINT_CLOUD) -{ -} +PointCloudComponent::PointCloudComponent() : GeometryComponent(GEO_COMPONENT_TYPE_POINT_CLOUD) {} PointCloudComponent::~PointCloudComponent() { diff --git a/source/blender/blenkernel/intern/geometry_component_volume.cc b/source/blender/blenkernel/intern/geometry_component_volume.cc index 154cac4e226..405521675cc 100644 --- a/source/blender/blenkernel/intern/geometry_component_volume.cc +++ b/source/blender/blenkernel/intern/geometry_component_volume.cc @@ -10,9 +10,7 @@ /** \name Geometry Component Implementation * \{ */ -VolumeComponent::VolumeComponent() : GeometryComponent(GEO_COMPONENT_TYPE_VOLUME) -{ -} +VolumeComponent::VolumeComponent() : GeometryComponent(GEO_COMPONENT_TYPE_VOLUME) {} VolumeComponent::~VolumeComponent() { diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 713034e4f16..1e6ee8ee3ab 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -39,9 +39,7 @@ using blender::bke::Instances; /** \name Geometry Component * \{ */ -GeometryComponent::GeometryComponent(GeometryComponentType type) : type_(type) -{ -} +GeometryComponent::GeometryComponent(GeometryComponentType type) : type_(type) {} GeometryComponent *GeometryComponent::create(GeometryComponentType component_type) { diff --git a/source/blender/blenkernel/intern/idprop_serialize.cc b/source/blender/blenkernel/intern/idprop_serialize.cc index 8381b0a1755..60d95c65c17 100644 --- a/source/blender/blenkernel/intern/idprop_serialize.cc +++ b/source/blender/blenkernel/intern/idprop_serialize.cc @@ -102,9 +102,7 @@ struct DictionaryEntryParser { const DictionaryValue::Lookup lookup; public: - explicit DictionaryEntryParser(const DictionaryValue &value) : lookup(value.create_lookup()) - { - } + explicit DictionaryEntryParser(const DictionaryValue &value) : lookup(value.create_lookup()) {} std::optional get_type() const { diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 67adb2b66b2..702b6779a76 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -758,9 +758,7 @@ bool BKE_lattice_is_any_selected(const Lattice *lt) /* **** Depsgraph evaluation **** */ -void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph), Lattice *UNUSED(latt)) -{ -} +void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph), Lattice *UNUSED(latt)) {} /* Draw Engine */ diff --git a/source/blender/blenkernel/intern/mesh_calc_edges.cc b/source/blender/blenkernel/intern/mesh_calc_edges.cc index bef3ad351ec..e2a889247a2 100644 --- a/source/blender/blenkernel/intern/mesh_calc_edges.cc +++ b/source/blender/blenkernel/intern/mesh_calc_edges.cc @@ -35,9 +35,7 @@ struct OrderedEdge { } } - OrderedEdge(const uint v1, const uint v2) : OrderedEdge(int(v1), int(v2)) - { - } + OrderedEdge(const uint v1, const uint v2) : OrderedEdge(int(v1), int(v2)) {} uint64_t hash() const { diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc index 374d67bbfa8..c4e25a8e97d 100644 --- a/source/blender/blenkernel/intern/node_tree_update.cc +++ b/source/blender/blenkernel/intern/node_tree_update.cc @@ -172,9 +172,7 @@ struct NodeTreeRelations { std::optional> modifiers_users_; public: - NodeTreeRelations(Main *bmain) : bmain_(bmain) - { - } + NodeTreeRelations(Main *bmain) : bmain_(bmain) {} void ensure_all_trees() { diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc index 1bc58475c3e..f1e9b9fd878 100644 --- a/source/blender/blenkernel/intern/object_update.cc +++ b/source/blender/blenkernel/intern/object_update.cc @@ -276,9 +276,7 @@ void BKE_object_sync_to_original(Depsgraph *depsgraph, Object *object) object_sync_boundbox_to_original(object_orig, object); } -void BKE_object_eval_uber_transform(Depsgraph * /*depsgraph*/, Object * /*object*/) -{ -} +void BKE_object_eval_uber_transform(Depsgraph * /*depsgraph*/, Object * /*object*/) {} void BKE_object_batch_cache_dirty_tag(Object *ob) { diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 66b7f417807..73619facd93 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -1634,9 +1634,7 @@ bool BKE_ocean_init(struct Ocean *UNUSED(o), return false; } -void BKE_ocean_free_data(struct Ocean *UNUSED(oc)) -{ -} +void BKE_ocean_free_data(struct Ocean *UNUSED(oc)) {} void BKE_ocean_free(struct Ocean *oc) { @@ -1688,9 +1686,7 @@ OceanCache *BKE_ocean_init_cache(const char *UNUSED(bakepath), return och; } -void BKE_ocean_simulate_cache(struct OceanCache *UNUSED(och), int UNUSED(frame)) -{ -} +void BKE_ocean_simulate_cache(struct OceanCache *UNUSED(och), int UNUSED(frame)) {} void BKE_ocean_bake(struct Ocean *UNUSED(o), struct OceanCache *UNUSED(och), diff --git a/source/blender/blenkernel/intern/outliner_treehash.cc b/source/blender/blenkernel/intern/outliner_treehash.cc index 9cca077509d..ade378f62ba 100644 --- a/source/blender/blenkernel/intern/outliner_treehash.cc +++ b/source/blender/blenkernel/intern/outliner_treehash.cc @@ -64,9 +64,7 @@ TreeStoreElemKey::TreeStoreElemKey(const TreeStoreElem &elem) { } -TreeStoreElemKey::TreeStoreElemKey(ID *id, short type, short nr) : id(id), type(type), nr(nr) -{ -} +TreeStoreElemKey::TreeStoreElemKey(ID *id, short type, short nr) : id(id), type(type), nr(nr) {} uint64_t TreeStoreElemKey::hash() const { diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.cc b/source/blender/blenkernel/intern/pbvh_uv_islands.cc index f9bafc7aa01..389cef21306 100644 --- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc +++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc @@ -1286,9 +1286,7 @@ void UVBorderCorner::print_debug() const /** \name UVPrimitive * \{ */ -UVPrimitive::UVPrimitive(const int primitive_i) : primitive_i(primitive_i) -{ -} +UVPrimitive::UVPrimitive(const int primitive_i) : primitive_i(primitive_i) {} Vector> UVPrimitive::shared_edges(UVPrimitive &other) { diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index f0d3b09feed..8ac21a7038e 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -66,24 +66,12 @@ static CLG_LogRef LOG = {"bke.rigidbody"}; static void rigidbody_update_ob_array(RigidBodyWorld *rbw); #else -static void RB_dworld_remove_constraint(void *UNUSED(world), void *UNUSED(con)) -{ -} -static void RB_dworld_remove_body(void *UNUSED(world), void *UNUSED(body)) -{ -} -static void RB_dworld_delete(void *UNUSED(world)) -{ -} -static void RB_body_delete(void *UNUSED(body)) -{ -} -static void RB_shape_delete(void *UNUSED(shape)) -{ -} -static void RB_constraint_delete(void *UNUSED(con)) -{ -} +static void RB_dworld_remove_constraint(void *UNUSED(world), void *UNUSED(con)) {} +static void RB_dworld_remove_body(void *UNUSED(world), void *UNUSED(body)) {} +static void RB_dworld_delete(void *UNUSED(world)) {} +static void RB_body_delete(void *UNUSED(body)) {} +static void RB_shape_delete(void *UNUSED(shape)) {} +static void RB_constraint_delete(void *UNUSED(con)) {} #endif @@ -2283,9 +2271,7 @@ void BKE_rigidbody_do_simulation(Depsgraph *depsgraph, Scene *scene, float ctime void BKE_rigidbody_object_copy(Main *bmain, Object *ob_dst, const Object *ob_src, const int flag) { } -void BKE_rigidbody_validate_sim_world(Scene *scene, RigidBodyWorld *rbw, bool rebuild) -{ -} +void BKE_rigidbody_validate_sim_world(Scene *scene, RigidBodyWorld *rbw, bool rebuild) {} void BKE_rigidbody_calc_volume(Object *ob, float *r_vol) { @@ -2305,9 +2291,7 @@ struct RigidBodyWorld *BKE_rigidbody_world_copy(RigidBodyWorld *rbw, const int f { return NULL; } -void BKE_rigidbody_world_groups_relink(struct RigidBodyWorld *rbw) -{ -} +void BKE_rigidbody_world_groups_relink(struct RigidBodyWorld *rbw) {} void BKE_rigidbody_world_id_loop(struct RigidBodyWorld *rbw, RigidbodyWorldIDFunc func, void *userdata) @@ -2326,9 +2310,7 @@ struct RigidBodyWorld *BKE_rigidbody_get_world(Scene *scene) return NULL; } -void BKE_rigidbody_ensure_local_object(Main *bmain, Object *ob) -{ -} +void BKE_rigidbody_ensure_local_object(Main *bmain, Object *ob) {} bool BKE_rigidbody_add_object(Main *bmain, Scene *scene, Object *ob, int type, ReportList *reports) { @@ -2339,12 +2321,8 @@ bool BKE_rigidbody_add_object(Main *bmain, Scene *scene, Object *ob, int type, R void BKE_rigidbody_remove_object(struct Main *bmain, Scene *scene, Object *ob, const bool free_us) { } -void BKE_rigidbody_remove_constraint(Main *bmain, Scene *scene, Object *ob, const bool free_us) -{ -} -void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime) -{ -} +void BKE_rigidbody_remove_constraint(Main *bmain, Scene *scene, Object *ob, const bool free_us) {} +void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime) {} void BKE_rigidbody_aftertrans_update( Object *ob, float loc[3], float rot[3], float quat[4], float rotAxis[3], float rotAngle) { @@ -2353,21 +2331,11 @@ bool BKE_rigidbody_check_sim_running(RigidBodyWorld *rbw, float ctime) { return false; } -void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) -{ -} -void BKE_rigidbody_rebuild_world(Depsgraph *depsgraph, Scene *scene, float ctime) -{ -} -void BKE_rigidbody_do_simulation(Depsgraph *depsgraph, Scene *scene, float ctime) -{ -} -void BKE_rigidbody_objects_collection_validate(Scene *scene, RigidBodyWorld *rbw) -{ -} -void BKE_rigidbody_constraints_collection_validate(Scene *scene, RigidBodyWorld *rbw) -{ -} +void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) {} +void BKE_rigidbody_rebuild_world(Depsgraph *depsgraph, Scene *scene, float ctime) {} +void BKE_rigidbody_do_simulation(Depsgraph *depsgraph, Scene *scene, float ctime) {} +void BKE_rigidbody_objects_collection_validate(Scene *scene, RigidBodyWorld *rbw) {} +void BKE_rigidbody_constraints_collection_validate(Scene *scene, RigidBodyWorld *rbw) {} void BKE_rigidbody_main_collection_object_add(Main *bmain, Collection *collection, Object *object) { } diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 96e4fb941af..15eada5cacc 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -1281,48 +1281,20 @@ bool BKE_sound_stream_info_get(struct Main *main, # include "BLI_utildefines.h" -void BKE_sound_force_device(const char *UNUSED(device)) -{ -} -void BKE_sound_init_once(void) -{ -} -void BKE_sound_init(Main *UNUSED(bmain)) -{ -} -void BKE_sound_exit(void) -{ -} -void BKE_sound_exit_once(void) -{ -} -void BKE_sound_cache(bSound *UNUSED(sound)) -{ -} -void BKE_sound_delete_cache(bSound *UNUSED(sound)) -{ -} -void BKE_sound_load(Main *UNUSED(bmain), bSound *UNUSED(sound)) -{ -} -void BKE_sound_create_scene(Scene *UNUSED(scene)) -{ -} -void BKE_sound_destroy_scene(Scene *UNUSED(scene)) -{ -} -void BKE_sound_lock(void) -{ -} -void BKE_sound_unlock(void) -{ -} -void BKE_sound_reset_scene_specs(Scene *UNUSED(scene)) -{ -} -void BKE_sound_mute_scene(Scene *UNUSED(scene), int UNUSED(muted)) -{ -} +void BKE_sound_force_device(const char *UNUSED(device)) {} +void BKE_sound_init_once(void) {} +void BKE_sound_init(Main *UNUSED(bmain)) {} +void BKE_sound_exit(void) {} +void BKE_sound_exit_once(void) {} +void BKE_sound_cache(bSound *UNUSED(sound)) {} +void BKE_sound_delete_cache(bSound *UNUSED(sound)) {} +void BKE_sound_load(Main *UNUSED(bmain), bSound *UNUSED(sound)) {} +void BKE_sound_create_scene(Scene *UNUSED(scene)) {} +void BKE_sound_destroy_scene(Scene *UNUSED(scene)) {} +void BKE_sound_lock(void) {} +void BKE_sound_unlock(void) {} +void BKE_sound_reset_scene_specs(Scene *UNUSED(scene)) {} +void BKE_sound_mute_scene(Scene *UNUSED(scene), int UNUSED(muted)) {} void *BKE_sound_scene_add_scene_sound(Scene *UNUSED(scene), Sequence *UNUSED(sequence), int UNUSED(startframe), @@ -1347,12 +1319,8 @@ void *BKE_sound_add_scene_sound_defaults(Scene *UNUSED(scene), Sequence *UNUSED( { return NULL; } -void BKE_sound_remove_scene_sound(Scene *UNUSED(scene), void *UNUSED(handle)) -{ -} -void BKE_sound_mute_scene_sound(void *UNUSED(handle), bool UNUSED(mute)) -{ -} +void BKE_sound_remove_scene_sound(Scene *UNUSED(scene), void *UNUSED(handle)) {} +void BKE_sound_mute_scene_sound(void *UNUSED(handle), bool UNUSED(mute)) {} void BKE_sound_move_scene_sound(const Scene *UNUSED(scene), void *UNUSED(handle), int UNUSED(startframe), @@ -1361,18 +1329,10 @@ void BKE_sound_move_scene_sound(const Scene *UNUSED(scene), double UNUSED(audio_offset)) { } -void BKE_sound_move_scene_sound_defaults(Scene *UNUSED(scene), Sequence *UNUSED(sequence)) -{ -} -void BKE_sound_play_scene(Scene *UNUSED(scene)) -{ -} -void BKE_sound_stop_scene(Scene *UNUSED(scene)) -{ -} -void BKE_sound_seek_scene(Main *UNUSED(bmain), Scene *UNUSED(scene)) -{ -} +void BKE_sound_move_scene_sound_defaults(Scene *UNUSED(scene), Sequence *UNUSED(sequence)) {} +void BKE_sound_play_scene(Scene *UNUSED(scene)) {} +void BKE_sound_stop_scene(Scene *UNUSED(scene)) {} +void BKE_sound_seek_scene(Main *UNUSED(bmain), Scene *UNUSED(scene)) {} double BKE_sound_sync_scene(Scene *UNUSED(scene)) { return NAN_FLT; @@ -1388,27 +1348,13 @@ void BKE_sound_read_waveform(Main *bmain, { UNUSED_VARS(sound, stop, bmain); } -void BKE_sound_init_main(Main *UNUSED(bmain)) -{ -} -void BKE_sound_set_cfra(int UNUSED(cfra)) -{ -} -void BKE_sound_update_sequencer(Main *UNUSED(main), bSound *UNUSED(sound)) -{ -} -void BKE_sound_update_scene(Depsgraph *UNUSED(depsgraph), Scene *UNUSED(scene)) -{ -} -void BKE_sound_update_scene_sound(void *UNUSED(handle), bSound *UNUSED(sound)) -{ -} -void BKE_sound_update_scene_listener(Scene *UNUSED(scene)) -{ -} -void BKE_sound_update_fps(Main *UNUSED(bmain), Scene *UNUSED(scene)) -{ -} +void BKE_sound_init_main(Main *UNUSED(bmain)) {} +void BKE_sound_set_cfra(int UNUSED(cfra)) {} +void BKE_sound_update_sequencer(Main *UNUSED(main), bSound *UNUSED(sound)) {} +void BKE_sound_update_scene(Depsgraph *UNUSED(depsgraph), Scene *UNUSED(scene)) {} +void BKE_sound_update_scene_sound(void *UNUSED(handle), bSound *UNUSED(sound)) {} +void BKE_sound_update_scene_listener(Scene *UNUSED(scene)) {} +void BKE_sound_update_fps(Main *UNUSED(bmain), Scene *UNUSED(scene)) {} void BKE_sound_set_scene_sound_volume(void *UNUSED(handle), float UNUSED(volume), char UNUSED(animated)) @@ -1417,9 +1363,7 @@ void BKE_sound_set_scene_sound_volume(void *UNUSED(handle), void BKE_sound_set_scene_sound_pan(void *UNUSED(handle), float UNUSED(pan), char UNUSED(animated)) { } -void BKE_sound_set_scene_volume(Scene *UNUSED(scene), float UNUSED(volume)) -{ -} +void BKE_sound_set_scene_volume(Scene *UNUSED(scene), float UNUSED(volume)) {} void BKE_sound_set_scene_sound_pitch(void *UNUSED(handle), float UNUSED(pitch), char UNUSED(animated)) @@ -1435,9 +1379,7 @@ char **BKE_sound_get_device_names(void) return names; } -void BKE_sound_free_waveform(bSound *UNUSED(sound)) -{ -} +void BKE_sound_free_waveform(bSound *UNUSED(sound)) {} bool BKE_sound_info_get(struct Main *UNUSED(main), struct bSound *UNUSED(sound), diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc index a36f7cf021b..a1a5741a7fb 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc @@ -244,9 +244,7 @@ static void precalc_uv_layer(const OpenSubdiv_Converter *converter, const int la BKE_mesh_uv_vert_map_free(uv_vert_map); } -static void finish_uv_layer(const OpenSubdiv_Converter * /*converter*/) -{ -} +static void finish_uv_layer(const OpenSubdiv_Converter * /*converter*/) {} static int get_num_uvs(const OpenSubdiv_Converter *converter) { diff --git a/source/blender/blenkernel/intern/undo_system.cc b/source/blender/blenkernel/intern/undo_system.cc index 01235e718f3..4058c7b91d6 100644 --- a/source/blender/blenkernel/intern/undo_system.cc +++ b/source/blender/blenkernel/intern/undo_system.cc @@ -244,9 +244,7 @@ static void undosys_stack_validate(UndoStack *ustack, bool expect_non_empty) } } #else -static void undosys_stack_validate(UndoStack * /*ustack*/, bool /*expect_non_empty*/) -{ -} +static void undosys_stack_validate(UndoStack * /*ustack*/, bool /*expect_non_empty*/) {} #endif UndoStack *BKE_undosys_stack_create(void) diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index de2e196c163..a1f14623cef 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -38,9 +38,7 @@ static int start_stub(void *UNUSED(context_v), return 0; } -static void end_stub(void *UNUSED(context_v)) -{ -} +static void end_stub(void *UNUSED(context_v)) {} static int append_stub(void *UNUSED(context_v), RenderData *UNUSED(rd), @@ -60,9 +58,7 @@ static void *context_create_stub(void) return NULL; } -static void context_free_stub(void *UNUSED(context_v)) -{ -} +static void context_free_stub(void *UNUSED(context_v)) {} #ifdef WITH_AVI # include "AVI_avi.h" diff --git a/source/blender/blenlib/BLI_array.hh b/source/blender/blenlib/BLI_array.hh index 200381048c9..6f685188eee 100644 --- a/source/blender/blenlib/BLI_array.hh +++ b/source/blender/blenlib/BLI_array.hh @@ -79,9 +79,7 @@ class Array { size_ = 0; } - Array(NoExceptConstructor, Allocator allocator = {}) noexcept : Array(allocator) - { - } + Array(NoExceptConstructor, Allocator allocator = {}) noexcept : Array(allocator) {} /** * Create a new array that contains copies of all values. @@ -157,9 +155,7 @@ class Array { size_ = size; } - Array(const Array &other) : Array(other.as_span(), other.allocator_) - { - } + Array(const Array &other) : Array(other.as_span(), other.allocator_) {} Array(Array &&other) noexcept(std::is_nothrow_move_constructible_v) : Array(NoExceptConstructor(), other.allocator_) diff --git a/source/blender/blenlib/BLI_bit_span.hh b/source/blender/blenlib/BLI_bit_span.hh index 2a0d4d7558f..458e4e4d27f 100644 --- a/source/blender/blenlib/BLI_bit_span.hh +++ b/source/blender/blenlib/BLI_bit_span.hh @@ -35,9 +35,7 @@ class BitIteratorBase { /** Allows iterating over the bits in a memory buffer. */ class BitIterator : public BitIteratorBase { public: - BitIterator(const BitInt *data, const int64_t bit_index) : BitIteratorBase(data, bit_index) - { - } + BitIterator(const BitInt *data, const int64_t bit_index) : BitIteratorBase(data, bit_index) {} BitRef operator*() const { @@ -48,9 +46,7 @@ class BitIterator : public BitIteratorBase { /** Allows iterating over the bits in a memory buffer. */ class MutableBitIterator : public BitIteratorBase { public: - MutableBitIterator(BitInt *data, const int64_t bit_index) : BitIteratorBase(data, bit_index) - { - } + MutableBitIterator(BitInt *data, const int64_t bit_index) : BitIteratorBase(data, bit_index) {} MutableBitRef operator*() const { @@ -81,9 +77,7 @@ class BitSpan { { } - BitSpan(const BitInt *data, const IndexRange bit_range) : data_(data), bit_range_(bit_range) - { - } + BitSpan(const BitInt *data, const IndexRange bit_range) : data_(data), bit_range_(bit_range) {} /** Number of bits referenced by the span. */ int64_t size() const @@ -143,13 +137,9 @@ class MutableBitSpan { public: MutableBitSpan() = default; - MutableBitSpan(BitInt *data, const int64_t size) : data_(data), bit_range_(size) - { - } + MutableBitSpan(BitInt *data, const int64_t size) : data_(data), bit_range_(size) {} - MutableBitSpan(BitInt *data, const IndexRange bit_range) : data_(data), bit_range_(bit_range) - { - } + MutableBitSpan(BitInt *data, const IndexRange bit_range) : data_(data), bit_range_(bit_range) {} int64_t size() const { diff --git a/source/blender/blenlib/BLI_bit_vector.hh b/source/blender/blenlib/BLI_bit_vector.hh index 3c48d17703f..f79464757c3 100644 --- a/source/blender/blenlib/BLI_bit_vector.hh +++ b/source/blender/blenlib/BLI_bit_vector.hh @@ -91,9 +91,7 @@ class BitVector { uninitialized_fill_n(data_, IntsInInlineBuffer, BitInt(0)); } - BitVector(NoExceptConstructor, Allocator allocator = {}) noexcept : BitVector(allocator) - { - } + BitVector(NoExceptConstructor, Allocator allocator = {}) noexcept : BitVector(allocator) {} BitVector(const BitVector &other) : BitVector(NoExceptConstructor(), other.allocator_) { diff --git a/source/blender/blenlib/BLI_dot_export.hh b/source/blender/blenlib/BLI_dot_export.hh index cc30d9425ee..10228e34509 100644 --- a/source/blender/blenlib/BLI_dot_export.hh +++ b/source/blender/blenlib/BLI_dot_export.hh @@ -89,9 +89,7 @@ class Cluster { public: Attributes attributes; - Cluster(Graph &graph) : graph_(graph) - { - } + Cluster(Graph &graph) : graph_(graph) {} public: void export__declare_nodes_and_clusters(std::stringstream &ss) const; @@ -127,9 +125,7 @@ class Node { public: Attributes attributes; - Node(Graph &graph) : graph_(graph) - { - } + Node(Graph &graph) : graph_(graph) {} public: void set_parent_cluster(Cluster *cluster); @@ -206,9 +202,7 @@ class Edge : blender::NonCopyable, blender::NonMovable { Attributes attributes; public: - Edge(NodePort a, NodePort b) : a_(std::move(a)), b_(std::move(b)) - { - } + Edge(NodePort a, NodePort b) : a_(std::move(a)), b_(std::move(b)) {} void set_arrowhead(Attr_arrowType type) { @@ -233,18 +227,14 @@ class Edge : blender::NonCopyable, blender::NonMovable { class DirectedEdge : public Edge { public: - DirectedEdge(NodePort from, NodePort to) : Edge(std::move(from), std::move(to)) - { - } + DirectedEdge(NodePort from, NodePort to) : Edge(std::move(from), std::move(to)) {} void export__as_edge_statement(std::stringstream &ss) const; }; class UndirectedEdge : public Edge { public: - UndirectedEdge(NodePort a, NodePort b) : Edge(std::move(a), std::move(b)) - { - } + UndirectedEdge(NodePort a, NodePort b) : Edge(std::move(a), std::move(b)) {} void export__as_edge_statement(std::stringstream &ss) const; }; diff --git a/source/blender/blenlib/BLI_enumerable_thread_specific.hh b/source/blender/blenlib/BLI_enumerable_thread_specific.hh index 3a52aaa97a8..1774230b000 100644 --- a/source/blender/blenlib/BLI_enumerable_thread_specific.hh +++ b/source/blender/blenlib/BLI_enumerable_thread_specific.hh @@ -54,9 +54,7 @@ template class EnumerableThreadSpecific : NonCopyable, NonMovable { EnumerableThreadSpecific() = default; - template EnumerableThreadSpecific(F initializer) : values_(std::move(initializer)) - { - } + template EnumerableThreadSpecific(F initializer) : values_(std::move(initializer)) {} T &local() { @@ -86,9 +84,7 @@ template class EnumerableThreadSpecific : NonCopyable, NonMovable { public: using iterator = typename Map>::MutableValueIterator; - EnumerableThreadSpecific() : initializer_([](void *buffer) { new (buffer) T(); }) - { - } + EnumerableThreadSpecific() : initializer_([](void *buffer) { new (buffer) T(); }) {} template EnumerableThreadSpecific(F initializer) diff --git a/source/blender/blenlib/BLI_function_ref.hh b/source/blender/blenlib/BLI_function_ref.hh index bc386322c5d..9f1cba83034 100644 --- a/source/blender/blenlib/BLI_function_ref.hh +++ b/source/blender/blenlib/BLI_function_ref.hh @@ -97,9 +97,7 @@ template class FunctionRef { public: FunctionRef() = default; - FunctionRef(std::nullptr_t) - { - } + FunctionRef(std::nullptr_t) {} /** * A `FunctionRef` itself is a callable as well. However, we don't want that this diff --git a/source/blender/blenlib/BLI_generic_array.hh b/source/blender/blenlib/BLI_generic_array.hh index c46dbe0c907..c8ac2fcf515 100644 --- a/source/blender/blenlib/BLI_generic_array.hh +++ b/source/blender/blenlib/BLI_generic_array.hh @@ -41,13 +41,9 @@ class GArray { * allowed to be null. This default constructor exists so `GArray` can be used in containers, * but the type should be supplied before doing anything else to the array. */ - GArray(Allocator allocator = {}) noexcept : allocator_(allocator) - { - } + GArray(Allocator allocator = {}) noexcept : allocator_(allocator) {} - GArray(NoExceptConstructor, Allocator allocator = {}) noexcept : GArray(allocator) - { - } + GArray(NoExceptConstructor, Allocator allocator = {}) noexcept : GArray(allocator) {} /** * Create and allocate a new array, with elements default constructed @@ -96,9 +92,7 @@ class GArray { /** * Create an array by copying values from another generic array. */ - GArray(const GArray &other) : GArray(other.as_span(), other.allocator()) - { - } + GArray(const GArray &other) : GArray(other.as_span(), other.allocator()) {} /** * Create an array by taking ownership of another array's data, clearing the data in the other. diff --git a/source/blender/blenlib/BLI_generic_pointer.hh b/source/blender/blenlib/BLI_generic_pointer.hh index 226f76c3d33..4714884fa17 100644 --- a/source/blender/blenlib/BLI_generic_pointer.hh +++ b/source/blender/blenlib/BLI_generic_pointer.hh @@ -23,13 +23,9 @@ class GMutablePointer { BLI_assert(data_ == nullptr || type_ != nullptr); } - GMutablePointer(const CPPType &type, void *data = nullptr) : GMutablePointer(&type, data) - { - } + GMutablePointer(const CPPType &type, void *data = nullptr) : GMutablePointer(&type, data) {} - template GMutablePointer(T *data) : GMutablePointer(&CPPType::get(), data) - { - } + template GMutablePointer(T *data) : GMutablePointer(&CPPType::get(), data) {} void *get() const { @@ -80,9 +76,7 @@ class GPointer { public: GPointer() = default; - GPointer(GMutablePointer ptr) : type_(ptr.type()), data_(ptr.get()) - { - } + GPointer(GMutablePointer ptr) : type_(ptr.type()), data_(ptr.get()) {} GPointer(const CPPType *type, const void *data = nullptr) : type_(type), data_(data) { @@ -90,13 +84,9 @@ class GPointer { BLI_assert(data_ == nullptr || type_ != nullptr); } - GPointer(const CPPType &type, const void *data = nullptr) : type_(&type), data_(data) - { - } + GPointer(const CPPType &type, const void *data = nullptr) : type_(&type), data_(data) {} - template GPointer(T *data) : GPointer(&CPPType::get(), data) - { - } + template GPointer(T *data) : GPointer(&CPPType::get(), data) {} const void *get() const { diff --git a/source/blender/blenlib/BLI_generic_span.hh b/source/blender/blenlib/BLI_generic_span.hh index e7a08988c46..ce8141547e7 100644 --- a/source/blender/blenlib/BLI_generic_span.hh +++ b/source/blender/blenlib/BLI_generic_span.hh @@ -32,17 +32,11 @@ class GSpan { BLI_assert(type == nullptr || type->pointer_has_valid_alignment(buffer)); } - GSpan(const CPPType &type, const void *buffer, int64_t size) : GSpan(&type, buffer, size) - { - } + GSpan(const CPPType &type, const void *buffer, int64_t size) : GSpan(&type, buffer, size) {} - GSpan(const CPPType &type) : type_(&type) - { - } + GSpan(const CPPType &type) : type_(&type) {} - GSpan(const CPPType *type) : type_(type) - { - } + GSpan(const CPPType *type) : type_(type) {} template GSpan(Span array) @@ -156,13 +150,9 @@ class GMutableSpan { { } - GMutableSpan(const CPPType &type) : type_(&type) - { - } + GMutableSpan(const CPPType &type) : type_(&type) {} - GMutableSpan(const CPPType *type) : type_(type) - { - } + GMutableSpan(const CPPType *type) : type_(type) {} template GMutableSpan(MutableSpan array) diff --git a/source/blender/blenlib/BLI_generic_value_map.hh b/source/blender/blenlib/BLI_generic_value_map.hh index bd8408526b8..8b4368e7b6b 100644 --- a/source/blender/blenlib/BLI_generic_value_map.hh +++ b/source/blender/blenlib/BLI_generic_value_map.hh @@ -19,9 +19,7 @@ template class GValueMap { Map values_; public: - GValueMap(LinearAllocator<> &allocator) : allocator_(allocator) - { - } + GValueMap(LinearAllocator<> &allocator) : allocator_(allocator) {} ~GValueMap() { diff --git a/source/blender/blenlib/BLI_generic_virtual_array.hh b/source/blender/blenlib/BLI_generic_virtual_array.hh index cb45da5e495..bbbfa8d4445 100644 --- a/source/blender/blenlib/BLI_generic_virtual_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_array.hh @@ -56,9 +56,7 @@ class GVArrayImpl { /* A generic version of #VMutableArrayImpl. */ class GVMutableArrayImpl : public GVArrayImpl { public: - GVMutableArrayImpl(const CPPType &type, int64_t size) : GVArrayImpl(type, size) - { - } + GVMutableArrayImpl(const CPPType &type, int64_t size) : GVArrayImpl(type, size) {} virtual void set_by_copy(int64_t index, const void *value); virtual void set_by_relocate(int64_t index, void *value); diff --git a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh index 373d010d926..7742c92e6e2 100644 --- a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh @@ -21,9 +21,7 @@ class GVVectorArray { int64_t size_; public: - GVVectorArray(const CPPType &type, const int64_t size) : type_(&type), size_(size) - { - } + GVVectorArray(const CPPType &type, const int64_t size) : type_(&type), size_(size) {} virtual ~GVVectorArray() = default; diff --git a/source/blender/blenlib/BLI_implicit_sharing.hh b/source/blender/blenlib/BLI_implicit_sharing.hh index 7b47830aadf..cb74367203c 100644 --- a/source/blender/blenlib/BLI_implicit_sharing.hh +++ b/source/blender/blenlib/BLI_implicit_sharing.hh @@ -40,9 +40,7 @@ class ImplicitSharingInfo : NonCopyable, NonMovable { mutable std::atomic users_; public: - ImplicitSharingInfo(const int initial_users) : users_(initial_users) - { - } + ImplicitSharingInfo(const int initial_users) : users_(initial_users) {} virtual ~ImplicitSharingInfo() { @@ -92,9 +90,7 @@ class ImplicitSharingInfo : NonCopyable, NonMovable { */ class ImplicitSharingMixin : public ImplicitSharingInfo { public: - ImplicitSharingMixin() : ImplicitSharingInfo(1) - { - } + ImplicitSharingMixin() : ImplicitSharingInfo(1) {} private: void delete_self_with_data() override diff --git a/source/blender/blenlib/BLI_implicit_sharing_ptr.hh b/source/blender/blenlib/BLI_implicit_sharing_ptr.hh index 8e726ac97ce..4c632499809 100644 --- a/source/blender/blenlib/BLI_implicit_sharing_ptr.hh +++ b/source/blender/blenlib/BLI_implicit_sharing_ptr.hh @@ -22,9 +22,7 @@ template class ImplicitSharingPtr { public: ImplicitSharingPtr() = default; - ImplicitSharingPtr(T *data) : data_(data) - { - } + ImplicitSharingPtr(T *data) : data_(data) {} ImplicitSharingPtr(const ImplicitSharingPtr &other) : data_(other.data_) { diff --git a/source/blender/blenlib/BLI_index_mask.hh b/source/blender/blenlib/BLI_index_mask.hh index c37820d648b..0e5e3e1075f 100644 --- a/source/blender/blenlib/BLI_index_mask.hh +++ b/source/blender/blenlib/BLI_index_mask.hh @@ -52,9 +52,7 @@ class IndexMask { * Use this method when you know that no indices are skipped. It is more efficient than preparing * an integer array all the time. */ - IndexMask(IndexRange range) : indices_(range.as_span()) - { - } + IndexMask(IndexRange range) : indices_(range.as_span()) {} /** * Construct an IndexMask from a sorted list of indices. Note, the created IndexMask is only @@ -66,16 +64,12 @@ class IndexMask { * Do this: * do_something_with_an_index_mask({3, 4, 5}); */ - IndexMask(const std::initializer_list &indices) : IndexMask(Span(indices)) - { - } + IndexMask(const std::initializer_list &indices) : IndexMask(Span(indices)) {} /** * Creates an IndexMask that references the indices [0, n-1]. */ - explicit IndexMask(int64_t n) : IndexMask(IndexRange(n)) - { - } + explicit IndexMask(int64_t n) : IndexMask(IndexRange(n)) {} /** Checks that the indices are non-negative and in ascending order. */ static bool indices_are_valid_index_mask(Span indices) diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh index c259282ca64..7f1266c6716 100644 --- a/source/blender/blenlib/BLI_index_range.hh +++ b/source/blender/blenlib/BLI_index_range.hh @@ -80,9 +80,7 @@ class IndexRange { int64_t current_; public: - constexpr explicit Iterator(int64_t current) : current_(current) - { - } + constexpr explicit Iterator(int64_t current) : current_(current) {} constexpr Iterator &operator++() { diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh index 56b1155570a..5d937c12025 100644 --- a/source/blender/blenlib/BLI_listbase_wrapper.hh +++ b/source/blender/blenlib/BLI_listbase_wrapper.hh @@ -26,9 +26,7 @@ template class ListBaseWrapperTemplate { BLI_assert(listbase); } - ListBaseWrapperTemplate(LB &listbase) : ListBaseWrapperTemplate(&listbase) - { - } + ListBaseWrapperTemplate(LB &listbase) : ListBaseWrapperTemplate(&listbase) {} class Iterator { private: @@ -36,9 +34,7 @@ template class ListBaseWrapperTemplate { T *current_; public: - Iterator(LB *listbase, T *current) : listbase_(listbase), current_(current) - { - } + Iterator(LB *listbase, T *current) : listbase_(listbase), current_(current) {} Iterator &operator++() { diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index e7958ee49ac..930af7f061c 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -171,9 +171,7 @@ class Map { { } - Map(NoExceptConstructor, Allocator allocator = {}) noexcept : Map(allocator) - { - } + Map(NoExceptConstructor, Allocator allocator = {}) noexcept : Map(allocator) {} ~Map() = default; @@ -1341,9 +1339,7 @@ template class StdUnorderedMapWrapper { map_.clear(); } - void print_stats(StringRef /*name*/ = "") const - { - } + void print_stats(StringRef /*name*/ = "") const {} }; } // namespace blender diff --git a/source/blender/blenlib/BLI_math_matrix_types.hh b/source/blender/blenlib/BLI_math_matrix_types.hh index 3646840c822..46e098a744a 100644 --- a/source/blender/blenlib/BLI_math_matrix_types.hh +++ b/source/blender/blenlib/BLI_math_matrix_types.hh @@ -149,9 +149,7 @@ struct alignas(Alignment) MatBase : public vec_struct_base, N unroll([&](auto i) { (*this)[i] = ptr[i]; }); } - explicit MatBase(const T (*ptr)[NumCol]) : MatBase(static_cast(ptr[0])) - { - } + explicit MatBase(const T (*ptr)[NumCol]) : MatBase(static_cast(ptr[0])) {} /** Conversion from other matrix types. */ diff --git a/source/blender/blenlib/BLI_math_vector_types.hh b/source/blender/blenlib/BLI_math_vector_types.hh index bb7134370e8..a865bb238c1 100644 --- a/source/blender/blenlib/BLI_math_vector_types.hh +++ b/source/blender/blenlib/BLI_math_vector_types.hh @@ -223,9 +223,7 @@ template struct VecBase : public vec_struct_base unroll([&](auto i) { (*this)[i] = ptr[i]; }); } - VecBase(const T (*ptr)[Size]) : VecBase(static_cast(ptr[0])) - { - } + VecBase(const T (*ptr)[Size]) : VecBase(static_cast(ptr[0])) {} /** Conversion from other vector types. */ diff --git a/source/blender/blenlib/BLI_memory_utils.hh b/source/blender/blenlib/BLI_memory_utils.hh index a13e3df7877..1eedd898dd2 100644 --- a/source/blender/blenlib/BLI_memory_utils.hh +++ b/source/blender/blenlib/BLI_memory_utils.hh @@ -96,9 +96,7 @@ template void uninitialized_fill_n(T *dst, int64_t n, const T &value template struct DestructValueAtAddress { DestructValueAtAddress() = default; - template DestructValueAtAddress(const U &) - { - } + template DestructValueAtAddress(const U &) {} void operator()(T *ptr) { diff --git a/source/blender/blenlib/BLI_mesh_intersect.hh b/source/blender/blenlib/BLI_mesh_intersect.hh index 7333700f79b..5ef2f2ec61b 100644 --- a/source/blender/blenlib/BLI_mesh_intersect.hh +++ b/source/blender/blenlib/BLI_mesh_intersect.hh @@ -246,9 +246,7 @@ class IMesh { public: IMesh() = default; - IMesh(Span faces) : face_(faces) - { - } + IMesh(Span faces) : face_(faces) {} void set_faces(Span faces); Face *face(int index) const @@ -338,9 +336,7 @@ struct BoundingBox { float3 max{-FLT_MAX, -FLT_MAX, -FLT_MAX}; BoundingBox() = default; - BoundingBox(const float3 &min, const float3 &max) : min(min), max(max) - { - } + BoundingBox(const float3 &min, const float3 &max) : min(min), max(max) {} void combine(const float3 &p) { diff --git a/source/blender/blenlib/BLI_probing_strategies.hh b/source/blender/blenlib/BLI_probing_strategies.hh index d11bed9208e..3f444439f60 100644 --- a/source/blender/blenlib/BLI_probing_strategies.hh +++ b/source/blender/blenlib/BLI_probing_strategies.hh @@ -55,9 +55,7 @@ class LinearProbingStrategy { uint64_t hash_; public: - LinearProbingStrategy(const uint64_t hash) : hash_(hash) - { - } + LinearProbingStrategy(const uint64_t hash) : hash_(hash) {} void next() { diff --git a/source/blender/blenlib/BLI_serialize.hh b/source/blender/blenlib/BLI_serialize.hh index e23d7d20d0b..3ebf157107a 100644 --- a/source/blender/blenlib/BLI_serialize.hh +++ b/source/blender/blenlib/BLI_serialize.hh @@ -116,9 +116,7 @@ class Value { protected: Value() = delete; - explicit Value(eValueType type) : type_(type) - { - } + explicit Value(eValueType type) : type_(type) {} public: virtual ~Value() = default; @@ -177,9 +175,7 @@ class PrimitiveValue : public Value { T inner_value_{}; public: - explicit PrimitiveValue(const T value) : Value(V), inner_value_(value) - { - } + explicit PrimitiveValue(const T value) : Value(V), inner_value_(value) {} const T value() const { @@ -189,9 +185,7 @@ class PrimitiveValue : public Value { class NullValue : public Value { public: - NullValue() : Value(eValueType::Null) - { - } + NullValue() : Value(eValueType::Null) {} }; class StringValue : public Value { @@ -199,9 +193,7 @@ class StringValue : public Value { std::string string_; public: - StringValue(const StringRef string) : Value(eValueType::String), string_(string) - { - } + StringValue(const StringRef string) : Value(eValueType::String), string_(string) {} const std::string &value() const { @@ -232,9 +224,7 @@ class ContainerValue : public Value { Container inner_value_; public: - ContainerValue() : Value(V) - { - } + ContainerValue() : Value(V) {} const Container &elements() const { diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index bdf108bb4fd..c713b68a8c3 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -175,9 +175,7 @@ class Set { { } - Set(NoExceptConstructor, Allocator allocator = {}) noexcept : Set(allocator) - { - } + Set(NoExceptConstructor, Allocator allocator = {}) noexcept : Set(allocator) {} Set(Span values, Allocator allocator = {}) : Set(NoExceptConstructor(), allocator) { @@ -187,9 +185,7 @@ class Set { /** * Construct a set that contains the given keys. Duplicates will be removed automatically. */ - Set(const std::initializer_list &values) : Set(Span(values)) - { - } + Set(const std::initializer_list &values) : Set(Span(values)) {} ~Set() = default; diff --git a/source/blender/blenlib/BLI_span.hh b/source/blender/blenlib/BLI_span.hh index a276bbd8f68..1ca371a2f46 100644 --- a/source/blender/blenlib/BLI_span.hh +++ b/source/blender/blenlib/BLI_span.hh @@ -118,13 +118,9 @@ template class Span { { } - constexpr Span(const std::vector &vector) : Span(vector.data(), int64_t(vector.size())) - { - } + constexpr Span(const std::vector &vector) : Span(vector.data(), int64_t(vector.size())) {} - template constexpr Span(const std::array &array) : Span(array.data(), N) - { - } + template constexpr Span(const std::array &array) : Span(array.data(), N) {} /** * Support implicit conversions like the one below: @@ -497,13 +493,9 @@ template class MutableSpan { public: constexpr MutableSpan() = default; - constexpr MutableSpan(T *start, const int64_t size) : data_(start), size_(size) - { - } + constexpr MutableSpan(T *start, const int64_t size) : data_(start), size_(size) {} - constexpr MutableSpan(std::vector &vector) : MutableSpan(vector.data(), vector.size()) - { - } + constexpr MutableSpan(std::vector &vector) : MutableSpan(vector.data(), vector.size()) {} template constexpr MutableSpan(std::array &array) : MutableSpan(array.data(), N) diff --git a/source/blender/blenlib/BLI_stack.hh b/source/blender/blenlib/BLI_stack.hh index a9db671e7ac..1e0c3190670 100644 --- a/source/blender/blenlib/BLI_stack.hh +++ b/source/blender/blenlib/BLI_stack.hh @@ -123,9 +123,7 @@ class Stack { size_ = 0; } - Stack(NoExceptConstructor, Allocator allocator = {}) noexcept : Stack(allocator) - { - } + Stack(NoExceptConstructor, Allocator allocator = {}) noexcept : Stack(allocator) {} /** * Create a new stack that contains the given elements. The values are pushed to the stack in diff --git a/source/blender/blenlib/BLI_string_ref.hh b/source/blender/blenlib/BLI_string_ref.hh index f7606ccc860..a029c12bda3 100644 --- a/source/blender/blenlib/BLI_string_ref.hh +++ b/source/blender/blenlib/BLI_string_ref.hh @@ -422,9 +422,7 @@ constexpr StringRef StringRefBase::trim(StringRef characters_to_remove) const /** \name #StringRefNull Inline Methods * \{ */ -constexpr StringRefNull::StringRefNull() : StringRefBase("", 0) -{ -} +constexpr StringRefNull::StringRefNull() : StringRefBase("", 0) {} /** * Construct a StringRefNull from a null terminated c-string. This invokes undefined behavior @@ -450,9 +448,7 @@ inline StringRefNull::StringRefNull(const char *str) : StringRefBase(str, int64_ * Reference a std::string. Remember that when the std::string is destructed, the StringRefNull * will point to uninitialized memory. */ -inline StringRefNull::StringRefNull(const std::string &str) : StringRefNull(str.c_str()) -{ -} +inline StringRefNull::StringRefNull(const std::string &str) : StringRefNull(str.c_str()) {} /** * Get the char at the given index. @@ -481,16 +477,12 @@ constexpr const char *StringRefNull::c_str() const /** \name #StringRef Inline Methods * \{ */ -constexpr StringRef::StringRef() : StringRefBase(nullptr, 0) -{ -} +constexpr StringRef::StringRef() : StringRefBase(nullptr, 0) {} /** * StringRefNull can be converted into StringRef, but not the other way around. */ -constexpr StringRef::StringRef(StringRefNull other) : StringRefBase(other.data(), other.size()) -{ -} +constexpr StringRef::StringRef(StringRefNull other) : StringRefBase(other.data(), other.size()) {} /** * Create a StringRef from a null-terminated c-string. diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh index 02795689f72..0d04a77999f 100644 --- a/source/blender/blenlib/BLI_vector.hh +++ b/source/blender/blenlib/BLI_vector.hh @@ -132,9 +132,7 @@ class Vector { UPDATE_VECTOR_SIZE(this); } - Vector(NoExceptConstructor, Allocator allocator = {}) noexcept : Vector(allocator) - { - } + Vector(NoExceptConstructor, Allocator allocator = {}) noexcept : Vector(allocator) {} /** * Create a vector with a specific size. @@ -185,9 +183,7 @@ class Vector { { } - Vector(const std::initializer_list &values) : Vector(Span(values)) - { - } + Vector(const std::initializer_list &values) : Vector(Span(values)) {} template))> Vector(const std::array &values) : Vector(Span(values)) @@ -225,9 +221,7 @@ class Vector { * Create a copy of another vector. The other vector will not be changed. If the other vector has * less than InlineBufferCapacity elements, no allocation will be made. */ - Vector(const Vector &other) : Vector(other.as_span(), other.allocator_) - { - } + Vector(const Vector &other) : Vector(other.as_span(), other.allocator_) {} /** * Create a copy of a vector with a different InlineBufferCapacity. This needs to be handled diff --git a/source/blender/blenlib/BLI_vector_set.hh b/source/blender/blenlib/BLI_vector_set.hh index 1be21ccb5d1..782623f02bc 100644 --- a/source/blender/blenlib/BLI_vector_set.hh +++ b/source/blender/blenlib/BLI_vector_set.hh @@ -163,9 +163,7 @@ class VectorSet { { } - VectorSet(NoExceptConstructor, Allocator allocator = {}) : VectorSet(allocator) - { - } + VectorSet(NoExceptConstructor, Allocator allocator = {}) : VectorSet(allocator) {} VectorSet(Span keys, Allocator allocator = {}) : VectorSet(NoExceptConstructor(), allocator) { diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 73a1ced19ea..d830ca541fe 100644 --- a/source/blender/blenlib/BLI_virtual_array.hh +++ b/source/blender/blenlib/BLI_virtual_array.hh @@ -210,9 +210,7 @@ template class VArrayImpl_For_Span : public VMutableArrayImpl { } protected: - VArrayImpl_For_Span(const int64_t size) : VMutableArrayImpl(size) - { - } + VArrayImpl_For_Span(const int64_t size) : VMutableArrayImpl(size) {} T get(const int64_t index) const final { @@ -818,13 +816,9 @@ template class VArray : public VArrayCommon { VArray(const VArray &other) = default; VArray(VArray &&other) noexcept = default; - VArray(const VArrayImpl *impl) : VArrayCommon(impl) - { - } + VArray(const VArrayImpl *impl) : VArrayCommon(impl) {} - VArray(std::shared_ptr> impl) : VArrayCommon(std::move(impl)) - { - } + VArray(std::shared_ptr> impl) : VArrayCommon(std::move(impl)) {} VArray(varray_tag::span /* tag */, Span span) { @@ -918,9 +912,7 @@ template class VMutableArray : public VArrayCommon { VMutableArray(const VMutableArray &other) = default; VMutableArray(VMutableArray &&other) noexcept = default; - VMutableArray(const VMutableArrayImpl *impl) : VArrayCommon(impl) - { - } + VMutableArray(const VMutableArrayImpl *impl) : VArrayCommon(impl) {} VMutableArray(std::shared_ptr> impl) : VArrayCommon(std::move(impl)) diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 43ccf9305a7..b714865ce57 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -1582,9 +1582,7 @@ template class CrossData { SymEdge *in; SymEdge *out; - CrossData() : lambda(T(0)), vert(nullptr), in(nullptr), out(nullptr) - { - } + CrossData() : lambda(T(0)), vert(nullptr), in(nullptr), out(nullptr) {} CrossData(T l, CDTVert *v, SymEdge *i, SymEdge *o) : lambda(l), vert(v), in(i), out(o) { } @@ -2336,9 +2334,7 @@ template struct EdgeToSort { CDTEdge *e{nullptr}; EdgeToSort() = default; - EdgeToSort(const EdgeToSort &other) : len_squared(other.len_squared), e(other.e) - { - } + EdgeToSort(const EdgeToSort &other) : len_squared(other.len_squared), e(other.e) {} EdgeToSort(EdgeToSort &&other) noexcept : len_squared(std::move(other.len_squared)), e(other.e) { } diff --git a/source/blender/blenlib/intern/generic_virtual_array.cc b/source/blender/blenlib/intern/generic_virtual_array.cc index b0623175dc7..f1a75969abe 100644 --- a/source/blender/blenlib/intern/generic_virtual_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_array.cc @@ -650,13 +650,9 @@ GVArray::GVArray(const GVArray &other) = default; GVArray::GVArray(GVArray &&other) noexcept = default; -GVArray::GVArray(const GVArrayImpl *impl) : GVArrayCommon(impl) -{ -} +GVArray::GVArray(const GVArrayImpl *impl) : GVArrayCommon(impl) {} -GVArray::GVArray(std::shared_ptr impl) : GVArrayCommon(std::move(impl)) -{ -} +GVArray::GVArray(std::shared_ptr impl) : GVArrayCommon(std::move(impl)) {} GVArray::GVArray(varray_tag::single /* tag */, const CPPType &type, @@ -747,9 +743,7 @@ GVArray &GVArray::operator=(GVArray &&other) noexcept GVMutableArray::GVMutableArray(const GVMutableArray &other) = default; GVMutableArray::GVMutableArray(GVMutableArray &&other) noexcept = default; -GVMutableArray::GVMutableArray(GVMutableArrayImpl *impl) : GVArrayCommon(impl) -{ -} +GVMutableArray::GVMutableArray(GVMutableArrayImpl *impl) : GVArrayCommon(impl) {} GVMutableArray::GVMutableArray(std::shared_ptr impl) : GVArrayCommon(std::move(impl)) diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 7b82ee4e6cd..6e995831e73 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -162,9 +162,7 @@ Face::Face( { } -Face::Face(Span verts, int id, int orig) : vert(verts), id(id), orig(orig) -{ -} +Face::Face(Span verts, int id, int orig) : vert(verts), id(id), orig(orig) {} void Face::populate_plane(bool need_exact) { @@ -305,9 +303,7 @@ class IMeshArena::IMeshArenaImpl : NonCopyable, NonMovable { struct VSetKey { Vert *vert; - VSetKey(Vert *p) : vert(p) - { - } + VSetKey(Vert *p) : vert(p) {} uint64_t hash() const { @@ -998,18 +994,10 @@ struct ITT_value { enum ITT_value_kind kind = INONE; ITT_value() = default; - explicit ITT_value(ITT_value_kind k) : kind(k) - { - } - ITT_value(ITT_value_kind k, int tsrc) : t_source(tsrc), kind(k) - { - } - ITT_value(ITT_value_kind k, const mpq3 &p1) : p1(p1), kind(k) - { - } - ITT_value(ITT_value_kind k, const mpq3 &p1, const mpq3 &p2) : p1(p1), p2(p2), kind(k) - { - } + explicit ITT_value(ITT_value_kind k) : kind(k) {} + ITT_value(ITT_value_kind k, int tsrc) : t_source(tsrc), kind(k) {} + ITT_value(ITT_value_kind k, const mpq3 &p1) : p1(p1), kind(k) {} + ITT_value(ITT_value_kind k, const mpq3 &p1, const mpq3 &p2) : p1(p1), p2(p2), kind(k) {} }; static std::ostream &operator<<(std::ostream &os, const ITT_value &itt); diff --git a/source/blender/blenlib/intern/threads.cc b/source/blender/blenlib/intern/threads.cc index f99a27c2475..90c4c1bd89a 100644 --- a/source/blender/blenlib/intern/threads.cc +++ b/source/blender/blenlib/intern/threads.cc @@ -116,9 +116,7 @@ void BLI_threadapi_init() mainid = pthread_self(); } -void BLI_threadapi_exit() -{ -} +void BLI_threadapi_exit() {} void BLI_threadpool_init(ListBase *threadbase, void *(*do_thread)(void *), int tot) { diff --git a/source/blender/blenlib/tests/BLI_implicit_sharing_test.cc b/source/blender/blenlib/tests/BLI_implicit_sharing_test.cc index ebb341d7a1b..93cf01f739d 100644 --- a/source/blender/blenlib/tests/BLI_implicit_sharing_test.cc +++ b/source/blender/blenlib/tests/BLI_implicit_sharing_test.cc @@ -26,9 +26,7 @@ class SharedDataContainer { ImplicitSharingPtr data_; public: - SharedDataContainer() : data_(MEM_new(__func__)) - { - } + SharedDataContainer() : data_(MEM_new(__func__)) {} const ImplicitlySharedData *get_for_read() const { diff --git a/source/blender/blenlib/tests/BLI_memory_utils_test.cc b/source/blender/blenlib/tests/BLI_memory_utils_test.cc index 6d8b02220de..6fd77f7cbd6 100644 --- a/source/blender/blenlib/tests/BLI_memory_utils_test.cc +++ b/source/blender/blenlib/tests/BLI_memory_utils_test.cc @@ -12,9 +12,7 @@ class TestBaseClass { }; class TestChildClass : public TestBaseClass { - void mymethod() override - { - } + void mymethod() override {} }; static_assert(is_convertible_pointer_v); diff --git a/source/blender/blenlib/tests/BLI_string_test.cc b/source/blender/blenlib/tests/BLI_string_test.cc index cd7dd503aeb..ce9de815b4e 100644 --- a/source/blender/blenlib/tests/BLI_string_test.cc +++ b/source/blender/blenlib/tests/BLI_string_test.cc @@ -661,9 +661,7 @@ TEST(string, StringNLen) struct WordInfo { WordInfo() = default; - WordInfo(int start, int end) : start(start), end(end) - { - } + WordInfo(int start, int end) : start(start), end(end) {} bool operator==(const WordInfo &other) const { return start == other.start && end == other.end; diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc index fc8090a2cb1..173fd0e9c38 100644 --- a/source/blender/blenlib/tests/BLI_vector_test.cc +++ b/source/blender/blenlib/tests/BLI_vector_test.cc @@ -502,17 +502,11 @@ class TypeConstructMock { bool copy_assigned = false; bool move_assigned = false; - TypeConstructMock() : default_constructed(true) - { - } + TypeConstructMock() : default_constructed(true) {} - TypeConstructMock(const TypeConstructMock & /*other*/) : copy_constructed(true) - { - } + TypeConstructMock(const TypeConstructMock & /*other*/) : copy_constructed(true) {} - TypeConstructMock(TypeConstructMock && /*other*/) noexcept : move_constructed(true) - { - } + TypeConstructMock(TypeConstructMock && /*other*/) noexcept : move_constructed(true) {} TypeConstructMock &operator=(const TypeConstructMock &other) { diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index 74c8442c212..c92bd25ac02 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -2753,9 +2753,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) id_us_ensure_real(&lib->id); } -static void lib_link_library(BlendLibReader * /*reader*/, Library * /*lib*/) -{ -} +static void lib_link_library(BlendLibReader * /*reader*/, Library * /*lib*/) {} /* Always call this once you have loaded new library data to set the relative paths correctly * in relation to the blend file. */ diff --git a/source/blender/compositor/intern/COM_CPUDevice.cc b/source/blender/compositor/intern/COM_CPUDevice.cc index 916c7e1a411..3753d2627eb 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.cc +++ b/source/blender/compositor/intern/COM_CPUDevice.cc @@ -8,9 +8,7 @@ namespace blender::compositor { -CPUDevice::CPUDevice(int thread_id) : thread_id_(thread_id) -{ -} +CPUDevice::CPUDevice(int thread_id) : thread_id_(thread_id) {} void CPUDevice::execute(WorkPackage *work_package) { diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h index f6a4638dfc0..a22c64768fe 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h @@ -14,9 +14,7 @@ struct ChunkOrderHotspot { int y; float addition; - ChunkOrderHotspot(int x, int y, float addition) : x(x), y(y), addition(addition) - { - } + ChunkOrderHotspot(int x, int y, float addition) : x(x), y(y), addition(addition) {} double calc_distance(int x, int y); diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index 03f981cd0a2..508e2f336b9 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -31,9 +31,7 @@ class Device { * \brief Declaration of the virtual destructor * \note resolve warning gcc 4.7 */ - virtual ~Device() - { - } + virtual ~Device() {} /** * \brief execute a WorkPackage diff --git a/source/blender/compositor/intern/COM_ExecutionModel.h b/source/blender/compositor/intern/COM_ExecutionModel.h index 5c896b690cd..71b4f0b42c5 100644 --- a/source/blender/compositor/intern/COM_ExecutionModel.h +++ b/source/blender/compositor/intern/COM_ExecutionModel.h @@ -45,9 +45,7 @@ class ExecutionModel { public: ExecutionModel(CompositorContext &context, Span operations); - virtual ~ExecutionModel() - { - } + virtual ~ExecutionModel() {} virtual void execute(ExecutionSystem &exec_system) = 0; diff --git a/source/blender/compositor/intern/COM_NodeConverter.cc b/source/blender/compositor/intern/COM_NodeConverter.cc index 054f822cb65..6834d007f45 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.cc +++ b/source/blender/compositor/intern/COM_NodeConverter.cc @@ -14,9 +14,7 @@ namespace blender::compositor { -NodeConverter::NodeConverter(NodeOperationBuilder *builder) : builder_(builder) -{ -} +NodeConverter::NodeConverter(NodeOperationBuilder *builder) : builder_(builder) {} void NodeConverter::add_operation(NodeOperation *operation) { diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 46f2facfb0e..e69f7cae1db 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -26,9 +26,7 @@ class NodeGraph { NodeOutput *from; NodeInput *to; - Link(NodeOutput *from, NodeInput *to) : from(from), to(to) - { - } + Link(NodeOutput *from, NodeInput *to) : from(from), to(to) {} }; private: diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 2477306685f..af6685c407e 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -351,9 +351,7 @@ class NodeOperation { ExecutionSystem *exec_system_; public: - virtual ~NodeOperation() - { - } + virtual ~NodeOperation() {} void set_name(const std::string name) { @@ -457,9 +455,7 @@ class NodeOperation { * \param chunk_number: the chunk_number to be calculated * \param memory_buffers: all input MemoryBuffer's needed */ - virtual void execute_region(rcti * /*rect*/, unsigned int /*chunk_number*/) - { - } + virtual void execute_region(rcti * /*rect*/, unsigned int /*chunk_number*/) {} /** * \brief when a chunk is executed by an OpenCLDevice, this method is called @@ -597,9 +593,7 @@ class NodeOperation { return 0; } - virtual void deinitialize_tile_data(rcti * /*rect*/, void * /*data*/) - { - } + virtual void deinitialize_tile_data(rcti * /*rect*/, void * /*data*/) {} virtual MemoryBuffer *get_input_memory_buffer(MemoryBuffer ** /*memory_buffers*/) { diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 09cb36b6e81..02b410766dc 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -35,9 +35,7 @@ class NodeOperationBuilder { NodeOperationInput *to_; public: - Link(NodeOperationOutput *from, NodeOperationInput *to) : from_(from), to_(to) - { - } + Link(NodeOperationOutput *from, NodeOperationInput *to) : from_(from), to_(to) {} NodeOperationOutput *from() const { diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h index 40b1d3c2b4f..a06fd513512 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.h +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class AlphaOverNode : public Node { public: - AlphaOverNode(bNode *editor_node) : Node(editor_node) - { - } + AlphaOverNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.h b/source/blender/compositor/nodes/COM_AntiAliasingNode.h index fe0a0fb2ff9..25469355bcf 100644 --- a/source/blender/compositor/nodes/COM_AntiAliasingNode.h +++ b/source/blender/compositor/nodes/COM_AntiAliasingNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class AntiAliasingNode : public Node { public: - AntiAliasingNode(bNode *editor_node) : Node(editor_node) - { - } + AntiAliasingNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cc b/source/blender/compositor/nodes/COM_CombineColorNode.cc index 7802a585c05..94bcf4252d2 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.cc +++ b/source/blender/compositor/nodes/COM_CombineColorNode.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -CombineColorNode::CombineColorNode(bNode *editor_node) : Node(editor_node) -{ -} +CombineColorNode::CombineColorNode(bNode *editor_node) : Node(editor_node) {} void CombineColorNode::convert_to_operations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc index 8ab84715179..dc713641743 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc +++ b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -CombineColorNodeLegacy::CombineColorNodeLegacy(bNode *editor_node) : Node(editor_node) -{ -} +CombineColorNodeLegacy::CombineColorNodeLegacy(bNode *editor_node) : Node(editor_node) {} void CombineColorNodeLegacy::convert_to_operations(NodeConverter &converter, const CompositorContext &context) const diff --git a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h index edc66c8932f..528b8d8babd 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h +++ b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h @@ -19,36 +19,28 @@ class CombineColorNodeLegacy : public Node { class CombineRGBANode : public CombineColorNodeLegacy { public: - CombineRGBANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) - { - } + CombineRGBANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class CombineHSVANode : public CombineColorNodeLegacy { public: - CombineHSVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) - { - } + CombineHSVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class CombineYCCANode : public CombineColorNodeLegacy { public: - CombineYCCANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) - { - } + CombineYCCANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class CombineYUVANode : public CombineColorNodeLegacy { public: - CombineYUVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) - { - } + CombineYUVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_CombineXYZNode.cc b/source/blender/compositor/nodes/COM_CombineXYZNode.cc index dd09dabef02..1ac0c73d611 100644 --- a/source/blender/compositor/nodes/COM_CombineXYZNode.cc +++ b/source/blender/compositor/nodes/COM_CombineXYZNode.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -CombineXYZNode::CombineXYZNode(bNode *editor_node) : Node(editor_node) -{ -} +CombineXYZNode::CombineXYZNode(bNode *editor_node) : Node(editor_node) {} void CombineXYZNode::convert_to_operations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h index 2ca56a18897..6367a227f82 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class ConvertAlphaNode : public Node { public: - ConvertAlphaNode(bNode *editor_node) : Node(editor_node) - { - } + ConvertAlphaNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cc b/source/blender/compositor/nodes/COM_CornerPinNode.cc index 86e9e518d81..6ad0ab7f4f4 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.cc +++ b/source/blender/compositor/nodes/COM_CornerPinNode.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -CornerPinNode::CornerPinNode(bNode *editor_node) : Node(editor_node) -{ -} +CornerPinNode::CornerPinNode(bNode *editor_node) : Node(editor_node) {} void CornerPinNode::convert_to_operations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h index f7db849f326..9ee7e77c362 100644 --- a/source/blender/compositor/nodes/COM_MathNode.h +++ b/source/blender/compositor/nodes/COM_MathNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class MathNode : public Node { public: - MathNode(bNode *editor_node) : Node(editor_node) - { - } + MathNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cc b/source/blender/compositor/nodes/COM_SeparateColorNode.cc index 6732396004f..479949bfade 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -SeparateColorNode::SeparateColorNode(bNode *editor_node) : Node(editor_node) -{ -} +SeparateColorNode::SeparateColorNode(bNode *editor_node) : Node(editor_node) {} void SeparateColorNode::convert_to_operations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc index 11d8ca31d35..d59e3a43779 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc +++ b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc @@ -7,9 +7,7 @@ namespace blender::compositor { -SeparateColorNodeLegacy::SeparateColorNodeLegacy(bNode *editor_node) : Node(editor_node) -{ -} +SeparateColorNodeLegacy::SeparateColorNodeLegacy(bNode *editor_node) : Node(editor_node) {} void SeparateColorNodeLegacy::convert_to_operations(NodeConverter &converter, const CompositorContext &context) const diff --git a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h index 10b33039c86..890b4ea0ca9 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h +++ b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h @@ -19,36 +19,28 @@ class SeparateColorNodeLegacy : public Node { class SeparateRGBANode : public SeparateColorNodeLegacy { public: - SeparateRGBANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) - { - } + SeparateRGBANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class SeparateHSVANode : public SeparateColorNodeLegacy { public: - SeparateHSVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) - { - } + SeparateHSVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class SeparateYCCANode : public SeparateColorNodeLegacy { public: - SeparateYCCANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) - { - } + SeparateYCCANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; class SeparateYUVANode : public SeparateColorNodeLegacy { public: - SeparateYUVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) - { - } + SeparateYUVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node) {} NodeOperation *get_color_converter(const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h index ee4734bdb14..d09bb490520 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.h +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class SetAlphaNode : public Node { public: - SetAlphaNode(bNode *editor_node) : Node(editor_node) - { - } + SetAlphaNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h index 97bd93bd4cc..64c4b90d7c8 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.h +++ b/source/blender/compositor/nodes/COM_ZCombineNode.h @@ -13,9 +13,7 @@ namespace blender::compositor { */ class ZCombineNode : public Node { public: - ZCombineNode(bNode *editor_node) : Node(editor_node) - { - } + ZCombineNode(bNode *editor_node) : Node(editor_node) {} void convert_to_operations(NodeConverter &converter, const CompositorContext &context) const override; }; diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cc b/source/blender/compositor/operations/COM_ConvertOperation.cc index 24c0c577ac7..b48294b17ba 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertOperation.cc @@ -25,9 +25,7 @@ void ConvertBaseOperation::deinit_execution() input_operation_ = nullptr; } -void ConvertBaseOperation::hash_output_params() -{ -} +void ConvertBaseOperation::hash_output_params() {} void ConvertBaseOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc index 5019c2bb158..e5d0413a8be 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.cc +++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc @@ -89,25 +89,15 @@ class DenoiseFilter { } #else - void init_and_lock_denoiser(MemoryBuffer * /*output*/) - { - } + void init_and_lock_denoiser(MemoryBuffer * /*output*/) {} - void deinit_and_unlock_denoiser() - { - } + void deinit_and_unlock_denoiser() {} - void set_image(const StringRef /*name*/, MemoryBuffer * /*buffer*/) - { - } + void set_image(const StringRef /*name*/, MemoryBuffer * /*buffer*/) {} - template void set(const StringRef /*option_name*/, T /*value*/) - { - } + template void set(const StringRef /*option_name*/, T /*value*/) {} - void execute() - { - } + void execute() {} #endif }; diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc index a74d09e81c1..9f06b06035f 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc @@ -6,9 +6,7 @@ namespace blender::compositor { -GaussianXBlurOperation::GaussianXBlurOperation() : GaussianBlurBaseOperation(eDimension::X) -{ -} +GaussianXBlurOperation::GaussianXBlurOperation() : GaussianBlurBaseOperation(eDimension::X) {} void *GaussianXBlurOperation::initialize_tile_data(rcti * /*rect*/) { diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc index 88bb86ab6d6..f305a4fb3bc 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc @@ -6,9 +6,7 @@ namespace blender::compositor { -GaussianYBlurOperation::GaussianYBlurOperation() : GaussianBlurBaseOperation(eDimension::Y) -{ -} +GaussianYBlurOperation::GaussianYBlurOperation() : GaussianBlurBaseOperation(eDimension::Y) {} void *GaussianYBlurOperation::initialize_tile_data(rcti * /*rect*/) { diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h index 2a74aeef048..d16844556af 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h @@ -11,9 +11,7 @@ namespace blender::compositor { class GlareFogGlowOperation : public GlareBaseOperation { public: - GlareFogGlowOperation() : GlareBaseOperation() - { - } + GlareFogGlowOperation() : GlareBaseOperation() {} protected: void generate_glare(float *data, MemoryBuffer *input_tile, const NodeGlare *settings) override; diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h index db79358034a..f1b7d4f8ebf 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.h +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h @@ -11,9 +11,7 @@ namespace blender::compositor { class GlareGhostOperation : public GlareBaseOperation { public: - GlareGhostOperation() : GlareBaseOperation() - { - } + GlareGhostOperation() : GlareBaseOperation() {} protected: void generate_glare(float *data, MemoryBuffer *input_tile, const NodeGlare *settings) override; diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h index 470af780eb2..b0c00c3e131 100644 --- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h +++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h @@ -11,9 +11,7 @@ namespace blender::compositor { class GlareSimpleStarOperation : public GlareBaseOperation { public: - GlareSimpleStarOperation() : GlareBaseOperation() - { - } + GlareSimpleStarOperation() : GlareBaseOperation() {} protected: void generate_glare(float *data, MemoryBuffer *input_tile, const NodeGlare *settings) override; diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h index 56afe3d8462..87466d7601c 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h @@ -11,9 +11,7 @@ namespace blender::compositor { class GlareStreaksOperation : public GlareBaseOperation { public: - GlareStreaksOperation() : GlareBaseOperation() - { - } + GlareStreaksOperation() : GlareBaseOperation() {} protected: void generate_glare(float *data, MemoryBuffer *input_tile, const NodeGlare *settings) override; diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h b/source/blender/compositor/operations/COM_PlaneTrackOperation.h index ab0986bd726..94a317ed11b 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h @@ -54,9 +54,7 @@ class PlaneTrackCommon { class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTrackCommon { public: - PlaneTrackMaskOperation() - { - } + PlaneTrackMaskOperation() {} void init_data() override; @@ -75,9 +73,7 @@ class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTr class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation, public PlaneTrackCommon { public: - PlaneTrackWarpImageOperation() : PlaneTrackCommon() - { - } + PlaneTrackWarpImageOperation() : PlaneTrackCommon() {} void init_data() override; diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cc b/source/blender/compositor/operations/COM_ScaleOperation.cc index b469e76b116..b6a2191a142 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.cc +++ b/source/blender/compositor/operations/COM_ScaleOperation.cc @@ -28,9 +28,7 @@ void BaseScaleOperation::set_scale_canvas_max_size(Size2f size) max_scale_canvas_size_ = size; } -ScaleOperation::ScaleOperation() : ScaleOperation(DataType::Color) -{ -} +ScaleOperation::ScaleOperation() : ScaleOperation(DataType::Color) {} ScaleOperation::ScaleOperation(DataType data_type) : BaseScaleOperation() { @@ -236,13 +234,9 @@ void ScaleOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) } } -ScaleRelativeOperation::ScaleRelativeOperation() : ScaleOperation() -{ -} +ScaleRelativeOperation::ScaleRelativeOperation() : ScaleOperation() {} -ScaleRelativeOperation::ScaleRelativeOperation(DataType data_type) : ScaleOperation(data_type) -{ -} +ScaleRelativeOperation::ScaleRelativeOperation(DataType data_type) : ScaleOperation(data_type) {} void ScaleRelativeOperation::execute_pixel_sampled(float output[4], float x, diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cc b/source/blender/compositor/operations/COM_TranslateOperation.cc index c5599cabe1a..4b2540315d5 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.cc +++ b/source/blender/compositor/operations/COM_TranslateOperation.cc @@ -5,9 +5,7 @@ namespace blender::compositor { -TranslateOperation::TranslateOperation() : TranslateOperation(DataType::Color) -{ -} +TranslateOperation::TranslateOperation() : TranslateOperation(DataType::Color) {} TranslateOperation::TranslateOperation(DataType data_type, ResizeMode resize_mode) { this->add_input_socket(data_type, resize_mode); diff --git a/source/blender/compositor/realtime_compositor/intern/compile_state.cc b/source/blender/compositor/realtime_compositor/intern/compile_state.cc index 2708668d502..d5fb91ddae2 100644 --- a/source/blender/compositor/realtime_compositor/intern/compile_state.cc +++ b/source/blender/compositor/realtime_compositor/intern/compile_state.cc @@ -21,9 +21,7 @@ namespace blender::realtime_compositor { using namespace nodes::derived_node_tree_types; -CompileState::CompileState(const Schedule &schedule) : schedule_(schedule) -{ -} +CompileState::CompileState(const Schedule &schedule) : schedule_(schedule) {} const Schedule &CompileState::get_schedule() { diff --git a/source/blender/compositor/realtime_compositor/intern/context.cc b/source/blender/compositor/realtime_compositor/intern/context.cc index a53c839c365..3b2f2b221cb 100644 --- a/source/blender/compositor/realtime_compositor/intern/context.cc +++ b/source/blender/compositor/realtime_compositor/intern/context.cc @@ -11,9 +11,7 @@ namespace blender::realtime_compositor { -Context::Context(TexturePool &texture_pool) : texture_pool_(texture_pool) -{ -} +Context::Context(TexturePool &texture_pool) : texture_pool_(texture_pool) {} int2 Context::get_compositing_region_size() const { diff --git a/source/blender/compositor/realtime_compositor/intern/domain.cc b/source/blender/compositor/realtime_compositor/intern/domain.cc index b293f0b00df..8f5dbb4929c 100644 --- a/source/blender/compositor/realtime_compositor/intern/domain.cc +++ b/source/blender/compositor/realtime_compositor/intern/domain.cc @@ -7,9 +7,7 @@ namespace blender::realtime_compositor { -Domain::Domain(const int2 &size) : size(size), transformation(float3x3::identity()) -{ -} +Domain::Domain(const int2 &size) : size(size), transformation(float3x3::identity()) {} Domain::Domain(const int2 &size, const float3x3 &transformation) : size(size), transformation(transformation) diff --git a/source/blender/compositor/realtime_compositor/intern/evaluator.cc b/source/blender/compositor/realtime_compositor/intern/evaluator.cc index f8c63cd7f6e..8325f40e005 100644 --- a/source/blender/compositor/realtime_compositor/intern/evaluator.cc +++ b/source/blender/compositor/realtime_compositor/intern/evaluator.cc @@ -21,9 +21,7 @@ namespace blender::realtime_compositor { using namespace nodes::derived_node_tree_types; -Evaluator::Evaluator(Context &context) : context_(context) -{ -} +Evaluator::Evaluator(Context &context) : context_(context) {} void Evaluator::evaluate() { diff --git a/source/blender/compositor/realtime_compositor/intern/operation.cc b/source/blender/compositor/realtime_compositor/intern/operation.cc index 832196cc5ef..d7b3ce483df 100644 --- a/source/blender/compositor/realtime_compositor/intern/operation.cc +++ b/source/blender/compositor/realtime_compositor/intern/operation.cc @@ -21,9 +21,7 @@ namespace blender::realtime_compositor { -Operation::Operation(Context &context) : context_(context) -{ -} +Operation::Operation(Context &context) : context_(context) {} Operation::~Operation() = default; diff --git a/source/blender/compositor/realtime_compositor/intern/simple_operation.cc b/source/blender/compositor/realtime_compositor/intern/simple_operation.cc index d55a20e5c54..84cdd585656 100644 --- a/source/blender/compositor/realtime_compositor/intern/simple_operation.cc +++ b/source/blender/compositor/realtime_compositor/intern/simple_operation.cc @@ -20,9 +20,7 @@ void SimpleOperation::map_input_to_result(Result *result) Operation::map_input_to_result(input_identifier_, result); } -void SimpleOperation::add_and_evaluate_input_processors() -{ -} +void SimpleOperation::add_and_evaluate_input_processors() {} Result &SimpleOperation::get_input() { diff --git a/source/blender/compositor/realtime_compositor/intern/texture_pool.cc b/source/blender/compositor/realtime_compositor/intern/texture_pool.cc index da9bb478064..4251cb260be 100644 --- a/source/blender/compositor/realtime_compositor/intern/texture_pool.cc +++ b/source/blender/compositor/realtime_compositor/intern/texture_pool.cc @@ -17,9 +17,7 @@ namespace blender::realtime_compositor { /** \name Texture Pool Key * \{ */ -TexturePoolKey::TexturePoolKey(int2 size, eGPUTextureFormat format) : size(size), format(format) -{ -} +TexturePoolKey::TexturePoolKey(int2 size, eGPUTextureFormat format) : size(size), format(format) {} TexturePoolKey::TexturePoolKey(const GPUTexture *texture) { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc index a9f8d1f73d3..fa864b1bf3e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc @@ -21,9 +21,7 @@ namespace blender::deg { /* Animated property storage. */ -AnimatedPropertyID::AnimatedPropertyID() : data(nullptr), property_rna(nullptr) -{ -} +AnimatedPropertyID::AnimatedPropertyID() : data(nullptr), property_rna(nullptr) {} AnimatedPropertyID::AnimatedPropertyID(const PointerRNA *pointer_rna, const PropertyRNA *property_rna) @@ -98,9 +96,7 @@ void animated_property_cb(ID * /*id*/, FCurve *fcurve, void *data_v) } // namespace -AnimatedPropertyStorage::AnimatedPropertyStorage() : is_fully_initialized(false) -{ -} +AnimatedPropertyStorage::AnimatedPropertyStorage() : is_fully_initialized(false) {} void AnimatedPropertyStorage::initializeFromID(DepsgraphBuilderCache *builder_cache, const ID *id) { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index c704e73b21d..6198b24fb44 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -481,9 +481,7 @@ Depsgraph *DepsgraphRelationBuilder::getGraph() /* **** Functions to build relations between entities **** */ -void DepsgraphRelationBuilder::begin_build() -{ -} +void DepsgraphRelationBuilder::begin_build() {} void DepsgraphRelationBuilder::build_id(ID *id) { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 1a4356c4a92..415536a145c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -39,9 +39,7 @@ namespace blender::deg { class RNANodeQueryIDData { public: - explicit RNANodeQueryIDData(const ID *id) : id_(id) - { - } + explicit RNANodeQueryIDData(const ID *id) : id_(id) {} ~RNANodeQueryIDData() { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_stack.h b/source/blender/depsgraph/intern/builder/deg_builder_stack.h index 3f9cc83928a..b78c066f9ac 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_stack.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_stack.h @@ -40,21 +40,13 @@ class BuilderStack { * the stack is printed. */ class Entry { public: - explicit Entry(const ID &id) : id_(&id) - { - } + explicit Entry(const ID &id) : id_(&id) {} - explicit Entry(const bConstraint &constraint) : constraint_(&constraint) - { - } + explicit Entry(const bConstraint &constraint) : constraint_(&constraint) {} - explicit Entry(const bPoseChannel &pchan) : pchan_(&pchan) - { - } + explicit Entry(const bPoseChannel &pchan) : pchan_(&pchan) {} - explicit Entry(const ModifierData &modifier_data) : modifier_data_(&modifier_data) - { - } + explicit Entry(const ModifierData &modifier_data) : modifier_data_(&modifier_data) {} private: friend class BuilderStack; @@ -109,9 +101,7 @@ class BuilderStack { private: friend BuilderStack; - explicit ScopedEntry(Stack &stack) : stack_(&stack) - { - } + explicit ScopedEntry(Stack &stack) : stack_(&stack) {} Stack *stack_; }; diff --git a/source/blender/depsgraph/intern/debug/deg_time_average.h b/source/blender/depsgraph/intern/debug/deg_time_average.h index d4eb05a9ddb..4816ed24e32 100644 --- a/source/blender/depsgraph/intern/debug/deg_time_average.h +++ b/source/blender/depsgraph/intern/debug/deg_time_average.h @@ -12,9 +12,7 @@ namespace blender::deg { /* Utility class which takes care of calculating average of time series, such as FPS counters. */ template class AveragedTimeSampler { public: - AveragedTimeSampler() : num_samples_(0), next_sample_index_(0) - { - } + AveragedTimeSampler() : num_samples_(0), next_sample_index_(0) {} void add_sample(double value) { diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index ab3d05e7fa7..28165865461 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -435,6 +435,4 @@ void DEG_iterator_ids_next(BLI_Iterator *iter) } while (iter->skip); } -void DEG_iterator_ids_end(BLI_Iterator * /*iter*/) -{ -} +void DEG_iterator_ids_end(BLI_Iterator * /*iter*/) {} diff --git a/source/blender/depsgraph/intern/depsgraph_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc index 77d5419f99e..133d40f82c2 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.cc +++ b/source/blender/depsgraph/intern/depsgraph_type.cc @@ -31,9 +31,7 @@ void DEG_register_node_types() deg::deg_register_operation_depsnodes(); } -void DEG_free_node_types() -{ -} +void DEG_free_node_types() {} deg::DEGCustomDataMeshMasks::DEGCustomDataMeshMasks(const CustomData_MeshMasks *other) : vert_mask(other->vmask), diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc index f7fe968d12f..c14edfe13a6 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc @@ -70,9 +70,7 @@ AnimationBackup::AnimationBackup(const Depsgraph *depsgraph) reset(); } -void AnimationBackup::reset() -{ -} +void AnimationBackup::reset() {} void AnimationBackup::init_from_id(ID *id) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc index be37d8b7ebe..aff91767973 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc @@ -15,13 +15,9 @@ namespace blender::deg { -GPencilBackup::GPencilBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) -{ -} +GPencilBackup::GPencilBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) {} -void GPencilBackup::init_from_gpencil(bGPdata * /*gpd*/) -{ -} +void GPencilBackup::init_from_gpencil(bGPdata * /*gpd*/) {} void GPencilBackup::restore_to_gpencil(bGPdata *gpd) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc index 3902543c1f8..9f1091018ff 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc @@ -18,9 +18,7 @@ namespace blender::deg { -SequencerBackup::SequencerBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) -{ -} +SequencerBackup::SequencerBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) {} static bool seq_init_cb(Sequence *seq, void *user_data) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc index 4f36c90fc7c..a99378d6a49 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc @@ -19,9 +19,7 @@ namespace blender::deg { -VolumeBackup::VolumeBackup(const Depsgraph * /*depsgraph*/) : grids(nullptr) -{ -} +VolumeBackup::VolumeBackup(const Depsgraph * /*depsgraph*/) : grids(nullptr) {} void VolumeBackup::init_from_volume(Volume *volume) { diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h index c28897a5ad4..fbd442f6062 100644 --- a/source/blender/depsgraph/intern/node/deg_node.h +++ b/source/blender/depsgraph/intern/node/deg_node.h @@ -189,13 +189,9 @@ struct Node { /** Generic identifier for Depsgraph Nodes. */ virtual string identifier() const; - virtual void init(const ID * /*id*/, const char * /*subdata*/) - { - } + virtual void init(const ID * /*id*/, const char * /*subdata*/) {} - virtual void tag_update(Depsgraph * /*graph*/, eUpdateSource /*source*/) - { - } + virtual void tag_update(Depsgraph * /*graph*/, eUpdateSource /*source*/) {} virtual OperationNode *get_entry_operation() { diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index a37feb7b95d..5beb833c6da 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -41,9 +41,7 @@ const char *linkedStateAsString(eDepsNode_LinkedState_Type linked_state) return "UNKNOWN"; } -IDNode::ComponentIDKey::ComponentIDKey(NodeType type, const char *name) : type(type), name(name) -{ -} +IDNode::ComponentIDKey::ComponentIDKey(NodeType type, const char *name) : type(type), name(name) {} bool IDNode::ComponentIDKey::operator==(const ComponentIDKey &other) const { diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index cccc7938a4b..504cae37029 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -200,9 +200,7 @@ const char *operationCodeAsString(OperationCode opcode) return "UNKNOWN"; } -OperationNode::OperationNode() : name_tag(-1), flag(0) -{ -} +OperationNode::OperationNode() : name_tag(-1), flag(0) {} string OperationNode::identifier() const { diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 1ae7bd3a3d5..00ee821486c 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -19,9 +19,7 @@ #include "eevee_private.h" -void EEVEE_subsurface_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *UNUSED(vedata)) -{ -} +void EEVEE_subsurface_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *UNUSED(vedata)) {} void EEVEE_subsurface_draw_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_filter_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_filter_comp.glsl index 836cd8945e6..80c6eed5947 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_filter_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_filter_comp.glsl @@ -12,9 +12,7 @@ struct FilterSample { #ifdef GPU_METAL inline FilterSample() = default; - inline FilterSample(vec4 in_color, float in_weight) : color(in_color), weight(in_weight) - { - } + inline FilterSample(vec4 in_color, float in_weight) : color(in_color), weight(in_weight) {} #endif }; diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_stabilize_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_stabilize_comp.glsl index cab587339c9..8ecaa0688a1 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_stabilize_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_stabilize_comp.glsl @@ -26,9 +26,7 @@ struct DofSample { #ifdef GPU_METAL /* Explicit constructors -- To support GLSL syntax. */ inline DofSample() = default; - inline DofSample(vec4 in_color, float in_coc) : color(in_color), coc(in_coc) - { - } + inline DofSample(vec4 in_color, float in_coc) : color(in_color), coc(in_coc) {} #endif }; @@ -157,9 +155,7 @@ struct DofNeighborhoodMinMax { #ifdef GPU_METAL /* Explicit constructors -- To support GLSL syntax. */ inline DofNeighborhoodMinMax() = default; - inline DofNeighborhoodMinMax(DofSample in_min, DofSample in_max) : min(in_min), max(in_max) - { - } + inline DofNeighborhoodMinMax(DofSample in_min, DofSample in_max) : min(in_min), max(in_max) {} #endif }; diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index 518b4654f9b..11f147d5e36 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -226,9 +226,7 @@ static void external_cache_populate(void *vedata, Object *ob) } } -static void external_cache_finish(void *UNUSED(vedata)) -{ -} +static void external_cache_finish(void *UNUSED(vedata)) {} static void external_draw_scene_do_v3d(void *vedata) { diff --git a/source/blender/draw/engines/image/image_batches.hh b/source/blender/draw/engines/image/image_batches.hh index 1d7e7a0b548..67a8e8976d1 100644 --- a/source/blender/draw/engines/image/image_batches.hh +++ b/source/blender/draw/engines/image/image_batches.hh @@ -20,9 +20,7 @@ class BatchUpdater { int uv_id; public: - BatchUpdater(TextureInfo &info) : info(info) - { - } + BatchUpdater(TextureInfo &info) : info(info) {} void update_batch() { diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh index b77150fbb02..23944964caa 100644 --- a/source/blender/draw/engines/image/image_drawing_mode.hh +++ b/source/blender/draw/engines/image/image_drawing_mode.hh @@ -43,9 +43,7 @@ template class ScreenTileTextures { IMAGE_InstanceData *instance_data; public: - ScreenTileTextures(IMAGE_InstanceData *instance_data) : instance_data(instance_data) - { - } + ScreenTileTextures(IMAGE_InstanceData *instance_data) : instance_data(instance_data) {} /** * \brief Ensure enough texture infos are allocated in `instance_data`. diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh index 5ca2894454b..05b8a6a8d6d 100644 --- a/source/blender/draw/engines/image/image_space_image.hh +++ b/source/blender/draw/engines/image/image_space_image.hh @@ -15,9 +15,7 @@ class SpaceImageAccessor : public AbstractSpaceAccessor { SpaceImage *sima; public: - SpaceImageAccessor(SpaceImage *sima) : sima(sima) - { - } + SpaceImageAccessor(SpaceImage *sima) : sima(sima) {} Image *get_image(Main * /*bmain*/) override { diff --git a/source/blender/draw/engines/image/image_space_node.hh b/source/blender/draw/engines/image/image_space_node.hh index 387d0315f3f..aa751f897c9 100644 --- a/source/blender/draw/engines/image/image_space_node.hh +++ b/source/blender/draw/engines/image/image_space_node.hh @@ -15,9 +15,7 @@ class SpaceNodeAccessor : public AbstractSpaceAccessor { SpaceNode *snode; public: - SpaceNodeAccessor(SpaceNode *snode) : snode(snode) - { - } + SpaceNodeAccessor(SpaceNode *snode) : snode(snode) {} Image *get_image(Main *bmain) override { diff --git a/source/blender/draw/engines/overlay/overlay_facing.cc b/source/blender/draw/engines/overlay/overlay_facing.cc index 44dab0f0a42..62b9947233b 100644 --- a/source/blender/draw/engines/overlay/overlay_facing.cc +++ b/source/blender/draw/engines/overlay/overlay_facing.cc @@ -10,9 +10,7 @@ #include "overlay_private.hh" -void OVERLAY_facing_init(OVERLAY_Data * /*vedata*/) -{ -} +void OVERLAY_facing_init(OVERLAY_Data * /*vedata*/) {} void OVERLAY_facing_cache_init(OVERLAY_Data *vedata) { diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc index b9523a4eac9..8aef21ad95d 100644 --- a/source/blender/draw/engines/overlay/overlay_fade.cc +++ b/source/blender/draw/engines/overlay/overlay_fade.cc @@ -12,9 +12,7 @@ #include "overlay_private.hh" -void OVERLAY_fade_init(OVERLAY_Data * /*vedata*/) -{ -} +void OVERLAY_fade_init(OVERLAY_Data * /*vedata*/) {} void OVERLAY_fade_cache_init(OVERLAY_Data *vedata) { diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh index be9600a4c80..67e7616eb04 100644 --- a/source/blender/draw/intern/DRW_gpu_wrapper.hh +++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh @@ -484,9 +484,7 @@ class Texture : NonCopyable { const char *name_; public: - Texture(const char *name = "gpu::Texture") : name_(name) - { - } + Texture(const char *name = "gpu::Texture") : name_(name) {} Texture(const char *name, eGPUTextureFormat format, diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc index d306079855d..8ff70d3761a 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc @@ -52,9 +52,7 @@ struct ExtractorRunData { void *buffer = nullptr; uint32_t data_offset = 0; - ExtractorRunData(const MeshExtract *extractor) : extractor(extractor) - { - } + ExtractorRunData(const MeshExtract *extractor) : extractor(extractor) {} #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("DRAW:ExtractorRunData") diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 36b3fddb43c..15314ca5337 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -244,9 +244,7 @@ void DRW_globals_update(void) /* ********************************* SHGROUP ************************************* */ -void DRW_globals_free(void) -{ -} +void DRW_globals_free(void) {} DRWView *DRW_view_create_with_zoffset(const DRWView *parent_view, const RegionView3D *rv3d, diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index c8d99de3a16..075d80f343c 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -124,9 +124,7 @@ struct PBVHBatch { struct cmp { Vector &master_vbos; - cmp(Vector &_master_vbos) : master_vbos(_master_vbos) - { - } + cmp(Vector &_master_vbos) : master_vbos(_master_vbos) {} bool operator()(const int &a, const int &b) { diff --git a/source/blender/editors/armature/meshlaplacian.cc b/source/blender/editors/armature/meshlaplacian.cc index 19a32cf6455..048ed456d8c 100644 --- a/source/blender/editors/armature/meshlaplacian.cc +++ b/source/blender/editors/armature/meshlaplacian.cc @@ -35,18 +35,10 @@ #include "meshlaplacian.h" /* ************* XXX *************** */ -static void waitcursor(int /*val*/) -{ -} -static void progress_bar(int /*dummy_val*/, const char * /*dummy*/) -{ -} -static void start_progress_bar(void) -{ -} -static void end_progress_bar(void) -{ -} +static void waitcursor(int /*val*/) {} +static void progress_bar(int /*dummy_val*/, const char * /*dummy*/) {} +static void start_progress_bar(void) {} +static void end_progress_bar(void) {} static void error(const char *str) { printf("error: %s\n", str); diff --git a/source/blender/editors/asset/intern/asset_indexer.cc b/source/blender/editors/asset/intern/asset_indexer.cc index 11495d4048e..992d8d053d8 100644 --- a/source/blender/editors/asset/intern/asset_indexer.cc +++ b/source/blender/editors/asset/intern/asset_indexer.cc @@ -108,9 +108,7 @@ class BlendFile : public AbstractFile { StringRefNull file_path_; public: - BlendFile(StringRefNull file_path) : file_path_(file_path) - { - } + BlendFile(StringRefNull file_path) : file_path_(file_path) {} uint64_t hash() const { @@ -147,9 +145,7 @@ struct AssetEntryReader { } public: - AssetEntryReader(const DictionaryValue &entry) : lookup(entry.create_lookup()) - { - } + AssetEntryReader(const DictionaryValue &entry) : lookup(entry.create_lookup()) {} ID_Type get_idcode() const { @@ -251,9 +247,7 @@ struct AssetEntryWriter { DictionaryValue::Items &attributes; public: - AssetEntryWriter(DictionaryValue &entry) : attributes(entry.elements()) - { - } + AssetEntryWriter(DictionaryValue &entry) : attributes(entry.elements()) {} /** * \brief add id + name to the attributes. @@ -674,9 +668,7 @@ struct AssetIndex { * Constructor when reading an asset index file. * #AssetIndex.contents are read from the given \p value. */ - AssetIndex(std::unique_ptr &value) : contents(std::move(value)) - { - } + AssetIndex(std::unique_ptr &value) : contents(std::move(value)) {} int get_version() const { diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index 1303be1a510..6f2aedcbad5 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -233,9 +233,7 @@ class AssetClearHelper { const bool set_fake_user_; public: - AssetClearHelper(const bool set_fake_user) : set_fake_user_(set_fake_user) - { - } + AssetClearHelper(const bool set_fake_user) : set_fake_user_(set_fake_user) {} void operator()(PointerRNAVec &ids); diff --git a/source/blender/editors/asset/intern/asset_temp_id_consumer.cc b/source/blender/editors/asset/intern/asset_temp_id_consumer.cc index d8525d4150f..f05c3a858e4 100644 --- a/source/blender/editors/asset/intern/asset_temp_id_consumer.cc +++ b/source/blender/editors/asset/intern/asset_temp_id_consumer.cc @@ -34,9 +34,7 @@ class AssetTemporaryIDConsumer : NonCopyable, NonMovable { TempLibraryContext *temp_lib_context_ = nullptr; public: - AssetTemporaryIDConsumer(const AssetRepresentation *asset) : asset_(asset) - { - } + AssetTemporaryIDConsumer(const AssetRepresentation *asset) : asset_(asset) {} ~AssetTemporaryIDConsumer() { if (temp_lib_context_) { diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index dd0e505576a..601b26bc0e5 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -1114,9 +1114,7 @@ static void free_iconfile_list(ListBase *list) #else -void UI_icons_reload_internal_textures() -{ -} +void UI_icons_reload_internal_textures() {} #endif /* WITH_HEADLESS */ diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 2d5a852d389..2b5365420c4 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -94,9 +94,7 @@ #define TEMPLATE_SEARCH_TEXTBUT_MIN_WIDTH (UI_UNIT_X * 6) #define TEMPLATE_SEARCH_TEXTBUT_HEIGHT UI_UNIT_Y -void UI_template_fix_linking(void) -{ -} +void UI_template_fix_linking(void) {} /* -------------------------------------------------------------------- */ /** \name Header Template diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index 72b7e7f62a4..ca150c9d914 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -180,18 +180,14 @@ std::unique_ptr AbstractViewItem::create_drop_target return nullptr; } -AbstractViewItemDragController::AbstractViewItemDragController(AbstractView &view) : view_(view) -{ -} +AbstractViewItemDragController::AbstractViewItemDragController(AbstractView &view) : view_(view) {} void AbstractViewItemDragController::on_drag_start() { /* Do nothing by default. */ } -AbstractViewItemDropTarget::AbstractViewItemDropTarget(AbstractView &view) : view_(view) -{ -} +AbstractViewItemDropTarget::AbstractViewItemDropTarget(AbstractView &view) : view_(view) {} /** \} */ diff --git a/source/blender/editors/interface/views/grid_view.cc b/source/blender/editors/interface/views/grid_view.cc index 8111c69619d..37d7ffef499 100644 --- a/source/blender/editors/interface/views/grid_view.cc +++ b/source/blender/editors/interface/views/grid_view.cc @@ -84,15 +84,11 @@ int AbstractGridView::get_item_count() const return items_.size(); } -GridViewStyle::GridViewStyle(int width, int height) : tile_width(width), tile_height(height) -{ -} +GridViewStyle::GridViewStyle(int width, int height) : tile_width(width), tile_height(height) {} /* ---------------------------------------------------------------------- */ -AbstractGridViewItem::AbstractGridViewItem(StringRef identifier) : identifier_(identifier) -{ -} +AbstractGridViewItem::AbstractGridViewItem(StringRef identifier) : identifier_(identifier) {} bool AbstractGridViewItem::matches(const AbstractViewItem &other) const { @@ -389,9 +385,7 @@ uiLayout *GridViewLayoutBuilder::current_layout() const /* ---------------------------------------------------------------------- */ -GridViewBuilder::GridViewBuilder(uiBlock & /*block*/) -{ -} +GridViewBuilder::GridViewBuilder(uiBlock & /*block*/) {} void GridViewBuilder::build_grid_view(AbstractGridView &grid_view, const View2D &v2d, diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 3064f5bc96e..dfc16a97d86 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -73,9 +73,7 @@ void ED_mball_editmball_make(Object *obedit) mb->editelems = &mb->elems; } -void ED_mball_editmball_load(Object *UNUSED(obedit)) -{ -} +void ED_mball_editmball_load(Object *UNUSED(obedit)) {} /** \} */ diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index d133a02571e..5fe5a401fca 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -3748,9 +3748,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) Base *base_src = nullptr; Object *object_new = nullptr; - DuplicateObjectLink(Base *base_src) : base_src(base_src) - { - } + DuplicateObjectLink(Base *base_src) : base_src(base_src) {} }; blender::Vector object_base_links; diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index a9933eb108e..34ff9716d48 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -1054,9 +1054,7 @@ static bool shader_preview_break(void *spv) return *(sp->stop); } -static void shader_preview_updatejob(void * /*spv*/) -{ -} +static void shader_preview_updatejob(void * /*spv*/) {} /* Renders texture directly to render buffer. */ static void shader_preview_texture(ShaderPreview *sp, Tex *tex, Scene *sce, Render *re) @@ -1752,9 +1750,7 @@ class PreviewLoadJob { static void finish_request(RequestedPreview &request); }; -PreviewLoadJob::PreviewLoadJob() : todo_queue_(BLI_thread_queue_init()) -{ -} +PreviewLoadJob::PreviewLoadJob() : todo_queue_(BLI_thread_queue_init()) {} PreviewLoadJob::~PreviewLoadJob() { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 5f953071804..b86d7cd4a9a 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -107,9 +107,7 @@ struct AddOperationExecutor { CurvesSurfaceTransforms transforms_; - AddOperationExecutor(const bContext &C) : ctx_(C) - { - } + AddOperationExecutor(const bContext &C) : ctx_(C) {} void execute(AddOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index 79b308626e1..6a28b891e54 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -108,9 +108,7 @@ struct CombOperationExecutor { CurvesSurfaceTransforms transforms_; - CombOperationExecutor(const bContext &C) : ctx_(C) - { - } + CombOperationExecutor(const bContext &C) : ctx_(C) {} void execute(CombOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc index a8c8501f07c..74d4ae40d81 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc @@ -84,9 +84,7 @@ struct DeleteOperationExecutor { CurvesSurfaceTransforms transforms_; - DeleteOperationExecutor(const bContext &C) : ctx_(C) - { - } + DeleteOperationExecutor(const bContext &C) : ctx_(C) {} void execute(DeleteOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 4149934341e..dda6707b001 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -91,9 +91,7 @@ struct DensityAddOperationExecutor { CurvesSurfaceTransforms transforms_; - DensityAddOperationExecutor(const bContext &C) : ctx_(C) - { - } + DensityAddOperationExecutor(const bContext &C) : ctx_(C) {} void execute(DensityAddOperation &self, const bContext &C, @@ -530,9 +528,7 @@ struct DensitySubtractOperationExecutor { KDTree_3d *root_points_kdtree_; - DensitySubtractOperationExecutor(const bContext &C) : ctx_(C) - { - } + DensitySubtractOperationExecutor(const bContext &C) : ctx_(C) {} void execute(DensitySubtractOperation &self, const bContext &C, diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index 26bec5ecfa1..56c68496bc6 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -81,9 +81,7 @@ class ShrinkCurvesEffect : public CurvesEffect { }; public: - ShrinkCurvesEffect(const Brush &brush) : brush_(brush) - { - } + ShrinkCurvesEffect(const Brush &brush) : brush_(brush) {} void execute(CurvesGeometry &curves, const Span curve_indices, @@ -173,9 +171,7 @@ class ScaleCurvesEffect : public CurvesEffect { const Brush &brush_; public: - ScaleCurvesEffect(bool scale_up, const Brush &brush) : scale_up_(scale_up), brush_(brush) - { - } + ScaleCurvesEffect(bool scale_up, const Brush &brush) : scale_up_(scale_up), brush_(brush) {} void execute(CurvesGeometry &curves, const Span curve_indices, @@ -225,9 +221,7 @@ class CurvesEffectOperation : public CurvesSculptStrokeOperation { friend struct CurvesEffectOperationExecutor; public: - CurvesEffectOperation(std::unique_ptr effect) : effect_(std::move(effect)) - { - } + CurvesEffectOperation(std::unique_ptr effect) : effect_(std::move(effect)) {} void on_stroke_extended(const bContext &C, const StrokeExtension &stroke_extension) override; }; @@ -265,9 +259,7 @@ struct CurvesEffectOperationExecutor { Vector move_distances_cu; }; - CurvesEffectOperationExecutor(const bContext &C) : ctx_(C) - { - } + CurvesEffectOperationExecutor(const bContext &C) : ctx_(C) {} void execute(CurvesEffectOperation &self, const bContext &C, diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc index dc854dc166d..9a630b835d6 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc @@ -53,9 +53,7 @@ class PinchOperation : public CurvesSculptStrokeOperation { friend struct PinchOperationExecutor; public: - PinchOperation(const bool invert_pinch) : invert_pinch_(invert_pinch) - { - } + PinchOperation(const bool invert_pinch) : invert_pinch_(invert_pinch) {} void on_stroke_extended(const bContext &C, const StrokeExtension &stroke_extension) override; }; @@ -84,9 +82,7 @@ struct PinchOperationExecutor { float2 brush_pos_re_; - PinchOperationExecutor(const bContext &C) : ctx_(C) - { - } + PinchOperationExecutor(const bContext &C) : ctx_(C) {} void execute(PinchOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index 8e484e4fb70..c00e45e1916 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -79,9 +79,7 @@ struct PuffOperationExecutor { Span corner_normals_su_; BVHTreeFromMesh surface_bvh_; - PuffOperationExecutor(const bContext &C) : ctx_(C) - { - } + PuffOperationExecutor(const bContext &C) : ctx_(C) {} void execute(PuffOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc index 9fdeaa73747..21041b4193d 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc @@ -72,9 +72,7 @@ struct SelectionPaintOperationExecutor { CurvesSurfaceTransforms transforms_; - SelectionPaintOperationExecutor(const bContext &C) : ctx_(C) - { - } + SelectionPaintOperationExecutor(const bContext &C) : ctx_(C) {} void execute(SelectionPaintOperation &self, const bContext &C, diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 2f198b89da9..810daf0b4d2 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -120,9 +120,7 @@ struct SlideOperationExecutor { std::atomic found_invalid_uv_mapping_{false}; - SlideOperationExecutor(const bContext &C) : ctx_(C) - { - } + SlideOperationExecutor(const bContext &C) : ctx_(C) {} void execute(SlideOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc index d90ca26eabe..e8dcc0ff88e 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc @@ -56,9 +56,7 @@ struct SmoothOperationExecutor { CurvesSurfaceTransforms transforms_; - SmoothOperationExecutor(const bContext &C) : ctx_(C) - { - } + SmoothOperationExecutor(const bContext &C) : ctx_(C) {} void execute(SmoothOperation &self, const bContext &C, const StrokeExtension &stroke_extension) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc index 13fc169a0e7..a5990fadfe7 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc @@ -95,9 +95,7 @@ struct SnakeHookOperatorExecutor { float2 brush_pos_re_; float2 brush_pos_diff_re_; - SnakeHookOperatorExecutor(const bContext &C) : ctx_(C) - { - } + SnakeHookOperatorExecutor(const bContext &C) : ctx_(C) {} void execute(SnakeHookOperation &self, const bContext &C, diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index 242d5a1c7ee..fbb5caeacd6 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -6018,9 +6018,7 @@ static int sculpt_brush_stroke_modal(bContext *C, wmOperator *op, const wmEvent return paint_stroke_modal(C, op, event, (PaintStroke **)&op->customdata); } -static void sculpt_redo_empty_ui(bContext * /*C*/, wmOperator * /*op*/) -{ -} +static void sculpt_redo_empty_ui(bContext * /*C*/, wmOperator * /*op*/) {} void SCULPT_OT_brush_stroke(wmOperatorType *ot) { diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 3dfbe08652a..0ed48924bbe 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -298,9 +298,7 @@ static SpaceLink *xxx_create(const ScrArea *UNUSED(area), const Scene *UNUSED(sc } /* not spacelink itself */ -static void xxx_free(SpaceLink *UNUSED(sl)) -{ -} +static void xxx_free(SpaceLink *UNUSED(sl)) {} /* spacetype; init callback for usage, should be re-doable. */ static void xxx_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index f6680ed8069..91141626677 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -1056,9 +1056,7 @@ static void clip_preview_region_draw(const bContext *C, ARegion *region) } } -static void clip_preview_region_listener(const wmRegionListenerParams * /*params*/) -{ -} +static void clip_preview_region_listener(const wmRegionListenerParams * /*params*/) {} /****************** channels region ******************/ @@ -1097,9 +1095,7 @@ static void clip_channels_region_draw(const bContext *C, ARegion *region) UI_view2d_view_restore(C); } -static void clip_channels_region_listener(const wmRegionListenerParams * /*params*/) -{ -} +static void clip_channels_region_listener(const wmRegionListenerParams * /*params*/) {} /****************** header region ******************/ diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 067a6ac3145..cf27155deb2 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -86,9 +86,7 @@ static void console_free(SpaceLink *sl) } /* spacetype; init callback */ -static void console_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void console_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *console_duplicate(SpaceLink *sl) { diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 11294ed6ecc..ca3167eb5d1 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -78,9 +78,7 @@ static void info_free(SpaceLink *UNUSED(sl)) } /* spacetype; init callback */ -static void info_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void info_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *info_duplicate(SpaceLink *sl) { diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index c1bd2c2a380..1b4777af29c 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -1171,9 +1171,7 @@ void ED_node_init_butfuncs() NODE_TYPES_END; } -void ED_init_custom_node_type(bNodeType * /*ntype*/) -{ -} +void ED_init_custom_node_type(bNodeType * /*ntype*/) {} void ED_init_custom_node_socket_type(bNodeSocketType *stype) { diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index 2308db83177..d2e8b564bba 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -92,9 +92,7 @@ static void outliner_main_region_draw(const bContext *C, ARegion *region) UI_view2d_scrollers_draw(v2d, nullptr); } -static void outliner_main_region_free(ARegion * /*region*/) -{ -} +static void outliner_main_region_free(ARegion * /*region*/) {} static void outliner_main_region_listener(const wmRegionListenerParams *params) { @@ -300,9 +298,7 @@ static void outliner_header_region_draw(const bContext *C, ARegion *region) ED_region_header(C, region); } -static void outliner_header_region_free(ARegion * /*region*/) -{ -} +static void outliner_header_region_free(ARegion * /*region*/) {} static void outliner_header_region_listener(const wmRegionListenerParams *params) { diff --git a/source/blender/editors/space_outliner/tree/tree_display.hh b/source/blender/editors/space_outliner/tree/tree_display.hh index 13b46651562..eba4d171579 100644 --- a/source/blender/editors/space_outliner/tree/tree_display.hh +++ b/source/blender/editors/space_outliner/tree/tree_display.hh @@ -61,9 +61,7 @@ struct TreeSourceData { */ class AbstractTreeDisplay { public: - AbstractTreeDisplay(SpaceOutliner &space_outliner) : space_outliner_(space_outliner) - { - } + AbstractTreeDisplay(SpaceOutliner &space_outliner) : space_outliner_(space_outliner) {} virtual ~AbstractTreeDisplay() = default; static std::unique_ptr createFromDisplayMode( diff --git a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc index a1eeb35bb8e..441ba3c85d0 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc @@ -200,9 +200,7 @@ void TreeDisplayViewLayer::add_layer_collection_objects_children(TreeElement &co * * \{ */ -ObjectsChildrenBuilder::ObjectsChildrenBuilder(SpaceOutliner &outliner) : outliner_(outliner) -{ -} +ObjectsChildrenBuilder::ObjectsChildrenBuilder(SpaceOutliner &outliner) : outliner_(outliner) {} void ObjectsChildrenBuilder::operator()(TreeElement &collection_tree_elem) { diff --git a/source/blender/editors/space_outliner/tree/tree_element.hh b/source/blender/editors/space_outliner/tree/tree_element.hh index 1b145a48daa..18894506ada 100644 --- a/source/blender/editors/space_outliner/tree/tree_element.hh +++ b/source/blender/editors/space_outliner/tree/tree_element.hh @@ -98,16 +98,12 @@ class AbstractTreeElement { protected: /* Pseudo-abstract: Only allow creation through derived types. */ - AbstractTreeElement(TreeElement &legacy_te) : legacy_te_(legacy_te) - { - } + AbstractTreeElement(TreeElement &legacy_te) : legacy_te_(legacy_te) {} /** * Let the type add its own children. */ - virtual void expand(SpaceOutliner &) const - { - } + virtual void expand(SpaceOutliner &) const {} }; /** diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index 4495501efe9..860a8dd261a 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -76,9 +76,7 @@ static void script_free(SpaceLink *sl) } /* spacetype; init callback */ -static void script_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void script_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *script_duplicate(SpaceLink *sl) { diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index b345cac7836..955dc192a8a 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -232,9 +232,7 @@ static void sequencer_free(SpaceLink *sl) } /* Space-type init callback. */ -static void sequencer_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void sequencer_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static void sequencer_refresh(const bContext *C, ScrArea *area) { diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index 30d15d46106..52c1fa7a3ec 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -515,9 +515,7 @@ static void spreadsheet_header_region_draw(const bContext *C, ARegion *region) ED_region_header(C, region); } -static void spreadsheet_header_region_free(ARegion * /*region*/) -{ -} +static void spreadsheet_header_region_free(ARegion * /*region*/) {} static void spreadsheet_header_region_listener(const wmRegionListenerParams *params) { @@ -602,13 +600,9 @@ static void spreadsheet_footer_region_draw(const bContext *C, ARegion *region) UI_block_draw(C, block); } -static void spreadsheet_footer_region_free(ARegion * /*region*/) -{ -} +static void spreadsheet_footer_region_free(ARegion * /*region*/) {} -static void spreadsheet_footer_region_listener(const wmRegionListenerParams * /*params*/) -{ -} +static void spreadsheet_footer_region_listener(const wmRegionListenerParams * /*params*/) {} static void spreadsheet_dataset_region_listener(const wmRegionListenerParams *params) { @@ -648,13 +642,9 @@ static void spreadsheet_sidebar_init(wmWindowManager *wm, ARegion *region) WM_event_add_keymap_handler(®ion->handlers, keymap); } -static void spreadsheet_right_region_free(ARegion * /*region*/) -{ -} +static void spreadsheet_right_region_free(ARegion * /*region*/) {} -static void spreadsheet_right_region_listener(const wmRegionListenerParams * /*params*/) -{ -} +static void spreadsheet_right_region_listener(const wmRegionListenerParams * /*params*/) {} static void spreadsheet_blend_read_data(BlendDataReader *reader, SpaceLink *sl) { diff --git a/source/blender/editors/space_statusbar/space_statusbar.c b/source/blender/editors/space_statusbar/space_statusbar.c index e82eeeed93a..1df3b4ce191 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.c +++ b/source/blender/editors/space_statusbar/space_statusbar.c @@ -47,14 +47,10 @@ static SpaceLink *statusbar_create(const ScrArea *UNUSED(area), const Scene *UNU } /* not spacelink itself */ -static void statusbar_free(SpaceLink *UNUSED(sl)) -{ -} +static void statusbar_free(SpaceLink *UNUSED(sl)) {} /* spacetype; init callback */ -static void statusbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void statusbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *statusbar_duplicate(SpaceLink *sl) { @@ -74,13 +70,9 @@ static void statusbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *r ED_region_header_init(region); } -static void statusbar_operatortypes(void) -{ -} +static void statusbar_operatortypes(void) {} -static void statusbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) -{ -} +static void statusbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) {} static void statusbar_header_region_listener(const wmRegionListenerParams *params) { diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index b7e5421ab73..4812b4200d3 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -93,9 +93,7 @@ static void text_free(SpaceLink *sl) } /* spacetype; init callback */ -static void text_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void text_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *text_duplicate(SpaceLink *sl) { diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 3cff9a25bba..5d3cd03ebb1 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -60,9 +60,7 @@ static void text_font_begin(const TextDrawContext *tdc) BLF_size(tdc->font_id, (float)tdc->lheight_px); } -static void text_font_end(const TextDrawContext *UNUSED(tdc)) -{ -} +static void text_font_end(const TextDrawContext *UNUSED(tdc)) {} static int text_font_draw(const TextDrawContext *tdc, int x, int y, const char *str) { diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c index d527688c3b1..beacf85f0e6 100644 --- a/source/blender/editors/space_topbar/space_topbar.c +++ b/source/blender/editors/space_topbar/space_topbar.c @@ -65,14 +65,10 @@ static SpaceLink *topbar_create(const ScrArea *UNUSED(area), const Scene *UNUSED } /* not spacelink itself */ -static void topbar_free(SpaceLink *UNUSED(sl)) -{ -} +static void topbar_free(SpaceLink *UNUSED(sl)) {} /* spacetype; init callback */ -static void topbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void topbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *topbar_duplicate(SpaceLink *sl) { @@ -98,13 +94,9 @@ static void topbar_main_region_init(wmWindowManager *wm, ARegion *region) WM_event_add_keymap_handler(®ion->handlers, keymap); } -static void topbar_operatortypes(void) -{ -} +static void topbar_operatortypes(void) {} -static void topbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) -{ -} +static void topbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) {} /* add handlers, stuff you only do once or on area/region changes */ static void topbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 45107547b8f..ca4bccf2619 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -83,9 +83,7 @@ static void userpref_free(SpaceLink *UNUSED(sl)) } /* spacetype; init callback */ -static void userpref_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) -{ -} +static void userpref_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) {} static SpaceLink *userpref_duplicate(SpaceLink *sl) { @@ -130,13 +128,9 @@ static void userpref_main_region_layout(const bContext *C, ARegion *region) ED_region_panels_layout_ex(C, region, ®ion->type->paneltypes, contexts, NULL); } -static void userpref_operatortypes(void) -{ -} +static void userpref_operatortypes(void) {} -static void userpref_keymap(struct wmKeyConfig *UNUSED(keyconf)) -{ -} +static void userpref_keymap(struct wmKeyConfig *UNUSED(keyconf)) {} /* add handlers, stuff you only do once or on area/region changes */ static void userpref_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) @@ -169,21 +163,13 @@ static void userpref_execute_region_init(wmWindowManager *wm, ARegion *region) region->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; } -static void userpref_main_region_listener(const wmRegionListenerParams *UNUSED(params)) -{ -} +static void userpref_main_region_listener(const wmRegionListenerParams *UNUSED(params)) {} -static void userpref_header_listener(const wmRegionListenerParams *UNUSED(params)) -{ -} +static void userpref_header_listener(const wmRegionListenerParams *UNUSED(params)) {} -static void userpref_navigation_region_listener(const wmRegionListenerParams *UNUSED(params)) -{ -} +static void userpref_navigation_region_listener(const wmRegionListenerParams *UNUSED(params)) {} -static void userpref_execute_region_listener(const wmRegionListenerParams *UNUSED(params)) -{ -} +static void userpref_execute_region_listener(const wmRegionListenerParams *UNUSED(params)) {} static void userpref_blend_write(BlendWriter *writer, SpaceLink *sl) { diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 5f5ba3aab2d..74d819a306b 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -330,9 +330,7 @@ static void view3d_free(SpaceLink *sl) } /* spacetype; init callback */ -static void view3d_init(wmWindowManager * /*wm*/, ScrArea * /*area*/) -{ -} +static void view3d_init(wmWindowManager * /*wm*/, ScrArea * /*area*/) {} static void view3d_exit(wmWindowManager * /*wm*/, ScrArea *area) { diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp index 109afd48b1b..4d9c6b4c03a 100644 --- a/source/blender/freestyle/intern/application/AppCanvas.cpp +++ b/source/blender/freestyle/intern/application/AppCanvas.cpp @@ -213,8 +213,6 @@ void AppCanvas::RenderStroke(Stroke *iStroke) } } -void AppCanvas::update() -{ -} +void AppCanvas::update() {} } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index 7645165f5cc..b00d2d954ea 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -37,9 +37,7 @@ class BlenderStrokeRenderer : public StrokeRenderer { Object *NewMesh() const; struct StrokeGroup { - explicit StrokeGroup() : totvert(0), totedge(0), totpoly(0), totloop(0) - { - } + explicit StrokeGroup() : totvert(0), totedge(0), totpoly(0), totloop(0) {} vector strokes; blender::Map materials; int totvert; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h index 1c4b8810918..653b3d2fbe8 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h @@ -23,9 +23,7 @@ class BufferedStyleModule : public StyleModule { _buffer = buffer; } - virtual ~BufferedStyleModule() - { - } + virtual ~BufferedStyleModule() {} protected: virtual int interpret() @@ -51,9 +49,7 @@ class BlenderStyleModule : public StyleModule { _text = text; } - virtual ~BlenderStyleModule() - { - } + virtual ~BlenderStyleModule() {} protected: virtual int interpret() diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 533ad18d927..a3c5cd5f806 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -595,9 +595,7 @@ void FRS_init_stroke_renderer(Render *re) controller->ResetRenderCount(); } -void FRS_begin_stroke_rendering(Render * /*re*/) -{ -} +void FRS_begin_stroke_rendering(Render * /*re*/) {} void FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer) { diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index 041589f721a..de75d13daae 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -21,12 +21,8 @@ using namespace Geometry; class GeomCleaner { public: - inline GeomCleaner() - { - } - inline ~GeomCleaner() - { - } + inline GeomCleaner() {} + inline ~GeomCleaner() {} /** Sorts an array of Indexed vertices * iVertices @@ -158,9 +154,7 @@ class IndexedVertex { unsigned _index; public: - inline IndexedVertex() - { - } + inline IndexedVertex() {} inline IndexedVertex(Vec3f iVector, unsigned iIndex) { diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index d66982eef52..325651513a2 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -44,9 +44,7 @@ class Cell { _orig = orig; } - virtual ~Cell() - { - } + virtual ~Cell() {} inline void addOccluder(Polygon3r *o) { @@ -78,17 +76,11 @@ class GridVisitor { public: virtual ~GridVisitor(){}; // soc - virtual void discoverCell(Cell * /*cell*/) - { - } + virtual void discoverCell(Cell * /*cell*/) {} - virtual void examineOccluder(Polygon3r * /*occ*/) - { - } + virtual void examineOccluder(Polygon3r * /*occ*/) {} - virtual void finishCell(Cell * /*cell*/) - { - } + virtual void finishCell(Cell * /*cell*/) {} virtual bool stop() { @@ -103,9 +95,7 @@ class GridVisitor { /** Gathers all the occluders belonging to the cells traversed by the ray */ class allOccludersGridVisitor : public GridVisitor { public: - allOccludersGridVisitor(OccludersSet &occluders) : GridVisitor(), occluders_(occluders) - { - } + allOccludersGridVisitor(OccludersSet &occluders) : GridVisitor(), occluders_(occluders) {} virtual void examineOccluder(Polygon3r *occ); @@ -150,9 +140,7 @@ class firstIntersectionGridVisitor : public GridVisitor { { } - virtual ~firstIntersectionGridVisitor() - { - } + virtual ~firstIntersectionGridVisitor() {} virtual void discoverCell(Cell *cell) { @@ -177,9 +165,7 @@ class firstIntersectionGridVisitor : public GridVisitor { class Grid { public: /** Builds a Grid. Must be followed by a call to configure() */ - Grid() - { - } + Grid() {} virtual ~Grid() { diff --git a/source/blender/freestyle/intern/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index 18eeb579d07..2c10235feb9 100644 --- a/source/blender/freestyle/intern/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h @@ -42,9 +42,7 @@ class HashGrid : public Grid { public: typedef map GridHashTable; - HashGrid() : Grid() - { - } + HashGrid() : Grid() {} virtual ~HashGrid() { diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index 79cd52c00f6..27b60d12bd5 100644 --- a/source/blender/freestyle/intern/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h @@ -30,9 +30,7 @@ class Noise { Noise(long seed = -1); /** Destructor */ - ~Noise() - { - } + ~Noise() {} /** Returns a noise value for a 1D element */ float turbulence1(float arg, float freq, float amp, unsigned oct = 4); diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h index d606cd8b282..d9d5ff17b81 100644 --- a/source/blender/freestyle/intern/geometry/Polygon.h +++ b/source/blender/freestyle/intern/geometry/Polygon.h @@ -56,9 +56,7 @@ template class Polygon { userdata2 = 0; } - virtual ~Polygon() - { - } + virtual ~Polygon() {} // // Accessors @@ -164,22 +162,16 @@ template class Polygon { /////////////////////////////////////////////////////////////////////////////// class Polygon3r : public Polygon { public: - inline Polygon3r() : Polygon() - { - } + inline Polygon3r() : Polygon() {} inline Polygon3r(const vector &vertices, const Vec3r &normal) : Polygon(vertices) { setNormal(normal); } - inline Polygon3r(const Polygon3r &poly) : Polygon(poly), _normal(poly._normal) - { - } + inline Polygon3r(const Polygon3r &poly) : Polygon(poly), _normal(poly._normal) {} - virtual ~Polygon3r() - { - } + virtual ~Polygon3r() {} void setNormal(const Vec3r &normal) { diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index c170ee4d122..b5427170cea 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -69,9 +69,7 @@ template class Intersection { template class Segment { public: - Segment() - { - } + Segment() {} Segment(T &s, const Point &iA, const Point &iB) { @@ -180,15 +178,9 @@ template class Segment { * intersection between 2 edges must be computed */ template struct binary_rule { - binary_rule() - { - } - template binary_rule(const binary_rule & /*brother*/) - { - } - virtual ~binary_rule() - { - } + binary_rule() {} + template binary_rule(const binary_rule & /*brother*/) {} + virtual ~binary_rule() {} virtual bool operator()(T1 &, T2 &) { @@ -198,9 +190,7 @@ template struct binary_rule { template class SweepLine { public: - SweepLine() - { - } + SweepLine() {} ~SweepLine() { for (typename vector> *>::iterator i = _Intersections.begin(), diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index e44444a270a..fff26c6eec4 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -24,9 +24,7 @@ template struct is_false { }; template<> struct is_false { - static inline void ensure() - { - } + static inline void ensure() {} }; } // end of namespace Internal @@ -280,21 +278,13 @@ template class Vec2 : public Vec { public: typedef typename Vec::value_type value_type; - inline Vec2() : Vec() - { - } + inline Vec2() : Vec() {} - template explicit inline Vec2(const U tab[2]) : Vec(tab) - { - } + template explicit inline Vec2(const U tab[2]) : Vec(tab) {} - template explicit inline Vec2(const std::vector &tab) : Vec(tab) - { - } + template explicit inline Vec2(const std::vector &tab) : Vec(tab) {} - template inline Vec2(const Vec &v) : Vec(v) - { - } + template inline Vec2(const Vec &v) : Vec(v) {} inline Vec2(const value_type x, const value_type y = 0) : Vec() { @@ -384,21 +374,13 @@ template class HVec3 : public Vec { public: typedef typename Vec::value_type value_type; - inline HVec3() : Vec() - { - } + inline HVec3() : Vec() {} - template explicit inline HVec3(const U tab[4]) : Vec(tab) - { - } + template explicit inline HVec3(const U tab[4]) : Vec(tab) {} - template explicit inline HVec3(const std::vector &tab) : Vec(tab) - { - } + template explicit inline HVec3(const std::vector &tab) : Vec(tab) {} - template inline HVec3(const Vec &v) : Vec(v) - { - } + template inline HVec3(const Vec &v) : Vec(v) {} inline HVec3(const value_type sx, const value_type sy = 0, @@ -485,21 +467,13 @@ template class Vec3 : public Vec { public: typedef typename Vec::value_type value_type; - inline Vec3() : Vec() - { - } + inline Vec3() : Vec() {} - template explicit inline Vec3(const U tab[3]) : Vec(tab) - { - } + template explicit inline Vec3(const U tab[3]) : Vec(tab) {} - template explicit inline Vec3(const std::vector &tab) : Vec(tab) - { - } + template explicit inline Vec3(const std::vector &tab) : Vec(tab) {} - template inline Vec3(const Vec &v) : Vec(v) - { - } + template inline Vec3(const Vec &v) : Vec(v) {} template inline Vec3(const HVec3 &v) { @@ -783,21 +757,15 @@ template class SquareMatrix : public Matrix { public: typedef T value_type; - inline SquareMatrix() : Matrix() - { - } + inline SquareMatrix() : Matrix() {} - template explicit inline SquareMatrix(const U tab[_SIZE]) : Matrix(tab) - { - } + template explicit inline SquareMatrix(const U tab[_SIZE]) : Matrix(tab) {} template explicit inline SquareMatrix(const std::vector &tab) : Matrix(tab) { } - template inline SquareMatrix(const Matrix &m) : Matrix(m) - { - } + template inline SquareMatrix(const Matrix &m) : Matrix(m) {} static inline SquareMatrix identity() { diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h index cbf8720aadb..80ddc0b330c 100644 --- a/source/blender/freestyle/intern/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h @@ -99,9 +99,7 @@ class FrsImage { } /** Destructor */ - virtual ~FrsImage() - { - } + virtual ~FrsImage() {} /** Returns the width of the complete image */ inline unsigned width() const diff --git a/source/blender/freestyle/intern/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index 5f3089f8597..9e386d2b5e7 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h @@ -24,9 +24,7 @@ class ImagePyramid { std::vector _levels; public: - ImagePyramid() - { - } + ImagePyramid() {} ImagePyramid(const ImagePyramid &iBrother); // ImagePyramid(const GrayImage& level0, unsigned nbLevels); virtual ~ImagePyramid(); @@ -81,9 +79,7 @@ class GaussianPyramid : public ImagePyramid { GaussianPyramid(const GrayImage &level0, unsigned nbLevels, float iSigma = 1.0f); GaussianPyramid(GrayImage *level0, unsigned nbLevels, float iSigma = 1.0f); GaussianPyramid(const GaussianPyramid &iBrother); - virtual ~GaussianPyramid() - { - } + virtual ~GaussianPyramid() {} virtual void BuildPyramid(const GrayImage &level0, unsigned nbLevels); virtual void BuildPyramid(GrayImage *level0, unsigned nbLevels); diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h index 5dae258e3ed..dc22a10e62c 100644 --- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h @@ -32,9 +32,7 @@ class DrawingStyle { inline explicit DrawingStyle(const DrawingStyle &iBrother); - virtual ~DrawingStyle() - { - } + virtual ~DrawingStyle() {} /** operators */ inline DrawingStyle &operator=(const DrawingStyle &ds); diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index 684b7905aca..152fc9a762f 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -50,9 +50,7 @@ class FrsMaterial { inline FrsMaterial(const FrsMaterial &m); /** Destructor */ - virtual ~FrsMaterial() - { - } + virtual ~FrsMaterial() {} /** Returns the line color as a 4 float array */ inline const float *line() const diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index 895947630a0..e20f1962a30 100644 --- a/source/blender/freestyle/intern/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h @@ -25,18 +25,14 @@ using namespace Geometry; class Node : public BaseObject { public: - inline Node() : BaseObject() - { - } + inline Node() : BaseObject() {} inline Node(const Node &iBrother) : BaseObject() { _BBox = iBrother.bbox(); } - virtual ~Node() - { - } + virtual ~Node() {} /** Accept the corresponding visitor * Each inherited node must overload this method diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp index 689a7d9d370..7de4283db9e 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp @@ -91,9 +91,7 @@ NodeOrthographicCamera::NodeOrthographicCamera( projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear); } -NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE) -{ -} +NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE) {} NodePerspectiveCamera::NodePerspectiveCamera(double fovy, double aspect, double zNear, double zFar) : NodeCamera(NodeCamera::PERSPECTIVE) diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index 3e57b89e4a0..ed1545bf3fe 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -35,9 +35,7 @@ class NodeCamera : public Node { NodeCamera(const NodeCamera &iBrother); #endif - virtual ~NodeCamera() - { - } + virtual ~NodeCamera() {} /** Accept the corresponding visitor */ virtual void accept(SceneVisitor &v); diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index a33bc3a0664..b51896a725e 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h @@ -17,12 +17,8 @@ namespace Freestyle { class NodeDrawingStyle : public NodeGroup { public: - inline NodeDrawingStyle() : NodeGroup() - { - } - virtual ~NodeDrawingStyle() - { - } + inline NodeDrawingStyle() : NodeGroup() {} + virtual ~NodeDrawingStyle() {} inline const DrawingStyle &drawingStyle() const { diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index b51c8c5c52f..c52513d59ee 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h @@ -21,12 +21,8 @@ namespace Freestyle { class NodeGroup : public Node { public: - inline NodeGroup() : Node() - { - } - virtual ~NodeGroup() - { - } + inline NodeGroup() : Node() {} + virtual ~NodeGroup() {} /** Adds a child. Makes a addRef on the iChild reference counter */ virtual void AddChild(Node *iChild); diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h index d3e3cd64b99..d9107c65c97 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeLight.h +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h @@ -22,9 +22,7 @@ class NodeLight : public Node { NodeLight(); NodeLight(NodeLight &iBrother); - virtual ~NodeLight() - { - } + virtual ~NodeLight() {} /** Accept the corresponding visitor */ virtual void accept(SceneVisitor &v); diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h index 9f27f436270..cbfff61e50f 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeShape.h +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h @@ -26,9 +26,7 @@ using namespace Geometry; class NodeShape : public Node { public: - inline NodeShape() : Node() - { - } + inline NodeShape() : Node() {} virtual ~NodeShape(); diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h index ba0023cee9f..063cf3672a2 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h @@ -26,9 +26,7 @@ class NodeTransform : public NodeGroup { _Scaled = false; } - virtual ~NodeTransform() - { - } + virtual ~NodeTransform() {} /** multiplies the current matrix by the x, y, z translation matrix. */ void Translate(real x, real y, real z); diff --git a/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h index a99f6f8d627..6b078496410 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h @@ -21,9 +21,7 @@ class NodeViewLayer : public Node { : Node(), _Scene(scene), _ViewLayer(view_layer) { } - virtual ~NodeViewLayer() - { - } + virtual ~NodeViewLayer() {} inline struct Scene &scene() const { diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h index c1cc18a5820..0f514556abe 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h @@ -15,32 +15,22 @@ namespace Freestyle { class OrientedLineRep : public LineRep { public: - OrientedLineRep() : LineRep() - { - } + OrientedLineRep() : LineRep() {} /** Builds a single line from 2 vertices * v1 * first vertex * v2 * second vertex */ - inline OrientedLineRep(const Vec3r &v1, const Vec3r &v2) : LineRep(v1, v2) - { - } + inline OrientedLineRep(const Vec3r &v1, const Vec3r &v2) : LineRep(v1, v2) {} /** Builds a line rep from a vertex chain */ - inline OrientedLineRep(const vector &vertices) : LineRep(vertices) - { - } + inline OrientedLineRep(const vector &vertices) : LineRep(vertices) {} /** Builds a line rep from a vertex chain */ - inline OrientedLineRep(const list &vertices) : LineRep(vertices) - { - } + inline OrientedLineRep(const list &vertices) : LineRep(vertices) {} - virtual ~OrientedLineRep() - { - } + virtual ~OrientedLineRep() {} /** Accept the corresponding visitor */ virtual void accept(SceneVisitor &v); diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h index 7e73760ad5b..ec0b13ca48c 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.h +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h @@ -26,9 +26,7 @@ class SceneHash : public SceneVisitor { _sum = 1; } - virtual ~SceneHash() - { - } + virtual ~SceneHash() {} VISIT_DECL(NodeCamera); VISIT_DECL(NodeViewLayer); diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index a671857f4aa..0b10d003d00 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -16,15 +16,9 @@ namespace Freestyle { #define VISIT_COMPLETE_DEF(type) \ - virtual void visit##type(type &) \ - { \ - } \ - virtual void visit##type##Before(type &) \ - { \ - } \ - virtual void visit##type##After(type &) \ - { \ - } + virtual void visit##type(type &) {} \ + virtual void visit##type##Before(type &) {} \ + virtual void visit##type##After(type &) {} #define VISIT_DECL(type) virtual void visit##type(type &) @@ -53,19 +47,11 @@ class FrsMaterial; class SceneVisitor { public: - SceneVisitor() - { - } - virtual ~SceneVisitor() - { - } + SceneVisitor() {} + virtual ~SceneVisitor() {} - virtual void beginScene() - { - } - virtual void endScene() - { - } + virtual void beginScene() {} + virtual void endScene() {} // // visitClass methods diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h index 4209bd4fb4e..6eb1e98d802 100644 --- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h +++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h @@ -65,9 +65,7 @@ class TriangleRep : public Rep { _Style = FILL; } - virtual ~TriangleRep() - { - } + virtual ~TriangleRep() {} /** accessors */ inline const TRIANGLE_STYLE style() const diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h index 67cc79ca606..2e20769d0dd 100644 --- a/source/blender/freestyle/intern/scene_graph/VertexRep.h +++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h @@ -29,9 +29,7 @@ class VertexRep : public Rep { _PointSize = 0.0f; } - inline ~VertexRep() - { - } + inline ~VertexRep() {} /** Accept the corresponding visitor */ virtual void accept(SceneVisitor &v) diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index e5009f2b4f8..cdf5d6a456f 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -48,9 +48,7 @@ class DensityF1D : public UnaryFunction1D { } /** Destructor */ - virtual ~DensityF1D() - { - } + virtual ~DensityF1D() {} /** Returns the string "DensityF1D". */ string getName() const @@ -219,9 +217,7 @@ class GetSteerableViewMapDensityF1D : public UnaryFunction1D { } /** Destructor */ - virtual ~GetSteerableViewMapDensityF1D() - { - } + virtual ~GetSteerableViewMapDensityF1D() {} /** Returns the string "GetSteerableViewMapDensityF1D" */ string getName() const diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index bc04d8b862b..2b6f2db0980 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -34,9 +34,7 @@ class CalligraphicShader : public StrokeShader { bool clamp); /** Destructor. */ - virtual ~CalligraphicShader() - { - } + virtual ~CalligraphicShader() {} /** The shading method */ virtual int shade(Stroke &ioStroke) const; @@ -70,9 +68,7 @@ class SpatialNoiseShader : public StrokeShader { SpatialNoiseShader(float iAmount, float ixScale, int nbOctave, bool smooth, bool pureRandom); /** Destructor. */ - virtual ~SpatialNoiseShader() - { - } + virtual ~SpatialNoiseShader() {} /** The shading method. */ virtual int shade(Stroke &ioStroke) const; @@ -122,9 +118,7 @@ class SmoothingShader : public StrokeShader { real icarricatureFactor); /** Destructor. */ - virtual ~SmoothingShader() - { - } + virtual ~SmoothingShader() {} /** The shading method. */ virtual int shade(Stroke &ioStroke) const; @@ -184,9 +178,7 @@ class Omitter : public Smoother { public: Omitter(Stroke &ioStroke); - virtual ~Omitter() - { - } + virtual ~Omitter() {} void omit(real sizeWindow, real thrVari, real thrFlat, real lFlat); @@ -203,9 +195,7 @@ class Omitter : public Smoother { class OmissionShader : public StrokeShader { public: OmissionShader(real sizeWindow, real thrVari, real thrFlat, real lFlat); - virtual ~OmissionShader() - { - } + virtual ~OmissionShader() {} virtual int shade(Stroke &ioStroke) const; diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index 9f0df7b924e..2abdd88c5ec 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -48,9 +48,7 @@ class ConstantThicknessShader : public StrokeShader { } /** Destructor. */ - virtual ~ConstantThicknessShader() - { - } + virtual ~ConstantThicknessShader() {} /** Returns the string "ConstantThicknessShader". */ virtual string getName() const @@ -77,9 +75,7 @@ class ConstantExternThicknessShader : public StrokeShader { _thickness = thickness; } - virtual ~ConstantExternThicknessShader() - { - } + virtual ~ConstantExternThicknessShader() {} virtual string getName() const { @@ -113,9 +109,7 @@ class IncreasingThicknessShader : public StrokeShader { } /** Destructor. */ - virtual ~IncreasingThicknessShader() - { - } + virtual ~IncreasingThicknessShader() {} virtual string getName() const { @@ -158,9 +152,7 @@ class ConstrainedIncreasingThicknessShader : public StrokeShader { } /** Destructor. */ - virtual ~ConstrainedIncreasingThicknessShader() - { - } + virtual ~ConstrainedIncreasingThicknessShader() {} virtual string getName() const { @@ -191,9 +183,7 @@ class LengthDependingThicknessShader : public StrokeShader { _maxThickness = iMaxThickness; } - virtual ~LengthDependingThicknessShader() - { - } + virtual ~LengthDependingThicknessShader() {} virtual string getName() const { @@ -560,9 +550,7 @@ class TipRemoverShader : public StrokeShader { TipRemoverShader(real tipLength); /** Destructor. */ - virtual ~TipRemoverShader() - { - } + virtual ~TipRemoverShader() {} /** The shading method */ virtual string getName() const diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 741fad592cf..4df4dae7f3d 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -81,9 +81,7 @@ Canvas::~Canvas() delete _steerableViewMap; } -void Canvas::preDraw() -{ -} +void Canvas::preDraw() {} void Canvas::Draw() { diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 40af57643fb..a9507539394 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -65,9 +65,7 @@ class AdjacencyIterator : public Iterator { return *this; } - virtual ~AdjacencyIterator() - { - } + virtual ~AdjacencyIterator() {} virtual string getExactTypeName() const { @@ -269,9 +267,7 @@ class ChainSilhouetteIterator : public ChainingIterator { } /** Copy constructor */ - ChainSilhouetteIterator(const ChainSilhouetteIterator &brother) : ChainingIterator(brother) - { - } + ChainSilhouetteIterator(const ChainSilhouetteIterator &brother) : ChainingIterator(brother) {} /** Returns the string "ChainSilhouetteIterator" */ virtual string getExactTypeName() const diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index 1d4cb189509..2531f173af2 100644 --- a/source/blender/freestyle/intern/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h @@ -79,9 +79,7 @@ class CurvePointIterator : public Interface0DIteratorNested { return *this; } - virtual ~CurvePointIterator() - { - } + virtual ~CurvePointIterator() {} protected: inline CurvePointIterator(Curve::vertex_container::iterator iA, diff --git a/source/blender/freestyle/intern/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h index 66f93ced6e8..4fb946f7a3e 100644 --- a/source/blender/freestyle/intern/stroke/Modifiers.h +++ b/source/blender/freestyle/intern/stroke/Modifiers.h @@ -26,14 +26,10 @@ namespace Freestyle { */ template struct EdgeModifier : public unary_function { /** Default construction */ - EdgeModifier() : unary_function() - { - } + EdgeModifier() : unary_function() {} /** the () operator */ - virtual void operator()(Edge &iEdge) - { - } + virtual void operator()(Edge &iEdge) {} #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:EdgeModifier") @@ -43,9 +39,7 @@ template struct EdgeModifier : public unary_function { /** Modifier that sets the time stamp of an Interface1D to the time stamp of the system. */ template struct TimestampModifier : public EdgeModifier { /** Default constructor */ - TimestampModifier() : EdgeModifier() - { - } + TimestampModifier() : EdgeModifier() {} /** The () operator. */ virtual void operator()(Edge &iEdge) diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index aca4c8c0e36..3c0c91017e6 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -260,9 +260,7 @@ class Operators { static void reset(bool removeStrokes = true); private: - Operators() - { - } + Operators() {} static I1DContainer _current_view_edges_set; static I1DContainer _current_chains_set; diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h index bbe602c03e5..7dfba075db1 100644 --- a/source/blender/freestyle/intern/stroke/Predicates0D.h +++ b/source/blender/freestyle/intern/stroke/Predicates0D.h @@ -38,9 +38,7 @@ class UnaryPredicate0D { } /** Destructor. */ - virtual ~UnaryPredicate0D() - { - } + virtual ~UnaryPredicate0D() {} /** Returns the string of the name of the UnaryPredicate0D. */ virtual string getName() const @@ -82,9 +80,7 @@ class BinaryPredicate0D { } /** Destructor. */ - virtual ~BinaryPredicate0D() - { - } + virtual ~BinaryPredicate0D() {} /** Returns the string of the name of the binary predicate. */ virtual string getName() const @@ -119,9 +115,7 @@ namespace Predicates0D { class TrueUP0D : public UnaryPredicate0D { public: /** Default constructor. */ - TrueUP0D() - { - } + TrueUP0D() {} /** Returns the string "TrueUP0D". */ string getName() const @@ -142,9 +136,7 @@ class TrueUP0D : public UnaryPredicate0D { class FalseUP0D : public UnaryPredicate0D { public: /** Default constructor. */ - FalseUP0D() - { - } + FalseUP0D() {} /** Returns the string "FalseUP0D". */ string getName() const diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index 742b31ea353..ba7ee2c94e2 100644 --- a/source/blender/freestyle/intern/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h @@ -45,9 +45,7 @@ class UnaryPredicate1D { } /** Destructor. */ - virtual ~UnaryPredicate1D() - { - } + virtual ~UnaryPredicate1D() {} /** Returns the string of the name of the UnaryPredicate1D. */ virtual string getName() const @@ -89,9 +87,7 @@ class BinaryPredicate1D { } /** Destructor. */ - virtual ~BinaryPredicate1D() - { - } + virtual ~BinaryPredicate1D() {} /** Returns the string of the name of the binary predicate. */ virtual string getName() const @@ -126,9 +122,7 @@ namespace Predicates1D { class TrueUP1D : public UnaryPredicate1D { public: /** Constructor */ - TrueUP1D() - { - } + TrueUP1D() {} /** Returns the string "TrueUP1D". */ string getName() const @@ -149,9 +143,7 @@ class TrueUP1D : public UnaryPredicate1D { class FalseUP1D : public UnaryPredicate1D { public: /** Constructor */ - FalseUP1D() - { - } + FalseUP1D() {} /** Returns the string "FalseUP1D". */ string getName() const @@ -177,9 +169,7 @@ class QuantitativeInvisibilityUP1D : public UnaryPredicate1D { * \param qi: * The Quantitative Invisibility you want the Interface1D to have */ - QuantitativeInvisibilityUP1D(unsigned qi = 0) : _qi(qi) - { - } + QuantitativeInvisibilityUP1D(unsigned qi = 0) : _qi(qi) {} /** Returns the string "QuantitativeInvisibilityUP1D" */ string getName() const diff --git a/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h index 591aa69312e..2c026731b41 100644 --- a/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h @@ -47,9 +47,7 @@ class vertex_iterator_base : public IteratorBase class IteratorBase { public: - virtual ~IteratorBase() - { - } + virtual ~IteratorBase() {} virtual bool begin() const = 0; virtual bool end() const = 0; @@ -78,9 +76,7 @@ template class IteratorBase { typedef typename Traits::reference reference; protected: - IteratorBase() - { - } + IteratorBase() {} #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase") diff --git a/source/blender/freestyle/intern/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h index 9a6fe675b0c..3bbaf06e70d 100644 --- a/source/blender/freestyle/intern/system/BaseObject.h +++ b/source/blender/freestyle/intern/system/BaseObject.h @@ -21,9 +21,7 @@ class BaseObject { _ref_counter = 0; } - virtual ~BaseObject() - { - } + virtual ~BaseObject() {} /** At least makes a release on this. * The BaseObject::destroy method must be explicitly called at the end of any overloaded destroy diff --git a/source/blender/freestyle/intern/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h index 33af5ef3714..47706686f2d 100644 --- a/source/blender/freestyle/intern/system/Interpreter.h +++ b/source/blender/freestyle/intern/system/Interpreter.h @@ -24,9 +24,7 @@ class Interpreter { _language = "Unknown"; } - virtual ~Interpreter() - { - } + virtual ~Interpreter() {} virtual int interpretFile(const string &filename) = 0; diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h index e9b2f1c3722..128573fe353 100644 --- a/source/blender/freestyle/intern/system/Iterator.h +++ b/source/blender/freestyle/intern/system/Iterator.h @@ -19,9 +19,7 @@ namespace Freestyle { class Iterator { public: - virtual ~Iterator() - { - } + virtual ~Iterator() {} virtual string getExactTypeName() const { diff --git a/source/blender/freestyle/intern/system/ProgressBar.h b/source/blender/freestyle/intern/system/ProgressBar.h index b52dfe34f23..98632d6bfce 100644 --- a/source/blender/freestyle/intern/system/ProgressBar.h +++ b/source/blender/freestyle/intern/system/ProgressBar.h @@ -25,9 +25,7 @@ class ProgressBar { _progress = 0; } - virtual ~ProgressBar() - { - } + virtual ~ProgressBar() {} virtual void reset() { diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index fda1dd1d083..dbb66bae1c7 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h @@ -17,9 +17,7 @@ namespace Freestyle { class PseudoNoise { public: - virtual ~PseudoNoise() - { - } + virtual ~PseudoNoise() {} real smoothNoise(real x); real linearNoise(real x); diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h index 585507e8a9c..5123117b3d7 100644 --- a/source/blender/freestyle/intern/system/RenderMonitor.h +++ b/source/blender/freestyle/intern/system/RenderMonitor.h @@ -22,9 +22,7 @@ class RenderMonitor { _re = re; } - virtual ~RenderMonitor() - { - } + virtual ~RenderMonitor() {} inline void setInfo(string info) { diff --git a/source/blender/freestyle/intern/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h index ee3f73e1f19..b142f8b91d4 100644 --- a/source/blender/freestyle/intern/system/TimeStamp.h +++ b/source/blender/freestyle/intern/system/TimeStamp.h @@ -41,9 +41,7 @@ class TimeStamp { _time_stamp = 1; } - TimeStamp(const TimeStamp &) - { - } + TimeStamp(const TimeStamp &) {} private: static TimeStamp _instance; diff --git a/source/blender/freestyle/intern/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h index d1c83e7572a..ac12e7b324a 100644 --- a/source/blender/freestyle/intern/system/TimeUtils.h +++ b/source/blender/freestyle/intern/system/TimeUtils.h @@ -17,12 +17,8 @@ namespace Freestyle { class Chronometer { public: - inline Chronometer() - { - } - inline ~Chronometer() - { - } + inline Chronometer() {} + inline ~Chronometer() {} inline clock_t start() { diff --git a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h index bee29bc23a9..bb21ca7633f 100644 --- a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h +++ b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h @@ -15,12 +15,8 @@ template class AutoPtr : public std::unique_ptr { public: using std::unique_ptr::unique_ptr; - AutoPtr() : std::unique_ptr() - { - } - AutoPtr(T *ptr) : std::unique_ptr(ptr) - { - } + AutoPtr() : std::unique_ptr() {} + AutoPtr(T *ptr) : std::unique_ptr(ptr) {} /* Mimic behavior of legacy auto_ptr. * Keep implementation as small as possible, hens delete assignment operator. */ diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 93c6a6a5d74..ec957fb08f2 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -51,9 +51,7 @@ class FEdgeXDetector { _creaseAngle = 0.7; // angle of 134.43 degrees } - virtual ~FEdgeXDetector() - { - } + virtual ~FEdgeXDetector() {} /** Process shapes from a WingedEdge containing a list of WShapes */ virtual void processShapes(WingedEdge &); diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index eb88eb29b4c..5fee88febfa 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -70,9 +70,7 @@ template class UnaryFunction0D { } /** Destructor; */ - virtual ~UnaryFunction0D() - { - } + virtual ~UnaryFunction0D() {} /** Returns the string "UnaryFunction0D" */ virtual string getName() const diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index bdee5db598e..c17ee3d6745 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -68,9 +68,7 @@ template class UnaryFunction1D { } /** destructor. */ - virtual ~UnaryFunction1D() - { - } + virtual ~UnaryFunction1D() {} /** returns the string "UnaryFunction1D". */ virtual string getName() const @@ -123,9 +121,7 @@ class UnaryFunction1D_void { _integration = iType; } - virtual ~UnaryFunction1D_void() - { - } + virtual ~UnaryFunction1D_void() {} virtual string getName() const { @@ -174,9 +170,7 @@ class GetXF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetXF1D(IntegrationType iType) : UnaryFunction1D(iType) - { - } + GetXF1D(IntegrationType iType) : UnaryFunction1D(iType) {} /** Returns the string "GetXF1D" */ string getName() const @@ -199,9 +193,7 @@ class GetYF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + GetYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "GetYF1D" */ string getName() const @@ -224,9 +216,7 @@ class GetZF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + GetZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "GetZF1D" */ string getName() const @@ -249,9 +239,7 @@ class GetProjectedXF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetProjectedXF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + GetProjectedXF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "GetProjectedXF1D" */ string getName() const @@ -274,9 +262,7 @@ class GetProjectedYF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetProjectedYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + GetProjectedYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "GetProjectedYF1D" */ string getName() const @@ -299,9 +285,7 @@ class GetProjectedZF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - GetProjectedZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + GetProjectedZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "GetProjectedZF1D" */ string getName() const @@ -324,9 +308,7 @@ class Orientation2DF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - Orientation2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + Orientation2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "Orientation2DF1D" */ string getName() const @@ -349,9 +331,7 @@ class Orientation3DF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - Orientation3DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + Orientation3DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "Orientation3DF1D" */ string getName() const @@ -378,9 +358,7 @@ class ZDiscontinuityF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - ZDiscontinuityF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + ZDiscontinuityF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "ZDiscontinuityF1D" */ string getName() const @@ -437,9 +415,7 @@ class CurveNatureF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - CurveNatureF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + CurveNatureF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "CurveNatureF1D" */ string getName() const @@ -501,9 +477,7 @@ class Curvature2DAngleF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - Curvature2DAngleF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + Curvature2DAngleF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "Curvature2DAngleF1D" */ string getName() const @@ -530,9 +504,7 @@ class Normal2DF1D : public UnaryFunction1D { * \param iType: * The integration method used to compute a single value from a set of values. */ - Normal2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) - { - } + Normal2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /** Returns the string "Normal2DF1D" */ string getName() const @@ -556,9 +528,7 @@ class Normal2DF1D : public UnaryFunction1D { class GetShapeF1D : public UnaryFunction1D> { public: /** Builds the functor. */ - GetShapeF1D() : UnaryFunction1D>() - { - } + GetShapeF1D() : UnaryFunction1D>() {} /** Returns the string "GetShapeF1D" */ string getName() const @@ -575,9 +545,7 @@ class GetShapeF1D : public UnaryFunction1D> { class GetOccludersF1D : public UnaryFunction1D> { public: /** Builds the functor. */ - GetOccludersF1D() : UnaryFunction1D>() - { - } + GetOccludersF1D() : UnaryFunction1D>() {} /** Returns the string "GetOccludersF1D" */ string getName() const @@ -594,9 +562,7 @@ class GetOccludersF1D : public UnaryFunction1D> { class GetOccludeeF1D : public UnaryFunction1D> { public: /** Builds the functor. */ - GetOccludeeF1D() : UnaryFunction1D>() - { - } + GetOccludeeF1D() : UnaryFunction1D>() {} /** Returns the string "GetOccludeeF1D" */ string getName() const diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h index 1b27e54d406..ec6b9a94fbb 100644 --- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h @@ -30,9 +30,7 @@ class GridDensityProvider { GridDensityProvider &operator=(const GridDensityProvider &other); public: - GridDensityProvider(OccluderSource &source) : source(source) - { - } + GridDensityProvider(OccluderSource &source) : source(source) {} virtual ~GridDensityProvider(){}; @@ -128,9 +126,7 @@ class GridDensityProviderFactory { GridDensityProviderFactory &operator=(const GridDensityProviderFactory &other); public: - GridDensityProviderFactory() - { - } + GridDensityProviderFactory() {} virtual AutoPtr newGridDensityProvider(OccluderSource &source, const real proscenium[4]) = 0; @@ -142,9 +138,7 @@ class GridDensityProviderFactory { virtual AutoPtr newGridDensityProvider(OccluderSource &source) = 0; - virtual ~GridDensityProviderFactory() - { - } + virtual ~GridDensityProviderFactory() {} #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridDensityProviderFactory") diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index 115ae1fe8d9..19c6cde97cb 100644 --- a/source/blender/freestyle/intern/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h @@ -41,9 +41,7 @@ class TVertex; class Interface0D { public: /** Default constructor */ - Interface0D() - { - } + Interface0D() {} /** Destructor */ virtual ~Interface0D(){}; @@ -114,9 +112,7 @@ class Interface0D { class Interface0DIteratorNested : public Iterator { public: - virtual ~Interface0DIteratorNested() - { - } + virtual ~Interface0DIteratorNested() {} virtual string getExactTypeName() const { diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index 28205d978e0..18fc262a35b 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -581,9 +581,7 @@ class FEdge : public Interface1D { } /** Destructor */ - virtual ~FEdge() - { - } + virtual ~FEdge() {} /** Cloning method. */ virtual FEdge *duplicate() @@ -1171,9 +1169,7 @@ class FEdgeSharp : public FEdge { } /** Destructor. */ - virtual ~FEdgeSharp() - { - } + virtual ~FEdgeSharp() {} /** Cloning method. */ virtual FEdge *duplicate() @@ -1326,9 +1322,7 @@ class FEdgeSmooth : public FEdge { } /** Destructor. */ - virtual ~FEdgeSmooth() - { - } + virtual ~FEdgeSmooth() {} /** Cloning method. */ virtual FEdge *duplicate() diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index 6483b534788..96ca880ad6c 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h @@ -172,9 +172,7 @@ class ViewEdgeXBuilder { _currentSVertexId = 0; } - virtual ~ViewEdgeXBuilder() - { - } + virtual ~ViewEdgeXBuilder() {} /** Builds a view shape from a WXShape in which the feature edges are flagged * Builds chains of feature edges (so ViewEdges) from a WXShape diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index fe7c2e62d9a..401bdf51b50 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -308,9 +308,7 @@ class ViewVertex : public Interface0D { public: /** Destructor. */ - virtual ~ViewVertex() - { - } + virtual ~ViewVertex() {} /* accessors */ /** Returns the nature of the vertex. */ @@ -327,9 +325,7 @@ class ViewVertex : public Interface0D { } /* Replaces old edge by new edge */ - virtual void Replace(ViewEdge *, ViewEdge *) - { - } + virtual void Replace(ViewEdge *, ViewEdge *) {} public: /* iterators access */ @@ -779,9 +775,7 @@ class NonTVertex : public ViewVertex { public: /** destructor. */ - virtual ~NonTVertex() - { - } + virtual ~NonTVertex() {} /* accessors */ /** Returns the SVertex on top of which this NonTVertex is built. */ diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index 2dee1be5a8a..44053eab6f2 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -92,9 +92,7 @@ class edge_iterator_base : public IteratorBase typedef IteratorBase parent_class; public: - inline edge_iterator_base() : parent_class() - { - } + inline edge_iterator_base() : parent_class() {} inline edge_iterator_base(Nature::VertexNature iNature) : parent_class() { @@ -147,9 +145,7 @@ class edge_iterator_base : public IteratorBase } } - virtual ~edge_iterator_base() - { - } + virtual ~edge_iterator_base() {} // protected://FIXME public: @@ -408,9 +404,7 @@ class edge_iterator_base : public IteratorBase @@ -531,9 +521,7 @@ class fedge_iterator_base : public IteratorBase> &iBrother) : parent_class() @@ -561,9 +549,7 @@ class fedge_iterator_base : public IteratorBase> &iBrother) : parent_class() @@ -699,9 +683,7 @@ class vertex_iterator_base : public IteratorBase &getEdgeList() diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 7e47422bb0c..44287ba5009 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -27,9 +27,7 @@ class WFillGrid { _polygon_id = 0; } - virtual ~WFillGrid() - { - } + virtual ~WFillGrid() {} void fillGrid(); diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index 3cd327e0fb2..d61422ed7b8 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h @@ -23,9 +23,7 @@ class WSFillGrid { _polygon_id = 0; } - virtual ~WSFillGrid() - { - } + virtual ~WSFillGrid() {} void fillGrid(); diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index 1a78e0427a0..5cd27d96fca 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -135,9 +135,7 @@ class WXEdge : public WEdge { return clone; } - virtual ~WXEdge() - { - } + virtual ~WXEdge() {} virtual void Reset() { @@ -230,9 +228,7 @@ class WXSmoothEdge { _front = iBrother._front; } - ~WXSmoothEdge() - { - } + ~WXSmoothEdge() {} inline WOEdge *woea() { @@ -722,9 +718,7 @@ class WXShape : public WShape { return clone; } - virtual ~WXShape() - { - } + virtual ~WXShape() {} inline bool getComputeViewIndependentFlag() const { diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index 3675b22c5dc..736c937f042 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h @@ -16,12 +16,8 @@ namespace Freestyle { class WXEdgeBuilder : public WingedEdgeBuilder { public: - WXEdgeBuilder() : WingedEdgeBuilder() - { - } - virtual ~WXEdgeBuilder() - { - } + WXEdgeBuilder() : WingedEdgeBuilder() {} + virtual ~WXEdgeBuilder() {} VISIT_DECL(IndexedFaceSet); protected: diff --git a/source/blender/functions/FN_field.hh b/source/blender/functions/FN_field.hh index 7d1fa855206..4a88981968b 100644 --- a/source/blender/functions/FN_field.hh +++ b/source/blender/functions/FN_field.hh @@ -552,13 +552,9 @@ template struct ValueOrField { ValueOrField() = default; - ValueOrField(T value) : value(std::move(value)) - { - } + ValueOrField(T value) : value(std::move(value)) {} - ValueOrField(Field field) : field(std::move(field)) - { - } + ValueOrField(Field field) : field(std::move(field)) {} bool is_field() const { @@ -600,9 +596,7 @@ template struct ValueOrField { /** \name #FieldNode Inline Methods * \{ */ -inline FieldNode::FieldNode(const FieldNodeType node_type) : node_type_(node_type) -{ -} +inline FieldNode::FieldNode(const FieldNodeType node_type) : node_type_(node_type) {} inline FieldNodeType FieldNode::node_type() const { diff --git a/source/blender/functions/FN_lazy_function.hh b/source/blender/functions/FN_lazy_function.hh index 5379e5f8506..fd9b553063e 100644 --- a/source/blender/functions/FN_lazy_function.hh +++ b/source/blender/functions/FN_lazy_function.hh @@ -241,9 +241,7 @@ struct Output { */ const CPPType *type = nullptr; - Output(const char *debug_name, const CPPType &type) : debug_name(debug_name), type(&type) - { - } + Output(const char *debug_name, const CPPType &type) : debug_name(debug_name), type(&type) {} }; /** diff --git a/source/blender/functions/FN_multi_function.hh b/source/blender/functions/FN_multi_function.hh index c00b0eb7b40..fbe60a55fab 100644 --- a/source/blender/functions/FN_multi_function.hh +++ b/source/blender/functions/FN_multi_function.hh @@ -42,9 +42,7 @@ class MultiFunction { const Signature *signature_ref_ = nullptr; public: - virtual ~MultiFunction() - { - } + virtual ~MultiFunction() {} /** * The result is the same as using #call directly but this method has some additional features. diff --git a/source/blender/functions/FN_multi_function_context.hh b/source/blender/functions/FN_multi_function_context.hh index 33817200edf..6b18413ea17 100644 --- a/source/blender/functions/FN_multi_function_context.hh +++ b/source/blender/functions/FN_multi_function_context.hh @@ -25,9 +25,7 @@ class ContextBuilder { class Context { public: - Context(ContextBuilder & /*builder*/) - { - } + Context(ContextBuilder & /*builder*/) {} }; } // namespace blender::fn::multi_function diff --git a/source/blender/functions/FN_multi_function_data_type.hh b/source/blender/functions/FN_multi_function_data_type.hh index d0b586c88ab..9a971835d41 100644 --- a/source/blender/functions/FN_multi_function_data_type.hh +++ b/source/blender/functions/FN_multi_function_data_type.hh @@ -25,9 +25,7 @@ class DataType { Category category_; const CPPType *type_; - DataType(Category category, const CPPType &type) : category_(category), type_(&type) - { - } + DataType(Category category, const CPPType &type) : category_(category), type_(&type) {} public: DataType() = default; diff --git a/source/blender/functions/FN_multi_function_params.hh b/source/blender/functions/FN_multi_function_params.hh index 5ca9f45009b..08a67981141 100644 --- a/source/blender/functions/FN_multi_function_params.hh +++ b/source/blender/functions/FN_multi_function_params.hh @@ -227,9 +227,7 @@ class Params { ParamsBuilder *builder_; public: - Params(ParamsBuilder &builder) : builder_(&builder) - { - } + Params(ParamsBuilder &builder) : builder_(&builder) {} template VArray readonly_single_input(int param_index, StringRef name = "") { diff --git a/source/blender/functions/intern/lazy_function_graph_executor.cc b/source/blender/functions/intern/lazy_function_graph_executor.cc index 4270885fc98..6361c687693 100644 --- a/source/blender/functions/intern/lazy_function_graph_executor.cc +++ b/source/blender/functions/intern/lazy_function_graph_executor.cc @@ -198,9 +198,7 @@ struct LockedNode { Vector delayed_required_outputs; Vector delayed_unused_outputs; - LockedNode(const Node &node, NodeState &node_state) : node(node), node_state(node_state) - { - } + LockedNode(const Node &node, NodeState &node_state) : node(node), node_state(node_state) {} }; class Executor; diff --git a/source/blender/functions/intern/multi_function_procedure.cc b/source/blender/functions/intern/multi_function_procedure.cc index 856aa5aa2aa..a785f69718d 100644 --- a/source/blender/functions/intern/multi_function_procedure.cc +++ b/source/blender/functions/intern/multi_function_procedure.cc @@ -553,9 +553,7 @@ class ProcedureDotExport { Map dot_nodes_by_end_; public: - ProcedureDotExport(const Procedure &procedure) : procedure_(procedure) - { - } + ProcedureDotExport(const Procedure &procedure) : procedure_(procedure) {} std::string generate() { diff --git a/source/blender/functions/intern/multi_function_procedure_executor.cc b/source/blender/functions/intern/multi_function_procedure_executor.cc index a2eaa36d107..4160d2c3931 100644 --- a/source/blender/functions/intern/multi_function_procedure_executor.cc +++ b/source/blender/functions/intern/multi_function_procedure_executor.cc @@ -38,9 +38,7 @@ constexpr int tot_variable_value_types = 6; struct VariableValue { ValueType type; - VariableValue(ValueType type) : type(type) - { - } + VariableValue(ValueType type) : type(type) {} }; /* This variable is the unmodified virtual array from the caller. */ @@ -94,9 +92,7 @@ struct VariableValue_OneSingle : public VariableValue { void *data; bool is_initialized = false; - VariableValue_OneSingle(void *data) : VariableValue(static_type), data(data) - { - } + VariableValue_OneSingle(void *data) : VariableValue(static_type), data(data) {} }; /* This variable has the same vector for every index. */ @@ -104,9 +100,7 @@ struct VariableValue_OneVector : public VariableValue { static inline constexpr ValueType static_type = ValueType::OneVector; GVectorArray &data; - VariableValue_OneVector(GVectorArray &data) : VariableValue(static_type), data(data) - { - } + VariableValue_OneVector(GVectorArray &data) : VariableValue(static_type), data(data) {} }; static_assert(std::is_trivially_destructible_v); @@ -153,9 +147,7 @@ class ValueAllocator : NonCopyable, NonMovable { Map> single_value_free_lists_; public: - ValueAllocator(LinearAllocator<> &linear_allocator) : linear_allocator_(linear_allocator) - { - } + ValueAllocator(LinearAllocator<> &linear_allocator) : linear_allocator_(linear_allocator) {} VariableValue_GVArray *obtain_GVArray(const GVArray &varray) { diff --git a/source/blender/functions/tests/FN_field_test.cc b/source/blender/functions/tests/FN_field_test.cc index c535097875d..202bc77d959 100644 --- a/source/blender/functions/tests/FN_field_test.cc +++ b/source/blender/functions/tests/FN_field_test.cc @@ -30,9 +30,7 @@ TEST(field, ConstantFunction) class IndexFieldInput final : public FieldInput { public: - IndexFieldInput() : FieldInput(CPPType::get(), "Index") - { - } + IndexFieldInput() : FieldInput(CPPType::get(), "Index") {} GVArray get_varray_for_context(const FieldContext & /*context*/, IndexMask mask, diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index e157e05c4c6..0a51ffe6def 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -64,9 +64,7 @@ struct AttributeFallbacksArray { */ Array array; - AttributeFallbacksArray(int size) : array(size, nullptr) - { - } + AttributeFallbacksArray(int size) : array(size, nullptr) {} }; struct PointCloudRealizeInfo { diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index eb3fec6afd3..4cfd9e509fa 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -959,9 +959,7 @@ void GPU_pass_cache_free(void) /** \name Module * \{ */ -void gpu_codegen_init(void) -{ -} +void gpu_codegen_init(void) {} void gpu_codegen_exit(void) { diff --git a/source/blender/gpu/metal/mtl_batch.mm b/source/blender/gpu/metal/mtl_batch.mm index 00610eefab0..21e6e39e2a3 100644 --- a/source/blender/gpu/metal/mtl_batch.mm +++ b/source/blender/gpu/metal/mtl_batch.mm @@ -583,9 +583,7 @@ id MTLBatch::bind(uint v_first, uint v_count, uint i_fi return rec; } -void MTLBatch::unbind() -{ -} +void MTLBatch::unbind() {} void MTLBatch::prepare_vertex_descriptor_and_bindings( MTLVertBuf **buffers, int &num_buffers, int v_first, int v_count, int i_first, int i_count) diff --git a/source/blender/gpu/metal/mtl_immediate.mm b/source/blender/gpu/metal/mtl_immediate.mm index 5c96effb6c6..2918a9c5edb 100644 --- a/source/blender/gpu/metal/mtl_immediate.mm +++ b/source/blender/gpu/metal/mtl_immediate.mm @@ -26,9 +26,7 @@ MTLImmediate::MTLImmediate(MTLContext *ctx) context_ = ctx; } -MTLImmediate::~MTLImmediate() -{ -} +MTLImmediate::~MTLImmediate() {} uchar *MTLImmediate::begin() { diff --git a/source/blender/gpu/metal/mtl_uniform_buffer.mm b/source/blender/gpu/metal/mtl_uniform_buffer.mm index ca209f86790..53664581b8c 100644 --- a/source/blender/gpu/metal/mtl_uniform_buffer.mm +++ b/source/blender/gpu/metal/mtl_uniform_buffer.mm @@ -18,9 +18,7 @@ namespace blender::gpu { -MTLUniformBuf::MTLUniformBuf(size_t size, const char *name) : UniformBuf(size, name) -{ -} +MTLUniformBuf::MTLUniformBuf(size_t size, const char *name) : UniformBuf(size, name) {} MTLUniformBuf::~MTLUniformBuf() { diff --git a/source/blender/gpu/metal/mtl_vertex_buffer.mm b/source/blender/gpu/metal/mtl_vertex_buffer.mm index 6114e1057c8..027a8f50281 100644 --- a/source/blender/gpu/metal/mtl_vertex_buffer.mm +++ b/source/blender/gpu/metal/mtl_vertex_buffer.mm @@ -8,9 +8,7 @@ namespace blender::gpu { -MTLVertBuf::MTLVertBuf() : VertBuf() -{ -} +MTLVertBuf::MTLVertBuf() : VertBuf() {} MTLVertBuf::~MTLVertBuf() { diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 51433ec9948..87b91ce3c5b 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -417,9 +417,7 @@ bool GLContext::debug_capture_scope_begin(void * /*scope*/) return false; } -void GLContext::debug_capture_scope_end(void * /*scope*/) -{ -} +void GLContext::debug_capture_scope_end(void * /*scope*/) {} /** \} */ diff --git a/source/blender/gpu/tests/gpu_testing.hh b/source/blender/gpu/tests/gpu_testing.hh index 74d075da46e..215d0d33bc0 100644 --- a/source/blender/gpu/tests/gpu_testing.hh +++ b/source/blender/gpu/tests/gpu_testing.hh @@ -38,9 +38,7 @@ class GPUTest : public ::testing::Test { class GPUOpenGLTest : public GPUTest { public: - GPUOpenGLTest() : GPUTest(GHOST_kDrawingContextTypeOpenGL, GPU_BACKEND_OPENGL) - { - } + GPUOpenGLTest() : GPUTest(GHOST_kDrawingContextTypeOpenGL, GPU_BACKEND_OPENGL) {} }; #define GPU_OPENGL_TEST(test_name) \ @@ -52,9 +50,7 @@ class GPUOpenGLTest : public GPUTest { #ifdef WITH_METAL_BACKEND class GPUMetalTest : public GPUTest { public: - GPUMetalTest() : GPUTest(GHOST_kDrawingContextTypeMetal, GPU_BACKEND_METAL) - { - } + GPUMetalTest() : GPUTest(GHOST_kDrawingContextTypeMetal, GPU_BACKEND_METAL) {} }; # define GPU_METAL_TEST(test_name) \ TEST_F(GPUMetalTest, test_name) \ @@ -68,9 +64,7 @@ class GPUMetalTest : public GPUTest { #ifdef WITH_VULKAN_BACKEND class GPUVulkanTest : public GPUTest { public: - GPUVulkanTest() : GPUTest(GHOST_kDrawingContextTypeVulkan, GPU_BACKEND_VULKAN) - { - } + GPUVulkanTest() : GPUTest(GHOST_kDrawingContextTypeVulkan, GPU_BACKEND_VULKAN) {} }; # define GPU_VULKAN_TEST(test_name) \ TEST_F(GPUVulkanTest, test_name) \ diff --git a/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl index 919810306a4..ab73b3a234a 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl @@ -1,3 +1 @@ -void main() -{ -} +void main() {} diff --git a/source/blender/gpu/vulkan/vk_backend.cc b/source/blender/gpu/vulkan/vk_backend.cc index 5d4e6c0dc9b..8a75d6e7285 100644 --- a/source/blender/gpu/vulkan/vk_backend.cc +++ b/source/blender/gpu/vulkan/vk_backend.cc @@ -52,13 +52,9 @@ void VKBackend::platform_exit() GPG.clear(); } -void VKBackend::delete_resources() -{ -} +void VKBackend::delete_resources() {} -void VKBackend::samplers_update() -{ -} +void VKBackend::samplers_update() {} void VKBackend::compute_dispatch(int groups_x_len, int groups_y_len, int groups_z_len) { @@ -77,9 +73,7 @@ void VKBackend::compute_dispatch(int groups_x_len, int groups_y_len, int groups_ command_buffer.dispatch(groups_x_len, groups_y_len, groups_z_len); } -void VKBackend::compute_dispatch_indirect(StorageBuf * /*indirect_buf*/) -{ -} +void VKBackend::compute_dispatch_indirect(StorageBuf * /*indirect_buf*/) {} Context *VKBackend::context_alloc(void *ghost_window, void *ghost_context) { @@ -146,17 +140,11 @@ VertBuf *VKBackend::vertbuf_alloc() return new VKVertexBuffer(); } -void VKBackend::render_begin() -{ -} +void VKBackend::render_begin() {} -void VKBackend::render_end() -{ -} +void VKBackend::render_end() {} -void VKBackend::render_step() -{ -} +void VKBackend::render_step() {} shaderc::Compiler &VKBackend::get_shaderc_compiler() { diff --git a/source/blender/gpu/vulkan/vk_batch.cc b/source/blender/gpu/vulkan/vk_batch.cc index bdcf626864b..87542d43391 100644 --- a/source/blender/gpu/vulkan/vk_batch.cc +++ b/source/blender/gpu/vulkan/vk_batch.cc @@ -9,13 +9,9 @@ namespace blender::gpu { -void VKBatch::draw(int /*v_first*/, int /*v_count*/, int /*i_first*/, int /*i_count*/) -{ -} +void VKBatch::draw(int /*v_first*/, int /*v_count*/, int /*i_first*/, int /*i_count*/) {} -void VKBatch::draw_indirect(GPUStorageBuf * /*indirect_buf*/, intptr_t /*offset*/) -{ -} +void VKBatch::draw_indirect(GPUStorageBuf * /*indirect_buf*/, intptr_t /*offset*/) {} void VKBatch::multi_draw_indirect(GPUStorageBuf * /*indirect_buf*/, int /*count*/, diff --git a/source/blender/gpu/vulkan/vk_context.cc b/source/blender/gpu/vulkan/vk_context.cc index 3812bf0b9a0..49388dbc9e9 100644 --- a/source/blender/gpu/vulkan/vk_context.cc +++ b/source/blender/gpu/vulkan/vk_context.cc @@ -92,9 +92,7 @@ void VKContext::activate() } } -void VKContext::deactivate() -{ -} +void VKContext::deactivate() {} void VKContext::begin_frame() { @@ -124,9 +122,7 @@ void VKContext::finish() command_buffer_.submit(); } -void VKContext::memory_statistics_get(int * /*total_mem*/, int * /*free_mem*/) -{ -} +void VKContext::memory_statistics_get(int * /*total_mem*/, int * /*free_mem*/) {} void VKContext::activate_framebuffer(VKFrameBuffer &framebuffer) { diff --git a/source/blender/gpu/vulkan/vk_debug.cc b/source/blender/gpu/vulkan/vk_debug.cc index 753a2e0371b..4ff7bbf657b 100644 --- a/source/blender/gpu/vulkan/vk_debug.cc +++ b/source/blender/gpu/vulkan/vk_debug.cc @@ -9,13 +9,9 @@ #include "vk_context.hh" namespace blender::gpu { -void VKContext::debug_group_begin(const char *, int) -{ -} +void VKContext::debug_group_begin(const char *, int) {} -void VKContext::debug_group_end() -{ -} +void VKContext::debug_group_end() {} bool VKContext::debug_capture_begin() { @@ -56,7 +52,5 @@ bool VKContext::debug_capture_scope_begin(void * /*scope*/) return false; } -void VKContext::debug_capture_scope_end(void * /*scope*/) -{ -} +void VKContext::debug_capture_scope_end(void * /*scope*/) {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_descriptor_pools.cc b/source/blender/gpu/vulkan/vk_descriptor_pools.cc index f351a7f8120..e9aa7b843df 100644 --- a/source/blender/gpu/vulkan/vk_descriptor_pools.cc +++ b/source/blender/gpu/vulkan/vk_descriptor_pools.cc @@ -9,9 +9,7 @@ #include "vk_memory.hh" namespace blender::gpu { -VKDescriptorPools::VKDescriptorPools() -{ -} +VKDescriptorPools::VKDescriptorPools() {} VKDescriptorPools::~VKDescriptorPools() { diff --git a/source/blender/gpu/vulkan/vk_descriptor_set.hh b/source/blender/gpu/vulkan/vk_descriptor_set.hh index f7e85670191..de19c495418 100644 --- a/source/blender/gpu/vulkan/vk_descriptor_set.hh +++ b/source/blender/gpu/vulkan/vk_descriptor_set.hh @@ -55,9 +55,7 @@ class VKDescriptorSet : NonCopyable { */ uint32_t binding; - Location(uint32_t binding) : binding(binding) - { - } + Location(uint32_t binding) : binding(binding) {} public: Location() = default; @@ -143,13 +141,9 @@ class VKDescriptorSetTracker : protected VKResourceTracker { VkDescriptorSetLayout layout_; public: - VKDescriptorSetTracker() - { - } + VKDescriptorSetTracker() {} - VKDescriptorSetTracker(VkDescriptorSetLayout layout) : layout_(layout) - { - } + VKDescriptorSetTracker(VkDescriptorSetLayout layout) : layout_(layout) {} void bind_as_ssbo(VKVertexBuffer &buffer, VKDescriptorSet::Location location); void bind_as_ssbo(VKIndexBuffer &buffer, VKDescriptorSet::Location location); diff --git a/source/blender/gpu/vulkan/vk_drawlist.cc b/source/blender/gpu/vulkan/vk_drawlist.cc index 3b699bb9ec4..edba7ade566 100644 --- a/source/blender/gpu/vulkan/vk_drawlist.cc +++ b/source/blender/gpu/vulkan/vk_drawlist.cc @@ -9,12 +9,8 @@ namespace blender::gpu { -void VKDrawList::append(GPUBatch * /*batch*/, int /*i_first*/, int /*i_count*/) -{ -} +void VKDrawList::append(GPUBatch * /*batch*/, int /*i_first*/, int /*i_count*/) {} -void VKDrawList::submit() -{ -} +void VKDrawList::submit() {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_fence.cc b/source/blender/gpu/vulkan/vk_fence.cc index 277daa5ef0d..30ec2380eda 100644 --- a/source/blender/gpu/vulkan/vk_fence.cc +++ b/source/blender/gpu/vulkan/vk_fence.cc @@ -9,12 +9,8 @@ namespace blender::gpu { -void VKFence::signal() -{ -} +void VKFence::signal() {} -void VKFence::wait() -{ -} +void VKFence::wait() {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_index_buffer.cc b/source/blender/gpu/vulkan/vk_index_buffer.cc index 4824d9cc7ec..a9a464f9ef6 100644 --- a/source/blender/gpu/vulkan/vk_index_buffer.cc +++ b/source/blender/gpu/vulkan/vk_index_buffer.cc @@ -11,9 +11,7 @@ namespace blender::gpu { -void VKIndexBuffer::upload_data() -{ -} +void VKIndexBuffer::upload_data() {} void VKIndexBuffer::bind_as_ssbo(uint binding) { @@ -38,13 +36,9 @@ void VKIndexBuffer::read(uint32_t *data) const buffer_.read(data); } -void VKIndexBuffer::update_sub(uint /*start*/, uint /*len*/, const void * /*data*/) -{ -} +void VKIndexBuffer::update_sub(uint /*start*/, uint /*len*/, const void * /*data*/) {} -void VKIndexBuffer::strip_restart_indices() -{ -} +void VKIndexBuffer::strip_restart_indices() {} void VKIndexBuffer::allocate(VKContext &context) { diff --git a/source/blender/gpu/vulkan/vk_query.cc b/source/blender/gpu/vulkan/vk_query.cc index 8d2ae38b92e..2706a3b7c4c 100644 --- a/source/blender/gpu/vulkan/vk_query.cc +++ b/source/blender/gpu/vulkan/vk_query.cc @@ -9,20 +9,12 @@ namespace blender::gpu { -void VKQueryPool::init(GPUQueryType /*type*/) -{ -} +void VKQueryPool::init(GPUQueryType /*type*/) {} -void VKQueryPool::begin_query() -{ -} +void VKQueryPool::begin_query() {} -void VKQueryPool::end_query() -{ -} +void VKQueryPool::end_query() {} -void VKQueryPool::get_occlusion_result(MutableSpan /*r_values*/) -{ -} +void VKQueryPool::get_occlusion_result(MutableSpan /*r_values*/) {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_shader.cc b/source/blender/gpu/vulkan/vk_shader.cc index 69d7f8014ad..3be1550ca68 100644 --- a/source/blender/gpu/vulkan/vk_shader.cc +++ b/source/blender/gpu/vulkan/vk_shader.cc @@ -659,9 +659,7 @@ void VKShader::compute_shader_from_glsl(MutableSpan sources) build_shader_module(sources, shaderc_compute_shader, &compute_module_); } -void VKShader::warm_cache(int /*limit*/) -{ -} +void VKShader::warm_cache(int /*limit*/) {} bool VKShader::finalize(const shader::ShaderCreateInfo *info) { @@ -978,9 +976,7 @@ bool VKShader::transform_feedback_enable(GPUVertBuf *) return false; } -void VKShader::transform_feedback_disable() -{ -} +void VKShader::transform_feedback_disable() {} void VKShader::bind() { diff --git a/source/blender/gpu/vulkan/vk_state_manager.cc b/source/blender/gpu/vulkan/vk_state_manager.cc index c970b3d6748..a395cabe503 100644 --- a/source/blender/gpu/vulkan/vk_state_manager.cc +++ b/source/blender/gpu/vulkan/vk_state_manager.cc @@ -9,13 +9,9 @@ #include "vk_texture.hh" namespace blender::gpu { -void VKStateManager::apply_state() -{ -} +void VKStateManager::apply_state() {} -void VKStateManager::force_state() -{ -} +void VKStateManager::force_state() {} void VKStateManager::issue_barrier(eGPUBarrier /*barrier_bits*/) { @@ -26,17 +22,11 @@ void VKStateManager::issue_barrier(eGPUBarrier /*barrier_bits*/) command_buffer.submit(); } -void VKStateManager::texture_bind(Texture * /*tex*/, eGPUSamplerState /*sampler*/, int /*unit*/) -{ -} +void VKStateManager::texture_bind(Texture * /*tex*/, eGPUSamplerState /*sampler*/, int /*unit*/) {} -void VKStateManager::texture_unbind(Texture * /*tex*/) -{ -} +void VKStateManager::texture_unbind(Texture * /*tex*/) {} -void VKStateManager::texture_unbind_all() -{ -} +void VKStateManager::texture_unbind_all() {} void VKStateManager::image_bind(Texture *tex, int binding) { @@ -44,16 +34,10 @@ void VKStateManager::image_bind(Texture *tex, int binding) texture->image_bind(binding); } -void VKStateManager::image_unbind(Texture * /*tex*/) -{ -} +void VKStateManager::image_unbind(Texture * /*tex*/) {} -void VKStateManager::image_unbind_all() -{ -} +void VKStateManager::image_unbind_all() {} -void VKStateManager::texture_unpack_row_length_set(uint /*len*/) -{ -} +void VKStateManager::texture_unpack_row_length_set(uint /*len*/) {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_storage_buffer.cc b/source/blender/gpu/vulkan/vk_storage_buffer.cc index fd89fc38296..7a404e68220 100644 --- a/source/blender/gpu/vulkan/vk_storage_buffer.cc +++ b/source/blender/gpu/vulkan/vk_storage_buffer.cc @@ -43,9 +43,7 @@ void VKStorageBuffer::bind(int slot) shader->pipeline_get().descriptor_set_get().bind(*this, location); } -void VKStorageBuffer::unbind() -{ -} +void VKStorageBuffer::unbind() {} void VKStorageBuffer::clear(uint32_t clear_value) { diff --git a/source/blender/gpu/vulkan/vk_texture.cc b/source/blender/gpu/vulkan/vk_texture.cc index a57c9ff47f3..05a6111c895 100644 --- a/source/blender/gpu/vulkan/vk_texture.cc +++ b/source/blender/gpu/vulkan/vk_texture.cc @@ -29,13 +29,9 @@ VKTexture::~VKTexture() vkDestroyImageView(context.device_get(), vk_image_view_, vk_allocation_callbacks); } -void VKTexture::generate_mipmap() -{ -} +void VKTexture::generate_mipmap() {} -void VKTexture::copy_to(Texture * /*tex*/) -{ -} +void VKTexture::copy_to(Texture * /*tex*/) {} void VKTexture::clear(eGPUDataFormat format, const void *data) { @@ -56,17 +52,11 @@ void VKTexture::clear(eGPUDataFormat format, const void *data) vk_image_, current_layout_get(), clear_color, Span(&range, 1)); } -void VKTexture::swizzle_set(const char /*swizzle_mask*/[4]) -{ -} +void VKTexture::swizzle_set(const char /*swizzle_mask*/[4]) {} -void VKTexture::stencil_texture_mode_set(bool /*use_stencil*/) -{ -} +void VKTexture::stencil_texture_mode_set(bool /*use_stencil*/) {} -void VKTexture::mip_range_set(int /*min*/, int /*max*/) -{ -} +void VKTexture::mip_range_set(int /*min*/, int /*max*/) {} void *VKTexture::read(int mip, eGPUDataFormat format) { diff --git a/source/blender/gpu/vulkan/vk_texture.hh b/source/blender/gpu/vulkan/vk_texture.hh index 29e5be95b47..ee5d9081548 100644 --- a/source/blender/gpu/vulkan/vk_texture.hh +++ b/source/blender/gpu/vulkan/vk_texture.hh @@ -24,9 +24,7 @@ class VKTexture : public Texture { VkImageLayout current_layout_ = VK_IMAGE_LAYOUT_UNDEFINED; public: - VKTexture(const char *name) : Texture(name) - { - } + VKTexture(const char *name) : Texture(name) {} virtual ~VKTexture() override; void generate_mipmap() override; diff --git a/source/blender/gpu/vulkan/vk_uniform_buffer.cc b/source/blender/gpu/vulkan/vk_uniform_buffer.cc index 398dfb68466..ff4a7ce9cc4 100644 --- a/source/blender/gpu/vulkan/vk_uniform_buffer.cc +++ b/source/blender/gpu/vulkan/vk_uniform_buffer.cc @@ -24,20 +24,12 @@ void VKUniformBuffer::allocate(VKContext &context) buffer_.create(context, size_in_bytes_, GPU_USAGE_STATIC, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT); } -void VKUniformBuffer::clear_to_zero() -{ -} +void VKUniformBuffer::clear_to_zero() {} -void VKUniformBuffer::bind(int /*slot*/) -{ -} +void VKUniformBuffer::bind(int /*slot*/) {} -void VKUniformBuffer::bind_as_ssbo(int /*slot*/) -{ -} +void VKUniformBuffer::bind_as_ssbo(int /*slot*/) {} -void VKUniformBuffer::unbind() -{ -} +void VKUniformBuffer::unbind() {} } // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_uniform_buffer.hh b/source/blender/gpu/vulkan/vk_uniform_buffer.hh index 0c51b04afcf..e7be3a69b33 100644 --- a/source/blender/gpu/vulkan/vk_uniform_buffer.hh +++ b/source/blender/gpu/vulkan/vk_uniform_buffer.hh @@ -19,9 +19,7 @@ class VKUniformBuffer : public UniformBuf, NonCopyable { VKBuffer buffer_; public: - VKUniformBuffer(int size, const char *name) : UniformBuf(size, name) - { - } + VKUniformBuffer(int size, const char *name) : UniformBuf(size, name) {} void update(const void *data) override; void clear_to_zero() override; diff --git a/source/blender/gpu/vulkan/vk_vertex_buffer.cc b/source/blender/gpu/vulkan/vk_vertex_buffer.cc index e667473cb2f..2e4e0a7161b 100644 --- a/source/blender/gpu/vulkan/vk_vertex_buffer.cc +++ b/source/blender/gpu/vulkan/vk_vertex_buffer.cc @@ -32,17 +32,11 @@ void VKVertexBuffer::bind_as_ssbo(uint binding) shader->pipeline_get().descriptor_set_get().bind_as_ssbo(*this, location); } -void VKVertexBuffer::bind_as_texture(uint /*binding*/) -{ -} +void VKVertexBuffer::bind_as_texture(uint /*binding*/) {} -void VKVertexBuffer::wrap_handle(uint64_t /*handle*/) -{ -} +void VKVertexBuffer::wrap_handle(uint64_t /*handle*/) {} -void VKVertexBuffer::update_sub(uint /*start*/, uint /*len*/, const void * /*data*/) -{ -} +void VKVertexBuffer::update_sub(uint /*start*/, uint /*len*/, const void * /*data*/) {} void VKVertexBuffer::read(void *data) const { @@ -63,22 +57,16 @@ void VKVertexBuffer::acquire_data() data = (uchar *)MEM_mallocN(sizeof(uchar) * this->size_alloc_get(), __func__); } -void VKVertexBuffer::resize_data() -{ -} +void VKVertexBuffer::resize_data() {} void VKVertexBuffer::release_data() { MEM_SAFE_FREE(data); } -void VKVertexBuffer::upload_data() -{ -} +void VKVertexBuffer::upload_data() {} -void VKVertexBuffer::duplicate_data(VertBuf * /*dst*/) -{ -} +void VKVertexBuffer::duplicate_data(VertBuf * /*dst*/) {} void VKVertexBuffer::allocate(VKContext &context) { diff --git a/source/blender/imbuf/intern/dds/Color.h b/source/blender/imbuf/intern/dds/Color.h index 5b00333ad77..54c0e94012a 100644 --- a/source/blender/imbuf/intern/dds/Color.h +++ b/source/blender/imbuf/intern/dds/Color.h @@ -18,9 +18,7 @@ /** 32 bit color stored as BGRA. */ class Color32 { public: - Color32() - { - } + Color32() {} Color32(const Color32 &) = default; Color32(unsigned char R, unsigned char G, unsigned char B) @@ -45,9 +43,7 @@ class Color32 { setRGBA(uint(R * 255), uint(G * 255), uint(B * 255), uint(A * 255)); } #endif - Color32(unsigned int U) : u(U) - { - } + Color32(unsigned int U) : u(U) {} void setRGBA(unsigned char R, unsigned char G, unsigned char B, unsigned char A) { @@ -81,15 +77,9 @@ class Color32 { /** 16 bit 565 BGR color. */ class Color16 { public: - Color16() - { - } - Color16(const Color16 &c) : u(c.u) - { - } - explicit Color16(unsigned short U) : u(U) - { - } + Color16() {} + Color16(const Color16 &c) : u(c.u) {} + explicit Color16(unsigned short U) : u(U) {} union { struct { diff --git a/source/blender/imbuf/intern/dds/Image.cpp b/source/blender/imbuf/intern/dds/Image.cpp index 04ee92a0530..ffcdded6270 100644 --- a/source/blender/imbuf/intern/dds/Image.cpp +++ b/source/blender/imbuf/intern/dds/Image.cpp @@ -18,9 +18,7 @@ #include /* printf */ -Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(nullptr) -{ -} +Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(nullptr) {} Image::~Image() { diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h index d90440f47cd..950a2e13f45 100644 --- a/source/blender/imbuf/intern/dds/Stream.h +++ b/source/blender/imbuf/intern/dds/Stream.h @@ -13,9 +13,7 @@ struct Stream { unsigned int size; /* size */ unsigned int pos; /* current position */ bool failed; /* error occurred when seeking */ - Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0), failed(false) - { - } + Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0), failed(false) {} unsigned int seek(unsigned int p); void set_failed(const char *msg); }; diff --git a/source/blender/imbuf/intern/oiio/openimageio_support.cc b/source/blender/imbuf/intern/oiio/openimageio_support.cc index cdfe74aa4f9..6be6d94ae0d 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_support.cc +++ b/source/blender/imbuf/intern/oiio/openimageio_support.cc @@ -21,9 +21,7 @@ namespace blender::imbuf { /* An OIIO IOProxy used during file packing to write into an in-memory #ImBuf buffer. */ class ImBufMemWriter : public Filesystem::IOProxy { public: - ImBufMemWriter(ImBuf *ibuf) : IOProxy("", Write), ibuf_(ibuf) - { - } + ImBufMemWriter(ImBuf *ibuf) : IOProxy("", Write), ibuf_(ibuf) {} const char *proxytype() const override { diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 244a02dcd3c..155aa4783a0 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -139,9 +139,7 @@ class IMemStream : public Imf::IStream { _exrpos = pos; } - void clear() override - { - } + void clear() override {} private: exr_file_offset_t _exrpos; @@ -277,9 +275,7 @@ class IFileStream : public Imf::IStream { class OMemStream : public OStream { public: - OMemStream(ImBuf *ibuf_) : OStream(""), ibuf(ibuf_), offset(0) - { - } + OMemStream(ImBuf *ibuf_) : OStream(""), ibuf(ibuf_), offset(0) {} void write(const char c[], int n) override { diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp index f8f204af70c..f9f14294b7e 100644 --- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp @@ -71,12 +71,8 @@ float *IMB_exr_channel_rect(void * /*handle*/, return nullptr; } -void IMB_exr_read_channels(void * /*handle*/) -{ -} -void IMB_exr_write_channels(void * /*handle*/) -{ -} +void IMB_exr_read_channels(void * /*handle*/) {} +void IMB_exr_write_channels(void * /*handle*/) {} void IMB_exrtile_write_channels(void * /*handle*/, int /*partx*/, int /*party*/, @@ -85,9 +81,7 @@ void IMB_exrtile_write_channels(void * /*handle*/, bool /*empty*/) { } -void IMB_exr_clear_channels(void * /*handle*/) -{ -} +void IMB_exr_clear_channels(void * /*handle*/) {} void IMB_exr_multilayer_convert(void * /*handle*/, void * /*base*/, @@ -103,13 +97,9 @@ void IMB_exr_multilayer_convert(void * /*handle*/, { } -void IMB_exr_close(void * /*handle*/) -{ -} +void IMB_exr_close(void * /*handle*/) {} -void IMB_exr_add_view(void * /*handle*/, const char * /*name*/) -{ -} +void IMB_exr_add_view(void * /*handle*/, const char * /*name*/) {} bool IMB_exr_has_multilayer(void * /*handle*/) { return false; diff --git a/source/blender/io/alembic/exporter/abc_custom_props.cc b/source/blender/io/alembic/exporter/abc_custom_props.cc index ad7df45dca0..4c46aaebebc 100644 --- a/source/blender/io/alembic/exporter/abc_custom_props.cc +++ b/source/blender/io/alembic/exporter/abc_custom_props.cc @@ -31,9 +31,7 @@ using Alembic::Abc::OStringArrayProperty; namespace blender::io::alembic { -CustomPropertiesExporter::CustomPropertiesExporter(ABCAbstractWriter *owner) : owner_(owner) -{ -} +CustomPropertiesExporter::CustomPropertiesExporter(ABCAbstractWriter *owner) : owner_(owner) {} void CustomPropertiesExporter::write_all(const IDProperty *group) { diff --git a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc index 712b04f3992..5ed89acced4 100644 --- a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc +++ b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc @@ -19,9 +19,7 @@ namespace blender::io::alembic { -SubdivModifierDisabler::SubdivModifierDisabler(Depsgraph *depsgraph) : depsgraph_(depsgraph) -{ -} +SubdivModifierDisabler::SubdivModifierDisabler(Depsgraph *depsgraph) : depsgraph_(depsgraph) {} SubdivModifierDisabler::~SubdivModifierDisabler() { diff --git a/source/blender/io/alembic/exporter/abc_writer_camera.cc b/source/blender/io/alembic/exporter/abc_writer_camera.cc index f1220660637..3334128579e 100644 --- a/source/blender/io/alembic/exporter/abc_writer_camera.cc +++ b/source/blender/io/alembic/exporter/abc_writer_camera.cc @@ -23,9 +23,7 @@ using Alembic::AbcGeom::CameraSample; using Alembic::AbcGeom::OCamera; using Alembic::AbcGeom::OFloatProperty; -ABCCameraWriter::ABCCameraWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) -{ -} +ABCCameraWriter::ABCCameraWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) {} bool ABCCameraWriter::is_supported(const HierarchyContext *context) const { diff --git a/source/blender/io/alembic/exporter/abc_writer_curves.cc b/source/blender/io/alembic/exporter/abc_writer_curves.cc index 03cd6e2120a..5e3d3d63939 100644 --- a/source/blender/io/alembic/exporter/abc_writer_curves.cc +++ b/source/blender/io/alembic/exporter/abc_writer_curves.cc @@ -29,9 +29,7 @@ namespace blender::io::alembic { const std::string ABC_CURVE_RESOLUTION_U_PROPNAME("blender:resolution"); -ABCCurveWriter::ABCCurveWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) -{ -} +ABCCurveWriter::ABCCurveWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) {} void ABCCurveWriter::create_alembic_objects(const HierarchyContext *context) { diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index 52fc86fd09d..e46d45c50ae 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -561,9 +561,7 @@ static void get_loop_normals(struct Mesh *mesh, } } -ABCMeshWriter::ABCMeshWriter(const ABCWriterConstructorArgs &args) : ABCGenericMeshWriter(args) -{ -} +ABCMeshWriter::ABCMeshWriter(const ABCWriterConstructorArgs &args) : ABCGenericMeshWriter(args) {} Mesh *ABCMeshWriter::get_export_mesh(Object *object_eval, bool & /*r_needsfree*/) { diff --git a/source/blender/io/alembic/exporter/abc_writer_nurbs.cc b/source/blender/io/alembic/exporter/abc_writer_nurbs.cc index 89ed7c5ce06..be50994452a 100644 --- a/source/blender/io/alembic/exporter/abc_writer_nurbs.cc +++ b/source/blender/io/alembic/exporter/abc_writer_nurbs.cc @@ -26,9 +26,7 @@ using Alembic::AbcGeom::OCompoundProperty; using Alembic::AbcGeom::ONuPatch; using Alembic::AbcGeom::ONuPatchSchema; -ABCNurbsWriter::ABCNurbsWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) -{ -} +ABCNurbsWriter::ABCNurbsWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) {} void ABCNurbsWriter::create_alembic_objects(const HierarchyContext *context) { diff --git a/source/blender/io/alembic/exporter/abc_writer_points.cc b/source/blender/io/alembic/exporter/abc_writer_points.cc index 9372bffc3ca..7792a40ad89 100644 --- a/source/blender/io/alembic/exporter/abc_writer_points.cc +++ b/source/blender/io/alembic/exporter/abc_writer_points.cc @@ -26,9 +26,7 @@ using Alembic::AbcGeom::kVertexScope; using Alembic::AbcGeom::OPoints; using Alembic::AbcGeom::OPointsSchema; -ABCPointsWriter::ABCPointsWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) -{ -} +ABCPointsWriter::ABCPointsWriter(const ABCWriterConstructorArgs &args) : ABCAbstractWriter(args) {} void ABCPointsWriter::create_alembic_objects(const HierarchyContext * /*context*/) { diff --git a/source/blender/io/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp index ac7fa81883a..525c180e8b3 100644 --- a/source/blender/io/collada/BCAnimationCurve.cpp +++ b/source/blender/io/collada/BCAnimationCurve.cpp @@ -628,9 +628,7 @@ bool BCCurveKey::operator<(const BCCurveKey &other) const return this->curve_array_index < other.curve_array_index; } -BCBezTriple::BCBezTriple(BezTriple &bezt) : bezt(bezt) -{ -} +BCBezTriple::BCBezTriple(BezTriple &bezt) : bezt(bezt) {} float BCBezTriple::get_frame() const { diff --git a/source/blender/io/collada/BCAnimationSampler.h b/source/blender/io/collada/BCAnimationSampler.h index 747699b859b..f6816fd5c70 100644 --- a/source/blender/io/collada/BCAnimationSampler.h +++ b/source/blender/io/collada/BCAnimationSampler.h @@ -120,9 +120,7 @@ class BCSampleFrameContainer { BCSampleFrameMap sample_frames; public: - ~BCSampleFrameContainer() - { - } + ~BCSampleFrameContainer() {} BCSample &add(Object *ob, int frame_index); /** Return either the #BCSampleFrame or NULL if frame does not exist. */ diff --git a/source/blender/io/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h index d9a1ba4e5a2..e9593fb3f75 100644 --- a/source/blender/io/collada/BCSampleData.h +++ b/source/blender/io/collada/BCSampleData.h @@ -29,9 +29,7 @@ class BCSample { BCBoneMatrixMap bonemats; /* For Armature animation */ public: - BCSample(Object *ob) : obmat(ob) - { - } + BCSample(Object *ob) : obmat(ob) {} ~BCSample(); diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index f70a551f075..c547b8a0b09 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -309,9 +309,7 @@ int DocumentExporter::exportCurrentScene() return status; } -void DocumentExporter::exportScenes(const char *filename) -{ -} +void DocumentExporter::exportScenes(const char *filename) {} /* * NOTES: diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 49ed37ba976..fc6316e97a8 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -161,9 +161,7 @@ void DocumentImporter::cancel(const COLLADAFW::String &errorMessage) * The latter sounds better. */ } -void DocumentImporter::start() -{ -} +void DocumentImporter::start() {} void DocumentImporter::finish() { diff --git a/source/blender/io/collada/ErrorHandler.cpp b/source/blender/io/collada/ErrorHandler.cpp index 551c87c32a0..f60c027a1e2 100644 --- a/source/blender/io/collada/ErrorHandler.cpp +++ b/source/blender/io/collada/ErrorHandler.cpp @@ -17,9 +17,7 @@ #include "BLI_utildefines.h" //-------------------------------------------------------------------- -ErrorHandler::ErrorHandler() : mError(false) -{ -} +ErrorHandler::ErrorHandler() : mError(false) {} //-------------------------------------------------------------------- bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error) diff --git a/source/blender/io/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h index 8790c32158d..d0b705d6b71 100644 --- a/source/blender/io/collada/MaterialExporter.h +++ b/source/blender/io/collada/MaterialExporter.h @@ -41,9 +41,7 @@ template class ForEachMaterialFunctor { Functor *f; public: - ForEachMaterialFunctor(Functor *f) : f(f) - { - } + ForEachMaterialFunctor(Functor *f) : f(f) {} void operator()(Object *ob) { diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 8c289e55157..6ccad864790 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -83,9 +83,7 @@ static const char *bc_geomTypeToStr(COLLADAFW::Geometry::GeometryType type) } } -UVDataWrapper::UVDataWrapper(COLLADAFW::MeshVertexData &vdata) : mVData(&vdata) -{ -} +UVDataWrapper::UVDataWrapper(COLLADAFW::MeshVertexData &vdata) : mVData(&vdata) {} #ifdef COLLADA_DEBUG void WVDataWrapper::print() @@ -145,9 +143,7 @@ void UVDataWrapper::getUV(int uv_index, float *uv) } } -VCOLDataWrapper::VCOLDataWrapper(COLLADAFW::MeshVertexData &vdata) : mVData(&vdata) -{ -} +VCOLDataWrapper::VCOLDataWrapper(COLLADAFW::MeshVertexData &vdata) : mVData(&vdata) {} template static void colladaAddColor(T values, MLoopCol *mloopcol, int v_index, int stride) diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index 9d109d1dee0..5e0f2d05ad9 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -56,9 +56,7 @@ SkinInfo::SkinInfo(const SkinInfo &skin) transfer_int_array_data_const(skin.joint_indices, joint_indices); } -SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(nullptr), parent(nullptr) -{ -} +SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(nullptr), parent(nullptr) {} template void SkinInfo::transfer_array_data(T &src, T &dest) { diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index d559b0efe82..e74c7cff53e 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -84,9 +84,7 @@ bool HierarchyContext::is_object_visible(const enum eEvaluationMode evaluation_m return (visibility & OB_VISIBLE_SELF) != 0; } -EnsuredWriter::EnsuredWriter() : writer_(nullptr), newly_created_(false) -{ -} +EnsuredWriter::EnsuredWriter() : writer_(nullptr), newly_created_(false) {} EnsuredWriter::EnsuredWriter(AbstractHierarchyWriter *writer, bool newly_created) : writer_(writer), newly_created_(newly_created) diff --git a/source/blender/io/common/intern/object_identifier_test.cc b/source/blender/io/common/intern/object_identifier_test.cc index abf36cfe32b..fb63051a1ea 100644 --- a/source/blender/io/common/intern/object_identifier_test.cc +++ b/source/blender/io/common/intern/object_identifier_test.cc @@ -44,12 +44,8 @@ class TestPersistentID : public PersistentID { : TestPersistentID(value0, value1, value2, INT_MAX, INT_MAX, INT_MAX, INT_MAX, INT_MAX) { } - TestPersistentID(int value0, int value1) : TestPersistentID(value0, value1, INT_MAX) - { - } - explicit TestPersistentID(int value0) : TestPersistentID(value0, INT_MAX) - { - } + TestPersistentID(int value0, int value1) : TestPersistentID(value0, value1, INT_MAX) {} + explicit TestPersistentID(int value0) : TestPersistentID(value0, INT_MAX) {} }; /* ObjectIdentifier subclass for use in tests, making it easier to construct test values. */ diff --git a/source/blender/io/ply/exporter/ply_export_load_plydata.hh b/source/blender/io/ply/exporter/ply_export_load_plydata.hh index 29332687c9c..5d48d81d9d8 100644 --- a/source/blender/io/ply/exporter/ply_export_load_plydata.hh +++ b/source/blender/io/ply/exporter/ply_export_load_plydata.hh @@ -35,9 +35,7 @@ struct UV_vertex_key { float2 UV; int mesh_vertex_index; - UV_vertex_key(float2 UV, int vertex_index) : UV(UV), mesh_vertex_index(vertex_index) - { - } + UV_vertex_key(float2 UV, int vertex_index) : UV(UV), mesh_vertex_index(vertex_index) {} bool operator==(const UV_vertex_key &r) const { diff --git a/source/blender/io/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc index 404c41879b6..2efb226e0d8 100644 --- a/source/blender/io/usd/intern/usd_writer_camera.cc +++ b/source/blender/io/usd/intern/usd_writer_camera.cc @@ -14,9 +14,7 @@ namespace blender::io::usd { -USDCameraWriter::USDCameraWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) -{ -} +USDCameraWriter::USDCameraWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {} bool USDCameraWriter::is_supported(const HierarchyContext *context) const { diff --git a/source/blender/io/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc index 31c41909480..13a3958ca25 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.cc +++ b/source/blender/io/usd/intern/usd_writer_hair.cc @@ -12,9 +12,7 @@ namespace blender::io::usd { -USDHairWriter::USDHairWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) -{ -} +USDHairWriter::USDHairWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {} void USDHairWriter::do_write(HierarchyContext &context) { diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc index 2f4f103f93d..f5579dcdbe4 100644 --- a/source/blender/io/usd/intern/usd_writer_light.cc +++ b/source/blender/io/usd/intern/usd_writer_light.cc @@ -16,9 +16,7 @@ namespace blender::io::usd { -USDLightWriter::USDLightWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) -{ -} +USDLightWriter::USDLightWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {} bool USDLightWriter::is_supported(const HierarchyContext *context) const { diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 6a0d41238f3..3ca5697c676 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -497,9 +497,7 @@ void USDGenericMeshWriter::write_surface_velocity(const Mesh *mesh, pxr::UsdGeom usd_mesh.CreateVelocitiesAttr().Set(usd_velocities, timecode); } -USDMeshWriter::USDMeshWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) -{ -} +USDMeshWriter::USDMeshWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) {} Mesh *USDMeshWriter::get_export_mesh(Object *object_eval, bool & /*r_needsfree*/) { diff --git a/source/blender/io/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc index e42da192b61..9079bf4c2c0 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.cc +++ b/source/blender/io/usd/intern/usd_writer_metaball.cc @@ -20,9 +20,7 @@ namespace blender::io::usd { -USDMetaballWriter::USDMetaballWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) -{ -} +USDMetaballWriter::USDMetaballWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) {} bool USDMetaballWriter::is_supported(const HierarchyContext *context) const { diff --git a/source/blender/io/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc index 96d80d4f904..85864fa9c69 100644 --- a/source/blender/io/usd/intern/usd_writer_transform.cc +++ b/source/blender/io/usd/intern/usd_writer_transform.cc @@ -14,9 +14,7 @@ namespace blender::io::usd { -USDTransformWriter::USDTransformWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) -{ -} +USDTransformWriter::USDTransformWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {} void USDTransformWriter::do_write(HierarchyContext &context) { diff --git a/source/blender/io/usd/intern/usd_writer_volume.cc b/source/blender/io/usd/intern/usd_writer_volume.cc index b835237f012..c985f1d061f 100644 --- a/source/blender/io/usd/intern/usd_writer_volume.cc +++ b/source/blender/io/usd/intern/usd_writer_volume.cc @@ -23,9 +23,7 @@ namespace blender::io::usd { -USDVolumeWriter::USDVolumeWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) -{ -} +USDVolumeWriter::USDVolumeWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {} bool USDVolumeWriter::check_is_animated(const HierarchyContext &context) const { diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh index 8aa08987943..5f3db4bbdd3 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh +++ b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh @@ -36,9 +36,7 @@ class FormatHandler : NonCopyable, NonMovable { size_t buffer_chunk_size_; public: - FormatHandler(size_t buffer_chunk_size = 64 * 1024) : buffer_chunk_size_(buffer_chunk_size) - { - } + FormatHandler(size_t buffer_chunk_size = 64 * 1024) : buffer_chunk_size_(buffer_chunk_size) {} /* Write contents to the buffer(s) into a file, and clear the buffers. */ void write_to_file(FILE *f) diff --git a/source/blender/makesdna/DNA_defs.h b/source/blender/makesdna/DNA_defs.h index 37ccca54f0e..e64bb7024cc 100644 --- a/source/blender/makesdna/DNA_defs.h +++ b/source/blender/makesdna/DNA_defs.h @@ -73,9 +73,7 @@ namespace blender::dna::internal { template class ShallowDataConstRef { public: - constexpr explicit ShallowDataConstRef(const T &ref) : ref_(ref) - { - } + constexpr explicit ShallowDataConstRef(const T &ref) : ref_(ref) {} inline const T *get_pointer() const { diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index ec92b7305ed..c0179998bdb 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -4892,9 +4892,7 @@ void *rna_iterator_listbase_get(CollectionPropertyIterator *iter) return internal->link; } -void rna_iterator_listbase_end(CollectionPropertyIterator * /*iter*/) -{ -} +void rna_iterator_listbase_end(CollectionPropertyIterator * /*iter*/) {} PointerRNA rna_listbase_lookup_int(PointerRNA *ptr, StructRNA *type, ListBase *lb, int index) { diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index c24cd7c6d3a..0dc31c6e73f 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -182,9 +182,7 @@ static void rna_Mesh_flip_normals(Mesh *mesh) DEG_id_tag_update(&mesh->id, 0); } -static void rna_Mesh_calc_normals(Mesh *UNUSED(mesh)) -{ -} +static void rna_Mesh_calc_normals(Mesh *UNUSED(mesh)) {} static void rna_Mesh_split_faces(Mesh *mesh, bool UNUSED(free_loop_normals)) { diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 59e863a1107..278360827d2 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -2679,9 +2679,7 @@ static void rna_Node_width_range( *max = *softmax = node->typeinfo->maxwidth; } -static void rna_Node_width_hidden_set(PointerRNA *UNUSED(ptr), float UNUSED(value)) -{ -} +static void rna_Node_width_hidden_set(PointerRNA *UNUSED(ptr), float UNUSED(value)) {} static float rna_Node_width_hidden_get(PointerRNA *UNUSED(ptr)) { @@ -4751,9 +4749,7 @@ static const EnumPropertyItem prop_image_extension[] = { /* -- Common nodes ---------------------------------------------------------- */ -static void def_group_input(StructRNA *UNUSED(srna)) -{ -} +static void def_group_input(StructRNA *UNUSED(srna)) {} static void def_group_output(StructRNA *srna) { @@ -8583,9 +8579,7 @@ static void def_cmp_switch(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } -static void def_cmp_switch_view(StructRNA *UNUSED(srna)) -{ -} +static void def_cmp_switch_view(StructRNA *UNUSED(srna)) {} static void def_cmp_colorcorrection(StructRNA *srna) { diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 4e11f5bae14..f7a83915ed2 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1497,9 +1497,7 @@ static PointerRNA rna_Object_material_slots_get(CollectionPropertyIterator *iter return ptr; } -static void rna_Object_material_slots_end(CollectionPropertyIterator *UNUSED(iter)) -{ -} +static void rna_Object_material_slots_end(CollectionPropertyIterator *UNUSED(iter)) {} static PointerRNA rna_Object_display_get(PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d2bed0c6ba3..1df30e12782 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3008,9 +3008,7 @@ static PointerRNA rna_FileBrowser_FSMenu_get(CollectionPropertyIterator *iter) return r_ptr; } -static void rna_FileBrowser_FSMenu_end(CollectionPropertyIterator *UNUSED(iter)) -{ -} +static void rna_FileBrowser_FSMenu_end(CollectionPropertyIterator *UNUSED(iter)) {} static void rna_FileBrowser_FSMenuSystem_data_begin(CollectionPropertyIterator *iter, PointerRNA *UNUSED(ptr)) diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c index 582f029ce55..dde35f5fa69 100644 --- a/source/blender/makesrna/intern/rna_volume.c +++ b/source/blender/makesrna/intern/rna_volume.c @@ -156,9 +156,7 @@ static void rna_Volume_grids_next(CollectionPropertyIterator *iter) iter->valid = (iter->internal.count.item < num_grids); } -static void rna_Volume_grids_end(CollectionPropertyIterator *UNUSED(iter)) -{ -} +static void rna_Volume_grids_end(CollectionPropertyIterator *UNUSED(iter)) {} static PointerRNA rna_Volume_grids_get(CollectionPropertyIterator *iter) { diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc index fc109f69acd..c73606e136c 100644 --- a/source/blender/modifiers/intern/MOD_ocean.cc +++ b/source/blender/modifiers/intern/MOD_ocean.cc @@ -139,9 +139,7 @@ static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_ma } } #else /* WITH_OCEANSIM */ -static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks * /*r_cddata_masks*/) -{ -} +static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks * /*r_cddata_masks*/) {} #endif /* WITH_OCEANSIM */ static bool dependsOnNormals(ModifierData *md) diff --git a/source/blender/nodes/NOD_geometry_nodes_log.hh b/source/blender/nodes/NOD_geometry_nodes_log.hh index eaf0a67fcc1..bee4e1e8d04 100644 --- a/source/blender/nodes/NOD_geometry_nodes_log.hh +++ b/source/blender/nodes/NOD_geometry_nodes_log.hh @@ -89,9 +89,7 @@ class GenericValueLog : public ValueLog { */ GMutablePointer value; - GenericValueLog(const GMutablePointer value) : value(value) - { - } + GenericValueLog(const GMutablePointer value) : value(value) {} ~GenericValueLog(); }; diff --git a/source/blender/nodes/NOD_socket_declarations.hh b/source/blender/nodes/NOD_socket_declarations.hh index cac4e63a100..e6835f5c9d1 100644 --- a/source/blender/nodes/NOD_socket_declarations.hh +++ b/source/blender/nodes/NOD_socket_declarations.hh @@ -383,29 +383,17 @@ inline StringBuilder &StringBuilder::default_value(std::string value) /** \name #IDSocketDeclaration and Children Inline Methods * \{ */ -inline IDSocketDeclaration::IDSocketDeclaration(const char *idname) : idname(idname) -{ -} +inline IDSocketDeclaration::IDSocketDeclaration(const char *idname) : idname(idname) {} -inline Object::Object() : IDSocketDeclaration("NodeSocketObject") -{ -} +inline Object::Object() : IDSocketDeclaration("NodeSocketObject") {} -inline Material::Material() : IDSocketDeclaration("NodeSocketMaterial") -{ -} +inline Material::Material() : IDSocketDeclaration("NodeSocketMaterial") {} -inline Collection::Collection() : IDSocketDeclaration("NodeSocketCollection") -{ -} +inline Collection::Collection() : IDSocketDeclaration("NodeSocketCollection") {} -inline Texture::Texture() : IDSocketDeclaration("NodeSocketTexture") -{ -} +inline Texture::Texture() : IDSocketDeclaration("NodeSocketTexture") {} -inline Image::Image() : IDSocketDeclaration("NodeSocketImage") -{ -} +inline Image::Image() : IDSocketDeclaration("NodeSocketImage") {} /** \} */ diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc index ab31ab3c218..97a8491166c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc @@ -15,9 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) class InstanceRotationFieldInput final : public bke::InstancesFieldInput { public: - InstanceRotationFieldInput() : bke::InstancesFieldInput(CPPType::get(), "Rotation") - { - } + InstanceRotationFieldInput() : bke::InstancesFieldInput(CPPType::get(), "Rotation") {} GVArray get_varray_for_context(const bke::Instances &instances, IndexMask /*mask*/) const final { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc index c4ef0c66cb6..6bf826dbddd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc @@ -15,9 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) class InstanceScaleFieldInput final : public bke::InstancesFieldInput { public: - InstanceScaleFieldInput() : bke::InstancesFieldInput(CPPType::get(), "Scale") - { - } + InstanceScaleFieldInput() : bke::InstancesFieldInput(CPPType::get(), "Scale") {} GVArray get_varray_for_context(const bke::Instances &instances, IndexMask /*mask*/) const final { diff --git a/source/blender/nodes/geometry/nodes/node_geo_points.cc b/source/blender/nodes/geometry/nodes/node_geo_points.cc index dcbe176b384..0537db582a5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points.cc @@ -33,9 +33,7 @@ class PointsFieldContext : public FieldContext { int points_num_; public: - PointsFieldContext(const int points_num) : points_num_(points_num) - { - } + PointsFieldContext(const int points_num) : points_num_(points_num) {} int64_t points_num() const { diff --git a/source/blender/nodes/texture/node_texture_tree.cc b/source/blender/nodes/texture/node_texture_tree.cc index 5a814728897..4e4b707bd04 100644 --- a/source/blender/nodes/texture/node_texture_tree.cc +++ b/source/blender/nodes/texture/node_texture_tree.cc @@ -113,9 +113,7 @@ static void localize(bNodeTree *localtree, bNodeTree * /*ntree*/) } } #else -static void localize(bNodeTree * /*localtree*/, bNodeTree * /*ntree*/) -{ -} +static void localize(bNodeTree * /*localtree*/, bNodeTree * /*ntree*/) {} #endif static void update(bNodeTree *ntree) diff --git a/source/blender/python/intern/stubs.c b/source/blender/python/intern/stubs.c index 6ac9cd64f33..8ce05ba5aee 100644 --- a/source/blender/python/intern/stubs.c +++ b/source/blender/python/intern/stubs.c @@ -25,13 +25,9 @@ void BPY_pyconstraint_exec(struct bPythonConstraint *con, struct ListBase *targets) { } -void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct) -{ -} +void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct) {} bool BPY_is_pyconstraint(struct Text *text) { return 0; } -void BPY_pyconstraint_update(struct Object *owner, struct bConstraint *con) -{ -} +void BPY_pyconstraint_update(struct Object *owner, struct bConstraint *con) {} diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 8c8f474ee7b..00df935b7a2 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -163,21 +163,11 @@ static bool do_write_image_or_movie(Render *re, const char *name_override); /* default callbacks, set in each new render */ -static void result_nothing(void * /*arg*/, RenderResult * /*rr*/) -{ -} -static void result_rcti_nothing(void * /*arg*/, RenderResult * /*rr*/, struct rcti * /*rect*/) -{ -} -static void current_scene_nothing(void * /*arg*/, Scene * /*scene*/) -{ -} -static void stats_nothing(void * /*arg*/, RenderStats * /*rs*/) -{ -} -static void float_nothing(void * /*arg*/, float /*val*/) -{ -} +static void result_nothing(void * /*arg*/, RenderResult * /*rr*/) {} +static void result_rcti_nothing(void * /*arg*/, RenderResult * /*rr*/, struct rcti * /*rect*/) {} +static void current_scene_nothing(void * /*arg*/, Scene * /*scene*/) {} +static void stats_nothing(void * /*arg*/, RenderStats * /*rs*/) {} +static void float_nothing(void * /*arg*/, float /*val*/) {} static bool default_break(void * /*arg*/) { return G.is_break == true; diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index 84b337282de..41e5214f4bd 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -144,9 +144,7 @@ class TextureMarginMap { { class DijkstraActivePixel { public: - DijkstraActivePixel(int dist, int _x, int _y) : distance(dist), x(_x), y(_y) - { - } + DijkstraActivePixel(int dist, int _x, int _y) : distance(dist), x(_x), y(_y) {} int distance; int x, y; }; diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index d342c7362bb..816bfbdf09e 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -944,6 +944,4 @@ void RE_point_density_free(struct PointDensity *pd) free_pointdensity(pd); } -void RE_point_density_fix_linking(void) -{ -} +void RE_point_density_fix_linking(void) {} diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index 3e3fe85ed39..dd13b60b5c6 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -652,17 +652,11 @@ static void build_gammatabs(void) } } -static void init_gammacross(Sequence *UNUSED(seq)) -{ -} +static void init_gammacross(Sequence *UNUSED(seq)) {} -static void load_gammacross(Sequence *UNUSED(seq)) -{ -} +static void load_gammacross(Sequence *UNUSED(seq)) {} -static void free_gammacross(Sequence *UNUSED(seq), const bool UNUSED(do_id_user)) -{ -} +static void free_gammacross(Sequence *UNUSED(seq), const bool UNUSED(do_id_user)) {} static void do_gammacross_effect_byte( float fac, int x, int y, uchar *rect1, uchar *rect2, uchar *out) @@ -3420,17 +3414,11 @@ static ImBuf *do_text_effect(const SeqRenderData *context, /** \name Sequence Effect Factory * \{ */ -static void init_noop(Sequence *UNUSED(seq)) -{ -} +static void init_noop(Sequence *UNUSED(seq)) {} -static void load_noop(Sequence *UNUSED(seq)) -{ -} +static void load_noop(Sequence *UNUSED(seq)) {} -static void free_noop(Sequence *UNUSED(seq), const bool UNUSED(do_id_user)) -{ -} +static void free_noop(Sequence *UNUSED(seq), const bool UNUSED(do_id_user)) {} static int num_inputs_default(void) { diff --git a/source/blender/simulation/intern/ConstrainedConjugateGradient.h b/source/blender/simulation/intern/ConstrainedConjugateGradient.h index 44722f13577..01b65bb50c5 100644 --- a/source/blender/simulation/intern/ConstrainedConjugateGradient.h +++ b/source/blender/simulation/intern/ConstrainedConjugateGradient.h @@ -216,9 +216,7 @@ class ConstrainedConjugateGradient public: /** Default constructor. */ - ConstrainedConjugateGradient() : Base() - { - } + ConstrainedConjugateGradient() : Base() {} /** Initialize the solver with matrix \a A for further \c Ax=b solving. * @@ -230,13 +228,9 @@ class ConstrainedConjugateGradient * this class becomes invalid. Call compute() to update it with the new * matrix A, or modify a copy of A. */ - ConstrainedConjugateGradient(const MatrixType &A) : Base(A) - { - } + ConstrainedConjugateGradient(const MatrixType &A) : Base(A) {} - ~ConstrainedConjugateGradient() - { - } + ~ConstrainedConjugateGradient() {} FilterMatrixType &filter() { diff --git a/source/blender/simulation/intern/eigen_utils.h b/source/blender/simulation/intern/eigen_utils.h index ea8ee68df33..4d269cfec2d 100644 --- a/source/blender/simulation/intern/eigen_utils.h +++ b/source/blender/simulation/intern/eigen_utils.h @@ -32,9 +32,7 @@ class Vector3 : public Eigen::Vector3f { public: typedef float *ctype; - Vector3() - { - } + Vector3() {} Vector3(const ctype &v) { @@ -64,9 +62,7 @@ class Matrix3 : public Eigen::Matrix3f { public: typedef float (*ctype)[3]; - Matrix3() - { - } + Matrix3() {} Matrix3(const ctype &v) { @@ -102,9 +98,7 @@ class lVector3f : public Eigen::VectorXf { public: typedef Eigen::VectorXf base_t; - lVector3f() - { - } + lVector3f() {} template lVector3f &operator=(T rhs) { @@ -135,9 +129,7 @@ typedef Eigen::SparseMatrix lMatrix; * matrix can be filled using construct(). */ struct lMatrix3fCtor { - lMatrix3fCtor() - { - } + lMatrix3fCtor() {} void reset() { diff --git a/source/blender/simulation/intern/implicit_eigen.cpp b/source/blender/simulation/intern/implicit_eigen.cpp index 75e915413bb..8df1629d6f3 100644 --- a/source/blender/simulation/intern/implicit_eigen.cpp +++ b/source/blender/simulation/intern/implicit_eigen.cpp @@ -76,9 +76,7 @@ class fVector : public Eigen::Vector3f { public: typedef float *ctype; - fVector() - { - } + fVector() {} fVector(const ctype &v) { @@ -108,9 +106,7 @@ class fMatrix : public Eigen::Matrix3f { public: typedef float (*ctype)[3]; - fMatrix() - { - } + fMatrix() {} fMatrix(const ctype &v) { @@ -144,9 +140,7 @@ class lVector : public Eigen::VectorXf { public: typedef Eigen::VectorXf base_t; - lVector() - { - } + lVector() {} template lVector &operator=(T rhs) { @@ -177,9 +171,7 @@ typedef Eigen::SparseMatrix lMatrix; * matrix can be filled using construct(). */ struct lMatrixCtor { - lMatrixCtor() - { - } + lMatrixCtor() {} void reset() { diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.c b/source/blender/windowmanager/intern/wm_keymap_utils.c index cf8c0ebb859..3126a06b134 100644 --- a/source/blender/windowmanager/intern/wm_keymap_utils.c +++ b/source/blender/windowmanager/intern/wm_keymap_utils.c @@ -490,8 +490,6 @@ bool WM_keymap_uses_event_modifier(const wmKeyMap *keymap, const int event_modif return false; } -void WM_keymap_fix_linking(void) -{ -} +void WM_keymap_fix_linking(void) {} /** \} */ diff --git a/source/blender/windowmanager/intern/wm_utils.c b/source/blender/windowmanager/intern/wm_utils.c index 55f24cb799c..453d07f9beb 100644 --- a/source/blender/windowmanager/intern/wm_utils.c +++ b/source/blender/windowmanager/intern/wm_utils.c @@ -23,9 +23,7 @@ void WM_generic_callback_free(wmGenericCallback *callback) MEM_freeN(callback); } -static void do_nothing(struct bContext *UNUSED(C), void *UNUSED(user_data)) -{ -} +static void do_nothing(struct bContext *UNUSED(C), void *UNUSED(user_data)) {} wmGenericCallback *WM_generic_callback_steal(wmGenericCallback *callback) { -- 2.30.2