From 90019676b076abdfc076ed6f38005d6cce89923b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 23 Jul 2022 23:41:51 +0200 Subject: [PATCH] Code quality: Fix header guards consistency Adds `header_guards.sh` bash script, used in CI to validate future changes. Can be run locally to fix invalid header guards. --- .github/workflows/static_checks.yml | 4 ++ core/core_constants.h | 2 +- core/crypto/crypto_core.h | 1 + core/debugger/debugger_marshalls.h | 6 +- core/extension/extension_api_dump.h | 6 +- core/extension/gdnative_interface.h | 2 +- core/extension/native_extension.h | 2 +- core/extension/native_extension_manager.h | 2 +- core/input/shortcut.h | 1 + core/io/packet_peer.h | 2 +- core/io/resource_uid.h | 6 +- core/math/projection.h | 6 +- core/math/vector4.h | 1 + core/multiplayer/multiplayer_peer.h | 6 +- core/os/spin_lock.h | 1 + core/os/thread.h | 1 + core/string/ustring.h | 3 +- core/templates/bin_sorted_array.h | 2 +- core/templates/lru.h | 2 +- core/templates/rb_map.h | 2 +- core/templates/rb_set.h | 2 +- core/templates/thread_work_pool.h | 2 +- drivers/coreaudio/audio_driver_coreaudio.h | 8 +-- drivers/coremidi/midi_driver_coremidi.h | 7 ++- drivers/gles3/effects/copy_effects.h | 7 ++- drivers/gles3/environment/fog.h | 2 +- drivers/gles3/environment/gi.h | 2 +- drivers/gles3/rasterizer_canvas_gles3.h | 7 ++- drivers/gles3/rasterizer_gles3.h | 6 +- drivers/gles3/rasterizer_scene_gles3.h | 6 +- drivers/gles3/shader_gles3.h | 9 +-- drivers/gles3/storage/config.h | 2 +- drivers/gles3/storage/light_storage.h | 4 +- drivers/gles3/storage/material_storage.h | 2 +- drivers/gles3/storage/mesh_storage.h | 2 +- drivers/gles3/storage/particles_storage.h | 2 +- drivers/gles3/storage/texture_storage.h | 4 +- drivers/gles3/storage/utilities.h | 2 +- drivers/png/image_loader_png.h | 2 +- drivers/png/png_driver_common.h | 2 +- drivers/register_driver_types.h | 2 +- drivers/unix/dir_access_unix.cpp | 2 +- drivers/unix/dir_access_unix.h | 5 +- drivers/unix/file_access_unix.cpp | 2 +- drivers/unix/file_access_unix.h | 5 +- drivers/unix/ip_unix.h | 1 + drivers/unix/net_socket_posix.h | 6 +- drivers/unix/os_unix.h | 4 +- drivers/unix/syslog_logger.h | 4 +- drivers/unix/thread_posix.h | 2 +- drivers/vulkan/vulkan_context.h | 2 +- drivers/vulkan/vulkan_hooks.h | 2 +- drivers/wasapi/audio_driver_wasapi.h | 1 + drivers/winmidi/midi_driver_winmidi.h | 7 ++- drivers/xaudio2/audio_driver_xaudio2.h | 2 +- editor/action_map_editor.h | 2 +- editor/create_dialog.h | 2 +- .../debug_adapter/debug_adapter_parser.h | 2 +- .../debug_adapter/debug_adapter_protocol.h | 2 +- .../debug_adapter/debug_adapter_server.h | 2 +- .../debug_adapter/debug_adapter_types.h | 2 +- editor/debugger/editor_debugger_inspector.h | 1 + editor/debugger/editor_debugger_node.h | 1 + editor/debugger/editor_debugger_server.h | 6 +- editor/debugger/editor_debugger_tree.h | 1 + editor/debugger/editor_network_profiler.h | 6 +- editor/debugger/editor_profiler.h | 6 +- editor/debugger/editor_visual_profiler.h | 6 +- editor/doc_tools.h | 2 +- editor/editor_about.h | 2 +- editor/editor_asset_installer.h | 6 +- editor/editor_autoload_settings.h | 2 +- editor/editor_command_palette.h | 2 +- editor/editor_export.h | 2 +- editor/editor_fonts.h | 2 +- editor/editor_inspector.h | 2 +- editor/editor_node.cpp | 2 +- editor/editor_plugin.h | 2 +- editor/editor_plugin_settings.h | 6 +- .../{quick_open.cpp => editor_quick_open.cpp} | 4 +- editor/{quick_open.h => editor_quick_open.h} | 2 +- editor/editor_resource_picker.cpp | 2 +- editor/editor_resource_preview.h | 6 +- editor/editor_scale.h | 1 + editor/editor_sectioned_inspector.h | 1 + editor/editor_themes.h | 2 +- editor/editor_vcs_interface.h | 2 +- editor/filesystem_dock.h | 2 +- editor/groups_editor.h | 2 +- editor/import/editor_import_collada.h | 2 +- editor/import/editor_import_plugin.h | 2 +- editor/import/resource_importer_bitmask.h | 1 + .../resource_importer_csv_translation.h | 6 +- editor/import/resource_importer_imagefont.h | 6 +- editor/import/resource_importer_obj.h | 6 +- editor/import/resource_importer_scene.h | 6 +- editor/import/resource_importer_texture.h | 6 +- editor/import_dock.h | 6 +- editor/inspector_dock.h | 2 +- editor/plugins/animation_library_editor.h | 2 +- editor/plugins/asset_library_editor_plugin.h | 2 +- editor/plugins/bit_map_editor_plugin.h | 6 +- editor/plugins/bone_map_editor_plugin.h | 6 +- editor/plugins/camera_3d_editor_plugin.h | 6 +- editor/plugins/canvas_item_editor_plugin.h | 2 +- .../collision_shape_2d_editor_plugin.h | 2 +- editor/plugins/control_editor_plugin.h | 2 +- .../plugins/cpu_particles_3d_editor_plugin.h | 6 +- editor/plugins/editor_preview_plugins.h | 7 ++- editor/plugins/font_config_plugin.h | 6 +- .../plugins/gpu_particles_2d_editor_plugin.h | 6 +- .../plugins/gpu_particles_3d_editor_plugin.h | 6 +- .../gradient_texture_2d_editor_plugin.h | 6 +- editor/plugins/lightmap_gi_editor_plugin.h | 6 +- editor/plugins/mesh_editor_plugin.h | 2 +- .../plugins/mesh_instance_3d_editor_plugin.h | 6 +- .../navigation_polygon_editor_plugin.h | 6 +- .../occluder_instance_3d_editor_plugin.h | 2 +- editor/plugins/path_3d_editor_plugin.h | 6 +- .../plugins/physical_bone_3d_editor_plugin.h | 6 +- editor/plugins/shader_editor_plugin.h | 2 +- editor/plugins/sprite_2d_editor_plugin.h | 6 +- editor/plugins/texture_3d_editor_plugin.h | 2 +- .../plugins/texture_layered_editor_plugin.h | 2 +- editor/plugins/tiles/tile_atlas_view.h | 2 +- editor/plugins/tiles/tile_map_editor.h | 2 +- editor/plugins/tiles/tile_set_editor.h | 2 +- ...tile_set_scenes_collection_source_editor.h | 2 +- .../plugins/version_control_editor_plugin.h | 2 +- editor/plugins/voxel_gi_editor_plugin.h | 6 +- editor/project_export.h | 6 +- editor/property_editor.h | 2 +- editor/property_selector.h | 6 +- editor/register_exporters.h | 2 +- editor/scene_tree_dock.h | 2 +- editor/scene_tree_editor.h | 2 +- editor/shader_create_dialog.h | 2 +- misc/scripts/header_guards.sh | 61 +++++++++++++++++++ modules/camera/camera_macos.h | 2 +- modules/camera/camera_win.h | 6 +- modules/enet/enet_multiplayer_peer.h | 6 +- modules/freetype/uwpdef.h | 5 ++ modules/gdscript/gdscript_byte_codegen.h | 6 +- modules/gdscript/gdscript_codegen.h | 6 +- modules/gdscript/gdscript_lambda_callable.h | 6 +- modules/gdscript/gdscript_rpc_callable.h | 6 +- modules/gdscript/gdscript_tokenizer.h | 2 +- modules/gdscript/gdscript_warning.h | 6 +- .../language_server/gdscript_extend_parser.h | 4 +- .../gdscript_language_protocol.h | 2 +- .../language_server/gdscript_text_document.h | 4 +- .../language_server/gdscript_workspace.h | 4 +- .../language_server/{lsp.hpp => godot_lsp.h} | 4 +- modules/gdscript/tests/gdscript_test_runner.h | 6 +- modules/gltf/extensions/gltf_spec_gloss.h | 1 + ...document_extension_convert_importer_mesh.h | 7 ++- modules/gltf/gltf_state.h | 1 + modules/gltf/structures/gltf_accessor.h | 1 + modules/gltf/structures/gltf_animation.h | 1 + modules/gltf/structures/gltf_buffer_view.h | 1 + modules/gltf/structures/gltf_camera.h | 1 + modules/gltf/structures/gltf_node.h | 1 + modules/gltf/structures/gltf_skeleton.h | 1 + modules/gltf/structures/gltf_skin.h | 1 + modules/hdr/image_loader_hdr.h | 2 +- modules/jpg/image_loader_jpegd.h | 6 +- modules/jsonrpc/jsonrpc.h | 6 +- modules/lightmapper_rd/lightmapper_rd.h | 2 +- modules/lightmapper_rd/register_types.h | 2 +- modules/mbedtls/dtls_server_mbedtls.h | 6 +- modules/mbedtls/ssl_context_mbedtls.h | 6 +- modules/mbedtls/stream_peer_mbedtls.h | 6 +- modules/meshoptimizer/register_types.h | 2 +- modules/mono/editor/editor_internal_calls.h | 6 +- modules/mono/glue/glue_header.h | 5 ++ modules/mono/mono_gc_handle.h | 6 +- modules/mono/mono_gd/gd_mono_field.h | 6 +- modules/mono/mono_gd/gd_mono_marshal.h | 6 +- modules/mono/mono_gd/gd_mono_utils.h | 6 +- modules/mono/utils/macos_utils.h | 6 +- modules/mono/utils/macros.h | 6 +- modules/mono/utils/path_utils.h | 6 +- modules/mono/utils/string_utils.h | 6 +- modules/openxr/action_map/openxr_action.h | 2 +- modules/openxr/action_map/openxr_action_map.h | 6 +- modules/openxr/action_map/openxr_action_set.h | 2 +- modules/openxr/action_map/openxr_defs.h | 2 +- .../action_map/openxr_interaction_profile.h | 2 +- modules/openxr/editor/openxr_action_editor.h | 2 +- .../openxr/editor/openxr_action_map_editor.h | 2 +- .../openxr/editor/openxr_action_set_editor.h | 2 +- modules/openxr/editor/openxr_editor_plugin.h | 2 +- .../openxr_interaction_profile_editor.h | 2 +- .../editor/openxr_select_action_dialog.h | 2 +- ...openxr_select_interaction_profile_dialog.h | 2 +- .../extensions/openxr_android_extension.h | 2 +- .../extensions/openxr_extension_wrapper.h | 2 +- .../openxr_htc_vive_tracker_extension.h | 2 +- .../extensions/openxr_vulkan_extension.h | 2 +- modules/openxr/openxr_api.h | 6 +- modules/openxr/openxr_interface.h | 2 +- modules/openxr/openxr_util.h | 2 +- modules/raycast/lightmap_raycaster.h | 2 +- modules/raycast/raycast_occlusion_cull.h | 6 +- modules/raycast/static_raycaster.h | 2 +- modules/text_server_adv/script_iterator.h | 2 +- modules/text_server_fb/text_server_fb.h | 6 +- modules/theora/video_stream_theora.h | 2 +- modules/tinyexr/image_loader_tinyexr.h | 2 +- modules/upnp/upnp.h | 6 +- modules/upnp/upnp_device.h | 6 +- .../editor/visual_script_editor.h | 6 +- .../editor/visual_script_property_selector.h | 6 +- .../visual_script/visual_script_expression.h | 6 +- modules/vorbis/audio_stream_ogg_vorbis.h | 6 +- modules/webp/image_loader_webp.h | 2 +- modules/webrtc/webrtc_data_channel.h | 1 + modules/webrtc/webrtc_multiplayer_peer.h | 6 +- modules/webrtc/webrtc_peer_connection.h | 1 + modules/websocket/emws_client.h | 6 +- modules/websocket/emws_peer.h | 6 +- modules/websocket/emws_server.h | 6 +- modules/websocket/websocket_peer.h | 7 ++- modules/websocket/websocket_server.h | 6 +- modules/websocket/wsl_client.h | 6 +- modules/websocket/wsl_peer.h | 6 +- modules/websocket/wsl_server.h | 6 +- modules/webxr/godot_webxr.h | 2 +- platform/android/export/gradle_export_util.h | 6 +- platform/android/java_godot_view_wrapper.h | 6 +- platform/ios/display_server_ios.h | 6 +- platform/ios/export/export_plugin.h | 2 +- platform/ios/export/godot_plugin_config.h | 2 +- platform/ios/ios.h | 2 +- platform/ios/os_ios.h | 2 +- platform/javascript/audio_driver_javascript.h | 2 +- platform/javascript/export/export.h | 2 +- platform/javascript/export/export_plugin.h | 2 +- platform/javascript/export/export_server.h | 2 +- platform/javascript/godot_audio.h | 2 +- platform/javascript/godot_js.h | 2 +- platform/javascript/godot_webgl2.h | 2 +- platform/javascript/http_client_javascript.h | 1 + platform/javascript/os_javascript.h | 2 +- platform/linuxbsd/crash_handler_linuxbsd.h | 6 +- platform/linuxbsd/detect_prime_x11.h | 3 +- platform/linuxbsd/export/export_plugin.h | 2 +- platform/linuxbsd/freedesktop_screensaver.h | 5 ++ platform/linuxbsd/os_linuxbsd.h | 2 +- platform/linuxbsd/vulkan_context_x11.h | 6 +- platform/macos/dir_access_macos.h | 5 +- platform/macos/dir_access_macos.mm | 2 +- platform/macos/export/codesign.h | 6 +- platform/macos/export/export_plugin.h | 2 +- platform/macos/export/lipo.h | 6 +- platform/macos/export/macho.h | 6 +- platform/macos/export/plist.h | 6 +- platform/macos/gl_manager_macos_legacy.h | 1 + platform/macos/godot_window.h | 2 +- platform/macos/godot_window_delegate.h | 2 +- platform/macos/macos_terminal_logger.h | 1 + platform/macos/os_macos.h | 2 +- platform/macos/vulkan_context_macos.h | 6 +- platform/register_platform_apis.h | 6 +- platform/uwp/app_uwp.h | 1 + platform/uwp/export/app_packager.h | 2 +- platform/uwp/export/export_plugin.h | 2 +- platform/uwp/joypad_uwp.h | 2 +- platform/uwp/os_uwp.h | 2 +- platform/windows/export/export.h | 2 +- platform/windows/export/export_plugin.h | 2 +- platform/windows/os_windows.h | 2 +- platform/windows/vulkan_context_win.h | 6 +- platform/windows/windows_terminal_logger.h | 2 +- scene/2d/animated_sprite_2d.h | 2 +- scene/2d/audio_listener_2d.h | 6 +- scene/2d/audio_stream_player_2d.h | 2 +- scene/2d/back_buffer_copy.h | 6 +- scene/2d/canvas_group.h | 6 +- scene/2d/canvas_modulate.h | 6 +- scene/2d/gpu_particles_2d.h | 6 +- scene/2d/light_occluder_2d.h | 6 +- scene/2d/line_2d.h | 6 +- scene/2d/navigation_agent_2d.h | 2 +- scene/2d/navigation_obstacle_2d.h | 2 +- scene/2d/node_2d.h | 6 +- scene/2d/shape_cast_2d.h | 6 +- scene/2d/sprite_2d.h | 2 +- scene/2d/visible_on_screen_notifier_2d.h | 2 +- scene/3d/audio_listener_3d.h | 6 +- scene/3d/audio_stream_player_3d.h | 1 + scene/3d/bone_attachment_3d.h | 6 +- scene/3d/camera_3d.h | 2 +- scene/3d/collision_object_3d.h | 2 +- scene/3d/collision_polygon_3d.h | 2 +- scene/3d/collision_shape_3d.h | 6 +- scene/3d/cpu_particles_3d.h | 6 +- scene/3d/gpu_particles_3d.h | 6 +- scene/3d/importer_mesh_instance_3d.h | 7 ++- scene/3d/lightmap_gi.h | 2 +- scene/3d/mesh_instance_3d.h | 6 +- scene/3d/multimesh_instance_3d.h | 2 +- scene/3d/navigation_agent_3d.h | 6 +- scene/3d/navigation_obstacle_3d.h | 6 +- scene/3d/navigation_region_3d.h | 6 +- scene/3d/occluder_instance_3d.h | 2 +- scene/3d/path_3d.h | 6 +- scene/3d/physics_body_3d.h | 2 +- scene/3d/ray_cast_3d.h | 2 +- scene/3d/reflection_probe.h | 6 +- scene/3d/remote_transform_3d.h | 6 +- scene/3d/skeleton_3d.h | 2 +- scene/3d/skeleton_ik_3d.h | 6 +- scene/3d/soft_dynamic_body_3d.h | 6 +- scene/3d/spring_arm_3d.h | 6 +- scene/3d/vehicle_body_3d.h | 6 +- scene/3d/velocity_tracker_3d.h | 6 +- scene/3d/visible_on_screen_notifier_3d.h | 2 +- scene/3d/visual_instance_3d.h | 6 +- scene/3d/voxelizer.h | 6 +- scene/3d/world_environment.h | 6 +- scene/animation/animation_player.h | 2 +- scene/animation/animation_tree.h | 6 +- scene/animation/easing_equations.h | 2 +- scene/animation/tween.h | 2 +- scene/debugger/scene_debugger.h | 2 +- scene/gui/base_button.h | 2 +- scene/gui/button.h | 2 +- scene/gui/code_edit.h | 6 +- scene/gui/color_picker.h | 1 + scene/gui/control.h | 2 +- scene/gui/dialogs.h | 2 +- scene/gui/file_dialog.h | 2 +- scene/gui/graph_edit.h | 2 +- scene/gui/item_list.h | 6 +- scene/gui/label.h | 2 +- scene/gui/line_edit.h | 2 +- scene/gui/link_button.h | 6 +- scene/gui/menu_button.h | 2 +- scene/gui/option_button.h | 2 +- scene/gui/popup.h | 2 +- scene/gui/popup_menu.h | 2 +- scene/gui/range.h | 2 +- scene/gui/scroll_bar.h | 2 +- scene/gui/scroll_container.h | 2 +- scene/gui/separator.h | 2 +- scene/gui/subviewport_container.h | 6 +- scene/gui/texture_button.h | 1 + scene/gui/tree.h | 3 +- scene/main/http_request.h | 6 +- scene/main/node.h | 2 +- scene/main/viewport.h | 2 +- scene/multiplayer/multiplayer_synchronizer.h | 1 + .../multiplayer/scene_replication_interface.h | 6 +- scene/multiplayer/scene_replication_state.h | 6 +- scene/register_scene_types.h | 2 +- scene/resources/animation.h | 2 +- scene/resources/animation_library.h | 2 +- scene/resources/box_shape_3d.h | 6 +- scene/resources/capsule_shape_3d.h | 6 +- scene/resources/concave_polygon_shape_2d.h | 2 +- scene/resources/concave_polygon_shape_3d.h | 2 +- scene/resources/convex_polygon_shape_3d.h | 6 +- scene/resources/cylinder_shape_3d.h | 2 +- scene/resources/default_theme/default_theme.h | 2 +- scene/resources/font.h | 2 +- scene/resources/height_map_shape_3d.h | 6 +- scene/resources/immediate_mesh.h | 2 +- scene/resources/importer_mesh.h | 7 ++- scene/resources/material.h | 2 +- scene/resources/mesh.h | 2 +- scene/resources/multimesh.h | 2 +- scene/resources/packed_scene.h | 2 +- scene/resources/primitive_meshes.h | 3 +- scene/resources/separation_ray_shape_3d.h | 8 ++- scene/resources/shape_3d.h | 2 +- scene/resources/skeleton_modification_2d.h | 6 +- .../skeleton_modification_2d_ccdik.h | 6 +- .../skeleton_modification_2d_fabrik.h | 6 +- .../skeleton_modification_2d_jiggle.h | 6 +- .../skeleton_modification_2d_lookat.h | 6 +- .../skeleton_modification_2d_physicalbones.h | 6 +- .../skeleton_modification_2d_stackholder.h | 6 +- .../skeleton_modification_2d_twoboneik.h | 6 +- scene/resources/skeleton_modification_3d.h | 6 +- .../skeleton_modification_3d_ccdik.h | 6 +- .../skeleton_modification_3d_fabrik.h | 6 +- .../skeleton_modification_3d_jiggle.h | 6 +- .../skeleton_modification_3d_lookat.h | 6 +- .../skeleton_modification_3d_stackholder.h | 6 +- .../skeleton_modification_3d_twoboneik.h | 6 +- .../skeleton_modification_stack_2d.h | 6 +- .../skeleton_modification_stack_3d.h | 6 +- scene/resources/sky_material.h | 2 +- scene/resources/sphere_shape_3d.h | 2 +- scene/resources/style_box.h | 2 +- scene/resources/surface_tool.h | 2 +- scene/resources/syntax_highlighter.h | 2 +- scene/resources/text_file.h | 6 +- scene/resources/texture.h | 2 +- scene/resources/theme.h | 2 +- scene/resources/video_stream.h | 2 +- .../resources/visual_shader_particle_nodes.h | 2 +- scene/resources/world_boundary_shape_3d.h | 3 +- servers/audio/audio_driver_dummy.h | 2 +- servers/audio/audio_effect.h | 6 +- servers/audio/effects/audio_effect_amplify.h | 6 +- servers/audio/effects/audio_effect_chorus.h | 6 +- .../audio/effects/audio_effect_compressor.h | 6 +- servers/audio/effects/audio_effect_delay.h | 6 +- .../audio/effects/audio_effect_distortion.h | 6 +- servers/audio/effects/audio_effect_eq.cpp | 1 + servers/audio/effects/audio_effect_eq.h | 8 +-- servers/audio/effects/audio_effect_filter.h | 6 +- servers/audio/effects/audio_effect_panner.h | 6 +- servers/audio/effects/audio_effect_record.h | 6 +- servers/audio/effects/audio_effect_reverb.h | 8 +-- .../audio/effects/audio_stream_generator.h | 1 + .../audio/effects/{eq.cpp => eq_filter.cpp} | 6 +- servers/audio/effects/{eq.h => eq_filter.h} | 2 +- .../effects/{reverb.cpp => reverb_filter.cpp} | 4 +- .../effects/{reverb.h => reverb_filter.h} | 8 +-- servers/debugger/servers_debugger.h | 4 +- .../extensions/physics_server_3d_extension.h | 2 +- servers/physics_3d/gjk_epa.h | 2 +- .../godot_collision_solver_3d_sat.h | 6 +- servers/rendering/dummy/environment/fog.h | 2 +- servers/rendering/dummy/environment/gi.h | 2 +- .../rendering/dummy/rasterizer_canvas_dummy.h | 2 +- .../rendering/dummy/rasterizer_scene_dummy.h | 2 +- .../rendering/dummy/storage/light_storage.h | 2 +- .../dummy/storage/material_storage.h | 2 +- .../rendering/dummy/storage/mesh_storage.h | 2 +- .../dummy/storage/particles_storage.h | 2 +- .../rendering/dummy/storage/texture_storage.h | 2 +- servers/rendering/dummy/storage/utilities.h | 2 +- servers/rendering/environment/renderer_fog.h | 2 +- servers/rendering/environment/renderer_gi.h | 2 +- servers/rendering/renderer_canvas_cull.h | 6 +- servers/rendering/renderer_canvas_render.h | 6 +- servers/rendering/renderer_compositor.h | 6 +- .../renderer_rd/cluster_builder_rd.h | 2 +- .../rendering/renderer_rd/effects/bokeh_dof.h | 2 +- .../renderer_rd/effects/copy_effects.h | 6 +- .../rendering/renderer_rd/effects/resolve.h | 2 +- .../renderer_rd/effects/ss_effects.h | 2 +- .../renderer_rd/effects/tone_mapper.h | 2 +- servers/rendering/renderer_rd/effects/vrs.h | 2 +- servers/rendering/renderer_rd/effects_rd.h | 2 +- .../rendering/renderer_rd/environment/fog.h | 2 +- .../rendering/renderer_rd/environment/gi.h | 2 +- .../render_forward_clustered.h | 7 ++- .../scene_shader_forward_clustered.h | 7 ++- .../forward_mobile/render_forward_mobile.h | 7 ++- .../scene_shader_forward_mobile.h | 7 ++- .../rendering/renderer_rd/pipeline_cache_rd.h | 2 +- .../renderer_rd/renderer_canvas_render_rd.h | 6 +- .../renderer_rd/renderer_compositor_rd.h | 7 ++- .../renderer_scene_environment_rd.h | 6 +- .../renderer_rd/renderer_scene_render_rd.h | 6 +- .../renderer_rd/renderer_scene_sky_rd.h | 6 +- .../renderer_rd/storage_rd/light_storage.h | 2 +- .../renderer_rd/storage_rd/material_storage.h | 2 +- .../renderer_rd/storage_rd/mesh_storage.h | 2 +- .../storage_rd/particles_storage.h | 2 +- .../renderer_rd/storage_rd/texture_storage.h | 2 +- .../renderer_rd/storage_rd/utilities.h | 2 +- .../renderer_rd/uniform_set_cache_rd.h | 6 +- servers/rendering/renderer_scene.h | 6 +- servers/rendering/renderer_scene_cull.h | 6 +- .../rendering/renderer_scene_occlusion_cull.h | 2 +- servers/rendering/renderer_scene_render.h | 6 +- servers/rendering/renderer_thread_pool.h | 6 +- servers/rendering/rendering_server_default.h | 2 +- servers/rendering/shader_types.h | 6 +- servers/rendering/shader_warnings.h | 6 +- servers/rendering/storage/light_storage.h | 2 +- servers/rendering/storage/material_storage.h | 2 +- servers/rendering/storage/mesh_storage.h | 2 +- servers/rendering/storage/particles_storage.h | 2 +- servers/rendering/storage/texture_storage.h | 2 +- servers/rendering/storage/utilities.h | 2 +- servers/server_wrap_mt_common.h | 5 ++ servers/xr/xr_interface_extension.h | 2 +- servers/xr/xr_pose.h | 2 +- tests/core/io/test_image.h | 1 + tests/core/io/test_resource.h | 6 +- tests/core/math/test_basis.h | 2 +- tests/core/templates/test_hash_set.h | 2 +- tests/scene/test_path_3d.h | 2 +- tests/servers/test_text_server.h | 7 ++- 491 files changed, 1009 insertions(+), 863 deletions(-) rename editor/{quick_open.cpp => editor_quick_open.cpp} (98%) rename editor/{quick_open.h => editor_quick_open.h} (98%) create mode 100755 misc/scripts/header_guards.sh rename modules/gdscript/language_server/{lsp.hpp => godot_lsp.h} (99%) rename servers/audio/effects/{eq.cpp => eq_filter.cpp} (98%) rename servers/audio/effects/{eq.h => eq_filter.h} (98%) rename servers/audio/effects/{reverb.cpp => reverb_filter.cpp} (99%) rename servers/audio/effects/{reverb.h => reverb_filter.h} (96%) diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index d7d07b7022d..81c70426631 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -37,6 +37,10 @@ jobs: run: | bash ./misc/scripts/clang_format.sh + - name: Header guards formatting checks (header_guards.sh) + run: | + bash ./misc/scripts/header_guards.sh + - name: Python style checks via black (black_format.sh) run: | bash ./misc/scripts/black_format.sh diff --git a/core/core_constants.h b/core/core_constants.h index d5b3b156b23..5e05b7a9313 100644 --- a/core/core_constants.h +++ b/core/core_constants.h @@ -42,4 +42,4 @@ public: static int64_t get_global_constant_value(int p_idx); }; -#endif // GLOBAL_CONSTANTS_H +#endif // CORE_CONSTANTS_H diff --git a/core/crypto/crypto_core.h b/core/crypto/crypto_core.h index eacef268cca..008e9e92b57 100644 --- a/core/crypto/crypto_core.h +++ b/core/crypto/crypto_core.h @@ -115,4 +115,5 @@ public: static Error sha1(const uint8_t *p_src, int p_src_len, unsigned char r_hash[20]); static Error sha256(const uint8_t *p_src, int p_src_len, unsigned char r_hash[32]); }; + #endif // CRYPTO_CORE_H diff --git a/core/debugger/debugger_marshalls.h b/core/debugger/debugger_marshalls.h index 378c3af8aab..751e8a63711 100644 --- a/core/debugger/debugger_marshalls.h +++ b/core/debugger/debugger_marshalls.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DEBUGGER_MARSHARLLS_H -#define DEBUGGER_MARSHARLLS_H +#ifndef DEBUGGER_MARSHALLS_H +#define DEBUGGER_MARSHALLS_H #include "core/object/script_language.h" @@ -69,4 +69,4 @@ struct DebuggerMarshalls { }; }; -#endif // DEBUGGER_MARSHARLLS_H +#endif // DEBUGGER_MARSHALLS_H diff --git a/core/extension/extension_api_dump.h b/core/extension/extension_api_dump.h index 7346e182f1b..1bc455ea676 100644 --- a/core/extension/extension_api_dump.h +++ b/core/extension/extension_api_dump.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef API_DUMP_H -#define API_DUMP_H +#ifndef EXTENSION_API_DUMP_H +#define EXTENSION_API_DUMP_H #include "core/extension/native_extension.h" @@ -42,4 +42,4 @@ public: }; #endif -#endif // API_DUMP_H +#endif // EXTENSION_API_DUMP_H diff --git a/core/extension/gdnative_interface.h b/core/extension/gdnative_interface.h index dd86abe0532..041a6e5112a 100644 --- a/core/extension/gdnative_interface.h +++ b/core/extension/gdnative_interface.h @@ -582,4 +582,4 @@ typedef GDNativeBool (*GDNativeInitializationFunction)(const GDNativeInterface * } #endif -#endif +#endif // GDNATIVE_INTERFACE_H diff --git a/core/extension/native_extension.h b/core/extension/native_extension.h index ca50f78621c..b7238d28996 100644 --- a/core/extension/native_extension.h +++ b/core/extension/native_extension.h @@ -97,4 +97,4 @@ public: virtual String get_resource_type(const String &p_path) const; }; -#endif // NATIVEEXTENSION_H +#endif // NATIVE_EXTENSION_H diff --git a/core/extension/native_extension_manager.h b/core/extension/native_extension_manager.h index 5594f6c0de3..ed80cd6b7aa 100644 --- a/core/extension/native_extension_manager.h +++ b/core/extension/native_extension_manager.h @@ -71,4 +71,4 @@ public: VARIANT_ENUM_CAST(NativeExtensionManager::LoadStatus) -#endif // NATIVEEXTENSIONMANAGER_H +#endif // NATIVE_EXTENSION_MANAGER_H diff --git a/core/input/shortcut.h b/core/input/shortcut.h index 0c9689cdcb3..daec4100392 100644 --- a/core/input/shortcut.h +++ b/core/input/shortcut.h @@ -55,4 +55,5 @@ public: static bool is_event_array_equal(const Array &p_event_array1, const Array &p_event_array2); }; + #endif // SHORTCUT_H diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index 0b126406279..ec9d33aa5a7 100644 --- a/core/io/packet_peer.h +++ b/core/io/packet_peer.h @@ -127,4 +127,4 @@ public: PacketPeerStream(); }; -#endif // PACKET_STREAM_H +#endif // PACKET_PEER_H diff --git a/core/io/resource_uid.h b/core/io/resource_uid.h index da42553cf58..0da37e27167 100644 --- a/core/io/resource_uid.h +++ b/core/io/resource_uid.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCE_UUID_H -#define RESOURCE_UUID_H +#ifndef RESOURCE_UID_H +#define RESOURCE_UID_H #include "core/object/ref_counted.h" #include "core/string/string_name.h" @@ -85,4 +85,4 @@ public: ~ResourceUID(); }; -#endif // RESOURCEUUID_H +#endif // RESOURCE_UID_H diff --git a/core/math/projection.h b/core/math/projection.h index ff652714175..a3d2d7720b8 100644 --- a/core/math/projection.h +++ b/core/math/projection.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CAMERA_MATRIX_H -#define CAMERA_MATRIX_H +#ifndef PROJECTION_H +#define PROJECTION_H #include "core/math/math_defs.h" #include "core/math/vector3.h" @@ -164,4 +164,4 @@ Vector3 Projection::xform(const Vector3 &p_vec3) const { return ret / w; } -#endif // CAMERA_MATRIX_H +#endif // PROJECTION_H diff --git a/core/math/vector4.h b/core/math/vector4.h index 7dd8d7aff5f..645c51db87a 100644 --- a/core/math/vector4.h +++ b/core/math/vector4.h @@ -272,4 +272,5 @@ _FORCE_INLINE_ Vector4 operator*(const int32_t p_scalar, const Vector4 &p_vec) { _FORCE_INLINE_ Vector4 operator*(const int64_t p_scalar, const Vector4 &p_vec) { return p_vec * p_scalar; } + #endif // VECTOR4_H diff --git a/core/multiplayer/multiplayer_peer.h b/core/multiplayer/multiplayer_peer.h index 474b18d2b65..91546832cef 100644 --- a/core/multiplayer/multiplayer_peer.h +++ b/core/multiplayer/multiplayer_peer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NETWORKED_MULTIPLAYER_PEER_H -#define NETWORKED_MULTIPLAYER_PEER_H +#ifndef MULTIPLAYER_PEER_H +#define MULTIPLAYER_PEER_H #include "core/io/packet_peer.h" #include "core/multiplayer/multiplayer.h" @@ -147,4 +147,4 @@ public: GDVIRTUAL0RC(int, _get_connection_status); }; -#endif // NETWORKED_MULTIPLAYER_PEER_H +#endif // MULTIPLAYER_PEER_H diff --git a/core/os/spin_lock.h b/core/os/spin_lock.h index 6e8d7f46d55..80eeef3386c 100644 --- a/core/os/spin_lock.h +++ b/core/os/spin_lock.h @@ -48,4 +48,5 @@ public: locked.clear(std::memory_order_release); } }; + #endif // SPIN_LOCK_H diff --git a/core/os/thread.h b/core/os/thread.h index 3382dd81f93..0fb283e224b 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -123,4 +123,5 @@ public: }; #endif // THREAD_H + #endif // PLATFORM_THREAD_OVERRIDE diff --git a/core/string/ustring.h b/core/string/ustring.h index 1b8bf3d234b..76726639647 100644 --- a/core/string/ustring.h +++ b/core/string/ustring.h @@ -28,9 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +// Note: _GODOT suffix added to avoid conflict with ICU header with the same guard. + #ifndef USTRING_GODOT_H #define USTRING_GODOT_H -// Note: Renamed to avoid conflict with ICU header with the same name. #include "core/string/char_utils.h" #include "core/templates/cowdata.h" diff --git a/core/templates/bin_sorted_array.h b/core/templates/bin_sorted_array.h index d928bd7a827..38beb9c04d9 100644 --- a/core/templates/bin_sorted_array.h +++ b/core/templates/bin_sorted_array.h @@ -178,4 +178,4 @@ public: } }; -#endif //BIN_SORTED_ARRAY_H +#endif // BIN_SORTED_ARRAY_H diff --git a/core/templates/lru.h b/core/templates/lru.h index b08b6455b65..3a78de61db5 100644 --- a/core/templates/lru.h +++ b/core/templates/lru.h @@ -124,4 +124,4 @@ public: } }; -#endif +#endif // LRU_H diff --git a/core/templates/rb_map.h b/core/templates/rb_map.h index c732ccd4856..3393e6dd3e8 100644 --- a/core/templates/rb_map.h +++ b/core/templates/rb_map.h @@ -758,4 +758,4 @@ public: } }; -#endif // MAP_H +#endif // RB_MAP_H diff --git a/core/templates/rb_set.h b/core/templates/rb_set.h index 226ea979c9b..e87ea544fd5 100644 --- a/core/templates/rb_set.h +++ b/core/templates/rb_set.h @@ -708,4 +708,4 @@ public: } }; -#endif // SET_H +#endif // RB_SET_H diff --git a/core/templates/thread_work_pool.h b/core/templates/thread_work_pool.h index b0cebf04f11..cdb43d6d891 100644 --- a/core/templates/thread_work_pool.h +++ b/core/templates/thread_work_pool.h @@ -154,4 +154,4 @@ public: ~ThreadWorkPool(); }; -#endif // THREAD_POOL_H +#endif // THREAD_WORK_POOL_H diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h index 0a4bbd662db..7fac8a99edc 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.h +++ b/drivers/coreaudio/audio_driver_coreaudio.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef COREAUDIO_ENABLED - #ifndef AUDIO_DRIVER_COREAUDIO_H #define AUDIO_DRIVER_COREAUDIO_H +#ifdef COREAUDIO_ENABLED + #include "servers/audio_server.h" #import @@ -120,6 +120,6 @@ public: ~AudioDriverCoreAudio() {} }; -#endif +#endif // COREAUDIO_ENABLED -#endif +#endif // AUDIO_DRIVER_COREAUDIO_H diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index 0085141c6dc..ac2ad99eb31 100644 --- a/drivers/coremidi/midi_driver_coremidi.h +++ b/drivers/coremidi/midi_driver_coremidi.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef COREMIDI_ENABLED - #ifndef MIDI_DRIVER_COREMIDI_H #define MIDI_DRIVER_COREMIDI_H +#ifdef COREMIDI_ENABLED + #include "core/os/midi_driver.h" #include "core/templates/vector.h" @@ -57,5 +57,6 @@ public: virtual ~MIDIDriverCoreMidi(); }; -#endif // MIDI_DRIVER_COREMIDI_H #endif // COREMIDI_ENABLED + +#endif // MIDI_DRIVER_COREMIDI_H diff --git a/drivers/gles3/effects/copy_effects.h b/drivers/gles3/effects/copy_effects.h index 1cf1ac94044..b863e76579c 100644 --- a/drivers/gles3/effects/copy_effects.h +++ b/drivers/gles3/effects/copy_effects.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COPY_GL_H -#define COPY_GL_H +#ifndef COPY_EFFECTS_GLES3_H +#define COPY_EFFECTS_GLES3_H #ifdef GLES3_ENABLED @@ -70,4 +70,5 @@ public: } //namespace GLES3 #endif // GLES3_ENABLED -#endif // !COPY_GL_H + +#endif // COPY_EFFECTS_GLES3_H diff --git a/drivers/gles3/environment/fog.h b/drivers/gles3/environment/fog.h index 22bf3bb017b..350eb459cfe 100644 --- a/drivers/gles3/environment/fog.h +++ b/drivers/gles3/environment/fog.h @@ -59,4 +59,4 @@ public: #endif // GLES3_ENABLED -#endif // !FOG_GLES3_H +#endif // FOG_GLES3_H diff --git a/drivers/gles3/environment/gi.h b/drivers/gles3/environment/gi.h index b6335207847..7a0634f22b1 100644 --- a/drivers/gles3/environment/gi.h +++ b/drivers/gles3/environment/gi.h @@ -93,4 +93,4 @@ public: #endif // GLES3_ENABLED -#endif // !GI_GLES3_H +#endif // GI_GLES3_H diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index 4c04b503431..f920e37130a 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_CANVAS_OPENGL_H -#define RASTERIZER_CANVAS_OPENGL_H +#ifndef RASTERIZER_CANVAS_GLES3_H +#define RASTERIZER_CANVAS_GLES3_H #ifdef GLES3_ENABLED @@ -262,4 +262,5 @@ public: }; #endif // GLES3_ENABLED -#endif // RASTERIZER_CANVAS_OPENGL_H + +#endif // RASTERIZER_CANVAS_GLES3_H diff --git a/drivers/gles3/rasterizer_gles3.h b/drivers/gles3/rasterizer_gles3.h index e842b6d70c5..97543af0d57 100644 --- a/drivers/gles3/rasterizer_gles3.h +++ b/drivers/gles3/rasterizer_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_OPENGL_H -#define RASTERIZER_OPENGL_H +#ifndef RASTERIZER_GLES3_H +#define RASTERIZER_GLES3_H #ifdef GLES3_ENABLED @@ -112,4 +112,4 @@ public: #endif // GLES3_ENABLED -#endif +#endif // RASTERIZER_GLES3_H diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 1cde835f728..3ac87702286 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_SCENE_OPENGL_H -#define RASTERIZER_SCENE_OPENGL_H +#ifndef RASTERIZER_SCENE_GLES3_H +#define RASTERIZER_SCENE_GLES3_H #ifdef GLES3_ENABLED @@ -947,4 +947,4 @@ public: #endif // GLES3_ENABLED -#endif // RASTERIZER_SCENE_OPENGL_H +#endif // RASTERIZER_SCENE_GLES3_H diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 9e84402399f..2b72549b5b0 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADER_OPENGL_H -#define SHADER_OPENGL_H +#ifndef SHADER_GLES3_H +#define SHADER_GLES3_H #include "core/math/projection.h" #include "core/os/mutex.h" @@ -248,5 +248,6 @@ public: virtual ~ShaderGLES3(); }; -#endif // SHADER_OPENGL_H -#endif +#endif // GLES3_ENABLED + +#endif // SHADER_GLES3_H diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index db76aa79fbd..b83c83f4252 100644 --- a/drivers/gles3/storage/config.h +++ b/drivers/gles3/storage/config.h @@ -90,4 +90,4 @@ public: #endif // GLES3_ENABLED -#endif // !CONFIG_GLES3_H +#endif // CONFIG_GLES3_H diff --git a/drivers/gles3/storage/light_storage.h b/drivers/gles3/storage/light_storage.h index 575ab93eabc..857a0261fa3 100644 --- a/drivers/gles3/storage/light_storage.h +++ b/drivers/gles3/storage/light_storage.h @@ -342,6 +342,6 @@ public: } // namespace GLES3 -#endif // !GLES3_ENABLED +#endif // GLES3_ENABLED -#endif // !LIGHT_STORAGE_GLES3_H +#endif // LIGHT_STORAGE_GLES3_H diff --git a/drivers/gles3/storage/material_storage.h b/drivers/gles3/storage/material_storage.h index c6883176d81..91e1eee306d 100644 --- a/drivers/gles3/storage/material_storage.h +++ b/drivers/gles3/storage/material_storage.h @@ -599,4 +599,4 @@ public: #endif // GLES3_ENABLED -#endif // !MATERIAL_STORAGE_GLES3_H +#endif // MATERIAL_STORAGE_GLES3_H diff --git a/drivers/gles3/storage/mesh_storage.h b/drivers/gles3/storage/mesh_storage.h index c51cd5dcd63..339380b3b00 100644 --- a/drivers/gles3/storage/mesh_storage.h +++ b/drivers/gles3/storage/mesh_storage.h @@ -543,4 +543,4 @@ public: #endif // GLES3_ENABLED -#endif // !MESH_STORAGE_GLES3_H +#endif // MESH_STORAGE_GLES3_H diff --git a/drivers/gles3/storage/particles_storage.h b/drivers/gles3/storage/particles_storage.h index cf47ada5d5e..84d1f94d8cc 100644 --- a/drivers/gles3/storage/particles_storage.h +++ b/drivers/gles3/storage/particles_storage.h @@ -137,4 +137,4 @@ public: #endif // GLES3_ENABLED -#endif // !PARTICLES_STORAGE_GLES3_H +#endif // PARTICLES_STORAGE_GLES3_H diff --git a/drivers/gles3/storage/texture_storage.h b/drivers/gles3/storage/texture_storage.h index b5d5641086a..77ec1da6f52 100644 --- a/drivers/gles3/storage/texture_storage.h +++ b/drivers/gles3/storage/texture_storage.h @@ -577,6 +577,6 @@ inline String TextureStorage::get_framebuffer_error(GLenum p_status) { } // namespace GLES3 -#endif // !GLES3_ENABLED +#endif // GLES3_ENABLED -#endif // !TEXTURE_STORAGE_GLES3_H +#endif // TEXTURE_STORAGE_GLES3_H diff --git a/drivers/gles3/storage/utilities.h b/drivers/gles3/storage/utilities.h index 523033886c7..e054f2f8163 100644 --- a/drivers/gles3/storage/utilities.h +++ b/drivers/gles3/storage/utilities.h @@ -156,4 +156,4 @@ public: #endif // GLES3_ENABLED -#endif // !UTILITIES_GLES3_H +#endif // UTILITIES_GLES3_H diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index 522cc901d49..9bcfb720d3a 100644 --- a/drivers/png/image_loader_png.h +++ b/drivers/png/image_loader_png.h @@ -45,4 +45,4 @@ public: ImageLoaderPNG(); }; -#endif +#endif // IMAGE_LOADER_PNG_H diff --git a/drivers/png/png_driver_common.h b/drivers/png/png_driver_common.h index 62302bbdbb3..24546d44027 100644 --- a/drivers/png/png_driver_common.h +++ b/drivers/png/png_driver_common.h @@ -43,4 +43,4 @@ Error png_to_image(const uint8_t *p_source, size_t p_size, bool p_force_linear, Error image_to_png(const Ref &p_image, Vector &p_buffer); } // namespace PNGDriverCommon -#endif +#endif // PNG_DRIVER_COMMON_H diff --git a/drivers/register_driver_types.h b/drivers/register_driver_types.h index c008d931854..41f95b57e7a 100644 --- a/drivers/register_driver_types.h +++ b/drivers/register_driver_types.h @@ -37,4 +37,4 @@ void unregister_core_driver_types(); void register_driver_types(); void unregister_driver_types(); -#endif +#endif // REGISTER_DRIVER_TYPES_H diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index 39dbadf3cd5..b8b72b8d30d 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -516,4 +516,4 @@ DirAccessUnix::~DirAccessUnix() { list_dir_end(); } -#endif //posix_enabled +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index 5e2129b74ab..18f435f942f 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -90,5 +90,6 @@ public: ~DirAccessUnix(); }; -#endif //UNIX ENABLED -#endif +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED + +#endif // DIR_ACCESS_UNIX_H diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 99836b7beac..388ad479b97 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -339,4 +339,4 @@ FileAccessUnix::~FileAccessUnix() { _close(); } -#endif +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h index 0261b8be539..d61fc08f57c 100644 --- a/drivers/unix/file_access_unix.h +++ b/drivers/unix/file_access_unix.h @@ -86,5 +86,6 @@ public: virtual ~FileAccessUnix(); }; -#endif -#endif +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED + +#endif // FILE_ACCESS_UNIX_H diff --git a/drivers/unix/ip_unix.h b/drivers/unix/ip_unix.h index 06fcdb6e171..798d02095ce 100644 --- a/drivers/unix/ip_unix.h +++ b/drivers/unix/ip_unix.h @@ -50,4 +50,5 @@ public: }; #endif + #endif // IP_UNIX_H diff --git a/drivers/unix/net_socket_posix.h b/drivers/unix/net_socket_posix.h index 867513099ac..5558114cb1c 100644 --- a/drivers/unix/net_socket_posix.h +++ b/drivers/unix/net_socket_posix.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NET_SOCKET_UNIX_H -#define NET_SOCKET_UNIX_H +#ifndef NET_SOCKET_POSIX_H +#define NET_SOCKET_POSIX_H #include "core/io/net_socket.h" @@ -104,4 +104,4 @@ public: ~NetSocketPosix(); }; -#endif +#endif // NET_SOCKET_POSIX_H diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index a1ed4bd501f..f4609a565bc 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -98,6 +98,6 @@ public: virtual ~UnixTerminalLogger(); }; -#endif +#endif // UNIX_ENABLED -#endif +#endif // OS_UNIX_H diff --git a/drivers/unix/syslog_logger.h b/drivers/unix/syslog_logger.h index 697a96a6f9b..cc6617eb253 100644 --- a/drivers/unix/syslog_logger.h +++ b/drivers/unix/syslog_logger.h @@ -43,6 +43,6 @@ public: virtual ~SyslogLogger(); }; -#endif +#endif // UNIX_ENABLED -#endif +#endif // SYSLOG_LOGGER_H diff --git a/drivers/unix/thread_posix.h b/drivers/unix/thread_posix.h index 9cd3ecbe902..672adcba724 100644 --- a/drivers/unix/thread_posix.h +++ b/drivers/unix/thread_posix.h @@ -35,4 +35,4 @@ void init_thread_posix(); #endif -#endif +#endif // THREAD_POSIX_H diff --git a/drivers/vulkan/vulkan_context.h b/drivers/vulkan/vulkan_context.h index b2eb43975f9..cc9c984eadd 100644 --- a/drivers/vulkan/vulkan_context.h +++ b/drivers/vulkan/vulkan_context.h @@ -330,4 +330,4 @@ public: virtual ~VulkanContext(); }; -#endif // VULKAN_DEVICE_H +#endif // VULKAN_CONTEXT_H diff --git a/drivers/vulkan/vulkan_hooks.h b/drivers/vulkan/vulkan_hooks.h index 3f244b4d452..dec2042d0d1 100644 --- a/drivers/vulkan/vulkan_hooks.h +++ b/drivers/vulkan/vulkan_hooks.h @@ -45,4 +45,4 @@ public: virtual ~VulkanHooks(){}; }; -#endif +#endif // VULKAN_HOOKS_H diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index 89ed90e97b5..9058077a1fa 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -120,4 +120,5 @@ public: }; #endif // WASAPI_ENABLED + #endif // AUDIO_DRIVER_WASAPI_H diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h index 6572ba0c169..e42f3df4cfe 100644 --- a/drivers/winmidi/midi_driver_winmidi.h +++ b/drivers/winmidi/midi_driver_winmidi.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef WINMIDI_ENABLED - #ifndef MIDI_DRIVER_WINMIDI_H #define MIDI_DRIVER_WINMIDI_H +#ifdef WINMIDI_ENABLED + #include "core/os/midi_driver.h" #include "core/templates/vector.h" @@ -57,5 +57,6 @@ public: virtual ~MIDIDriverWinMidi(); }; -#endif // MIDI_DRIVER_WINMIDI_H #endif // WINMIDI_ENABLED + +#endif // MIDI_DRIVER_WINMIDI_H diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 9072269a0e8..81432ceb8ea 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -106,4 +106,4 @@ public: ~AudioDriverXAudio2() {} }; -#endif +#endif // AUDIO_DRIVER_XAUDIO2_H diff --git a/editor/action_map_editor.h b/editor/action_map_editor.h index d8c40a97a7d..1ca3c5bac0e 100644 --- a/editor/action_map_editor.h +++ b/editor/action_map_editor.h @@ -209,4 +209,4 @@ public: ActionMapEditor(); }; -#endif +#endif // ACTION_MAP_EDITOR_H diff --git a/editor/create_dialog.h b/editor/create_dialog.h index dc8618a1c0d..04094108ad2 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -125,4 +125,4 @@ public: CreateDialog(); }; -#endif +#endif // CREATE_DIALOG_H diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.h b/editor/debugger/debug_adapter/debug_adapter_parser.h index f458151e17b..ee323061463 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.h +++ b/editor/debugger/debug_adapter/debug_adapter_parser.h @@ -93,4 +93,4 @@ public: Dictionary ev_breakpoint(const DAP::Breakpoint &p_breakpoint, const bool &p_enabled) const; }; -#endif +#endif // DEBUG_ADAPTER_PARSER_H diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.h b/editor/debugger/debug_adapter/debug_adapter_protocol.h index a17e550dfc3..29f577ef97c 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.h +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.h @@ -152,4 +152,4 @@ public: ~DebugAdapterProtocol(); }; -#endif +#endif // DEBUG_ADAPTER_PROTOCOL_H diff --git a/editor/debugger/debug_adapter/debug_adapter_server.h b/editor/debugger/debug_adapter/debug_adapter_server.h index a2b01f92c64..633739eaae9 100644 --- a/editor/debugger/debug_adapter/debug_adapter_server.h +++ b/editor/debugger/debug_adapter/debug_adapter_server.h @@ -54,4 +54,4 @@ public: void stop(); }; -#endif +#endif // DEBUG_ADAPTER_SERVER_H diff --git a/editor/debugger/debug_adapter/debug_adapter_types.h b/editor/debugger/debug_adapter/debug_adapter_types.h index fd66905f9b0..eb10184ab39 100644 --- a/editor/debugger/debug_adapter/debug_adapter_types.h +++ b/editor/debugger/debug_adapter/debug_adapter_types.h @@ -278,4 +278,4 @@ struct Variable { } // namespace DAP -#endif +#endif // DEBUG_ADAPTER_TYPES_H diff --git a/editor/debugger/editor_debugger_inspector.h b/editor/debugger/editor_debugger_inspector.h index 0e739285589..5aac4dbf111 100644 --- a/editor/debugger/editor_debugger_inspector.h +++ b/editor/debugger/editor_debugger_inspector.h @@ -30,6 +30,7 @@ #ifndef EDITOR_DEBUGGER_INSPECTOR_H #define EDITOR_DEBUGGER_INSPECTOR_H + #include "editor/editor_inspector.h" class EditorDebuggerRemoteObject : public Object { diff --git a/editor/debugger/editor_debugger_node.h b/editor/debugger/editor_debugger_node.h index d50cbec291e..4c9ad49ac4c 100644 --- a/editor/debugger/editor_debugger_node.h +++ b/editor/debugger/editor_debugger_node.h @@ -205,4 +205,5 @@ public: void add_debugger_plugin(const Ref