From 818f1eed31d3e6874f66f8234b3c12fab82682fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 25 Jul 2022 12:33:41 +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. --- core/bitfield_dynamic.h | 2 +- core/color.h | 2 +- core/command_queue_mt.h | 2 +- core/core_string_names.h | 2 +- core/cowdata.h | 6 +- core/crypto/crypto_core.h | 1 + core/error_list.h | 2 +- core/error_macros.h | 3 +- core/hash_map.h | 2 +- core/hashfuncs.h | 2 +- core/image.h | 2 +- core/int_types.h | 2 +- core/io/image_loader.h | 2 +- core/io/logger.h | 2 +- core/io/marshalls.h | 2 +- core/io/multiplayer_api.h | 6 +- core/io/networked_multiplayer_custom.h | 2 +- core/io/networked_multiplayer_peer.h | 2 +- core/io/packet_peer.h | 2 +- core/io/resource_loader.h | 2 +- core/io/resource_saver.h | 2 +- core/io/stream_peer_tcp.h | 2 +- core/io/xml_parser.h | 2 +- core/list.h | 6 +- core/map.h | 2 +- core/math/a_star.h | 6 +- core/math/audio_frame.h | 6 +- core/math/basis.h | 1 + core/math/bsp_tree.h | 2 +- core/math/camera_matrix.h | 2 +- core/math/disjoint_set.h | 2 +- core/math/geometry.h | 2 +- core/math/quat.h | 2 +- core/math/triangulate.h | 2 +- core/method_bind.h | 2 +- core/method_ptrcall.h | 3 +- core/node_path.h | 2 +- core/oa_hash_map.h | 2 +- core/object.h | 2 +- core/object_id.h | 6 +- core/object_rc.h | 6 +- core/os/dir_access.h | 2 +- core/os/file_access.h | 2 +- core/os/input_event.h | 2 +- core/os/keyboard.h | 2 +- core/os/main_loop.h | 2 +- core/os/memory.h | 2 +- core/os/midi_driver.h | 2 +- core/os/os.h | 2 +- core/os/rw_lock.h | 6 +- core/os/spin_lock.h | 1 + core/os/thread_safe.h | 2 +- core/os/thread_work_pool.h | 2 +- core/pool_allocator.h | 2 +- core/print_string.h | 2 +- core/project_settings.h | 6 +- core/ref_ptr.h | 1 + core/register_core_types.h | 2 +- core/resource.h | 2 +- core/rid.h | 2 +- core/ring_buffer.h | 6 +- core/script_language.h | 2 +- core/set.h | 2 +- core/simple_type.h | 2 +- core/string_buffer.h | 2 +- core/type_info.h | 6 +- core/ucaps.h | 3 +- core/ustring.h | 6 +- core/variant.h | 3 +- core/vector.h | 2 +- core/version.h | 6 +- core/vmap.h | 1 + drivers/coreaudio/audio_driver_coreaudio.h | 2 +- drivers/coremidi/midi_driver_coremidi.h | 7 ++- drivers/gles2/rasterizer_canvas_base_gles2.h | 6 +- drivers/gles2/rasterizer_canvas_gles2.h | 6 +- drivers/gles2/rasterizer_gles2.h | 6 +- drivers/gles2/rasterizer_scene_gles2.h | 7 +-- drivers/gles2/rasterizer_storage_gles2.h | 6 +- drivers/gles2/shader_compiler_gles2.h | 6 +- drivers/gles2/shader_gles2.h | 2 +- drivers/gles3/rasterizer_canvas_base_gles3.h | 6 +- drivers/gles3/rasterizer_canvas_gles3.h | 6 +- drivers/gles3/rasterizer_gles3.h | 6 +- drivers/gles3/rasterizer_scene_gles3.h | 6 +- drivers/gles3/rasterizer_storage_gles3.h | 6 +- drivers/gles3/shader_cache_gles3.h | 2 +- drivers/gles3/shader_compiler_gles3.h | 6 +- drivers/gles3/shader_gles3.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 | 2 +- drivers/unix/syslog_logger.h | 2 +- drivers/unix/thread_posix.h | 2 +- drivers/wasapi/audio_driver_wasapi.h | 3 +- drivers/windows/dir_access_windows.h | 4 +- drivers/windows/file_access_windows.h | 5 +- drivers/winmidi/midi_driver_winmidi.h | 7 ++- drivers/xaudio2/audio_driver_xaudio2.h | 2 +- editor/connections_dialog.h | 2 +- editor/create_dialog.h | 2 +- editor/editor_about.h | 2 +- editor/editor_asset_installer.h | 6 +- editor/editor_audio_buses.h | 6 +- editor/editor_autoload_settings.h | 2 +- editor/editor_export.h | 2 +- editor/editor_file_dialog.h | 6 +- editor/editor_fonts.h | 2 +- editor/editor_inspector.h | 2 +- editor/editor_network_profiler.h | 6 +- editor/editor_node.cpp | 2 +- editor/editor_plugin.h | 2 +- editor/editor_plugin_settings.h | 6 +- editor/editor_profiler.h | 6 +- .../{quick_open.cpp => editor_quick_open.cpp} | 4 +- editor/{quick_open.h => editor_quick_open.h} | 2 +- editor/editor_resource_picker.h | 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 +- .../resource_importer_layered_texture.h | 1 + editor/import/resource_importer_obj.h | 6 +- editor/import/resource_importer_scene.h | 6 +- editor/import/resource_importer_texture.h | 6 +- editor/import/resource_importer_wav.h | 6 +- editor/import_dock.h | 6 +- editor/inspector_dock.h | 2 +- .../animation_tree_player_editor_plugin.h | 2 +- editor/plugins/asset_library_editor_plugin.h | 2 +- editor/plugins/bit_map_editor_plugin.h | 6 +- editor/plugins/canvas_item_editor_plugin.h | 6 +- .../collision_shape_2d_editor_plugin.h | 2 +- editor/plugins/editor_preview_plugins.h | 7 ++- editor/plugins/gi_probe_editor_plugin.h | 6 +- editor/plugins/gradient_editor_plugin.h | 6 +- .../gradient_texture_2d_editor_plugin.h | 6 +- editor/plugins/mesh_editor_plugin.h | 2 +- editor/plugins/mesh_instance_editor_plugin.h | 2 +- .../navigation_polygon_editor_plugin.h | 6 +- editor/plugins/physical_bone_plugin.h | 2 +- editor/plugins/room_manager_editor_plugin.h | 2 +- editor/plugins/shader_editor_plugin.h | 2 +- editor/plugins/spatial_editor_plugin.h | 2 +- .../plugins/version_control_editor_plugin.h | 2 +- editor/project_export.h | 6 +- editor/project_settings_editor.h | 6 +- editor/property_editor.h | 2 +- editor/property_selector.h | 6 +- editor/register_exporters.h | 2 +- editor/reparent_dialog.h | 2 +- editor/scene_tree_dock.h | 2 +- editor/scene_tree_editor.h | 2 +- main/tests/test_astar.h | 2 +- main/tests/test_basis.h | 2 +- main/tests/test_crypto.h | 2 +- main/tests/test_gui.h | 2 +- main/tests/test_math.h | 2 +- main/tests/test_physics.h | 2 +- main/tests/test_render.h | 2 +- main/tests/test_string.h | 2 +- main/tests/test_theme.h | 1 + main/tests/test_transform.h | 2 +- main/tests/test_xml_parser.h | 1 + misc/scripts/header_guards.sh | 61 +++++++++++++++++++ modules/bullet/area_bullet.h | 6 +- modules/bullet/btRayShape.h | 1 + modules/bullet/bullet_physics_server.h | 2 +- modules/bullet/bullet_types_converter.h | 3 +- modules/bullet/bullet_utilities.h | 3 +- modules/bullet/collision_object_bullet.h | 2 +- modules/bullet/cone_twist_joint_bullet.h | 3 +- modules/bullet/constraint_bullet.h | 3 +- modules/bullet/generic_6dof_joint_bullet.h | 2 +- .../bullet/godot_collision_configuration.h | 3 +- modules/bullet/godot_collision_dispatcher.h | 3 +- modules/bullet/godot_motion_state.h | 3 +- modules/bullet/godot_result_callbacks.h | 1 + modules/bullet/hinge_joint_bullet.h | 3 +- modules/bullet/joint_bullet.h | 3 +- modules/bullet/pin_joint_bullet.h | 3 +- modules/bullet/register_types.h | 7 ++- modules/bullet/rid_bullet.h | 3 +- modules/bullet/rigid_body_bullet.h | 6 +- modules/bullet/shape_bullet.h | 3 +- modules/bullet/shape_owner_bullet.h | 3 +- modules/bullet/slider_joint_bullet.h | 3 +- modules/bullet/space_bullet.h | 3 +- modules/camera/camera_osx.h | 6 +- modules/camera/camera_win.h | 6 +- modules/fbx/data/fbx_anim_container.h | 2 +- modules/fbx/editor_scene_importer_fbx.h | 1 + modules/fbx/fbx_parser/ByteSwapper.h | 8 +-- modules/fbx/fbx_parser/FBXCommon.h | 7 ++- modules/fbx/fbx_parser/FBXDocument.h | 7 ++- modules/fbx/fbx_parser/FBXDocumentUtil.h | 7 ++- modules/fbx/fbx_parser/FBXImportSettings.h | 8 +-- modules/fbx/fbx_parser/FBXMeshGeometry.h | 7 +-- modules/fbx/fbx_parser/FBXParseTools.h | 6 +- modules/fbx/fbx_parser/FBXParser.h | 8 +-- modules/fbx/fbx_parser/FBXProperties.h | 8 +-- modules/fbx/fbx_parser/FBXTokenizer.h | 8 +-- modules/fbx/fbx_parser/FBXUtil.h | 8 +-- modules/fbx/tools/import_utils.h | 6 +- modules/fbx/tools/validation_tools.h | 7 ++- modules/freetype/uwpdef.h | 5 ++ .../gdnative/gdnative_library_editor_plugin.h | 1 + .../gdnative_library_singleton_editor.h | 7 ++- .../gdnative/include/android/godot_android.h | 6 +- modules/gdnative/include/arvr/godot_arvr.h | 6 +- modules/gdnative/include/gdnative/aabb.h | 6 +- modules/gdnative/include/gdnative/array.h | 6 +- modules/gdnative/include/gdnative/basis.h | 6 +- modules/gdnative/include/gdnative/color.h | 6 +- .../gdnative/include/gdnative/dictionary.h | 6 +- modules/gdnative/include/gdnative/gdnative.h | 6 +- modules/gdnative/include/gdnative/node_path.h | 6 +- modules/gdnative/include/gdnative/plane.h | 6 +- .../gdnative/include/gdnative/pool_arrays.h | 6 +- modules/gdnative/include/gdnative/quat.h | 6 +- modules/gdnative/include/gdnative/rect2.h | 6 +- modules/gdnative/include/gdnative/rid.h | 6 +- modules/gdnative/include/gdnative/string.h | 6 +- .../gdnative/include/gdnative/string_name.h | 6 +- modules/gdnative/include/gdnative/transform.h | 6 +- .../gdnative/include/gdnative/transform2d.h | 6 +- modules/gdnative/include/gdnative/variant.h | 6 +- modules/gdnative/include/gdnative/vector2.h | 6 +- modules/gdnative/include/gdnative/vector3.h | 6 +- .../include/nativescript/godot_nativescript.h | 2 +- modules/gdnative/include/net/godot_net.h | 6 +- modules/gdnative/include/net/godot_webrtc.h | 6 +- .../include/videodecoder/godot_videodecoder.h | 6 +- modules/gdnative/nativescript/nativescript.h | 6 +- .../pluginscript/pluginscript_loader.h | 6 +- .../videodecoder/video_stream_gdnative.h | 2 +- .../language_server/gdscript_extend_parser.h | 2 +- .../gdscript_language_protocol.h | 6 +- .../language_server/gdscript_text_document.h | 2 +- .../language_server/gdscript_workspace.h | 2 +- modules/gltf/editor_scene_importer_gltf.h | 8 +-- modules/gltf/packed_scene_gltf.h | 8 +-- modules/gridmap/grid_map_editor_plugin.h | 2 +- modules/hdr/image_loader_hdr.h | 2 +- modules/jpg/image_loader_jpegd.h | 6 +- modules/jsonrpc/jsonrpc.h | 6 +- modules/lightmapper_cpu/lightmapper_cpu.h | 2 +- modules/mbedtls/dtls_server_mbedtls.h | 6 +- modules/mbedtls/ssl_context_mbedtls.h | 6 +- modules/mbedtls/stream_peer_mbedtls.h | 6 +- modules/mobile_vr/mobile_vr_interface.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/macros.h | 6 +- modules/mono/utils/osx_utils.h | 6 +- modules/mono/utils/path_utils.h | 6 +- modules/mono/utils/string_utils.h | 6 +- modules/mono/utils/thread_local.h | 6 +- .../navigation_mesh_editor_plugin.h | 2 +- modules/stb_vorbis/audio_stream_ogg_vorbis.h | 6 +- .../stb_vorbis/resource_importer_ogg_vorbis.h | 6 +- modules/svg/image_loader_svg.h | 2 +- modules/tga/image_loader_tga.h | 2 +- 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 +- modules/visual_script/visual_script_editor.h | 6 +- .../visual_script/visual_script_expression.h | 6 +- .../visual_script_property_selector.h | 6 +- modules/webp/image_loader_webp.h | 2 +- modules/webrtc/webrtc_data_channel.h | 1 + modules/webrtc/webrtc_data_channel_js.h | 8 +-- modules/webrtc/webrtc_multiplayer.h | 2 +- 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_macros.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/iphone/ios.h | 2 +- platform/iphone/os_iphone.h | 8 +-- platform/javascript/audio_driver_javascript.h | 2 +- platform/javascript/godot_audio.h | 2 +- platform/javascript/godot_js.h | 2 +- platform/javascript/godot_webgl2.h | 2 +- platform/javascript/os_javascript.h | 2 +- platform/osx/dir_access_osx.h | 5 +- platform/osx/dir_access_osx.mm | 2 +- platform/osx/export/codesign.h | 6 +- platform/osx/export/lipo.h | 6 +- platform/osx/export/macho.h | 6 +- platform/osx/export/plist.h | 6 +- platform/osx/joypad_osx.h | 6 +- platform/osx/os_osx.h | 2 +- platform/register_platform_apis.h | 6 +- platform/server/os_server.h | 2 +- platform/uwp/joypad_uwp.h | 2 +- platform/uwp/os_uwp.h | 2 +- platform/windows/context_gl_windows.h | 11 ++-- platform/windows/os_windows.h | 2 +- platform/windows/windows_terminal_logger.h | 2 +- platform/x11/context_gl_x11.h | 3 +- platform/x11/detect_prime.h | 3 +- platform/x11/joypad_linux.h | 2 + platform/x11/key_mapping_x11.h | 2 +- platform/x11/os_x11.h | 2 +- scene/2d/audio_stream_player_2d.h | 2 +- scene/2d/back_buffer_copy.h | 6 +- scene/2d/canvas_modulate.h | 6 +- scene/2d/light_occluder_2d.h | 6 +- scene/2d/line_2d.h | 6 +- scene/2d/listener_2d.h | 2 +- scene/2d/navigation_agent_2d.h | 2 +- scene/2d/navigation_obstacle_2d.h | 2 +- scene/2d/navigation_polygon.h | 2 +- scene/2d/node_2d.h | 6 +- scene/3d/area.h | 2 +- scene/3d/arvr_nodes.h | 2 +- scene/3d/audio_stream_player_3d.h | 1 + scene/3d/baked_lightmap.h | 6 +- scene/3d/camera.h | 3 +- scene/3d/collision_object.h | 2 +- scene/3d/collision_shape.h | 2 +- scene/3d/cull_instance.h | 2 +- scene/3d/gi_probe.h | 6 +- scene/3d/light.h | 2 +- scene/3d/listener.h | 2 +- scene/3d/mesh_instance.h | 2 +- scene/3d/navigation_agent.h | 2 +- scene/3d/navigation_obstacle.h | 2 +- scene/3d/physics_body.h | 6 +- scene/3d/portal.h | 2 +- scene/3d/reflection_probe.h | 6 +- scene/3d/remote_transform.h | 6 +- scene/3d/room.h | 2 +- scene/3d/room_group.h | 2 +- scene/3d/room_manager.h | 2 +- scene/3d/skeleton.h | 2 +- scene/3d/soft_body.h | 6 +- scene/3d/spatial.h | 2 +- scene/3d/spring_arm.h | 2 +- scene/3d/sprite_3d.h | 1 + scene/3d/visual_instance.h | 2 +- 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/scene_tree_tween.h | 2 +- scene/animation/tween.h | 2 +- scene/gui/base_button.h | 2 +- scene/gui/button.h | 2 +- scene/gui/check_box.h | 2 +- scene/gui/check_button.h | 2 +- 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/nine_patch_rect.h | 1 + scene/gui/option_button.h | 2 +- scene/gui/panel.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/texture_button.h | 1 + scene/gui/texture_rect.h | 7 ++- scene/gui/tree.h | 3 +- scene/gui/viewport_container.h | 6 +- scene/main/http_request.h | 6 +- scene/main/node.h | 2 +- scene/main/scene_tree.h | 6 +- scene/main/viewport.h | 2 +- scene/register_scene_types.h | 2 +- scene/resources/animation.h | 2 +- scene/resources/concave_polygon_shape_2d.h | 2 +- scene/resources/default_theme/default_theme.h | 2 +- scene/resources/font.h | 2 +- scene/resources/height_map_shape.h | 2 +- scene/resources/material.h | 2 +- scene/resources/mesh.h | 2 +- scene/resources/mesh_library.h | 6 +- scene/resources/multimesh.h | 2 +- scene/resources/packed_scene.h | 2 +- scene/resources/physics_material.h | 6 +- scene/resources/plane_shape.h | 1 + scene/resources/primitive_meshes.h | 2 +- scene/resources/ray_shape.h | 2 + scene/resources/style_box.h | 2 +- scene/resources/surface_tool.h | 2 +- scene/resources/text_file.h | 6 +- scene/resources/texture.h | 2 +- scene/resources/theme.h | 2 +- scene/resources/video_stream.h | 2 +- servers/arvr/arvr_interface.h | 2 +- servers/arvr/arvr_positional_tracker.h | 2 +- servers/arvr_server.h | 2 +- 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.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 +-- .../effects/audio_effect_stereo_enhance.h | 6 +- .../audio/effects/audio_stream_generator.h | 1 + .../audio/effects/{eq.cpp => eq_filter.cpp} | 6 +- servers/audio/effects/{eq.h => eq_filter.h} | 4 +- .../effects/{reverb.cpp => reverb_filter.cpp} | 6 +- .../effects/{reverb.h => reverb_filter.h} | 8 +-- servers/camera/camera_feed.h | 2 +- servers/camera_server.h | 2 +- servers/physics/area_pair_sw.h | 2 +- servers/physics/area_sw.h | 2 +- servers/physics/body_pair_sw.h | 2 +- servers/physics/body_sw.h | 2 +- servers/physics/broad_phase_sw.h | 2 +- servers/physics/collision_solver_sw.h | 2 +- servers/physics/constraint_sw.h | 2 +- servers/physics/gjk_epa.h | 2 +- servers/physics/physics_server_sw.h | 6 +- servers/physics/shape_sw.h | 2 +- servers/physics/space_sw.h | 2 +- servers/physics/step_sw.h | 2 +- servers/physics_2d/physics_2d_server_sw.h | 6 +- .../physics_2d/physics_2d_server_wrap_mt.h | 6 +- servers/physics_2d/shape_2d_sw.h | 6 +- servers/physics_2d_server.h | 2 +- servers/physics_server.h | 2 +- servers/server_wrap_mt_common.h | 5 ++ .../visual/portals/portal_gameplay_monitor.h | 2 +- servers/visual/portals/portal_pvs.h | 2 +- servers/visual/portals/portal_pvs_builder.h | 2 +- servers/visual/portals/portal_rooms_bsp.h | 2 +- servers/visual/portals/portal_tracer.h | 2 +- servers/visual/portals/portal_types.h | 2 +- servers/visual/shader_types.h | 6 +- servers/visual/visual_server_canvas.h | 6 +- servers/visual/visual_server_raster.h | 2 +- servers/visual/visual_server_scene.h | 6 +- servers/visual/visual_server_viewport.h | 6 +- servers/visual/visual_server_wrap_mt.h | 2 +- servers/visual_server.h | 2 +- 479 files changed, 986 insertions(+), 842 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 servers/audio/effects/{eq.cpp => eq_filter.cpp} (98%) rename servers/audio/effects/{eq.h => eq_filter.h} (97%) rename servers/audio/effects/{reverb.cpp => reverb_filter.cpp} (98%) rename servers/audio/effects/{reverb.h => reverb_filter.h} (96%) diff --git a/core/bitfield_dynamic.h b/core/bitfield_dynamic.h index 82933bbe523..dd790e0dfff 100644 --- a/core/bitfield_dynamic.h +++ b/core/bitfield_dynamic.h @@ -108,4 +108,4 @@ inline void BitFieldDynamic::set_bit(uint32_t p_bit, uint32_t p_set) { _data[byte_number] = uc; } -#endif +#endif // BITFIELD_DYNAMIC_H diff --git a/core/color.h b/core/color.h index c08394e09e8..28225f6c8d5 100644 --- a/core/color.h +++ b/core/color.h @@ -232,4 +232,4 @@ bool Color::operator<(const Color &p_color) const { } } -#endif +#endif // COLOR_H diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index ab9e5135c0e..3701b586907 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -507,4 +507,4 @@ public: #undef CMD_SYNC_TYPE #undef DECL_CMD_SYNC -#endif +#endif // COMMAND_QUEUE_MT_H diff --git a/core/core_string_names.h b/core/core_string_names.h index f3340fb31da..7e9bf12e301 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -91,4 +91,4 @@ public: StringName a8; }; -#endif // SCENE_STRING_NAMES_H +#endif // CORE_STRING_NAMES_H diff --git a/core/cowdata.h b/core/cowdata.h index c3cb9a9179c..a258cbcc20e 100644 --- a/core/cowdata.h +++ b/core/cowdata.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COWDATA_H_ -#define COWDATA_H_ +#ifndef COWDATA_H +#define COWDATA_H #include @@ -375,4 +375,4 @@ CowData::~CowData() { _unref(_ptr); } -#endif /* COW_H_ */ +#endif // COWDATA_H diff --git a/core/crypto/crypto_core.h b/core/crypto/crypto_core.h index d8e2321bb46..24ed4bff6b0 100644 --- a/core/crypto/crypto_core.h +++ b/core/crypto/crypto_core.h @@ -98,4 +98,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/error_list.h b/core/error_list.h index 777d7874a0c..a694bb82ddc 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -90,4 +90,4 @@ enum Error { ERR_PRINTER_ON_FIRE, /// the parallel port printer is engulfed in flames }; -#endif +#endif // ERROR_LIST_H diff --git a/core/error_macros.h b/core/error_macros.h index 379cc7d7cb0..38d118a9e14 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -558,4 +558,5 @@ void _err_flush_stdout(); ((void)0) #else #define DEV_CHECK_ONCE(m_cond) -#endif + +#endif // ERROR_MACROS_H diff --git a/core/hash_map.h b/core/hash_map.h index 1d76f927e6e..7badc663ce9 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -574,4 +574,4 @@ public: } }; -#endif +#endif // HASH_MAP_H diff --git a/core/hashfuncs.h b/core/hashfuncs.h index 33564eded1f..11a20234635 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -166,4 +166,4 @@ struct HashMapComparatorDefault { } }; -#endif +#endif // HASHFUNCS_H diff --git a/core/image.h b/core/image.h index 6e957a3a45b..0e1f2c35ecd 100644 --- a/core/image.h +++ b/core/image.h @@ -388,4 +388,4 @@ VARIANT_ENUM_CAST(Image::CompressMode) VARIANT_ENUM_CAST(Image::CompressSource) VARIANT_ENUM_CAST(Image::AlphaMode) -#endif +#endif // IMAGE_H diff --git a/core/int_types.h b/core/int_types.h index 31820fb6810..f4720b4a908 100644 --- a/core/int_types.h +++ b/core/int_types.h @@ -54,4 +54,4 @@ typedef unsigned long long uint64_t; #include #endif -#endif +#endif // INT_TYPES_H diff --git a/core/io/image_loader.h b/core/io/image_loader.h index a562dcbca6c..c693fcf4e7c 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -78,4 +78,4 @@ public: virtual String get_resource_type(const String &p_path) const; }; -#endif +#endif // IMAGE_LOADER_H diff --git a/core/io/logger.h b/core/io/logger.h index 61fcb5cc68c..a0aaab02088 100644 --- a/core/io/logger.h +++ b/core/io/logger.h @@ -109,4 +109,4 @@ public: virtual ~CompositeLogger(); }; -#endif +#endif // LOGGER_H diff --git a/core/io/marshalls.h b/core/io/marshalls.h index 951af9881f6..00a51e5bc29 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -183,4 +183,4 @@ public: Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len = nullptr, bool p_allow_objects = false, int p_depth = 0); Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects = false, int p_depth = 0); -#endif +#endif // MARSHALLS_H diff --git a/core/io/multiplayer_api.h b/core/io/multiplayer_api.h index 55cbeb799f3..895686f48c4 100644 --- a/core/io/multiplayer_api.h +++ b/core/io/multiplayer_api.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef MULTIPLAYER_PROTOCOL_H -#define MULTIPLAYER_PROTOCOL_H +#ifndef MULTIPLAYER_API_H +#define MULTIPLAYER_API_H #include "core/io/networked_multiplayer_peer.h" #include "core/reference.h" @@ -170,4 +170,4 @@ public: VARIANT_ENUM_CAST(MultiplayerAPI::RPCMode); -#endif // MULTIPLAYER_PROTOCOL_H +#endif // MULTIPLAYER_API_H diff --git a/core/io/networked_multiplayer_custom.h b/core/io/networked_multiplayer_custom.h index 83693e6fd8b..448314baaa3 100644 --- a/core/io/networked_multiplayer_custom.h +++ b/core/io/networked_multiplayer_custom.h @@ -84,4 +84,4 @@ public: void deliver_packet(const PoolByteArray &p_data, int p_from_peer_id); }; -#endif +#endif // NETWORKED_MULTIPLAYER_CUSTOM_H diff --git a/core/io/networked_multiplayer_peer.h b/core/io/networked_multiplayer_peer.h index 7c6774f49ce..9de86757a17 100644 --- a/core/io/networked_multiplayer_peer.h +++ b/core/io/networked_multiplayer_peer.h @@ -79,4 +79,4 @@ public: VARIANT_ENUM_CAST(NetworkedMultiplayerPeer::TransferMode) VARIANT_ENUM_CAST(NetworkedMultiplayerPeer::ConnectionStatus) -#endif // NetworkedMultiplayerPeer_H +#endif // NETWORKED_MULTIPLAYER_PEER_H diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index 1c18921b328..e6ecf9ecfa0 100644 --- a/core/io/packet_peer.h +++ b/core/io/packet_peer.h @@ -110,4 +110,4 @@ public: PacketPeerStream(); }; -#endif // PACKET_STREAM_H +#endif // PACKET_PEER_H diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 4a2edaf4881..4c1389a8b92 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -200,4 +200,4 @@ public: static void finalize(); }; -#endif +#endif // RESOURCE_LOADER_H diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h index 03076aa99b1..b1fce38bce0 100644 --- a/core/io/resource_saver.h +++ b/core/io/resource_saver.h @@ -89,4 +89,4 @@ public: static void remove_custom_savers(); }; -#endif +#endif // RESOURCE_SAVER_H diff --git a/core/io/stream_peer_tcp.h b/core/io/stream_peer_tcp.h index 18394c56aa6..49b5f235c67 100644 --- a/core/io/stream_peer_tcp.h +++ b/core/io/stream_peer_tcp.h @@ -89,4 +89,4 @@ public: VARIANT_ENUM_CAST(StreamPeerTCP::Status); -#endif +#endif // STREAM_PEER_TCP_H diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index 453427904a0..20412a025c4 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -117,4 +117,4 @@ public: ~XMLParser(); }; -#endif +#endif // XML_PARSER_H diff --git a/core/list.h b/core/list.h index 131c6b98209..31e1370a1f5 100644 --- a/core/list.h +++ b/core/list.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLOBALS_LIST_H -#define GLOBALS_LIST_H +#ifndef LIST_H +#define LIST_H #include "core/error_macros.h" #include "core/os/memory.h" @@ -697,4 +697,4 @@ public: }; }; -#endif +#endif // LIST_H diff --git a/core/map.h b/core/map.h index 9afe25b5a14..4ae598efe23 100644 --- a/core/map.h +++ b/core/map.h @@ -675,4 +675,4 @@ public: } }; -#endif +#endif // MAP_H diff --git a/core/math/a_star.h b/core/math/a_star.h index 13402b01c7b..7f4254b83dd 100644 --- a/core/math/a_star.h +++ b/core/math/a_star.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ASTAR_H -#define ASTAR_H +#ifndef A_STAR_H +#define A_STAR_H #include "core/oa_hash_map.h" #include "core/reference.h" @@ -208,4 +208,4 @@ public: ~AStar2D(); }; -#endif // ASTAR_H +#endif // A_STAR_H diff --git a/core/math/audio_frame.h b/core/math/audio_frame.h index d8151ecbfd5..3a3479f69d3 100644 --- a/core/math/audio_frame.h +++ b/core/math/audio_frame.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOFRAME_H -#define AUDIOFRAME_H +#ifndef AUDIO_FRAME_H +#define AUDIO_FRAME_H #include "core/math/vector2.h" #include "core/typedefs.h" @@ -141,4 +141,4 @@ struct AudioFrame { _ALWAYS_INLINE_ AudioFrame() {} }; -#endif +#endif // AUDIO_FRAME_H diff --git a/core/math/basis.h b/core/math/basis.h index 45c67a35943..b3890b93bde 100644 --- a/core/math/basis.h +++ b/core/math/basis.h @@ -350,4 +350,5 @@ Basis Basis::lerp(const Basis &p_to, const real_t &p_weight) const { return b; } + #endif // BASIS_H diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h index 7a7bdb238d1..e4ebfd2de80 100644 --- a/core/math/bsp_tree.h +++ b/core/math/bsp_tree.h @@ -157,4 +157,4 @@ struct PtrToArg { #endif -#endif +#endif // BSP_TREE_H diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 36c9b0f1f06..90fe965fa45 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -102,4 +102,4 @@ Vector3 CameraMatrix::xform(const Vector3 &p_vec3) const { return ret / w; } -#endif +#endif // CAMERA_MATRIX_H diff --git a/core/math/disjoint_set.h b/core/math/disjoint_set.h index 25040557b08..5240e1b8436 100644 --- a/core/math/disjoint_set.h +++ b/core/math/disjoint_set.h @@ -151,4 +151,4 @@ void DisjointSet::get_members(Vector &out_members, T representative } } -#endif +#endif // DISJOINT_SET_H diff --git a/core/math/geometry.h b/core/math/geometry.h index 30cd6ddc92c..60386fe23ba 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -1114,4 +1114,4 @@ private: static Vector> _polypath_offset(const Vector &p_polypath, real_t p_delta, PolyJoinType p_join_type, PolyEndType p_end_type); }; -#endif +#endif // GEOMETRY_H diff --git a/core/math/quat.h b/core/math/quat.h index 356bc9790ab..2d3a0e288b0 100644 --- a/core/math/quat.h +++ b/core/math/quat.h @@ -228,4 +228,4 @@ bool Quat::operator!=(const Quat &p_quat) const { return x != p_quat.x || y != p_quat.y || z != p_quat.z || w != p_quat.w; } -#endif +#endif // QUAT_H diff --git a/core/math/triangulate.h b/core/math/triangulate.h index 81310fc5a2f..18bae4757a7 100644 --- a/core/math/triangulate.h +++ b/core/math/triangulate.h @@ -58,4 +58,4 @@ private: static bool snip(const Vector &p_contour, int u, int v, int w, int n, const Vector &V, bool relaxed); }; -#endif +#endif // TRIANGULATE_H diff --git a/core/method_bind.h b/core/method_bind.h index 007c2f24ce9..445dea3ac4b 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -382,4 +382,4 @@ class __UnexistingClass; #include "method_bind.gen.inc" -#endif +#endif // METHOD_BIND_H diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index 71fb76851dc..2214cb114eb 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -448,5 +448,6 @@ struct PtrToArg &> { } }; +#endif // PTRCALL_ENABLED + #endif // METHOD_PTRCALL_H -#endif diff --git a/core/node_path.h b/core/node_path.h index 537fbc38a3a..e275ea79dc6 100644 --- a/core/node_path.h +++ b/core/node_path.h @@ -102,4 +102,4 @@ public: ~NodePath(); }; -#endif +#endif // NODE_PATH_H diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index e0ae91228ec..b8d5296d8ce 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -376,4 +376,4 @@ public: } }; -#endif +#endif // OA_HASH_MAP_H diff --git a/core/object.h b/core/object.h index 3e025771b3a..e9a920ad573 100644 --- a/core/object.h +++ b/core/object.h @@ -808,4 +808,4 @@ public: //needed by macros #include "core/class_db.h" -#endif +#endif // OBJECT_H diff --git a/core/object_id.h b/core/object_id.h index f9a9d4d2725..f5a99100d9d 100644 --- a/core/object_id.h +++ b/core/object_id.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OBJECTID_H -#define OBJECTID_H +#ifndef OBJECT_ID_H +#define OBJECT_ID_H #include "core/int_types.h" typedef uint64_t ObjectID; -#endif +#endif // OBJECT_ID_H diff --git a/core/object_rc.h b/core/object_rc.h index 663cd93c7ac..d1fe3b681b1 100644 --- a/core/object_rc.h +++ b/core/object_rc.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OBJECTRC_H -#define OBJECTRC_H +#ifndef OBJECT_RC_H +#define OBJECT_RC_H #include "core/os/memory.h" #include "core/typedefs.h" @@ -74,4 +74,4 @@ public: } }; -#endif +#endif // OBJECT_RC_H diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 01704abf7a0..5eb8ca6fac6 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -157,4 +157,4 @@ struct DirAccessRef { } }; -#endif +#endif // DIR_ACCESS_H diff --git a/core/os/file_access.h b/core/os/file_access.h index 797b667ddfb..823c83ac800 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -197,4 +197,4 @@ struct FileAccessRef { } }; -#endif +#endif // FILE_ACCESS_H diff --git a/core/os/input_event.h b/core/os/input_event.h index 977f389ca98..1dd0c46f3d8 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -649,4 +649,4 @@ public: InputEventMIDI(); }; -#endif +#endif // INPUT_EVENT_H diff --git a/core/os/keyboard.h b/core/os/keyboard.h index 09a128a59ec..0dfe8f5091c 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -325,4 +325,4 @@ int keycode_get_count(); int keycode_get_value_by_index(int p_index); const char *keycode_get_name_by_index(int p_index); -#endif +#endif // KEYBOARD_H diff --git a/core/os/main_loop.h b/core/os/main_loop.h index c36c05ae221..96d4002100a 100644 --- a/core/os/main_loop.h +++ b/core/os/main_loop.h @@ -81,4 +81,4 @@ public: virtual ~MainLoop(); }; -#endif +#endif // MAIN_LOOP_H diff --git a/core/os/memory.h b/core/os/memory.h index d8b2aa4af7e..77f6ea5132a 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -202,4 +202,4 @@ struct _GlobalNilClass { static _GlobalNil _nil; }; -#endif +#endif // MEMORY_H diff --git a/core/os/midi_driver.h b/core/os/midi_driver.h index 4ee782f396f..727a70853be 100644 --- a/core/os/midi_driver.h +++ b/core/os/midi_driver.h @@ -57,4 +57,4 @@ public: virtual ~MIDIDriver() {} }; -#endif +#endif // MIDI_DRIVER_H diff --git a/core/os/os.h b/core/os/os.h index b46063c8d3c..1f03c0d27ce 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -620,4 +620,4 @@ public: VARIANT_ENUM_CAST(OS::PowerState); -#endif +#endif // OS_H diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h index df5bcf47878..232e673eb86 100644 --- a/core/os/rw_lock.h +++ b/core/os/rw_lock.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RWLOCK_H -#define RWLOCK_H +#ifndef RW_LOCK_H +#define RW_LOCK_H #include "core/error_list.h" @@ -113,4 +113,4 @@ public: } }; -#endif // RWLOCK_H +#endif // RW_LOCK_H diff --git a/core/os/spin_lock.h b/core/os/spin_lock.h index 27d915e0aef..79a11853a73 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_safe.h b/core/os/thread_safe.h index b6676a5750f..fa443048e41 100644 --- a/core/os/thread_safe.h +++ b/core/os/thread_safe.h @@ -38,4 +38,4 @@ #define _THREAD_SAFE_LOCK_ _thread_safe_.lock(); #define _THREAD_SAFE_UNLOCK_ _thread_safe_.unlock(); -#endif +#endif // THREAD_SAFE_H diff --git a/core/os/thread_work_pool.h b/core/os/thread_work_pool.h index b0cebf04f11..cdb43d6d891 100644 --- a/core/os/thread_work_pool.h +++ b/core/os/thread_work_pool.h @@ -154,4 +154,4 @@ public: ~ThreadWorkPool(); }; -#endif // THREAD_POOL_H +#endif // THREAD_WORK_POOL_H diff --git a/core/pool_allocator.h b/core/pool_allocator.h index 865d7805a6d..7247c2a9bcb 100644 --- a/core/pool_allocator.h +++ b/core/pool_allocator.h @@ -147,4 +147,4 @@ public: virtual ~PoolAllocator(); }; -#endif +#endif // POOL_ALLOCATOR_H diff --git a/core/print_string.h b/core/print_string.h index d5112066303..85dd66550b5 100644 --- a/core/print_string.h +++ b/core/print_string.h @@ -59,4 +59,4 @@ extern void print_line(String p_string); extern void print_error(String p_string); extern void print_verbose(String p_string); -#endif +#endif // PRINT_STRING_H diff --git a/core/project_settings.h b/core/project_settings.h index 877186c1ad6..09f966c5e40 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLOBAL_CONFIG_H -#define GLOBAL_CONFIG_H +#ifndef PROJECT_SETTINGS_H +#define PROJECT_SETTINGS_H #include "core/object.h" #include "core/os/thread_safe.h" @@ -218,4 +218,4 @@ Variant _GLOBAL_DEF_ALIAS(const String &p_var, const String &p_old_name, const V #define GLOBAL_DEF_ALIAS_RST(m_var, m_old_name, m_value) _GLOBAL_DEF(m_var, m_old_name, m_value, true) #define GLOBAL_GET(m_var) ProjectSettings::get_singleton()->get(m_var) -#endif +#endif // PROJECT_SETTINGS_H diff --git a/core/ref_ptr.h b/core/ref_ptr.h index 9d2d180fe88..42c98061b4b 100644 --- a/core/ref_ptr.h +++ b/core/ref_ptr.h @@ -30,6 +30,7 @@ #ifndef REF_PTR_H #define REF_PTR_H + /** @author Juan Linietsky * This class exists to workaround a limitation in C++ but keep the design OK. diff --git a/core/register_core_types.h b/core/register_core_types.h index 9b1bf644eb0..b517393d230 100644 --- a/core/register_core_types.h +++ b/core/register_core_types.h @@ -36,4 +36,4 @@ void register_core_settings(); void register_core_singletons(); void unregister_core_types(); -#endif +#endif // REGISTER_CORE_TYPES_H diff --git a/core/resource.h b/core/resource.h index dd24369a1f4..2cc42d2fd1c 100644 --- a/core/resource.h +++ b/core/resource.h @@ -164,4 +164,4 @@ public: static int get_cached_resource_count(); }; -#endif +#endif // RESOURCE_H diff --git a/core/rid.h b/core/rid.h index 242a56a8dd5..1d9eb1dbf94 100644 --- a/core/rid.h +++ b/core/rid.h @@ -191,4 +191,4 @@ public: #endif // not handles -#endif +#endif // RID_H diff --git a/core/ring_buffer.h b/core/ring_buffer.h index 8a282e0dc7b..f13e9e2bb58 100644 --- a/core/ring_buffer.h +++ b/core/ring_buffer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RINGBUFFER_H -#define RINGBUFFER_H +#ifndef RING_BUFFER_H +#define RING_BUFFER_H #include "core/vector.h" @@ -219,4 +219,4 @@ public: ~RingBuffer(){}; }; -#endif +#endif // RING_BUFFER_H diff --git a/core/script_language.h b/core/script_language.h index 11076a2706e..2d21c2f464d 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -468,4 +468,4 @@ public: virtual ~ScriptDebugger() { singleton = nullptr; } }; -#endif +#endif // SCRIPT_LANGUAGE_H diff --git a/core/set.h b/core/set.h index 3227154d7c6..901c9c0f054 100644 --- a/core/set.h +++ b/core/set.h @@ -629,4 +629,4 @@ public: } }; -#endif +#endif // SET_H diff --git a/core/simple_type.h b/core/simple_type.h index 3d8af4feae2..a63ae25a7c5 100644 --- a/core/simple_type.h +++ b/core/simple_type.h @@ -48,4 +48,4 @@ struct GetSimpleTypeT { typedef T type_t; }; -#endif +#endif // SIMPLE_TYPE_H diff --git a/core/string_buffer.h b/core/string_buffer.h index 1f648e83448..bf08f758382 100644 --- a/core/string_buffer.h +++ b/core/string_buffer.h @@ -163,4 +163,4 @@ int64_t StringBuffer::as_int() { return String::to_int(current_buffer_ptr()); } -#endif +#endif // STRING_BUFFER_H diff --git a/core/type_info.h b/core/type_info.h index 39c39fb429d..7e7fce356fb 100644 --- a/core/type_info.h +++ b/core/type_info.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GET_TYPE_INFO_H -#define GET_TYPE_INFO_H +#ifndef TYPE_INFO_H +#define TYPE_INFO_H template struct EnableIf { @@ -282,4 +282,4 @@ inline StringName __constant_get_enum_name(T param, const String &p_constant) { #define MAKE_ENUM_TYPE_INFO(m_enum) #define CLASS_INFO(m_type) -#endif // GET_TYPE_INFO_H +#endif // TYPE_INFO_H diff --git a/core/ucaps.h b/core/ucaps.h index d452469e4b6..357d36e703b 100644 --- a/core/ucaps.h +++ b/core/ucaps.h @@ -1411,4 +1411,5 @@ static int _find_lower(int ch) { return ch; } -#endif + +#endif // UCAPS_H diff --git a/core/ustring.h b/core/ustring.h index dee9018dd3b..16f55a7cf94 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef USTRING_H -#define USTRING_H +#ifndef USTRING_GODOT_H +#define USTRING_GODOT_H #include "core/array.h" #include "core/cowdata.h" @@ -455,4 +455,4 @@ String RTR(const String &); bool is_symbol(CharType c); bool select_word(const String &p_s, int p_col, int &r_beg, int &r_end); -#endif // USTRING_H +#endif // USTRING_GODOT_H diff --git a/core/variant.h b/core/variant.h index 71d9b43b78a..7835e6fb0da 100644 --- a/core/variant.h +++ b/core/variant.h @@ -467,4 +467,5 @@ const Variant::ObjData &Variant::_get_obj() const { } String vformat(const String &p_text, const Variant &p1 = Variant(), const Variant &p2 = Variant(), const Variant &p3 = Variant(), const Variant &p4 = Variant(), const Variant &p5 = Variant()); -#endif + +#endif // VARIANT_H diff --git a/core/vector.h b/core/vector.h index 690e28692f0..65b1df81f77 100644 --- a/core/vector.h +++ b/core/vector.h @@ -200,4 +200,4 @@ void Vector::fill(T p_elem) { } } -#endif +#endif // VECTOR_H diff --git a/core/version.h b/core/version.h index d5b50b59737..e22922fa669 100644 --- a/core/version.h +++ b/core/version.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VERSION_H -#define GODOT_VERSION_H +#ifndef VERSION_H +#define VERSION_H #include "core/version_generated.gen.h" @@ -71,4 +71,4 @@ // Git commit hash, generated at build time in `core/version_hash.gen.cpp`. extern const char *const VERSION_HASH; -#endif // GODOT_VERSION_H +#endif // VERSION_H diff --git a/core/vmap.h b/core/vmap.h index 8b9961fe0e0..08cae18a306 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -199,4 +199,5 @@ public: return *this; } }; + #endif // VMAP_H diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h index fece0c3ed39..5c79a61e17a 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.h +++ b/drivers/coreaudio/audio_driver_coreaudio.h @@ -122,4 +122,4 @@ public: #endif -#endif +#endif // AUDIO_DRIVER_COREAUDIO_H diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index f6a66dbfad1..b8743bbedbc 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/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/gles2/rasterizer_canvas_base_gles2.h b/drivers/gles2/rasterizer_canvas_base_gles2.h index d721d94cd54..c7ff7c3a365 100644 --- a/drivers/gles2/rasterizer_canvas_base_gles2.h +++ b/drivers/gles2/rasterizer_canvas_base_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERCANVASBASEGLES2_H -#define RASTERIZERCANVASBASEGLES2_H +#ifndef RASTERIZER_CANVAS_BASE_GLES2_H +#define RASTERIZER_CANVAS_BASE_GLES2_H #include "drivers/gles_common/rasterizer_array.h" #include "rasterizer_storage_gles2.h" @@ -145,4 +145,4 @@ public: RasterizerCanvasBaseGLES2(); }; -#endif // RASTERIZERCANVASBASEGLES2_H +#endif // RASTERIZER_CANVAS_BASE_GLES2_H diff --git a/drivers/gles2/rasterizer_canvas_gles2.h b/drivers/gles2/rasterizer_canvas_gles2.h index 8f0c8374a01..841d8bc981a 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.h +++ b/drivers/gles2/rasterizer_canvas_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERCANVASGLES2_H -#define RASTERIZERCANVASGLES2_H +#ifndef RASTERIZER_CANVAS_GLES2_H +#define RASTERIZER_CANVAS_GLES2_H #include "drivers/gles_common/rasterizer_canvas_batcher.h" #include "rasterizer_canvas_base_gles2.h" @@ -70,4 +70,4 @@ public: RasterizerCanvasGLES2(); }; -#endif // RASTERIZERCANVASGLES2_H +#endif // RASTERIZER_CANVAS_GLES2_H diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h index bb2dc2b9193..00f3e36e986 100644 --- a/drivers/gles2/rasterizer_gles2.h +++ b/drivers/gles2/rasterizer_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERGLES2_H -#define RASTERIZERGLES2_H +#ifndef RASTERIZER_GLES2_H +#define RASTERIZER_GLES2_H #include "rasterizer_canvas_gles2.h" #include "rasterizer_scene_gles2.h" @@ -76,4 +76,4 @@ public: ~RasterizerGLES2(); }; -#endif // RASTERIZERGLES2_H +#endif // RASTERIZER_GLES2_H diff --git a/drivers/gles2/rasterizer_scene_gles2.h b/drivers/gles2/rasterizer_scene_gles2.h index d3dfafbcf3c..b3e0e8eddb5 100644 --- a/drivers/gles2/rasterizer_scene_gles2.h +++ b/drivers/gles2/rasterizer_scene_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERSCENEGLES2_H -#define RASTERIZERSCENEGLES2_H +#ifndef RASTERIZER_SCENE_GLES2_H +#define RASTERIZER_SCENE_GLES2_H /* Must come before shaders or the Windows build fails... */ #include "rasterizer_storage_gles2.h" @@ -40,7 +40,6 @@ #include "shaders/tonemap.glsl.gen.h" /* - #include "drivers/gles3/shaders/exposure.glsl.gen.h" #include "drivers/gles3/shaders/resolve.glsl.gen.h" #include "drivers/gles3/shaders/scene.glsl.gen.h" @@ -780,4 +779,4 @@ public: ~RasterizerSceneGLES2(); }; -#endif // RASTERIZERSCENEGLES2_H +#endif // RASTERIZER_SCENE_GLES2_H diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index 14bd9db4e78..4aeb91b17b4 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERSTORAGEGLES2_H -#define RASTERIZERSTORAGEGLES2_H +#ifndef RASTERIZER_STORAGE_GLES2_H +#define RASTERIZER_STORAGE_GLES2_H #include "core/pool_vector.h" #include "core/self_list.h" @@ -1404,4 +1404,4 @@ inline void RasterizerStorageGLES2::buffer_orphan_and_upload(unsigned int p_buff glBufferSubData(p_target, p_offset_bytes, p_data_size_bytes, p_data); } -#endif // RASTERIZERSTORAGEGLES2_H +#endif // RASTERIZER_STORAGE_GLES2_H diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index 7b81eb1c0fd..516cc576766 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADERCOMPILERGLES2_H -#define SHADERCOMPILERGLES2_H +#ifndef SHADER_COMPILER_GLES2_H +#define SHADER_COMPILER_GLES2_H #include "core/pair.h" #include "core/string_builder.h" @@ -98,4 +98,4 @@ public: ShaderCompilerGLES2(); }; -#endif // SHADERCOMPILERGLES2_H +#endif // SHADER_COMPILER_GLES2_H diff --git a/drivers/gles2/shader_gles2.h b/drivers/gles2/shader_gles2.h index 791993a63cd..f1b6df8a7c8 100644 --- a/drivers/gles2/shader_gles2.h +++ b/drivers/gles2/shader_gles2.h @@ -270,4 +270,4 @@ void ShaderGLES2::_set_conditional(int p_which, bool p_value) { } } -#endif +#endif // SHADER_GLES2_H diff --git a/drivers/gles3/rasterizer_canvas_base_gles3.h b/drivers/gles3/rasterizer_canvas_base_gles3.h index ccf1fd20a37..2f524a715e8 100644 --- a/drivers/gles3/rasterizer_canvas_base_gles3.h +++ b/drivers/gles3/rasterizer_canvas_base_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERCANVASBASEGLES3_H -#define RASTERIZERCANVASBASEGLES3_H +#ifndef RASTERIZER_CANVAS_BASE_GLES3_H +#define RASTERIZER_CANVAS_BASE_GLES3_H #include "rasterizer_storage_gles3.h" #include "servers/visual/rasterizer.h" @@ -159,4 +159,4 @@ public: RasterizerCanvasBaseGLES3(); }; -#endif // RASTERIZERCANVASBASEGLES3_H +#endif // RASTERIZER_CANVAS_BASE_GLES3_H diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index b1c0d08200d..768d7adb50a 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 RASTERIZERCANVASGLES3_H -#define RASTERIZERCANVASGLES3_H +#ifndef RASTERIZER_CANVAS_GLES3_H +#define RASTERIZER_CANVAS_GLES3_H #include "drivers/gles_common/rasterizer_canvas_batcher.h" #include "rasterizer_canvas_base_gles3.h" @@ -75,4 +75,4 @@ public: RasterizerCanvasGLES3(); }; -#endif // RASTERIZERCANVASGLES3_H +#endif // RASTERIZER_CANVAS_GLES3_H diff --git a/drivers/gles3/rasterizer_gles3.h b/drivers/gles3/rasterizer_gles3.h index d1d8e877f75..038afb47248 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 RASTERIZERGLES3_H -#define RASTERIZERGLES3_H +#ifndef RASTERIZER_GLES3_H +#define RASTERIZER_GLES3_H #include "rasterizer_canvas_gles3.h" #include "rasterizer_scene_gles3.h" @@ -76,4 +76,4 @@ public: ~RasterizerGLES3(); }; -#endif // RASTERIZERGLES3_H +#endif // RASTERIZER_GLES3_H diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index f7dd0fd9e54..91f8d3b0f93 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 RASTERIZERSCENEGLES3_H -#define RASTERIZERSCENEGLES3_H +#ifndef RASTERIZER_SCENE_GLES3_H +#define RASTERIZER_SCENE_GLES3_H /* Must come before shaders or the Windows build fails... */ #include "rasterizer_storage_gles3.h" @@ -870,4 +870,4 @@ public: ~RasterizerSceneGLES3(); }; -#endif // RASTERIZERSCENEGLES3_H +#endif // RASTERIZER_SCENE_GLES3_H diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index a40285b5586..8de3ac4e1b4 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERSTORAGEGLES3_H -#define RASTERIZERSTORAGEGLES3_H +#ifndef RASTERIZER_STORAGE_GLES3_H +#define RASTERIZER_STORAGE_GLES3_H #include "core/self_list.h" #include "drivers/gles_common/rasterizer_asserts.h" @@ -1559,4 +1559,4 @@ inline void RasterizerStorageGLES3::buffer_orphan_and_upload(unsigned int p_buff glBufferSubData(p_target, p_offset_bytes, p_data_size_bytes, p_data); } -#endif // RASTERIZERSTORAGEGLES3_H +#endif // RASTERIZER_STORAGE_GLES3_H diff --git a/drivers/gles3/shader_cache_gles3.h b/drivers/gles3/shader_cache_gles3.h index 2c8bbb6f49b..72cf4ecc9f5 100644 --- a/drivers/gles3/shader_cache_gles3.h +++ b/drivers/gles3/shader_cache_gles3.h @@ -55,4 +55,4 @@ public: ~ShaderCacheGLES3(); }; -#endif +#endif // SHADER_CACHE_GLES3_H diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h index b285d251dcd..062d3885164 100644 --- a/drivers/gles3/shader_compiler_gles3.h +++ b/drivers/gles3/shader_compiler_gles3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADERCOMPILERGLES3_H -#define SHADERCOMPILERGLES3_H +#ifndef SHADER_COMPILER_GLES3_H +#define SHADER_COMPILER_GLES3_H #include "core/pair.h" #include "servers/visual/shader_language.h" @@ -100,4 +100,4 @@ public: ShaderCompilerGLES3(); }; -#endif // SHADERCOMPILERGLES3_H +#endif // SHADER_COMPILER_GLES3_H diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 1823ce06dde..38050f02231 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -447,4 +447,4 @@ void ShaderGLES3::_set_conditional(int p_which, bool p_value) { } } -#endif +#endif // SHADER_GLES3_H diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index 54b1f152039..6d0ff068c1e 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 fda79be6f8c..7f6573cfbee 100644 --- a/drivers/png/png_driver_common.h +++ b/drivers/png/png_driver_common.h @@ -45,4 +45,4 @@ Error image_to_png(const Ref &p_image, PoolVector &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 fdb0c7bcbcc..7036eb918f5 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -479,4 +479,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 5def374d898..9c959a022de 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -88,5 +88,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 79366c2534f..cad61ffcee0 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -347,4 +347,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 6ad26430a56..6e4349317c1 100644 --- a/drivers/unix/file_access_unix.h +++ b/drivers/unix/file_access_unix.h @@ -85,5 +85,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 54e5ceb610f..9bb157589f0 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 fafab8ef47e..7d551dd22cb 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" @@ -101,4 +101,4 @@ public: ~NetSocketPosix(); }; -#endif +#endif // NET_SOCKET_POSIX_H diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index d783c41f22d..f277bbbfc88 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -111,4 +111,4 @@ public: #endif -#endif +#endif // OS_UNIX_H diff --git a/drivers/unix/syslog_logger.h b/drivers/unix/syslog_logger.h index 697a96a6f9b..c2fc1728ab0 100644 --- a/drivers/unix/syslog_logger.h +++ b/drivers/unix/syslog_logger.h @@ -45,4 +45,4 @@ public: #endif -#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/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index b2e98eefa2e..5bf8aa3b887 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -126,5 +126,6 @@ public: AudioDriverWASAPI(); }; +#endif // WASAPI_ENABLED + #endif // AUDIO_DRIVER_WASAPI_H -#endif diff --git a/drivers/windows/dir_access_windows.h b/drivers/windows/dir_access_windows.h index 2647ffb0148..709e3c90ae5 100644 --- a/drivers/windows/dir_access_windows.h +++ b/drivers/windows/dir_access_windows.h @@ -91,6 +91,6 @@ public: ~DirAccessWindows(); }; -#endif //WINDOWS_ENABLED +#endif // WINDOWS_ENABLED -#endif +#endif // DIR_ACCESS_WINDOWS_H diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h index a587a1b1015..1ac7790b8c7 100644 --- a/drivers/windows/file_access_windows.h +++ b/drivers/windows/file_access_windows.h @@ -82,5 +82,6 @@ public: virtual ~FileAccessWindows(); }; -#endif -#endif +#endif // WINDOWS_ENABLED + +#endif // FILE_ACCESS_WINDOWS_H diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h index 413b8e61d18..c01e0ad9275 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/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 79cfce38e6b..5c1382b4cf1 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/connections_dialog.h b/editor/connections_dialog.h index c2eef3d6186..134e20d4583 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -175,4 +175,4 @@ public: ~ConnectionsDock(); }; -#endif +#endif // CONNECTIONS_DIALOG_H diff --git a/editor/create_dialog.h b/editor/create_dialog.h index 2327f771c8d..6b0337ec814 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -108,4 +108,4 @@ public: CreateDialog(); }; -#endif +#endif // CREATE_DIALOG_H diff --git a/editor/editor_about.h b/editor/editor_about.h index 59010a948bd..e5b75ed7ac3 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -74,4 +74,4 @@ public: ~EditorAbout(); }; -#endif +#endif // EDITOR_ABOUT_H diff --git a/editor/editor_asset_installer.h b/editor/editor_asset_installer.h index b17c9723f9c..8d5e180fdc9 100644 --- a/editor/editor_asset_installer.h +++ b/editor/editor_asset_installer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORASSETINSTALLER_H -#define EDITORASSETINSTALLER_H +#ifndef EDITOR_ASSET_INSTALLER_H +#define EDITOR_ASSET_INSTALLER_H #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" @@ -60,4 +60,4 @@ public: EditorAssetInstaller(); }; -#endif // EDITORASSETINSTALLER_H +#endif // EDITOR_ASSET_INSTALLER_H diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index a5cce10012a..47a16028140 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORAUDIOBUSES_H -#define EDITORAUDIOBUSES_H +#ifndef EDITOR_AUDIO_BUSES_H +#define EDITOR_AUDIO_BUSES_H #include "editor/editor_file_dialog.h" #include "editor_plugin.h" @@ -278,4 +278,4 @@ public: ~AudioBusesEditorPlugin(); }; -#endif // EDITORAUDIOBUSES_H +#endif // EDITOR_AUDIO_BUSES_H diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h index de5eda528a7..4d7f753346b 100644 --- a/editor/editor_autoload_settings.h +++ b/editor/editor_autoload_settings.h @@ -109,4 +109,4 @@ public: ~EditorAutoloadSettings(); }; -#endif +#endif // EDITOR_AUTOLOAD_SETTINGS_H diff --git a/editor/editor_export.h b/editor/editor_export.h index 3c6c15ad297..e4b9f3c919d 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -520,4 +520,4 @@ public: EditorExportTextSceneToBinaryPlugin(); }; -#endif // EDITOR_IMPORT_EXPORT_H +#endif // EDITOR_EXPORT_H diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index be79aacfa67..3ab1fb0300a 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORFILEDIALOG_H -#define EDITORFILEDIALOG_H +#ifndef EDITOR_FILE_DIALOG_H +#define EDITOR_FILE_DIALOG_H #include "core/os/dir_access.h" #include "scene/gui/box_container.h" @@ -268,4 +268,4 @@ VARIANT_ENUM_CAST(EditorFileDialog::Mode); VARIANT_ENUM_CAST(EditorFileDialog::Access); VARIANT_ENUM_CAST(EditorFileDialog::DisplayMode); -#endif // EDITORFILEDIALOG_H +#endif // EDITOR_FILE_DIALOG_H diff --git a/editor/editor_fonts.h b/editor/editor_fonts.h index e450af00da4..c8b60b0198d 100644 --- a/editor/editor_fonts.h +++ b/editor/editor_fonts.h @@ -35,4 +35,4 @@ void editor_register_fonts(Ref p_theme); -#endif +#endif // EDITOR_FONTS_H diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index bbc330162d0..5f4e39622ff 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -408,4 +408,4 @@ public: EditorInspector(); }; -#endif // INSPECTOR_H +#endif // EDITOR_INSPECTOR_H diff --git a/editor/editor_network_profiler.h b/editor/editor_network_profiler.h index 54ab3264d3d..b11e67b7926 100644 --- a/editor/editor_network_profiler.h +++ b/editor/editor_network_profiler.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORNETWORKPROFILER_H -#define EDITORNETWORKPROFILER_H +#ifndef EDITOR_NETWORK_PROFILER_H +#define EDITOR_NETWORK_PROFILER_H #include "scene/gui/box_container.h" #include "scene/gui/button.h" @@ -68,4 +68,4 @@ public: EditorNetworkProfiler(); }; -#endif //EDITORNETWORKPROFILER_H +#endif // EDITOR_NETWORK_PROFILER_H diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index ae715356ae4..bc396400120 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -81,6 +81,7 @@ #include "editor/editor_plugin.h" #include "editor/editor_properties.h" #include "editor/editor_property_name_processor.h" +#include "editor/editor_quick_open.h" #include "editor/editor_resource_picker.h" #include "editor/editor_resource_preview.h" #include "editor/editor_run_native.h" @@ -171,7 +172,6 @@ #include "editor/progress_dialog.h" #include "editor/project_export.h" #include "editor/project_settings_editor.h" -#include "editor/quick_open.h" #include "editor/register_exporters.h" #include "editor/run_settings_dialog.h" #include "editor/script_editor_debugger.h" diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index e3dc4e66447..655092504c7 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -292,4 +292,4 @@ public: } }; -#endif +#endif // EDITOR_PLUGIN_H diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index 7ce4057979b..fb23dcea719 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORPLUGINSETTINGS_H -#define EDITORPLUGINSETTINGS_H +#ifndef EDITOR_PLUGIN_SETTINGS_H +#define EDITOR_PLUGIN_SETTINGS_H #include "core/undo_redo.h" #include "editor/plugin_config_dialog.h" @@ -67,4 +67,4 @@ public: EditorPluginSettings(); }; -#endif // EDITORPLUGINSETTINGS_H +#endif // EDITOR_PLUGIN_SETTINGS_H diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index 4dcce030ab8..4545c6d1a70 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORPROFILER_H -#define EDITORPROFILER_H +#ifndef EDITOR_PROFILER_H +#define EDITOR_PROFILER_H #include "scene/gui/box_container.h" #include "scene/gui/button.h" @@ -170,4 +170,4 @@ public: EditorProfiler(); }; -#endif // EDITORPROFILER_H +#endif // EDITOR_PROFILER_H diff --git a/editor/quick_open.cpp b/editor/editor_quick_open.cpp similarity index 98% rename from editor/quick_open.cpp rename to editor/editor_quick_open.cpp index 5f44fdd248a..082757dd58d 100644 --- a/editor/quick_open.cpp +++ b/editor/editor_quick_open.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* quick_open.cpp */ +/* editor_quick_open.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "quick_open.h" +#include "editor_quick_open.h" #include "core/os/keyboard.h" diff --git a/editor/quick_open.h b/editor/editor_quick_open.h similarity index 98% rename from editor/quick_open.h rename to editor/editor_quick_open.h index 8ac8c27e542..be1e95e40ab 100644 --- a/editor/quick_open.h +++ b/editor/editor_quick_open.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* quick_open.h */ +/* editor_quick_open.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index a94949e788a..ef28e4de713 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -32,7 +32,7 @@ #define EDITOR_RESOURCE_PICKER_H #include "editor_file_dialog.h" -#include "quick_open.h" +#include "editor_quick_open.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/popup_menu.h" diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index a604333b964..4b2c370637a 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORRESOURCEPREVIEW_H -#define EDITORRESOURCEPREVIEW_H +#ifndef EDITOR_RESOURCE_PREVIEW_H +#define EDITOR_RESOURCE_PREVIEW_H #include "core/os/semaphore.h" #include "core/os/thread.h" @@ -117,4 +117,4 @@ public: ~EditorResourcePreview(); }; -#endif // EDITORRESOURCEPREVIEW_H +#endif // EDITOR_RESOURCE_PREVIEW_H diff --git a/editor/editor_scale.h b/editor/editor_scale.h index 918fde15fb3..02e9b997f64 100644 --- a/editor/editor_scale.h +++ b/editor/editor_scale.h @@ -35,4 +35,5 @@ void editor_set_scale(float p_scale); float editor_get_scale(); #define EDSCALE (editor_get_scale()) + #endif // EDITOR_SCALE_H diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h index ba16aef6640..d3857575177 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -73,4 +73,5 @@ public: SectionedInspector(); ~SectionedInspector(); }; + #endif // EDITOR_SECTIONED_INSPECTOR_H diff --git a/editor/editor_themes.h b/editor/editor_themes.h index 642558d7742..95184b9d4ac 100644 --- a/editor/editor_themes.h +++ b/editor/editor_themes.h @@ -40,4 +40,4 @@ Ref create_custom_theme(Ref p_theme = nullptr); Ref create_unscaled_default_project_icon(); -#endif +#endif // EDITOR_THEMES_H diff --git a/editor/editor_vcs_interface.h b/editor/editor_vcs_interface.h index 82d379eb2bf..178f6ef85c6 100644 --- a/editor/editor_vcs_interface.h +++ b/editor/editor_vcs_interface.h @@ -147,4 +147,4 @@ public: VARIANT_ENUM_CAST(EditorVCSInterface::ChangeType); VARIANT_ENUM_CAST(EditorVCSInterface::TreeArea); -#endif // !EDITOR_VCS_INTERFACE_H +#endif // EDITOR_VCS_INTERFACE_H diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index ace5482692a..726c05b3ae2 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -334,4 +334,4 @@ public: ~FileSystemDock(); }; -#endif // SCENES_DOCK_H +#endif // FILESYSTEM_DOCK_H diff --git a/editor/groups_editor.h b/editor/groups_editor.h index 7368bf1c979..be186b52d09 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -145,4 +145,4 @@ public: ~GroupsEditor(); }; -#endif +#endif // GROUPS_EDITOR_H diff --git a/editor/import/editor_import_collada.h b/editor/import/editor_import_collada.h index 873a622c772..bfc7aeb9a1a 100644 --- a/editor/import/editor_import_collada.h +++ b/editor/import/editor_import_collada.h @@ -45,4 +45,4 @@ public: EditorSceneImporterCollada(); }; -#endif +#endif // EDITOR_IMPORT_COLLADA_H diff --git a/editor/import/editor_import_plugin.h b/editor/import/editor_import_plugin.h index 41798566bb1..8cc7cc487f4 100644 --- a/editor/import/editor_import_plugin.h +++ b/editor/import/editor_import_plugin.h @@ -55,4 +55,4 @@ public: virtual Error import(const String &p_source_file, const String &p_save_path, const Map &p_options, List *r_platform_variants, List *r_gen_files, Variant *r_metadata = nullptr); }; -#endif //EDITOR_IMPORT_PLUGIN_H +#endif // EDITOR_IMPORT_PLUGIN_H diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h index 3b74328266b..52ec7e8ceee 100644 --- a/editor/import/resource_importer_bitmask.h +++ b/editor/import/resource_importer_bitmask.h @@ -56,4 +56,5 @@ public: ResourceImporterBitMap(); ~ResourceImporterBitMap(); }; + #endif // RESOURCE_IMPORTER_BITMASK_H diff --git a/editor/import/resource_importer_csv_translation.h b/editor/import/resource_importer_csv_translation.h index 576fd687973..74408f7d642 100644 --- a/editor/import/resource_importer_csv_translation.h +++ b/editor/import/resource_importer_csv_translation.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTERCSVTRANSLATION_H -#define RESOURCEIMPORTERCSVTRANSLATION_H +#ifndef RESOURCE_IMPORTER_CSV_TRANSLATION_H +#define RESOURCE_IMPORTER_CSV_TRANSLATION_H #include "core/io/resource_importer.h" @@ -54,4 +54,4 @@ public: ResourceImporterCSVTranslation(); }; -#endif // RESOURCEIMPORTERCSVTRANSLATION_H +#endif // RESOURCE_IMPORTER_CSV_TRANSLATION_H diff --git a/editor/import/resource_importer_layered_texture.h b/editor/import/resource_importer_layered_texture.h index 8841b7b926c..d5458413de3 100644 --- a/editor/import/resource_importer_layered_texture.h +++ b/editor/import/resource_importer_layered_texture.h @@ -82,4 +82,5 @@ public: ResourceImporterLayeredTexture(); ~ResourceImporterLayeredTexture(); }; + #endif // RESOURCE_IMPORTER_LAYERED_TEXTURE_H diff --git a/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h index 95c62710058..e56454597d5 100644 --- a/editor/import/resource_importer_obj.h +++ b/editor/import/resource_importer_obj.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTEROBJ_H -#define RESOURCEIMPORTEROBJ_H +#ifndef RESOURCE_IMPORTER_OBJ_H +#define RESOURCE_IMPORTER_OBJ_H #include "resource_importer_scene.h" @@ -66,4 +66,4 @@ public: ResourceImporterOBJ(); }; -#endif // RESOURCEIMPORTEROBJ_H +#endif // RESOURCE_IMPORTER_OBJ_H diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index c354fca0545..44577e2f233 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTERSCENE_H -#define RESOURCEIMPORTERSCENE_H +#ifndef RESOURCE_IMPORTER_SCENE_H +#define RESOURCE_IMPORTER_SCENE_H #include "core/io/resource_importer.h" #include "scene/resources/animation.h" @@ -172,4 +172,4 @@ public: virtual Ref import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps); }; -#endif // RESOURCEIMPORTERSCENE_H +#endif // RESOURCE_IMPORTER_SCENE_H diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h index 7a21aa9445e..505f86b6a33 100644 --- a/editor/import/resource_importer_texture.h +++ b/editor/import/resource_importer_texture.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTTEXTURE_H -#define RESOURCEIMPORTTEXTURE_H +#ifndef RESOURCE_IMPORTER_TEXTURE_H +#define RESOURCE_IMPORTER_TEXTURE_H #include "core/image.h" #include "core/io/resource_importer.h" @@ -96,4 +96,4 @@ public: ResourceImporterTexture(); }; -#endif // RESOURCEIMPORTTEXTURE_H +#endif // RESOURCE_IMPORTER_TEXTURE_H diff --git a/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h index 1451d79f589..dda1942e7f5 100644 --- a/editor/import/resource_importer_wav.h +++ b/editor/import/resource_importer_wav.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTWAV_H -#define RESOURCEIMPORTWAV_H +#ifndef RESOURCE_IMPORTER_WAV_H +#define RESOURCE_IMPORTER_WAV_H #include "core/io/resource_importer.h" @@ -167,4 +167,4 @@ public: ResourceImporterWAV(); }; -#endif // RESOURCEIMPORTWAV_H +#endif // RESOURCE_IMPORTER_WAV_H diff --git a/editor/import_dock.h b/editor/import_dock.h index 5695616b9a1..acb2ef1c400 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMPORTDOCK_H -#define IMPORTDOCK_H +#ifndef IMPORT_DOCK_H +#define IMPORT_DOCK_H #include "core/io/config_file.h" #include "core/io/resource_importer.h" @@ -95,4 +95,4 @@ public: ~ImportDock(); }; -#endif // IMPORTDOCK_H +#endif // IMPORT_DOCK_H diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index da7343c2919..c9ea0df2afc 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -148,4 +148,4 @@ public: ~InspectorDock(); }; -#endif +#endif // INSPECTOR_DOCK_H diff --git a/editor/plugins/animation_tree_player_editor_plugin.h b/editor/plugins/animation_tree_player_editor_plugin.h index e15c822981e..b6996592320 100644 --- a/editor/plugins/animation_tree_player_editor_plugin.h +++ b/editor/plugins/animation_tree_player_editor_plugin.h @@ -177,4 +177,4 @@ public: ~AnimationTreePlayerEditorPlugin(); }; -#endif // ANIMATION_TREE_EDITOR_PLUGIN_H +#endif // ANIMATION_TREE_PLAYER_EDITOR_PLUGIN_H diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/plugins/asset_library_editor_plugin.h index 9e9eb5ce38c..bc5e3199c5d 100644 --- a/editor/plugins/asset_library_editor_plugin.h +++ b/editor/plugins/asset_library_editor_plugin.h @@ -331,4 +331,4 @@ public: ~AssetLibraryEditorPlugin(); }; -#endif // EDITORASSETLIBRARY_H +#endif // ASSET_LIBRARY_EDITOR_PLUGIN_H diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/plugins/bit_map_editor_plugin.h index d1704475fdd..4232d546f3f 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/plugins/bit_map_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BIT_MAP_PREVIEW_EDITOR_PLUGIN_H -#define BIT_MAP_PREVIEW_EDITOR_PLUGIN_H +#ifndef BIT_MAP_EDITOR_PLUGIN_H +#define BIT_MAP_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" #include "scene/resources/bit_map.h" @@ -61,4 +61,4 @@ public: BitMapEditorPlugin(EditorNode *p_editor); }; -#endif // BIT_MAP_PREVIEW_EDITOR_PLUGIN_H +#endif // BIT_MAP_EDITOR_PLUGIN_H diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 02d949b1bb8..37d9788827a 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CONTROL_EDITOR_PLUGIN_H -#define CONTROL_EDITOR_PLUGIN_H +#ifndef CANVAS_ITEM_EDITOR_PLUGIN_H +#define CANVAS_ITEM_EDITOR_PLUGIN_H #include "editor/editor_node.h" #include "editor/editor_plugin.h" @@ -740,4 +740,4 @@ public: ~CanvasItemEditorViewport(); }; -#endif +#endif // CANVAS_ITEM_EDITOR_PLUGIN_H diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index ffb853764a8..1785c35542e 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -118,4 +118,4 @@ public: ~CollisionShape2DEditorPlugin(); }; -#endif //COLLISION_SHAPE_2D_EDITOR_PLUGIN_H +#endif // COLLISION_SHAPE_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h index a6a9ce7dce6..bd05b695894 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/plugins/editor_preview_plugins.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITORPREVIEWPLUGINS_H -#define EDITORPREVIEWPLUGINS_H +#ifndef EDITOR_PREVIEW_PLUGINS_H +#define EDITOR_PREVIEW_PLUGINS_H #include "editor/editor_resource_preview.h" @@ -173,4 +173,5 @@ public: EditorFontPreviewPlugin(); ~EditorFontPreviewPlugin(); }; -#endif // EDITORPREVIEWPLUGINS_H + +#endif // EDITOR_PREVIEW_PLUGINS_H diff --git a/editor/plugins/gi_probe_editor_plugin.h b/editor/plugins/gi_probe_editor_plugin.h index 4bda65634c3..b4d17440474 100644 --- a/editor/plugins/gi_probe_editor_plugin.h +++ b/editor/plugins/gi_probe_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GIPROBEEDITORPLUGIN_H -#define GIPROBEEDITORPLUGIN_H +#ifndef GI_PROBE_EDITOR_PLUGIN_H +#define GI_PROBE_EDITOR_PLUGIN_H #include "editor/editor_node.h" #include "editor/editor_plugin.h" @@ -65,4 +65,4 @@ public: ~GIProbeEditorPlugin(); }; -#endif // GIPROBEEDITORPLUGIN_H +#endif // GI_PROBE_EDITOR_PLUGIN_H diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index beefe6e250d..3cf8af2901b 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_ -#define TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_ +#ifndef GRADIENT_EDITOR_PLUGIN_H +#define GRADIENT_EDITOR_PLUGIN_H #include "editor/editor_node.h" #include "editor/editor_plugin.h" @@ -70,4 +70,4 @@ public: GradientEditorPlugin(EditorNode *p_node); }; -#endif /* TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_ */ +#endif // GRADIENT_EDITOR_PLUGIN_H diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/plugins/gradient_texture_2d_editor_plugin.h index 8036207af82..365f4975e79 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.h +++ b/editor/plugins/gradient_texture_2d_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GRADIENT_TEXTURE_2D_EDITOR -#define GRADIENT_TEXTURE_2D_EDITOR +#ifndef GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H +#define GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H #include "editor/editor_plugin.h" #include "editor/editor_spin_slider.h" @@ -111,4 +111,4 @@ public: GradientTexture2DEditorPlugin(EditorNode *p_node); }; -#endif +#endif // GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index ab9a7a94719..7def3ae21d2 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -89,4 +89,4 @@ public: MeshEditorPlugin(EditorNode *p_node); }; -#endif +#endif // MESH_EDITOR_PLUGIN_H diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h index 5bdd2ace297..246c1cce06d 100644 --- a/editor/plugins/mesh_instance_editor_plugin.h +++ b/editor/plugins/mesh_instance_editor_plugin.h @@ -100,4 +100,4 @@ public: ~MeshInstanceEditorPlugin(); }; -#endif // MESH_EDITOR_PLUGIN_H +#endif // MESH_INSTANCE_EDITOR_PLUGIN_H diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h index 985f4f53f20..349c454d5ed 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.h +++ b/editor/plugins/navigation_polygon_editor_plugin.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NAVIGATIONPOLYGONEDITORPLUGIN_H -#define NAVIGATIONPOLYGONEDITORPLUGIN_H +#ifndef NAVIGATION_POLYGON_EDITOR_PLUGIN_H +#define NAVIGATION_POLYGON_EDITOR_PLUGIN_H #include "editor/plugins/abstract_polygon_2d_editor.h" #include "scene/2d/navigation_polygon.h" @@ -67,4 +67,4 @@ public: NavigationPolygonEditorPlugin(EditorNode *p_node); }; -#endif // NAVIGATIONPOLYGONEDITORPLUGIN_H +#endif // NAVIGATION_POLYGON_EDITOR_PLUGIN_H diff --git a/editor/plugins/physical_bone_plugin.h b/editor/plugins/physical_bone_plugin.h index c7f32ec7a70..18ce4045d98 100644 --- a/editor/plugins/physical_bone_plugin.h +++ b/editor/plugins/physical_bone_plugin.h @@ -75,4 +75,4 @@ public: PhysicalBonePlugin(EditorNode *p_editor); }; -#endif +#endif // PHYSICAL_BONE_PLUGIN_H diff --git a/editor/plugins/room_manager_editor_plugin.h b/editor/plugins/room_manager_editor_plugin.h index 7946b2de09e..833f9e885e7 100644 --- a/editor/plugins/room_manager_editor_plugin.h +++ b/editor/plugins/room_manager_editor_plugin.h @@ -140,4 +140,4 @@ public: ~OccluderEditorPlugin(); }; -#endif +#endif // ROOM_MANAGER_EDITOR_PLUGIN_H diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index 930cb18bb86..a475c7010aa 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -165,4 +165,4 @@ public: ~ShaderEditorPlugin(); }; -#endif +#endif // SHADER_EDITOR_PLUGIN_H diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 310bede2389..a867777ab59 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -917,4 +917,4 @@ public: virtual ~EditorSpatialGizmoPlugin(); }; -#endif +#endif // SPATIAL_EDITOR_PLUGIN_H diff --git a/editor/plugins/version_control_editor_plugin.h b/editor/plugins/version_control_editor_plugin.h index e566daac20a..7c37e0d9b96 100644 --- a/editor/plugins/version_control_editor_plugin.h +++ b/editor/plugins/version_control_editor_plugin.h @@ -213,4 +213,4 @@ public: ~VersionControlEditorPlugin(); }; -#endif // !VERSION_CONTROL_EDITOR_PLUGIN_H +#endif // VERSION_CONTROL_EDITOR_PLUGIN_H diff --git a/editor/project_export.h b/editor/project_export.h index 49df5dfdea0..c394ff97ee9 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PROJECT_EXPORT_SETTINGS_H -#define PROJECT_EXPORT_SETTINGS_H +#ifndef PROJECT_EXPORT_H +#define PROJECT_EXPORT_H #include "core/os/dir_access.h" #include "core/os/thread.h" @@ -177,4 +177,4 @@ public: ~ProjectExportDialog(); }; -#endif // PROJECT_EXPORT_SETTINGS_H +#endif // PROJECT_EXPORT_H diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index d77634639b0..e320dd68f31 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PROJECT_SETTINGS_H -#define PROJECT_SETTINGS_H +#ifndef PROJECT_SETTINGS_EDITOR_H +#define PROJECT_SETTINGS_EDITOR_H #include "core/undo_redo.h" #include "editor/editor_autoload_settings.h" @@ -205,4 +205,4 @@ public: ProjectSettingsEditor(EditorData *p_data); }; -#endif // PROJECT_SETTINGS_H +#endif // PROJECT_SETTINGS_EDITOR_H diff --git a/editor/property_editor.h b/editor/property_editor.h index 022362c3edc..5f08351ba7f 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -170,4 +170,4 @@ public: CustomPropertyEditor(); }; -#endif +#endif // PROPERTY_EDITOR_H diff --git a/editor/property_selector.h b/editor/property_selector.h index d1d4dc3c93b..2ff06bf3ff3 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PROPERTYSELECTOR_H -#define PROPERTYSELECTOR_H +#ifndef PROPERTY_SELECTOR_H +#define PROPERTY_SELECTOR_H #include "editor/property_editor.h" #include "editor_help.h" @@ -82,4 +82,4 @@ public: PropertySelector(); }; -#endif // PROPERTYSELECTOR_H +#endif // PROPERTY_SELECTOR_H diff --git a/editor/register_exporters.h b/editor/register_exporters.h index 09076af978f..9aa98f509f2 100644 --- a/editor/register_exporters.h +++ b/editor/register_exporters.h @@ -33,4 +33,4 @@ void register_exporters(); -#endif +#endif // REGISTER_EXPORTERS_H diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h index 3d76eb3294b..25e1d3e33f2 100644 --- a/editor/reparent_dialog.h +++ b/editor/reparent_dialog.h @@ -60,4 +60,4 @@ public: ~ReparentDialog(); }; -#endif +#endif // REPARENT_DIALOG_H diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 91b518ea66d..fea3b061fc4 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -34,9 +34,9 @@ #include "editor/connections_dialog.h" #include "editor/create_dialog.h" #include "editor/editor_data.h" +#include "editor/editor_quick_open.h" #include "editor/editor_sub_scene.h" #include "editor/groups_editor.h" -#include "editor/quick_open.h" #include "editor/rename_dialog.h" #include "editor/reparent_dialog.h" #include "editor/script_create_dialog.h" diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h index 671ae1eb3b5..4f7ce60dc1e 100644 --- a/editor/scene_tree_editor.h +++ b/editor/scene_tree_editor.h @@ -183,4 +183,4 @@ public: ~SceneTreeDialog(); }; -#endif +#endif // SCENE_TREE_EDITOR_H diff --git a/main/tests/test_astar.h b/main/tests/test_astar.h index c2faaeffcfa..7129a6aeeea 100644 --- a/main/tests/test_astar.h +++ b/main/tests/test_astar.h @@ -38,4 +38,4 @@ namespace TestAStar { MainLoop *test(); } -#endif +#endif // TEST_ASTAR_H diff --git a/main/tests/test_basis.h b/main/tests/test_basis.h index 36809b1b17e..a7d9f2206b4 100644 --- a/main/tests/test_basis.h +++ b/main/tests/test_basis.h @@ -37,4 +37,4 @@ namespace TestBasis { MainLoop *test(); } -#endif +#endif // TEST_BASIS_H diff --git a/main/tests/test_crypto.h b/main/tests/test_crypto.h index e03dafd6be2..550b89eef5b 100644 --- a/main/tests/test_crypto.h +++ b/main/tests/test_crypto.h @@ -38,4 +38,4 @@ namespace TestCrypto { MainLoop *test(); } -#endif +#endif // TEST_CRYPTO_H diff --git a/main/tests/test_gui.h b/main/tests/test_gui.h index 5df652bee60..8f4920a0399 100644 --- a/main/tests/test_gui.h +++ b/main/tests/test_gui.h @@ -38,4 +38,4 @@ namespace TestGUI { MainLoop *test(); } -#endif +#endif // TEST_GUI_H diff --git a/main/tests/test_math.h b/main/tests/test_math.h index 1670c1e0f76..b7f65f207f3 100644 --- a/main/tests/test_math.h +++ b/main/tests/test_math.h @@ -38,4 +38,4 @@ namespace TestMath { MainLoop *test(); } -#endif +#endif // TEST_MATH_H diff --git a/main/tests/test_physics.h b/main/tests/test_physics.h index cee47aea539..18e210bafc7 100644 --- a/main/tests/test_physics.h +++ b/main/tests/test_physics.h @@ -38,4 +38,4 @@ namespace TestPhysics { MainLoop *test(); } -#endif +#endif // TEST_PHYSICS_H diff --git a/main/tests/test_render.h b/main/tests/test_render.h index 32333ba2172..7973764e3e9 100644 --- a/main/tests/test_render.h +++ b/main/tests/test_render.h @@ -38,4 +38,4 @@ namespace TestRender { MainLoop *test(); } -#endif +#endif // TEST_RENDER_H diff --git a/main/tests/test_string.h b/main/tests/test_string.h index 76a9bf0c46a..4865765b0a6 100644 --- a/main/tests/test_string.h +++ b/main/tests/test_string.h @@ -39,4 +39,4 @@ namespace TestString { MainLoop *test(); } -#endif +#endif // TEST_STRING_H diff --git a/main/tests/test_theme.h b/main/tests/test_theme.h index e7da0b3b6d8..b916873c223 100644 --- a/main/tests/test_theme.h +++ b/main/tests/test_theme.h @@ -38,4 +38,5 @@ namespace TestTheme { MainLoop *test(); } + #endif // TEST_THEME_H diff --git a/main/tests/test_transform.h b/main/tests/test_transform.h index 1c0b9f7f325..f42e5c012d2 100644 --- a/main/tests/test_transform.h +++ b/main/tests/test_transform.h @@ -37,4 +37,4 @@ namespace TestTransform { MainLoop *test(); } -#endif +#endif // TEST_TRANSFORM_H diff --git a/main/tests/test_xml_parser.h b/main/tests/test_xml_parser.h index 36117b63828..84d96a17e71 100644 --- a/main/tests/test_xml_parser.h +++ b/main/tests/test_xml_parser.h @@ -42,4 +42,5 @@ namespace TestXMLParser { MainLoop *test(); } + #endif // TEST_XML_PARSER_H diff --git a/misc/scripts/header_guards.sh b/misc/scripts/header_guards.sh new file mode 100755 index 00000000000..45671fcd0a2 --- /dev/null +++ b/misc/scripts/header_guards.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +if [ ! -f "version.py" ]; then + echo "Warning: This script is intended to be run from the root of the Godot repository." + echo "Some of the paths checks may not work as intended from a different folder." +fi + +for file in $(find -name "thirdparty" -prune -o -name "*.h" -print); do + # Skip *.gen.h and *-so_wrap.h, they're generated. + if [[ "$file" == *".gen.h" || "$file" == *"-so_wrap.h" ]]; then continue; fi + # Has important define before normal header guards. + if [[ "$file" == *"thread.h" || "$file" == *"platform_config.h" ]]; then continue; fi + + bname=$(basename $file .h) + + # Add custom prefix or suffix for generic filenames with a well-defined namespace. + + prefix= + if [[ "$file" == "./modules/gdnative/"*"/register_types.h" ]]; then + module=$(echo $file | sed "s@.*modules/gdnative/\([^/]*\).*@\1@") + prefix="${module^^}_" + elif [[ "$file" == "./modules/"*"/register_types.h" ]]; then + module=$(echo $file | sed "s@.*modules/\([^/]*\).*@\1@") + prefix="${module^^}_" + fi + if [[ "$file" == "./platform/"*"/api/api.h" || "$file" == "./platform/"*"/export/"* ]]; then + platform=$(echo $file | sed "s@.*platform/\([^/]*\).*@\1@") + prefix="${platform^^}_" + fi + if [[ "$file" == "./modules/mono/utils/"* && "$bname" != *"mono"* ]]; then prefix="MONO_"; fi + if [[ "$file" == "./modules/gdnative/include/gdnative/"* ]]; then prefix="GDNATIVE_"; fi + + suffix= + if [[ "$file" == *"ustring.h" ]]; then suffix="_GODOT"; fi + + # ^^ is bash builtin for UPPERCASE. + guard="${prefix}${bname^^}${suffix}_H" + + # Replaces guards to use computed name. + # We also add some \n to make sure there's a proper separation. + sed -i $file -e "0,/ifndef/s/#ifndef.*/\n#ifndef $guard/" + sed -i $file -e "0,/define/s/#define.*/#define $guard\n/" + sed -i $file -e "$ s/#endif.*/\n#endif \/\/ $guard/" + # Removes redundant \n added before, if they weren't needed. + sed -i $file -e "/^$/N;/^\n$/D" +done + +diff=$(git diff --color) + +# If no diff has been generated all is OK, clean up, and exit. +if [ -z "$diff" ] ; then + printf "Files in this commit comply with the header guards formatting rules.\n" + exit 0 +fi + +# A diff has been created, notify the user, clean up, and exit. +printf "\n*** The following differences were found between the code " +printf "and the header guards formatting rules:\n\n" +echo "$diff" +printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i '\n" +exit 1 diff --git a/modules/bullet/area_bullet.h b/modules/bullet/area_bullet.h index ff195be3e04..9863350c0ee 100644 --- a/modules/bullet/area_bullet.h +++ b/modules/bullet/area_bullet.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AREABULLET_H -#define AREABULLET_H +#ifndef AREA_BULLET_H +#define AREA_BULLET_H #include "collision_object_bullet.h" #include "core/vector.h" @@ -165,4 +165,4 @@ public: virtual void on_exit_area(AreaBullet *p_area); }; -#endif +#endif // AREA_BULLET_H diff --git a/modules/bullet/btRayShape.h b/modules/bullet/btRayShape.h index a06a8596078..d0efff2f8a5 100644 --- a/modules/bullet/btRayShape.h +++ b/modules/bullet/btRayShape.h @@ -30,6 +30,7 @@ /// IMPORTANT The class name and filename was created by following Bullet writing rules for an easy (eventually) porting to bullet /// This shape is a custom shape that is not present to Bullet physics engine + #ifndef BTRAYSHAPE_H #define BTRAYSHAPE_H diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h index d869d61fc4a..579d99965f7 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -409,4 +409,4 @@ public: public: }; -#endif +#endif // BULLET_PHYSICS_SERVER_H diff --git a/modules/bullet/bullet_types_converter.h b/modules/bullet/bullet_types_converter.h index 7ffb09b8bab..5cf2e81fbc7 100644 --- a/modules/bullet/bullet_types_converter.h +++ b/modules/bullet/bullet_types_converter.h @@ -59,4 +59,5 @@ extern void INVERT_G_TO_B(Basis const &inVal, btMatrix3x3 &outVal); extern void G_TO_B(Transform const &inVal, btTransform &outVal); extern void UNSCALE_BT_BASIS(btTransform &scaledBasis); -#endif + +#endif // BULLET_TYPES_CONVERTER_H diff --git a/modules/bullet/bullet_utilities.h b/modules/bullet/bullet_utilities.h index 9241b4ca912..578cd6b9fce 100644 --- a/modules/bullet/bullet_utilities.h +++ b/modules/bullet/bullet_utilities.h @@ -43,4 +43,5 @@ delete cl; \ cl = NULL; \ } -#endif + +#endif // BULLET_UTILITIES_H diff --git a/modules/bullet/collision_object_bullet.h b/modules/bullet/collision_object_bullet.h index b16cc2f401b..83c9046eb10 100644 --- a/modules/bullet/collision_object_bullet.h +++ b/modules/bullet/collision_object_bullet.h @@ -260,4 +260,4 @@ private: void internal_shape_destroy(int p_index, bool p_permanentlyFromThisBody = false); }; -#endif +#endif // COLLISION_OBJECT_BULLET_H diff --git a/modules/bullet/cone_twist_joint_bullet.h b/modules/bullet/cone_twist_joint_bullet.h index 922b5fb7812..88c847f8153 100644 --- a/modules/bullet/cone_twist_joint_bullet.h +++ b/modules/bullet/cone_twist_joint_bullet.h @@ -50,4 +50,5 @@ public: void set_param(PhysicsServer::ConeTwistJointParam p_param, real_t p_value); real_t get_param(PhysicsServer::ConeTwistJointParam p_param) const; }; -#endif + +#endif // CONE_TWIST_JOINT_BULLET_H diff --git a/modules/bullet/constraint_bullet.h b/modules/bullet/constraint_bullet.h index 68c2ebe9e6b..8b901d0f7b3 100644 --- a/modules/bullet/constraint_bullet.h +++ b/modules/bullet/constraint_bullet.h @@ -68,4 +68,5 @@ public: _FORCE_INLINE_ btTypedConstraint *get_bt_constraint() { return constraint; } }; -#endif + +#endif // CONSTRAINT_BULLET_H diff --git a/modules/bullet/generic_6dof_joint_bullet.h b/modules/bullet/generic_6dof_joint_bullet.h index 8ddfed6aeb6..01921c7ea24 100644 --- a/modules/bullet/generic_6dof_joint_bullet.h +++ b/modules/bullet/generic_6dof_joint_bullet.h @@ -70,4 +70,4 @@ public: bool get_flag(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisFlag p_flag) const; }; -#endif +#endif // GENERIC_6DOF_JOINT_BULLET_H diff --git a/modules/bullet/godot_collision_configuration.h b/modules/bullet/godot_collision_configuration.h index 3b1bc3a97d8..7de2d040c11 100644 --- a/modules/bullet/godot_collision_configuration.h +++ b/modules/bullet/godot_collision_configuration.h @@ -63,4 +63,5 @@ public: virtual btCollisionAlgorithmCreateFunc *getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1); virtual btCollisionAlgorithmCreateFunc *getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1); }; -#endif + +#endif // GODOT_COLLISION_CONFIGURATION_H diff --git a/modules/bullet/godot_collision_dispatcher.h b/modules/bullet/godot_collision_dispatcher.h index 4e5c6937c18..c3f7ae93eff 100644 --- a/modules/bullet/godot_collision_dispatcher.h +++ b/modules/bullet/godot_collision_dispatcher.h @@ -49,4 +49,5 @@ public: virtual bool needsCollision(const btCollisionObject *body0, const btCollisionObject *body1); virtual bool needsResponse(const btCollisionObject *body0, const btCollisionObject *body1); }; -#endif + +#endif // GODOT_COLLISION_DISPATCHER_H diff --git a/modules/bullet/godot_motion_state.h b/modules/bullet/godot_motion_state.h index d0c4ba7f9a0..a92822aefb5 100644 --- a/modules/bullet/godot_motion_state.h +++ b/modules/bullet/godot_motion_state.h @@ -96,4 +96,5 @@ public: return bodyCurrentWorldTransform; } }; -#endif + +#endif // GODOT_MOTION_STATE_H diff --git a/modules/bullet/godot_result_callbacks.h b/modules/bullet/godot_result_callbacks.h index 1ee19299e6f..824ef00c707 100644 --- a/modules/bullet/godot_result_callbacks.h +++ b/modules/bullet/godot_result_callbacks.h @@ -237,4 +237,5 @@ struct GodotDeepPenetrationContactResultCallback : public btManifoldResult { virtual void addContactPoint(const btVector3 &normalOnBInWorld, const btVector3 &pointInWorldOnB, btScalar depth); }; + #endif // GODOT_RESULT_CALLBACKS_H diff --git a/modules/bullet/hinge_joint_bullet.h b/modules/bullet/hinge_joint_bullet.h index ec8e926af3a..254fadc5e8a 100644 --- a/modules/bullet/hinge_joint_bullet.h +++ b/modules/bullet/hinge_joint_bullet.h @@ -54,4 +54,5 @@ public: void set_flag(PhysicsServer::HingeJointFlag p_flag, bool p_value); bool get_flag(PhysicsServer::HingeJointFlag p_flag) const; }; -#endif + +#endif // HINGE_JOINT_BULLET_H diff --git a/modules/bullet/joint_bullet.h b/modules/bullet/joint_bullet.h index 67fc4791324..d9916b14f20 100644 --- a/modules/bullet/joint_bullet.h +++ b/modules/bullet/joint_bullet.h @@ -48,4 +48,5 @@ public: virtual PhysicsServer::JointType get_type() const = 0; }; -#endif + +#endif // JOINT_BULLET_H diff --git a/modules/bullet/pin_joint_bullet.h b/modules/bullet/pin_joint_bullet.h index 21de51f4c3e..2d86a0c944d 100644 --- a/modules/bullet/pin_joint_bullet.h +++ b/modules/bullet/pin_joint_bullet.h @@ -57,4 +57,5 @@ public: Vector3 getPivotInA(); Vector3 getPivotInB(); }; -#endif + +#endif // PIN_JOINT_BULLET_H diff --git a/modules/bullet/register_types.h b/modules/bullet/register_types.h index 739614dc52f..de411ea4c20 100644 --- a/modules/bullet/register_types.h +++ b/modules/bullet/register_types.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REGISTER_BULLET_TYPES_H -#define REGISTER_BULLET_TYPES_H +#ifndef BULLET_REGISTER_TYPES_H +#define BULLET_REGISTER_TYPES_H /** @author AndreaCatania @@ -37,4 +37,5 @@ void register_bullet_types(); void unregister_bullet_types(); -#endif + +#endif // BULLET_REGISTER_TYPES_H diff --git a/modules/bullet/rid_bullet.h b/modules/bullet/rid_bullet.h index 72dd72851e1..1d061dbaee5 100644 --- a/modules/bullet/rid_bullet.h +++ b/modules/bullet/rid_bullet.h @@ -50,4 +50,5 @@ public: _FORCE_INLINE_ void _set_physics_server(BulletPhysicsServer *p_physicsServer) { physicsServer = p_physicsServer; } _FORCE_INLINE_ BulletPhysicsServer *get_physics_server() const { return physicsServer; } }; -#endif + +#endif // RID_BULLET_H diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h index b10666f9b00..f4096cc8b2d 100644 --- a/modules/bullet/rigid_body_bullet.h +++ b/modules/bullet/rigid_body_bullet.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BODYBULLET_H -#define BODYBULLET_H +#ifndef RIGID_BODY_BULLET_H +#define RIGID_BODY_BULLET_H #include "collision_object_bullet.h" #include "space_bullet.h" @@ -300,4 +300,4 @@ private: void _internal_set_mass(real_t p_mass); }; -#endif +#endif // RIGID_BODY_BULLET_H diff --git a/modules/bullet/shape_bullet.h b/modules/bullet/shape_bullet.h index 233df761b86..d65c36ed4b3 100644 --- a/modules/bullet/shape_bullet.h +++ b/modules/bullet/shape_bullet.h @@ -244,4 +244,5 @@ public: private: void setup(real_t p_length, bool p_slips_on_slope); }; -#endif + +#endif // SHAPE_BULLET_H diff --git a/modules/bullet/shape_owner_bullet.h b/modules/bullet/shape_owner_bullet.h index 5f8bb615030..991704acfa6 100644 --- a/modules/bullet/shape_owner_bullet.h +++ b/modules/bullet/shape_owner_bullet.h @@ -51,4 +51,5 @@ public: virtual void remove_shape_full(class ShapeBullet *p_shape) = 0; virtual ~ShapeOwnerBullet() {} }; -#endif + +#endif // SHAPE_OWNER_BULLET_H diff --git a/modules/bullet/slider_joint_bullet.h b/modules/bullet/slider_joint_bullet.h index 6c858458129..9342f5a195c 100644 --- a/modules/bullet/slider_joint_bullet.h +++ b/modules/bullet/slider_joint_bullet.h @@ -118,4 +118,5 @@ public: void set_param(PhysicsServer::SliderJointParam p_param, real_t p_value); real_t get_param(PhysicsServer::SliderJointParam p_param) const; }; -#endif + +#endif // SLIDER_JOINT_BULLET_H diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index ea241261ee1..e74be379546 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -255,4 +255,5 @@ private: int add_separation_result(PhysicsServer::SeparationResult *r_results, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const; int recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer::SeparationResult *r_results); }; -#endif + +#endif // SPACE_BULLET_H diff --git a/modules/camera/camera_osx.h b/modules/camera/camera_osx.h index 9d672358399..f440f64e8fc 100644 --- a/modules/camera/camera_osx.h +++ b/modules/camera/camera_osx.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CAMERAOSX_H -#define CAMERAOSX_H +#ifndef CAMERA_OSX_H +#define CAMERA_OSX_H ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!! // If you fix something here, make sure you fix it there as well! @@ -44,4 +44,4 @@ public: void update_feeds(); }; -#endif /* CAMERAOSX_H */ +#endif // CAMERA_OSX_H diff --git a/modules/camera/camera_win.h b/modules/camera/camera_win.h index 730dc29a195..133713fd86d 100644 --- a/modules/camera/camera_win.h +++ b/modules/camera/camera_win.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CAMERAWIN_H -#define CAMERAWIN_H +#ifndef CAMERA_WIN_H +#define CAMERA_WIN_H #include "servers/camera/camera_feed.h" #include "servers/camera_server.h" @@ -43,4 +43,4 @@ public: ~CameraWindows(); }; -#endif /* CAMERAWIN_H */ +#endif // CAMERA_WIN_H diff --git a/modules/fbx/data/fbx_anim_container.h b/modules/fbx/data/fbx_anim_container.h index 27ef9eacd07..49b89e86bfe 100644 --- a/modules/fbx/data/fbx_anim_container.h +++ b/modules/fbx/data/fbx_anim_container.h @@ -43,4 +43,4 @@ struct FBXTrack { std::map keyframes; }; -#endif //MODEL_ABSTRACTION_ANIM_CONTAINER_H +#endif // FBX_ANIM_CONTAINER_H diff --git a/modules/fbx/editor_scene_importer_fbx.h b/modules/fbx/editor_scene_importer_fbx.h index 61ee4cadf1a..55b18a9d474 100644 --- a/modules/fbx/editor_scene_importer_fbx.h +++ b/modules/fbx/editor_scene_importer_fbx.h @@ -133,4 +133,5 @@ public: }; #endif // TOOLS_ENABLED + #endif // EDITOR_SCENE_IMPORTER_FBX_H diff --git a/modules/fbx/fbx_parser/ByteSwapper.h b/modules/fbx/fbx_parser/ByteSwapper.h index 6555c12b246..42b95185f9e 100644 --- a/modules/fbx/fbx_parser/ByteSwapper.h +++ b/modules/fbx/fbx_parser/ByteSwapper.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2020, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -72,8 +71,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Helper class to perform various byte order swappings (e.g. little to big endian) */ -#ifndef BYTE_SWAPPER_H -#define BYTE_SWAPPER_H + +#ifndef BYTESWAPPER_H +#define BYTESWAPPER_H #include #include @@ -280,4 +280,4 @@ struct Getter { } // namespace Intern } // namespace FBXDocParser -#endif // BYTE_SWAPPER_H +#endif // BYTESWAPPER_H diff --git a/modules/fbx/fbx_parser/FBXCommon.h b/modules/fbx/fbx_parser/FBXCommon.h index d0d4790ba86..f8926f2823b 100644 --- a/modules/fbx/fbx_parser/FBXCommon.h +++ b/modules/fbx/fbx_parser/FBXCommon.h @@ -72,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXCommon.h * Some useful constants and enums for dealing with FBX files. */ -#ifndef FBX_COMMON_H -#define FBX_COMMON_H + +#ifndef FBXCOMMON_H +#define FBXCOMMON_H #include @@ -107,4 +108,4 @@ enum TransformInheritance { }; } // namespace FBXDocParser -#endif // FBX_COMMON_H +#endif // FBXCOMMON_H diff --git a/modules/fbx/fbx_parser/FBXDocument.h b/modules/fbx/fbx_parser/FBXDocument.h index 493545eadbe..f7e7f0f66b0 100644 --- a/modules/fbx/fbx_parser/FBXDocument.h +++ b/modules/fbx/fbx_parser/FBXDocument.h @@ -31,8 +31,9 @@ /** @file FBXDocument.h * @brief FBX DOM */ -#ifndef FBX_DOCUMENT_H -#define FBX_DOCUMENT_H + +#ifndef FBXDOCUMENT_H +#define FBXDOCUMENT_H #include "FBXCommon.h" #include "FBXParser.h" @@ -1317,4 +1318,4 @@ struct hash { }; } // namespace std -#endif // FBX_DOCUMENT_H +#endif // FBXDOCUMENT_H diff --git a/modules/fbx/fbx_parser/FBXDocumentUtil.h b/modules/fbx/fbx_parser/FBXDocumentUtil.h index 2bc53e37110..1d668bb25a2 100644 --- a/modules/fbx/fbx_parser/FBXDocumentUtil.h +++ b/modules/fbx/fbx_parser/FBXDocumentUtil.h @@ -71,8 +71,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXDocumentUtil.h * @brief FBX internal utilities used by the DOM reading code */ -#ifndef FBX_DOCUMENT_UTIL_H -#define FBX_DOCUMENT_UTIL_H + +#ifndef FBXDOCUMENTUTIL_H +#define FBXDOCUMENTUTIL_H #include "FBXDocument.h" #include @@ -139,4 +140,4 @@ const T *ProcessSimpleConnection(const Connection &con, } // namespace Util } // namespace FBXDocParser -#endif // FBX_DOCUMENT_UTIL_H +#endif // FBXDOCUMENTUTIL_H diff --git a/modules/fbx/fbx_parser/FBXImportSettings.h b/modules/fbx/fbx_parser/FBXImportSettings.h index feecefff797..05e6f6316b4 100644 --- a/modules/fbx/fbx_parser/FBXImportSettings.h +++ b/modules/fbx/fbx_parser/FBXImportSettings.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -73,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXImportSettings.h * @brief FBX importer runtime configuration */ -#ifndef FBX_IMPORT_SETTINGS_H -#define FBX_IMPORT_SETTINGS_H + +#ifndef FBXIMPORTSETTINGS_H +#define FBXIMPORTSETTINGS_H namespace FBXDocParser { @@ -171,4 +171,4 @@ struct ImportSettings { } // namespace FBXDocParser -#endif // FBX_IMPORT_SETTINGS_H +#endif // FBXIMPORTSETTINGS_H diff --git a/modules/fbx/fbx_parser/FBXMeshGeometry.h b/modules/fbx/fbx_parser/FBXMeshGeometry.h index a934c7dd5c5..9827e31e69f 100644 --- a/modules/fbx/fbx_parser/FBXMeshGeometry.h +++ b/modules/fbx/fbx_parser/FBXMeshGeometry.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -70,8 +69,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -#ifndef FBX_MESH_GEOMETRY_H -#define FBX_MESH_GEOMETRY_H +#ifndef FBXMESHGEOMETRY_H +#define FBXMESHGEOMETRY_H #include "core/color.h" #include "core/math/vector2.h" @@ -261,4 +260,4 @@ private: } // namespace FBXDocParser -#endif // FBX_MESH_GEOMETRY_H +#endif // FBXMESHGEOMETRY_H diff --git a/modules/fbx/fbx_parser/FBXParseTools.h b/modules/fbx/fbx_parser/FBXParseTools.h index 55c8436091e..a73020aaab8 100644 --- a/modules/fbx/fbx_parser/FBXParseTools.h +++ b/modules/fbx/fbx_parser/FBXParseTools.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FBX_PARSE_TOOLS_H -#define FBX_PARSE_TOOLS_H +#ifndef FBXPARSETOOLS_H +#define FBXPARSETOOLS_H #include "core/error_macros.h" #include "core/ustring.h" @@ -108,4 +108,4 @@ inline uint64_t strtoul10_64(const char *in, bool &errored, const char **out = n return value; } -#endif // FBX_PARSE_TOOLS_H +#endif // FBXPARSETOOLS_H diff --git a/modules/fbx/fbx_parser/FBXParser.h b/modules/fbx/fbx_parser/FBXParser.h index 5751ec2ddec..f836b472d9e 100644 --- a/modules/fbx/fbx_parser/FBXParser.h +++ b/modules/fbx/fbx_parser/FBXParser.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -73,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXParser.h * @brief FBX parsing code */ -#ifndef FBX_PARSER_H -#define FBX_PARSER_H + +#ifndef FBXPARSER_H +#define FBXPARSER_H #include #include @@ -261,4 +261,4 @@ Transform ReadMatrix(const ElementPtr element); } // namespace FBXDocParser -#endif // FBX_PARSER_H +#endif // FBXPARSER_H diff --git a/modules/fbx/fbx_parser/FBXProperties.h b/modules/fbx/fbx_parser/FBXProperties.h index 68b09c3a9e9..88d33a642e8 100644 --- a/modules/fbx/fbx_parser/FBXProperties.h +++ b/modules/fbx/fbx_parser/FBXProperties.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -73,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXProperties.h * @brief FBX dynamic properties */ -#ifndef FBX_PROPERTIES_H -#define FBX_PROPERTIES_H + +#ifndef FBXPROPERTIES_H +#define FBXPROPERTIES_H #include "FBXParser.h" #include @@ -220,4 +220,4 @@ inline T PropertyGet(const PropertyTable *in, const std::string &name, bool &res } // namespace FBXDocParser -#endif // FBX_PROPERTIES_H +#endif // FBXPROPERTIES_H diff --git a/modules/fbx/fbx_parser/FBXTokenizer.h b/modules/fbx/fbx_parser/FBXTokenizer.h index d173e989c25..2abadc44c82 100644 --- a/modules/fbx/fbx_parser/FBXTokenizer.h +++ b/modules/fbx/fbx_parser/FBXTokenizer.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -73,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXTokenizer.h * @brief FBX lexer */ -#ifndef FBX_TOKENIZER_H -#define FBX_TOKENIZER_H + +#ifndef FBXTOKENIZER_H +#define FBXTOKENIZER_H #include "FBXParseTools.h" #include "core/ustring.h" @@ -201,4 +201,4 @@ void TokenizeBinary(TokenList &output_tokens, const char *input, size_t length); } // namespace FBXDocParser -#endif // FBX_TOKENIZER_H +#endif // FBXTOKENIZER_H diff --git a/modules/fbx/fbx_parser/FBXUtil.h b/modules/fbx/fbx_parser/FBXUtil.h index 7ce7bbc54b7..c71f68cd692 100644 --- a/modules/fbx/fbx_parser/FBXUtil.h +++ b/modules/fbx/fbx_parser/FBXUtil.h @@ -34,7 +34,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -73,8 +72,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file FBXUtil.h * @brief FBX utility functions for internal use */ -#ifndef FBX_UTIL_H -#define FBX_UTIL_H + +#ifndef FBXUTIL_H +#define FBXUTIL_H #include "FBXTokenizer.h" #include @@ -120,4 +120,4 @@ std::string EncodeBase64(const char *data, size_t length); } // namespace Util } // namespace FBXDocParser -#endif // FBX_UTIL_H +#endif // FBXUTIL_H diff --git a/modules/fbx/tools/import_utils.h b/modules/fbx/tools/import_utils.h index 52d31257690..3584856c0a9 100644 --- a/modules/fbx/tools/import_utils.h +++ b/modules/fbx/tools/import_utils.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMPORT_UTILS_FBX_IMPORTER_H -#define IMPORT_UTILS_FBX_IMPORTER_H +#ifndef IMPORT_UTILS_H +#define IMPORT_UTILS_H #include "core/io/image_loader.h" @@ -398,4 +398,4 @@ Transform get_unscaled_transform(const Transform &p_initial, real_t p_scale); /// The polygon must be at least size of 3 or bigger. Vector3 get_poly_normal(const std::vector &p_vertices); -#endif // IMPORT_UTILS_FBX_IMPORTER_H +#endif // IMPORT_UTILS_H diff --git a/modules/fbx/tools/validation_tools.h b/modules/fbx/tools/validation_tools.h index 58be3d515f7..2aa0b9d1f2d 100644 --- a/modules/fbx/tools/validation_tools.h +++ b/modules/fbx/tools/validation_tools.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FBX_VALIDATION_TOOLS_H -#define FBX_VALIDATION_TOOLS_H +#ifndef VALIDATION_TOOLS_H +#define VALIDATION_TOOLS_H #ifdef TOOLS_ENABLED @@ -91,4 +91,5 @@ public: }; #endif // TOOLS_ENABLED -#endif // FBX_VALIDATION_TOOLS_H + +#endif // VALIDATION_TOOLS_H diff --git a/modules/freetype/uwpdef.h b/modules/freetype/uwpdef.h index 05aaae61b5e..f85f293171f 100644 --- a/modules/freetype/uwpdef.h +++ b/modules/freetype/uwpdef.h @@ -28,6 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef UWPDEF_H +#define UWPDEF_H + // "generic" is a reserved keyword in C++/CX code // this avoids the errors in the variable name from Freetype code #define generic freetype_generic + +#endif // UWPDEF_H diff --git a/modules/gdnative/gdnative_library_editor_plugin.h b/modules/gdnative/gdnative_library_editor_plugin.h index cf69d8477cf..f01de9bfbcc 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.h +++ b/modules/gdnative/gdnative_library_editor_plugin.h @@ -109,4 +109,5 @@ public: GDNativeLibraryEditorPlugin(EditorNode *p_node); }; #endif + #endif // GDNATIVE_LIBRARY_EDITOR_PLUGIN_H diff --git a/modules/gdnative/gdnative_library_singleton_editor.h b/modules/gdnative/gdnative_library_singleton_editor.h index 16155723bc5..3670261e236 100644 --- a/modules/gdnative/gdnative_library_singleton_editor.h +++ b/modules/gdnative/gdnative_library_singleton_editor.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GD_NATIVE_LIBRARY_EDITOR_H -#define GD_NATIVE_LIBRARY_EDITOR_H +#ifndef GDNATIVE_LIBRARY_SINGLETON_EDITOR_H +#define GDNATIVE_LIBRARY_SINGLETON_EDITOR_H #ifdef TOOLS_ENABLED #include "editor/editor_file_system.h" @@ -59,4 +59,5 @@ public: }; #endif -#endif // GD_NATIVE_LIBRARY_EDITOR_H + +#endif // GDNATIVE_LIBRARY_SINGLETON_EDITOR_H diff --git a/modules/gdnative/include/android/godot_android.h b/modules/gdnative/include/android/godot_android.h index 859a85ae1ed..8e7397f8053 100644 --- a/modules/gdnative/include/android/godot_android.h +++ b/modules/gdnative/include/android/godot_android.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_ANDROID_GDN_H -#define GODOT_ANDROID_GDN_H +#ifndef GODOT_ANDROID_H +#define GODOT_ANDROID_H #include @@ -53,4 +53,4 @@ bool GDAPI godot_android_is_activity_resumed(); } #endif -#endif /* !GODOT_ANDROID_GDN_H */ +#endif // GODOT_ANDROID_H diff --git a/modules/gdnative/include/arvr/godot_arvr.h b/modules/gdnative/include/arvr/godot_arvr.h index dbf04262f60..7a07380b866 100644 --- a/modules/gdnative/include/arvr/godot_arvr.h +++ b/modules/gdnative/include/arvr/godot_arvr.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEARVR_H -#define GODOT_NATIVEARVR_H +#ifndef GODOT_ARVR_H +#define GODOT_ARVR_H #include @@ -95,4 +95,4 @@ godot_int GDAPI godot_arvr_get_depthid(godot_rid *p_render_target); } #endif -#endif /* !GODOT_NATIVEARVR_H */ +#endif // GODOT_ARVR_H diff --git a/modules/gdnative/include/gdnative/aabb.h b/modules/gdnative/include/gdnative/aabb.h index 69256e3317c..df81a495059 100644 --- a/modules/gdnative/include/gdnative/aabb.h +++ b/modules/gdnative/include/gdnative/aabb.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_AABB_H -#define GODOT_AABB_H +#ifndef GDNATIVE_AABB_H +#define GDNATIVE_AABB_H #ifdef __cplusplus extern "C" { @@ -115,4 +115,4 @@ godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot } #endif -#endif // GODOT_AABB_H +#endif // GDNATIVE_AABB_H diff --git a/modules/gdnative/include/gdnative/array.h b/modules/gdnative/include/gdnative/array.h index d14926dfd1d..a9e3a517e4e 100644 --- a/modules/gdnative/include/gdnative/array.h +++ b/modules/gdnative/include/gdnative/array.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_ARRAY_H -#define GODOT_ARRAY_H +#ifndef GDNATIVE_ARRAY_H +#define GDNATIVE_ARRAY_H #ifdef __cplusplus extern "C" { @@ -144,4 +144,4 @@ void GDAPI godot_array_shuffle(godot_array *p_self); } #endif -#endif // GODOT_ARRAY_H +#endif // GDNATIVE_ARRAY_H diff --git a/modules/gdnative/include/gdnative/basis.h b/modules/gdnative/include/gdnative/basis.h index 012ac791e6d..85c6f76dc87 100644 --- a/modules/gdnative/include/gdnative/basis.h +++ b/modules/gdnative/include/gdnative/basis.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_BASIS_H -#define GODOT_BASIS_H +#ifndef GDNATIVE_BASIS_H +#define GDNATIVE_BASIS_H #ifdef __cplusplus extern "C" { @@ -133,4 +133,4 @@ godot_basis GDAPI godot_basis_slerp(const godot_basis *p_self, const godot_basis } #endif -#endif // GODOT_BASIS_H +#endif // GDNATIVE_BASIS_H diff --git a/modules/gdnative/include/gdnative/color.h b/modules/gdnative/include/gdnative/color.h index 8c28b828ce4..3e55b17c4bf 100644 --- a/modules/gdnative/include/gdnative/color.h +++ b/modules/gdnative/include/gdnative/color.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_COLOR_H -#define GODOT_COLOR_H +#ifndef GDNATIVE_COLOR_H +#define GDNATIVE_COLOR_H #ifdef __cplusplus extern "C" { @@ -117,4 +117,4 @@ godot_bool GDAPI godot_color_operator_less(const godot_color *p_self, const godo } #endif -#endif // GODOT_COLOR_H +#endif // GDNATIVE_COLOR_H diff --git a/modules/gdnative/include/gdnative/dictionary.h b/modules/gdnative/include/gdnative/dictionary.h index 1a7411ec140..00e697a392a 100644 --- a/modules/gdnative/include/gdnative/dictionary.h +++ b/modules/gdnative/include/gdnative/dictionary.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_DICTIONARY_H -#define GODOT_DICTIONARY_H +#ifndef GDNATIVE_DICTIONARY_H +#define GDNATIVE_DICTIONARY_H #ifdef __cplusplus extern "C" { @@ -110,4 +110,4 @@ void GDAPI godot_dictionary_merge(godot_dictionary *p_self, const godot_dictiona } #endif -#endif // GODOT_DICTIONARY_H +#endif // GDNATIVE_DICTIONARY_H diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 664fbe9145a..67a6919e0cd 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_GDNATIVE_H -#define GODOT_GDNATIVE_H +#ifndef GDNATIVE_GDNATIVE_H +#define GDNATIVE_GDNATIVE_H #ifdef __cplusplus extern "C" { @@ -301,4 +301,4 @@ godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id); } #endif -#endif // GODOT_C_H +#endif // GDNATIVE_GDNATIVE_H diff --git a/modules/gdnative/include/gdnative/node_path.h b/modules/gdnative/include/gdnative/node_path.h index 9c4f1e0a799..36e1535e86a 100644 --- a/modules/gdnative/include/gdnative/node_path.h +++ b/modules/gdnative/include/gdnative/node_path.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NODE_PATH_H -#define GODOT_NODE_PATH_H +#ifndef GDNATIVE_NODE_PATH_H +#define GDNATIVE_NODE_PATH_H #ifdef __cplusplus extern "C" { @@ -86,4 +86,4 @@ godot_node_path godot_node_path_get_as_property_path(const godot_node_path *p_se } #endif -#endif // GODOT_NODE_PATH_H +#endif // GDNATIVE_NODE_PATH_H diff --git a/modules/gdnative/include/gdnative/plane.h b/modules/gdnative/include/gdnative/plane.h index fe817decb51..834ceeb8561 100644 --- a/modules/gdnative/include/gdnative/plane.h +++ b/modules/gdnative/include/gdnative/plane.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_PLANE_H -#define GODOT_PLANE_H +#ifndef GDNATIVE_PLANE_H +#define GDNATIVE_PLANE_H #ifdef __cplusplus extern "C" { @@ -100,4 +100,4 @@ void GDAPI godot_plane_set_d(godot_plane *p_self, const godot_real p_d); } #endif -#endif // GODOT_PLANE_H +#endif // GDNATIVE_PLANE_H diff --git a/modules/gdnative/include/gdnative/pool_arrays.h b/modules/gdnative/include/gdnative/pool_arrays.h index 279f22d075e..54aa5d9530d 100644 --- a/modules/gdnative/include/gdnative/pool_arrays.h +++ b/modules/gdnative/include/gdnative/pool_arrays.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_POOL_ARRAYS_H -#define GODOT_POOL_ARRAYS_H +#ifndef GDNATIVE_POOL_ARRAYS_H +#define GDNATIVE_POOL_ARRAYS_H #ifdef __cplusplus extern "C" { @@ -505,4 +505,4 @@ void GDAPI godot_pool_color_array_write_access_destroy(godot_pool_color_array_wr } #endif -#endif // GODOT_POOL_ARRAYS_H +#endif // GDNATIVE_POOL_ARRAYS_H diff --git a/modules/gdnative/include/gdnative/quat.h b/modules/gdnative/include/gdnative/quat.h index 171efeface4..243f959661d 100644 --- a/modules/gdnative/include/gdnative/quat.h +++ b/modules/gdnative/include/gdnative/quat.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_QUAT_H -#define GODOT_QUAT_H +#ifndef GDNATIVE_QUAT_H +#define GDNATIVE_QUAT_H #ifdef __cplusplus extern "C" { @@ -115,4 +115,4 @@ void GDAPI godot_quat_set_axis_angle(godot_quat *p_self, const godot_vector3 *p_ } #endif -#endif // GODOT_QUAT_H +#endif // GDNATIVE_QUAT_H diff --git a/modules/gdnative/include/gdnative/rect2.h b/modules/gdnative/include/gdnative/rect2.h index 15d7cf29d5b..d046e6d174e 100644 --- a/modules/gdnative/include/gdnative/rect2.h +++ b/modules/gdnative/include/gdnative/rect2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_RECT2_H -#define GODOT_RECT2_H +#ifndef GDNATIVE_RECT2_H +#define GDNATIVE_RECT2_H #ifdef __cplusplus extern "C" { @@ -99,4 +99,4 @@ void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size } #endif -#endif // GODOT_RECT2_H +#endif // GDNATIVE_RECT2_H diff --git a/modules/gdnative/include/gdnative/rid.h b/modules/gdnative/include/gdnative/rid.h index 349907f5235..a9862eb0483 100644 --- a/modules/gdnative/include/gdnative/rid.h +++ b/modules/gdnative/include/gdnative/rid.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_RID_H -#define GODOT_RID_H +#ifndef GDNATIVE_RID_H +#define GDNATIVE_RID_H #ifdef __cplusplus extern "C" { @@ -71,4 +71,4 @@ godot_bool GDAPI godot_rid_operator_less(const godot_rid *p_self, const godot_ri } #endif -#endif // GODOT_RID_H +#endif // GDNATIVE_RID_H diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h index 047b447281f..32e4fff873d 100644 --- a/modules/gdnative/include/gdnative/string.h +++ b/modules/gdnative/include/gdnative/string.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_STRING_H -#define GODOT_STRING_H +#ifndef GDNATIVE_STRING_H +#define GDNATIVE_STRING_H #ifdef __cplusplus extern "C" { @@ -264,4 +264,4 @@ void GDAPI godot_string_destroy(godot_string *p_self); } #endif -#endif // GODOT_STRING_H +#endif // GDNATIVE_STRING_H diff --git a/modules/gdnative/include/gdnative/string_name.h b/modules/gdnative/include/gdnative/string_name.h index 46ce681184b..e6a353e4f5c 100644 --- a/modules/gdnative/include/gdnative/string_name.h +++ b/modules/gdnative/include/gdnative/string_name.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_STRING_NAME_H -#define GODOT_STRING_NAME_H +#ifndef GDNATIVE_STRING_NAME_H +#define GDNATIVE_STRING_NAME_H #ifdef __cplusplus extern "C" { @@ -75,4 +75,4 @@ void GDAPI godot_string_name_destroy(godot_string_name *p_self); } #endif -#endif // GODOT_STRING_NAME_H +#endif // GDNATIVE_STRING_NAME_H diff --git a/modules/gdnative/include/gdnative/transform.h b/modules/gdnative/include/gdnative/transform.h index faedb1fa48b..18d1ff2ecc0 100644 --- a/modules/gdnative/include/gdnative/transform.h +++ b/modules/gdnative/include/gdnative/transform.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_TRANSFORM_H -#define GODOT_TRANSFORM_H +#ifndef GDNATIVE_TRANSFORM_H +#define GDNATIVE_TRANSFORM_H #ifdef __cplusplus extern "C" { @@ -108,4 +108,4 @@ godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, c } #endif -#endif // GODOT_TRANSFORM_H +#endif // GDNATIVE_TRANSFORM_H diff --git a/modules/gdnative/include/gdnative/transform2d.h b/modules/gdnative/include/gdnative/transform2d.h index 0093769e188..d6327221635 100644 --- a/modules/gdnative/include/gdnative/transform2d.h +++ b/modules/gdnative/include/gdnative/transform2d.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_TRANSFORM2D_H -#define GODOT_TRANSFORM2D_H +#ifndef GDNATIVE_TRANSFORM2D_H +#define GDNATIVE_TRANSFORM2D_H #ifdef __cplusplus extern "C" { @@ -106,4 +106,4 @@ godot_rect2 GDAPI godot_transform2d_xform_inv_rect2(const godot_transform2d *p_s } #endif -#endif // GODOT_TRANSFORM2D_H +#endif // GDNATIVE_TRANSFORM2D_H diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h index 350e719f786..47b571c6190 100644 --- a/modules/gdnative/include/gdnative/variant.h +++ b/modules/gdnative/include/gdnative/variant.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VARIANT_H -#define GODOT_VARIANT_H +#ifndef GDNATIVE_VARIANT_H +#define GDNATIVE_VARIANT_H #ifdef __cplusplus extern "C" { @@ -252,4 +252,4 @@ void GDAPI godot_variant_evaluate(godot_variant_operator p_op, const godot_varia } #endif -#endif +#endif // GDNATIVE_VARIANT_H diff --git a/modules/gdnative/include/gdnative/vector2.h b/modules/gdnative/include/gdnative/vector2.h index 1d780ebd0d5..b548c897a89 100644 --- a/modules/gdnative/include/gdnative/vector2.h +++ b/modules/gdnative/include/gdnative/vector2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VECTOR2_H -#define GODOT_VECTOR2_H +#ifndef GDNATIVE_VECTOR2_H +#define GDNATIVE_VECTOR2_H #ifdef __cplusplus extern "C" { @@ -139,4 +139,4 @@ godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self); } #endif -#endif // GODOT_VECTOR2_H +#endif // GDNATIVE_VECTOR2_H diff --git a/modules/gdnative/include/gdnative/vector3.h b/modules/gdnative/include/gdnative/vector3.h index 68ca1cd2bc3..a5084c13dca 100644 --- a/modules/gdnative/include/gdnative/vector3.h +++ b/modules/gdnative/include/gdnative/vector3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VECTOR3_H -#define GODOT_VECTOR3_H +#ifndef GDNATIVE_VECTOR3_H +#define GDNATIVE_VECTOR3_H #ifdef __cplusplus extern "C" { @@ -146,4 +146,4 @@ godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot } #endif -#endif // GODOT_VECTOR3_H +#endif // GDNATIVE_VECTOR3_H diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index 2e5d923a6af..42fad628ee6 100644 --- a/modules/gdnative/include/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -249,4 +249,4 @@ void GDAPI godot_nativescript_profiling_add_data(const char *p_signature, uint64 } #endif -#endif +#endif // GODOT_NATIVESCRIPT_H diff --git a/modules/gdnative/include/net/godot_net.h b/modules/gdnative/include/net/godot_net.h index e10277b8682..4834c18e7fa 100644 --- a/modules/gdnative/include/net/godot_net.h +++ b/modules/gdnative/include/net/godot_net.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVENET_H -#define GODOT_NATIVENET_H +#ifndef GODOT_NET_H +#define GODOT_NET_H #include @@ -117,4 +117,4 @@ void GDAPI godot_net_bind_multiplayer_peer(godot_object *p_obj, const godot_net_ // WebRTC Bindings #include "net/godot_webrtc.h" -#endif /* GODOT_NATIVENET_H */ +#endif // GODOT_NET_H diff --git a/modules/gdnative/include/net/godot_webrtc.h b/modules/gdnative/include/net/godot_webrtc.h index 6d640fb30e4..f51c0bc1830 100644 --- a/modules/gdnative/include/net/godot_webrtc.h +++ b/modules/gdnative/include/net/godot_webrtc.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEWEBRTC_H -#define GODOT_NATIVEWEBRTC_H +#ifndef GODOT_WEBRTC_H +#define GODOT_WEBRTC_H #include @@ -126,4 +126,4 @@ void GDAPI godot_net_bind_webrtc_data_channel(godot_object *p_obj, const godot_n } #endif -#endif +#endif // GODOT_WEBRTC_H diff --git a/modules/gdnative/include/videodecoder/godot_videodecoder.h b/modules/gdnative/include/videodecoder/godot_videodecoder.h index 4de0f450e43..cb215d673dd 100644 --- a/modules/gdnative/include/videodecoder/godot_videodecoder.h +++ b/modules/gdnative/include/videodecoder/godot_videodecoder.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEVIDEODECODER_H -#define GODOT_NATIVEVIDEODECODER_H +#ifndef GODOT_VIDEODECODER_H +#define GODOT_VIDEODECODER_H #include @@ -72,4 +72,4 @@ void GDAPI godot_videodecoder_register_decoder(const godot_videodecoder_interfac } #endif -#endif /* GODOT_NATIVEVIDEODECODER_H */ +#endif // GODOT_VIDEODECODER_H diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h index 74ec060369d..738e76fe6e7 100644 --- a/modules/gdnative/nativescript/nativescript.h +++ b/modules/gdnative/nativescript/nativescript.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NATIVE_SCRIPT_H -#define NATIVE_SCRIPT_H +#ifndef NATIVESCRIPT_H +#define NATIVESCRIPT_H #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" @@ -391,4 +391,4 @@ class ResourceFormatSaverNativeScript : public ResourceFormatSaver { virtual void get_recognized_extensions(const RES &p_resource, List *p_extensions) const; }; -#endif // GDNATIVE_H +#endif // NATIVESCRIPT_H diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h index 58d8bbb938b..324a704e5a0 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.h +++ b/modules/gdnative/pluginscript/pluginscript_loader.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PYTHONSCRIPT_PY_LOADER_H -#define PYTHONSCRIPT_PY_LOADER_H +#ifndef PLUGINSCRIPT_LOADER_H +#define PLUGINSCRIPT_LOADER_H // Godot imports #include "core/io/resource_loader.h" @@ -59,4 +59,4 @@ public: virtual bool recognize(const RES &p_resource) const; }; -#endif // PYTHONSCRIPT_PY_LOADER_H +#endif // PLUGINSCRIPT_LOADER_H diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.h b/modules/gdnative/videodecoder/video_stream_gdnative.h index 61a037a6593..31c5bbe8383 100644 --- a/modules/gdnative/videodecoder/video_stream_gdnative.h +++ b/modules/gdnative/videodecoder/video_stream_gdnative.h @@ -204,4 +204,4 @@ public: virtual String get_resource_type(const String &p_path) const; }; -#endif +#endif // VIDEO_STREAM_GDNATIVE_H diff --git a/modules/gdscript/language_server/gdscript_extend_parser.h b/modules/gdscript/language_server/gdscript_extend_parser.h index 58333d5b7e9..542660549b3 100644 --- a/modules/gdscript/language_server/gdscript_extend_parser.h +++ b/modules/gdscript/language_server/gdscript_extend_parser.h @@ -99,4 +99,4 @@ public: Error parse(const String &p_code, const String &p_path); }; -#endif +#endif // GDSCRIPT_EXTEND_PARSER_H diff --git a/modules/gdscript/language_server/gdscript_language_protocol.h b/modules/gdscript/language_server/gdscript_language_protocol.h index 3d08ae5e608..f24227b3369 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.h +++ b/modules/gdscript/language_server/gdscript_language_protocol.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GDSCRIPT_PROTOCAL_SERVER_H -#define GDSCRIPT_PROTOCAL_SERVER_H +#ifndef GDSCRIPT_LANGUAGE_PROTOCOL_H +#define GDSCRIPT_LANGUAGE_PROTOCOL_H #include "core/io/stream_peer.h" #include "core/io/stream_peer_tcp.h" @@ -110,4 +110,4 @@ public: GDScriptLanguageProtocol(); }; -#endif +#endif // GDSCRIPT_LANGUAGE_PROTOCOL_H diff --git a/modules/gdscript/language_server/gdscript_text_document.h b/modules/gdscript/language_server/gdscript_text_document.h index 224fbbf82c7..16ffb7add57 100644 --- a/modules/gdscript/language_server/gdscript_text_document.h +++ b/modules/gdscript/language_server/gdscript_text_document.h @@ -78,4 +78,4 @@ public: virtual ~GDScriptTextDocument(); }; -#endif +#endif // GDSCRIPT_TEXT_DOCUMENT_H diff --git a/modules/gdscript/language_server/gdscript_workspace.h b/modules/gdscript/language_server/gdscript_workspace.h index cc17d697c7b..91017370136 100644 --- a/modules/gdscript/language_server/gdscript_workspace.h +++ b/modules/gdscript/language_server/gdscript_workspace.h @@ -101,4 +101,4 @@ public: ~GDScriptWorkspace(); }; -#endif +#endif // GDSCRIPT_WORKSPACE_H diff --git a/modules/gltf/editor_scene_importer_gltf.h b/modules/gltf/editor_scene_importer_gltf.h index d0b2d6043e7..584e97bb818 100644 --- a/modules/gltf/editor_scene_importer_gltf.h +++ b/modules/gltf/editor_scene_importer_gltf.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef TOOLS_ENABLED - #ifndef EDITOR_SCENE_IMPORTER_GLTF_H #define EDITOR_SCENE_IMPORTER_GLTF_H +#ifdef TOOLS_ENABLED + #include "editor/import/resource_importer_scene.h" #include "gltf_document.h" @@ -52,6 +52,6 @@ public: uint32_t p_flags, int p_bake_fps); }; -#endif // EDITOR_SCENE_IMPORTER_GLTF_H - #endif // TOOLS_ENABLED + +#endif // EDITOR_SCENE_IMPORTER_GLTF_H diff --git a/modules/gltf/packed_scene_gltf.h b/modules/gltf/packed_scene_gltf.h index 99b7cbcc300..2182264f3f7 100644 --- a/modules/gltf/packed_scene_gltf.h +++ b/modules/gltf/packed_scene_gltf.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef TOOLS_ENABLED - #ifndef PACKED_SCENE_GLTF_H #define PACKED_SCENE_GLTF_H +#ifdef TOOLS_ENABLED + #include "scene/main/node.h" #include "scene/resources/packed_scene.h" @@ -61,6 +61,6 @@ public: real_t p_bake_fps = 1000.0f, uint32_t p_compress_flags = Mesh::ARRAY_COMPRESS_DEFAULT, Ref r_state = Ref()); }; -#endif // PACKED_SCENE_GLTF_H - #endif // TOOLS_ENABLED + +#endif // PACKED_SCENE_GLTF_H diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h index fa7b6cbc6e0..f6ac63d4561 100644 --- a/modules/gridmap/grid_map_editor_plugin.h +++ b/modules/gridmap/grid_map_editor_plugin.h @@ -267,4 +267,4 @@ public: ~GridMapEditorPlugin(); }; -#endif // CUBE_GRID_MAP_EDITOR_PLUGIN_H +#endif // GRID_MAP_EDITOR_PLUGIN_H diff --git a/modules/hdr/image_loader_hdr.h b/modules/hdr/image_loader_hdr.h index 0213fdbcb27..ec6f66bbba9 100644 --- a/modules/hdr/image_loader_hdr.h +++ b/modules/hdr/image_loader_hdr.h @@ -40,4 +40,4 @@ public: ImageLoaderHDR(); }; -#endif +#endif // IMAGE_LOADER_HDR_H diff --git a/modules/jpg/image_loader_jpegd.h b/modules/jpg/image_loader_jpegd.h index 8e64f6fba79..e404995d36f 100644 --- a/modules/jpg/image_loader_jpegd.h +++ b/modules/jpg/image_loader_jpegd.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMAGE_LOADER_JPG_H -#define IMAGE_LOADER_JPG_H +#ifndef IMAGE_LOADER_JPEGD_H +#define IMAGE_LOADER_JPEGD_H #include "core/io/image_loader.h" @@ -40,4 +40,4 @@ public: ImageLoaderJPG(); }; -#endif +#endif // IMAGE_LOADER_JPEGD_H diff --git a/modules/jsonrpc/jsonrpc.h b/modules/jsonrpc/jsonrpc.h index ee9a6e33e3b..45b6aed6417 100644 --- a/modules/jsonrpc/jsonrpc.h +++ b/modules/jsonrpc/jsonrpc.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_JSON_RPC_H -#define GODOT_JSON_RPC_H +#ifndef JSONRPC_H +#define JSONRPC_H #include "core/object.h" #include "core/variant.h" @@ -67,4 +67,4 @@ public: VARIANT_ENUM_CAST(JSONRPC::ErrorCode); -#endif +#endif // JSONRPC_H diff --git a/modules/lightmapper_cpu/lightmapper_cpu.h b/modules/lightmapper_cpu/lightmapper_cpu.h index bd0e74cc253..1fc7ba82cad 100644 --- a/modules/lightmapper_cpu/lightmapper_cpu.h +++ b/modules/lightmapper_cpu/lightmapper_cpu.h @@ -185,4 +185,4 @@ public: LightmapperCPU(); }; -#endif // LIGHTMAPPER_H +#endif // LIGHTMAPPER_CPU_H diff --git a/modules/mbedtls/dtls_server_mbedtls.h b/modules/mbedtls/dtls_server_mbedtls.h index 29370062c46..a6626c9f653 100644 --- a/modules/mbedtls/dtls_server_mbedtls.h +++ b/modules/mbedtls/dtls_server_mbedtls.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef MBED_DTLS_SERVER_H -#define MBED_DTLS_SERVER_H +#ifndef DTLS_SERVER_MBEDTLS_H +#define DTLS_SERVER_MBEDTLS_H #include "core/io/dtls_server.h" #include "ssl_context_mbedtls.h" @@ -54,4 +54,4 @@ public: ~DTLSServerMbedTLS(); }; -#endif // MBED_DTLS_SERVER_H +#endif // DTLS_SERVER_MBEDTLS_H diff --git a/modules/mbedtls/ssl_context_mbedtls.h b/modules/mbedtls/ssl_context_mbedtls.h index 13568adba36..5af003042c4 100644 --- a/modules/mbedtls/ssl_context_mbedtls.h +++ b/modules/mbedtls/ssl_context_mbedtls.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SSL_CONTEXT_MBED_TLS_H -#define SSL_CONTEXT_MBED_TLS_H +#ifndef SSL_CONTEXT_MBEDTLS_H +#define SSL_CONTEXT_MBEDTLS_H #include "crypto_mbedtls.h" @@ -90,4 +90,4 @@ public: ~SSLContextMbedTLS(); }; -#endif // SSL_CONTEXT_MBED_TLS_H +#endif // SSL_CONTEXT_MBEDTLS_H diff --git a/modules/mbedtls/stream_peer_mbedtls.h b/modules/mbedtls/stream_peer_mbedtls.h index a1b762ff3f4..71e249af36d 100644 --- a/modules/mbedtls/stream_peer_mbedtls.h +++ b/modules/mbedtls/stream_peer_mbedtls.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef STREAM_PEER_OPEN_SSL_H -#define STREAM_PEER_OPEN_SSL_H +#ifndef STREAM_PEER_MBEDTLS_H +#define STREAM_PEER_MBEDTLS_H #include "core/io/stream_peer_ssl.h" #include "ssl_context_mbedtls.h" @@ -75,4 +75,4 @@ public: ~StreamPeerMbedTLS(); }; -#endif // STREAM_PEER_SSL_H +#endif // STREAM_PEER_MBEDTLS_H diff --git a/modules/mobile_vr/mobile_vr_interface.h b/modules/mobile_vr/mobile_vr_interface.h index f8dd4b7c30e..a18ac4ec526 100644 --- a/modules/mobile_vr/mobile_vr_interface.h +++ b/modules/mobile_vr/mobile_vr_interface.h @@ -148,4 +148,4 @@ public: ~MobileVRInterface(); }; -#endif // !MOBILE_VR_INTERFACE_H +#endif // MOBILE_VR_INTERFACE_H diff --git a/modules/mono/editor/editor_internal_calls.h b/modules/mono/editor/editor_internal_calls.h index a899634d570..8262ac211af 100644 --- a/modules/mono/editor/editor_internal_calls.h +++ b/modules/mono/editor/editor_internal_calls.h @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_INTERNAL_CALL_H -#define EDITOR_INTERNAL_CALL_H +#ifndef EDITOR_INTERNAL_CALLS_H +#define EDITOR_INTERNAL_CALLS_H void register_editor_internal_calls(); -#endif // EDITOR_INTERNAL_CALL_H +#endif // EDITOR_INTERNAL_CALLS_H diff --git a/modules/mono/glue/glue_header.h b/modules/mono/glue/glue_header.h index 44373488328..a3343d3cfdf 100644 --- a/modules/mono/glue/glue_header.h +++ b/modules/mono/glue/glue_header.h @@ -28,6 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef GLUE_HEADER_H +#define GLUE_HEADER_H + #ifdef MONO_GLUE_ENABLED #include "base_object_glue.h" @@ -77,3 +80,5 @@ void godot_register_glue_header_icalls() { #include "arguments_vector.h" #endif // MONO_GLUE_ENABLED + +#endif // GLUE_HEADER_H diff --git a/modules/mono/mono_gc_handle.h b/modules/mono/mono_gc_handle.h index 79675aa6ec5..59731eb6814 100644 --- a/modules/mono/mono_gc_handle.h +++ b/modules/mono/mono_gc_handle.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CSHARP_GC_HANDLE_H -#define CSHARP_GC_HANDLE_H +#ifndef MONO_GC_HANDLE_H +#define MONO_GC_HANDLE_H #include @@ -72,4 +72,4 @@ public: ~MonoGCHandle(); }; -#endif // CSHARP_GC_HANDLE_H +#endif // MONO_GC_HANDLE_H diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h index abeed529ecc..f0919033305 100644 --- a/modules/mono/mono_gd/gd_mono_field.h +++ b/modules/mono/mono_gd/gd_mono_field.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GDMONOFIELD_H -#define GDMONOFIELD_H +#ifndef GD_MONO_FIELD_H +#define GD_MONO_FIELD_H #include "gd_mono.h" #include "gd_mono_header.h" @@ -74,4 +74,4 @@ public: ~GDMonoField(); }; -#endif // GDMONOFIELD_H +#endif // GD_MONO_FIELD_H diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h index 41bb6245414..e755c804874 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.h +++ b/modules/mono/mono_gd/gd_mono_marshal.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GDMONOMARSHAL_H -#define GDMONOMARSHAL_H +#ifndef GD_MONO_MARSHAL_H +#define GD_MONO_MARSHAL_H #include "core/variant.h" @@ -465,4 +465,4 @@ DECL_TYPE_MARSHAL_TEMPLATES(Plane) } // namespace GDMonoMarshal -#endif // GDMONOMARSHAL_H +#endif // GD_MONO_MARSHAL_H diff --git a/modules/mono/mono_gd/gd_mono_utils.h b/modules/mono/mono_gd/gd_mono_utils.h index de480fc2d69..6565c864c0b 100644 --- a/modules/mono/mono_gd/gd_mono_utils.h +++ b/modules/mono/mono_gd/gd_mono_utils.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GD_MONOUTILS_H -#define GD_MONOUTILS_H +#ifndef GD_MONO_UTILS_H +#define GD_MONO_UTILS_H #include @@ -192,4 +192,4 @@ void add_internal_call(const char *p_name, R (*p_func)(P...)) { #define GD_MONO_ASSERT_THREAD_ATTACHED #endif -#endif // GD_MONOUTILS_H +#endif // GD_MONO_UTILS_H diff --git a/modules/mono/utils/macros.h b/modules/mono/utils/macros.h index 1a6955b8191..fa59a75786a 100644 --- a/modules/mono/utils/macros.h +++ b/modules/mono/utils/macros.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef UTIL_MACROS_H -#define UTIL_MACROS_H +#ifndef MONO_MACROS_H +#define MONO_MACROS_H #define _GD_VARNAME_CONCAT_B_(m_ignore, m_name) m_name #define _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_B_(hello there, m_a##m_b##m_c) @@ -102,4 +102,4 @@ public: #define SCOPE_EXIT \ auto GD_UNIQUE_NAME(gd_scope_exit) = gdmono::ScopeExitAux() + [=]() -> void -#endif // UTIL_MACROS_H +#endif // MONO_MACROS_H diff --git a/modules/mono/utils/osx_utils.h b/modules/mono/utils/osx_utils.h index f0a473c9ae7..edd6ef30a94 100644 --- a/modules/mono/utils/osx_utils.h +++ b/modules/mono/utils/osx_utils.h @@ -30,8 +30,8 @@ #include "core/ustring.h" -#ifndef OSX_UTILS_H -#define OSX_UTILS_H +#ifndef MONO_OSX_UTILS_H +#define MONO_OSX_UTILS_H #ifdef OSX_ENABLED @@ -39,4 +39,4 @@ bool osx_is_app_bundle_installed(const String &p_bundle_id); #endif -#endif // OSX_UTILS_H +#endif // MONO_OSX_UTILS_H diff --git a/modules/mono/utils/path_utils.h b/modules/mono/utils/path_utils.h index 58d2e1a2ab3..03ebcf8c3fe 100644 --- a/modules/mono/utils/path_utils.h +++ b/modules/mono/utils/path_utils.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PATH_UTILS_H -#define PATH_UTILS_H +#ifndef MONO_PATH_UTILS_H +#define MONO_PATH_UTILS_H #include "core/string_builder.h" #include "core/ustring.h" @@ -61,4 +61,4 @@ String relative_to(const String &p_path, const String &p_relative_to); } // namespace path -#endif // PATH_UTILS_H +#endif // MONO_PATH_UTILS_H diff --git a/modules/mono/utils/string_utils.h b/modules/mono/utils/string_utils.h index c3706061bd9..ec22a9ee2e4 100644 --- a/modules/mono/utils/string_utils.h +++ b/modules/mono/utils/string_utils.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef STRING_FORMAT_H -#define STRING_FORMAT_H +#ifndef MONO_STRING_UTILS_H +#define MONO_STRING_UTILS_H #include "core/ustring.h" #include "core/variant.h" @@ -59,4 +59,4 @@ String str_format(const char *p_format, va_list p_list) _PRINTF_FORMAT_ATTRIBUTE char *str_format_new(const char *p_format, ...) _PRINTF_FORMAT_ATTRIBUTE_1_2; char *str_format_new(const char *p_format, va_list p_list) _PRINTF_FORMAT_ATTRIBUTE_1_0; -#endif // STRING_FORMAT_H +#endif // MONO_STRING_UTILS_H diff --git a/modules/mono/utils/thread_local.h b/modules/mono/utils/thread_local.h index 24c031fd8fa..27ba8aba8fd 100644 --- a/modules/mono/utils/thread_local.h +++ b/modules/mono/utils/thread_local.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef THREAD_LOCAL_H -#define THREAD_LOCAL_H +#ifndef MONO_THREAD_LOCAL_H +#define MONO_THREAD_LOCAL_H #ifdef HAVE_CXX11_THREAD_LOCAL #define _THREAD_LOCAL_(m_t) thread_local m_t @@ -171,4 +171,4 @@ private: return; \ FlagScopeGuard _recursion_guard_(_recursion_flag_); -#endif // THREAD_LOCAL_H +#endif // MONO_THREAD_LOCAL_H diff --git a/modules/navigation/navigation_mesh_editor_plugin.h b/modules/navigation/navigation_mesh_editor_plugin.h index 5b864064697..8c9777da735 100644 --- a/modules/navigation/navigation_mesh_editor_plugin.h +++ b/modules/navigation/navigation_mesh_editor_plugin.h @@ -85,4 +85,4 @@ public: #endif -#endif +#endif // NAVIGATION_MESH_EDITOR_PLUGIN_H diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h index 6cc22964fd5..deb03f1d5ae 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_STREAM_STB_VORBIS_H -#define AUDIO_STREAM_STB_VORBIS_H +#ifndef AUDIO_STREAM_OGG_VORBIS_H +#define AUDIO_STREAM_OGG_VORBIS_H #include "core/io/resource_loader.h" #include "servers/audio/audio_stream.h" @@ -109,4 +109,4 @@ public: virtual ~AudioStreamOGGVorbis(); }; -#endif +#endif // AUDIO_STREAM_OGG_VORBIS_H diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.h b/modules/stb_vorbis/resource_importer_ogg_vorbis.h index 2523b1cb241..dc9ee8135d9 100644 --- a/modules/stb_vorbis/resource_importer_ogg_vorbis.h +++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCEIMPORTEROGGVORBIS_H -#define RESOURCEIMPORTEROGGVORBIS_H +#ifndef RESOURCE_IMPORTER_OGG_VORBIS_H +#define RESOURCE_IMPORTER_OGG_VORBIS_H #include "audio_stream_ogg_vorbis.h" #include "core/io/resource_importer.h" @@ -55,4 +55,4 @@ public: ResourceImporterOGGVorbis(); }; -#endif // RESOURCEIMPORTEROGGVORBIS_H +#endif // RESOURCE_IMPORTER_OGG_VORBIS_H diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h index fcb934d31de..48f7b892bcd 100644 --- a/modules/svg/image_loader_svg.h +++ b/modules/svg/image_loader_svg.h @@ -70,4 +70,4 @@ public: ImageLoaderSVG(); }; -#endif +#endif // IMAGE_LOADER_SVG_H diff --git a/modules/tga/image_loader_tga.h b/modules/tga/image_loader_tga.h index 5355f8f2c57..05957c1b303 100644 --- a/modules/tga/image_loader_tga.h +++ b/modules/tga/image_loader_tga.h @@ -81,4 +81,4 @@ public: ImageLoaderTGA(); }; -#endif +#endif // IMAGE_LOADER_TGA_H diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h index 6de6366dc67..0eb44ff4679 100644 --- a/modules/theora/video_stream_theora.h +++ b/modules/theora/video_stream_theora.h @@ -192,4 +192,4 @@ public: virtual String get_resource_type(const String &p_path) const; }; -#endif +#endif // VIDEO_STREAM_THEORA_H diff --git a/modules/tinyexr/image_loader_tinyexr.h b/modules/tinyexr/image_loader_tinyexr.h index aba5fdb9598..5f5af91fd44 100644 --- a/modules/tinyexr/image_loader_tinyexr.h +++ b/modules/tinyexr/image_loader_tinyexr.h @@ -40,4 +40,4 @@ public: ImageLoaderTinyEXR(); }; -#endif +#endif // IMAGE_LOADER_TINYEXR_H diff --git a/modules/upnp/upnp.h b/modules/upnp/upnp.h index 137461830b9..a4c23fda331 100644 --- a/modules/upnp/upnp.h +++ b/modules/upnp/upnp.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_UPNP_H -#define GODOT_UPNP_H +#ifndef UPNP_H +#define UPNP_H #include "core/reference.h" @@ -122,4 +122,4 @@ public: VARIANT_ENUM_CAST(UPNP::UPNPResult) -#endif // GODOT_UPNP_H +#endif // UPNP_H diff --git a/modules/upnp/upnp_device.h b/modules/upnp/upnp_device.h index 33e498b3bf2..de09cd02ed4 100644 --- a/modules/upnp/upnp_device.h +++ b/modules/upnp/upnp_device.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_UPNP_DEVICE_H -#define GODOT_UPNP_DEVICE_H +#ifndef UPNP_DEVICE_H +#define UPNP_DEVICE_H #include "core/reference.h" @@ -91,4 +91,4 @@ private: VARIANT_ENUM_CAST(UPNPDevice::IGDStatus) -#endif // GODOT_UPNP_DEVICE_H +#endif // UPNP_DEVICE_H diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h index 5ed88163c8f..16e2c69ed1a 100644 --- a/modules/visual_script/visual_script_editor.h +++ b/modules/visual_script/visual_script_editor.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSCRIPT_EDITOR_H -#define VISUALSCRIPT_EDITOR_H +#ifndef VISUAL_SCRIPT_EDITOR_H +#define VISUAL_SCRIPT_EDITOR_H #include "editor/create_dialog.h" #include "editor/plugins/script_editor_plugin.h" @@ -362,4 +362,4 @@ public: }; #endif -#endif // VISUALSCRIPT_EDITOR_H +#endif // VISUAL_SCRIPT_EDITOR_H diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h index 4f17c79bcea..c017798e01e 100644 --- a/modules/visual_script/visual_script_expression.h +++ b/modules/visual_script/visual_script_expression.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSCRIPTEXPRESSION_H -#define VISUALSCRIPTEXPRESSION_H +#ifndef VISUAL_SCRIPT_EXPRESSION_H +#define VISUAL_SCRIPT_EXPRESSION_H #include "visual_script.h" #include "visual_script_builtin_funcs.h" @@ -282,4 +282,4 @@ public: void register_visual_script_expression_node(); -#endif // VISUALSCRIPTEXPRESSION_H +#endif // VISUAL_SCRIPT_EXPRESSION_H diff --git a/modules/visual_script/visual_script_property_selector.h b/modules/visual_script/visual_script_property_selector.h index 49cb4615812..51e60c02fa3 100644 --- a/modules/visual_script/visual_script_property_selector.h +++ b/modules/visual_script/visual_script_property_selector.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSCRIPT_PROPERTYSELECTOR_H -#define VISUALSCRIPT_PROPERTYSELECTOR_H +#ifndef VISUAL_SCRIPT_PROPERTY_SELECTOR_H +#define VISUAL_SCRIPT_PROPERTY_SELECTOR_H #include "editor/editor_help.h" #include "editor/property_editor.h" @@ -89,4 +89,4 @@ public: VisualScriptPropertySelector(); }; -#endif // VISUALSCRIPT_PROPERTYSELECTOR_H +#endif // VISUAL_SCRIPT_PROPERTY_SELECTOR_H diff --git a/modules/webp/image_loader_webp.h b/modules/webp/image_loader_webp.h index 327582ca558..77cc5c04a91 100644 --- a/modules/webp/image_loader_webp.h +++ b/modules/webp/image_loader_webp.h @@ -40,4 +40,4 @@ public: ImageLoaderWEBP(); }; -#endif +#endif // IMAGE_LOADER_WEBP_H diff --git a/modules/webrtc/webrtc_data_channel.h b/modules/webrtc/webrtc_data_channel.h index 31403e8858f..f0fe9997bd8 100644 --- a/modules/webrtc/webrtc_data_channel.h +++ b/modules/webrtc/webrtc_data_channel.h @@ -88,4 +88,5 @@ public: VARIANT_ENUM_CAST(WebRTCDataChannel::WriteMode); VARIANT_ENUM_CAST(WebRTCDataChannel::ChannelState); + #endif // WEBRTC_DATA_CHANNEL_H diff --git a/modules/webrtc/webrtc_data_channel_js.h b/modules/webrtc/webrtc_data_channel_js.h index 2c4bc22c71d..4f3778924b8 100644 --- a/modules/webrtc/webrtc_data_channel_js.h +++ b/modules/webrtc/webrtc_data_channel_js.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef JAVASCRIPT_ENABLED - #ifndef WEBRTC_DATA_CHANNEL_JS_H #define WEBRTC_DATA_CHANNEL_JS_H +#ifdef JAVASCRIPT_ENABLED + #include "webrtc_data_channel.h" class WebRTCDataChannelJS : public WebRTCDataChannel { @@ -89,6 +89,6 @@ public: ~WebRTCDataChannelJS(); }; -#endif // WEBRTC_DATA_CHANNEL_JS_H - #endif // JAVASCRIPT_ENABLED + +#endif // WEBRTC_DATA_CHANNEL_JS_H diff --git a/modules/webrtc/webrtc_multiplayer.h b/modules/webrtc/webrtc_multiplayer.h index ba3058bf59d..f02da5b5e21 100644 --- a/modules/webrtc/webrtc_multiplayer.h +++ b/modules/webrtc/webrtc_multiplayer.h @@ -112,4 +112,4 @@ public: ConnectionStatus get_connection_status() const; }; -#endif +#endif // WEBRTC_MULTIPLAYER_H diff --git a/modules/webrtc/webrtc_peer_connection.h b/modules/webrtc/webrtc_peer_connection.h index baf13332337..d251a799818 100644 --- a/modules/webrtc/webrtc_peer_connection.h +++ b/modules/webrtc/webrtc_peer_connection.h @@ -71,4 +71,5 @@ public: }; VARIANT_ENUM_CAST(WebRTCPeerConnection::ConnectionState); + #endif // WEBRTC_PEER_CONNECTION_H diff --git a/modules/websocket/emws_client.h b/modules/websocket/emws_client.h index d264e67c2e2..c0263bce58d 100644 --- a/modules/websocket/emws_client.h +++ b/modules/websocket/emws_client.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EMWSCLIENT_H -#define EMWSCLIENT_H +#ifndef EMWS_CLIENT_H +#define EMWS_CLIENT_H #ifdef JAVASCRIPT_ENABLED @@ -68,4 +68,4 @@ public: #endif // JAVASCRIPT_ENABLED -#endif // EMWSCLIENT_H +#endif // EMWS_CLIENT_H diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h index 1c80a39fbd5..7d57cba03f4 100644 --- a/modules/websocket/emws_peer.h +++ b/modules/websocket/emws_peer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EMWSPEER_H -#define EMWSPEER_H +#ifndef EMWS_PEER_H +#define EMWS_PEER_H #ifdef JAVASCRIPT_ENABLED @@ -90,4 +90,4 @@ public: #endif // JAVASCRIPT_ENABLED -#endif // LSWPEER_H +#endif // EMWS_PEER_H diff --git a/modules/websocket/emws_server.h b/modules/websocket/emws_server.h index 8803814b822..b08cde520fb 100644 --- a/modules/websocket/emws_server.h +++ b/modules/websocket/emws_server.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EMWSSERVER_H -#define EMWSSERVER_H +#ifndef EMWS_SERVER_H +#define EMWS_SERVER_H #ifdef JAVASCRIPT_ENABLED @@ -61,4 +61,4 @@ public: #endif -#endif // LWSSERVER_H +#endif // EMWS_SERVER_H diff --git a/modules/websocket/websocket_macros.h b/modules/websocket/websocket_macros.h index 73741d374fc..8f204c360a3 100644 --- a/modules/websocket/websocket_macros.h +++ b/modules/websocket/websocket_macros.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WEBSOCKETMACTOS_H -#define WEBSOCKETMACTOS_H +#ifndef WEBSOCKET_MACROS_H +#define WEBSOCKET_MACROS_H #define WSC_IN_BUF PNAME("network/limits/websocket_client/max_in_buffer_kb") #define WSC_IN_PKT PNAME("network/limits/websocket_client/max_in_packets") @@ -71,4 +71,4 @@ public:\ protected:\ /* clang-format on */ -#endif // WEBSOCKETMACTOS_H +#endif // WEBSOCKET_MACROS_H diff --git a/modules/websocket/websocket_peer.h b/modules/websocket/websocket_peer.h index 50ec4819c6c..a5fd1b6d7f0 100644 --- a/modules/websocket/websocket_peer.h +++ b/modules/websocket/websocket_peer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WEBSOCKETPEER_H -#define WEBSOCKETPEER_H +#ifndef WEBSOCKET_PEER_H +#define WEBSOCKET_PEER_H #include "core/error_list.h" #include "core/io/packet_peer.h" @@ -71,4 +71,5 @@ public: }; VARIANT_ENUM_CAST(WebSocketPeer::WriteMode); -#endif // WEBSOCKETPEER_H + +#endif // WEBSOCKET_PEER_H diff --git a/modules/websocket/websocket_server.h b/modules/websocket/websocket_server.h index 561afa0047a..320fc667c3f 100644 --- a/modules/websocket/websocket_server.h +++ b/modules/websocket/websocket_server.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WEBSOCKET_H -#define WEBSOCKET_H +#ifndef WEBSOCKET_SERVER_H +#define WEBSOCKET_SERVER_H #include "core/crypto/crypto.h" #include "core/reference.h" @@ -91,4 +91,4 @@ public: ~WebSocketServer(); }; -#endif // WEBSOCKET_H +#endif // WEBSOCKET_SERVER_H diff --git a/modules/websocket/wsl_client.h b/modules/websocket/wsl_client.h index 9184b0f0f89..07e69897d54 100644 --- a/modules/websocket/wsl_client.h +++ b/modules/websocket/wsl_client.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WSLCLIENT_H -#define WSLCLIENT_H +#ifndef WSL_CLIENT_H +#define WSL_CLIENT_H #ifndef JAVASCRIPT_ENABLED @@ -89,4 +89,4 @@ public: #endif // JAVASCRIPT_ENABLED -#endif // WSLCLIENT_H +#endif // WSL_CLIENT_H diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h index f050d8535e6..8dbedd92dc5 100644 --- a/modules/websocket/wsl_peer.h +++ b/modules/websocket/wsl_peer.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WSLPEER_H -#define WSLPEER_H +#ifndef WSL_PEER_H +#define WSL_PEER_H #ifndef JAVASCRIPT_ENABLED @@ -124,4 +124,4 @@ public: #endif // JAVASCRIPT_ENABLED -#endif // LSWPEER_H +#endif // WSL_PEER_H diff --git a/modules/websocket/wsl_server.h b/modules/websocket/wsl_server.h index edd4dfc925c..6a42adf07e2 100644 --- a/modules/websocket/wsl_server.h +++ b/modules/websocket/wsl_server.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WSLSERVER_H -#define WSLSERVER_H +#ifndef WSL_SERVER_H +#define WSL_SERVER_H #ifndef JAVASCRIPT_ENABLED @@ -97,4 +97,4 @@ public: #endif // JAVASCRIPT_ENABLED -#endif // WSLSERVER_H +#endif // WSL_SERVER_H diff --git a/modules/webxr/godot_webxr.h b/modules/webxr/godot_webxr.h index df3f4b29d8c..b035811c904 100644 --- a/modules/webxr/godot_webxr.h +++ b/modules/webxr/godot_webxr.h @@ -91,4 +91,4 @@ extern int *godot_webxr_get_bounds_geometry(); } #endif -#endif /* GODOT_WEBXR_H */ +#endif // GODOT_WEBXR_H diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h index 81923a25d0d..0afc9ad977b 100644 --- a/platform/android/export/gradle_export_util.h +++ b/platform/android/export/gradle_export_util.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_GRADLE_EXPORT_UTIL_H -#define GODOT_GRADLE_EXPORT_UTIL_H +#ifndef ANDROID_GRADLE_EXPORT_UTIL_H +#define ANDROID_GRADLE_EXPORT_UTIL_H #include "core/io/zip_io.h" #include "core/os/dir_access.h" @@ -107,4 +107,4 @@ String _get_activity_tag(const Ref &p_preset); String _get_application_tag(const Ref &p_preset, bool p_has_read_write_storage_permission); -#endif // GODOT_GRADLE_EXPORT_UTIL_H +#endif // ANDROID_GRADLE_EXPORT_UTIL_H diff --git a/platform/iphone/ios.h b/platform/iphone/ios.h index 05ecccf61a5..6113ba65abe 100644 --- a/platform/iphone/ios.h +++ b/platform/iphone/ios.h @@ -58,4 +58,4 @@ public: iOS(); }; -#endif +#endif // IOS_H diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index c2fdd1bcd0b..2c3f520fede 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef IPHONE_ENABLED - #ifndef OS_IPHONE_H #define OS_IPHONE_H +#ifdef IPHONE_ENABLED + #include "core/os/input.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" #include "drivers/unix/os_unix.h" @@ -195,6 +195,6 @@ public: void on_focus_in(); }; -#endif // OS_IPHONE_H +#endif // IPHONE_ENABLED -#endif +#endif // OS_IPHONE_H diff --git a/platform/javascript/audio_driver_javascript.h b/platform/javascript/audio_driver_javascript.h index b7b0b3ac960..807e2f936b9 100644 --- a/platform/javascript/audio_driver_javascript.h +++ b/platform/javascript/audio_driver_javascript.h @@ -158,4 +158,4 @@ public: }; #endif -#endif +#endif // AUDIO_DRIVER_JAVASCRIPT_H diff --git a/platform/javascript/godot_audio.h b/platform/javascript/godot_audio.h index 012f8daeb7f..3855b7301ec 100644 --- a/platform/javascript/godot_audio.h +++ b/platform/javascript/godot_audio.h @@ -63,4 +63,4 @@ extern void godot_audio_script_start(float *p_in_buf, int p_in_size, float *p_ou } #endif -#endif /* GODOT_AUDIO_H */ +#endif // GODOT_AUDIO_H diff --git a/platform/javascript/godot_js.h b/platform/javascript/godot_js.h index 2cb5c3025c9..d300d9fc317 100644 --- a/platform/javascript/godot_js.h +++ b/platform/javascript/godot_js.h @@ -117,4 +117,4 @@ extern void godot_js_display_vk_hide(); } #endif -#endif /* GODOT_JS_H */ +#endif // GODOT_JS_H diff --git a/platform/javascript/godot_webgl2.h b/platform/javascript/godot_webgl2.h index 01b6489335e..da584fd75aa 100644 --- a/platform/javascript/godot_webgl2.h +++ b/platform/javascript/godot_webgl2.h @@ -34,4 +34,4 @@ // We could include "webgl/webgl2.h", but old (< 2.0.17) emscripten versions do not have it, so use our own wrapper instead. void glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -#endif +#endif // GODOT_WEBGL2_H diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index fc646a026ba..a1cc7aa8371 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -201,4 +201,4 @@ public: OS_JavaScript(); }; -#endif +#endif // OS_JAVASCRIPT_H diff --git a/platform/osx/dir_access_osx.h b/platform/osx/dir_access_osx.h index 4b43a9efe34..d86c7bd1839 100644 --- a/platform/osx/dir_access_osx.h +++ b/platform/osx/dir_access_osx.h @@ -51,5 +51,6 @@ protected: virtual bool is_hidden(const String &p_name); }; -#endif //UNIX ENABLED -#endif +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED + +#endif // DIR_ACCESS_OSX_H diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm index d26f35e8476..53c0e0e1ad6 100644 --- a/platform/osx/dir_access_osx.mm +++ b/platform/osx/dir_access_osx.mm @@ -78,4 +78,4 @@ bool DirAccessOSX::is_hidden(const String &p_name) { return [hidden boolValue]; } -#endif //posix_enabled +#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED diff --git a/platform/osx/export/codesign.h b/platform/osx/export/codesign.h index 2f6c139b17e..90d56442f48 100644 --- a/platform/osx/export/codesign.h +++ b/platform/osx/export/codesign.h @@ -38,8 +38,8 @@ // - Requirements code generator is not implemented (only hard-coded requirements for the ad-hoc signing is supported). // - RFC5652/CMS blob generation is not implemented, supports ad-hoc signing only. -#ifndef CODESIGN_H -#define CODESIGN_H +#ifndef OSX_CODESIGN_H +#define OSX_CODESIGN_H #include "core/crypto/crypto.h" #include "core/crypto/crypto_core.h" @@ -365,4 +365,4 @@ public: #endif // MODULE_REGEX_ENABLED -#endif // CODESIGN_H +#endif // OSX_CODESIGN_H diff --git a/platform/osx/export/lipo.h b/platform/osx/export/lipo.h index 2d679300af2..fe0b3a1dd38 100644 --- a/platform/osx/export/lipo.h +++ b/platform/osx/export/lipo.h @@ -30,8 +30,8 @@ // Universal / Universal 2 fat binary file creator and extractor. -#ifndef LIPO_H -#define LIPO_H +#ifndef OSX_LIPO_H +#define OSX_LIPO_H #include "core/os/file_access.h" #include "core/reference.h" @@ -73,4 +73,4 @@ public: #endif // MODULE_REGEX_ENABLED -#endif // LIPO_H +#endif // OSX_LIPO_H diff --git a/platform/osx/export/macho.h b/platform/osx/export/macho.h index 9887d7f84dc..84f38755b07 100644 --- a/platform/osx/export/macho.h +++ b/platform/osx/export/macho.h @@ -30,8 +30,8 @@ // Mach-O binary object file format parser and editor. -#ifndef MACHO_H -#define MACHO_H +#ifndef OSX_MACHO_H +#define OSX_MACHO_H #include "core/crypto/crypto.h" #include "core/crypto/crypto_core.h" @@ -214,4 +214,4 @@ public: #endif // MODULE_REGEX_ENABLED -#endif // MACHO_H +#endif // OSX_MACHO_H diff --git a/platform/osx/export/plist.h b/platform/osx/export/plist.h index 34457ea7e57..d95017ef65d 100644 --- a/platform/osx/export/plist.h +++ b/platform/osx/export/plist.h @@ -30,8 +30,8 @@ // Property list file format (application/x-plist) parser, property list ASN-1 serialization. -#ifndef PLIST_H -#define PLIST_H +#ifndef OSX_PLIST_H +#define OSX_PLIST_H #include "core/crypto/crypto_core.h" #include "core/os/file_access.h" @@ -113,4 +113,4 @@ public: #endif // MODULE_REGEX_ENABLED -#endif // PLIST_H +#endif // OSX_PLIST_H diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index f10ea96d95c..bdde5ab6853 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOYPADOSX_H -#define JOYPADOSX_H +#ifndef JOYPAD_OSX_H +#define JOYPAD_OSX_H #ifdef MACOS_10_0_4 #include @@ -121,4 +121,4 @@ public: ~JoypadOSX(); }; -#endif // JOYPADOSX_H +#endif // JOYPAD_OSX_H diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index af5a879d6eb..1ce88afdb68 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -345,4 +345,4 @@ private: Point2 get_screens_origin() const; }; -#endif +#endif // OS_OSX_H diff --git a/platform/register_platform_apis.h b/platform/register_platform_apis.h index 8b6d23a7a43..9dd90d9b205 100644 --- a/platform/register_platform_apis.h +++ b/platform/register_platform_apis.h @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REGISTER_APIS_H -#define REGISTER_APIS_H +#ifndef REGISTER_PLATFORM_APIS_H +#define REGISTER_PLATFORM_APIS_H void register_platform_apis(); void unregister_platform_apis(); -#endif +#endif // REGISTER_PLATFORM_APIS_H diff --git a/platform/server/os_server.h b/platform/server/os_server.h index af03f898db1..36c5d5d0670 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -127,4 +127,4 @@ public: OS_Server(); }; -#endif +#endif // OS_SERVER_H diff --git a/platform/uwp/joypad_uwp.h b/platform/uwp/joypad_uwp.h index 99be2547d6b..20144648155 100644 --- a/platform/uwp/joypad_uwp.h +++ b/platform/uwp/joypad_uwp.h @@ -87,4 +87,4 @@ private: void joypad_vibration_stop(int p_device, uint64_t p_timestamp); }; -#endif +#endif // JOYPAD_UWP_H diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index de279074d64..543d2311d17 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -260,4 +260,4 @@ public: ~OS_UWP(); }; -#endif +#endif // OS_UWP_H diff --git a/platform/windows/context_gl_windows.h b/platform/windows/context_gl_windows.h index 81fa17b0581..1f23c1be324 100644 --- a/platform/windows/context_gl_windows.h +++ b/platform/windows/context_gl_windows.h @@ -28,13 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef CONTEXT_GL_WINDOWS_H +#define CONTEXT_GL_WINDOWS_H + #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) -// Author: Juan Linietsky , (C) 2008 - -#ifndef CONTEXT_GL_WIN_H -#define CONTEXT_GL_WIN_H - #include "core/error_list.h" #include "core/os/os.h" @@ -85,4 +83,5 @@ public: }; #endif -#endif + +#endif // CONTEXT_GL_WINDOWS_H diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 1b26c2c7f34..dba0e6c9607 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -602,4 +602,4 @@ public: ~OS_Windows(); }; -#endif +#endif // OS_WINDOWS_H diff --git a/platform/windows/windows_terminal_logger.h b/platform/windows/windows_terminal_logger.h index 9d4f13dd0b6..2614b147e74 100644 --- a/platform/windows/windows_terminal_logger.h +++ b/platform/windows/windows_terminal_logger.h @@ -44,4 +44,4 @@ public: #endif -#endif +#endif // WINDOWS_TERMINAL_LOGGER_H diff --git a/platform/x11/context_gl_x11.h b/platform/x11/context_gl_x11.h index 9f2f20744cf..1399980c414 100644 --- a/platform/x11/context_gl_x11.h +++ b/platform/x11/context_gl_x11.h @@ -85,4 +85,5 @@ public: #endif #endif -#endif + +#endif // CONTEXT_GL_X11_H diff --git a/platform/x11/detect_prime.h b/platform/x11/detect_prime.h index 0b3d0daa691..faf48e6f5d2 100644 --- a/platform/x11/detect_prime.h +++ b/platform/x11/detect_prime.h @@ -34,4 +34,5 @@ int detect_prime(); #endif -#endif + +#endif // DETECT_PRIME_H diff --git a/platform/x11/joypad_linux.h b/platform/x11/joypad_linux.h index 97c33d7fb77..5c3ef341b43 100644 --- a/platform/x11/joypad_linux.h +++ b/platform/x11/joypad_linux.h @@ -29,6 +29,7 @@ /*************************************************************************/ //author: Andreas Haas + #ifndef JOYPAD_LINUX_H #define JOYPAD_LINUX_H @@ -120,4 +121,5 @@ private: }; #endif + #endif // JOYPAD_LINUX_H diff --git a/platform/x11/key_mapping_x11.h b/platform/x11/key_mapping_x11.h index 7769d85c4bb..5d8bc5d1a74 100644 --- a/platform/x11/key_mapping_x11.h +++ b/platform/x11/key_mapping_x11.h @@ -52,4 +52,4 @@ public: static KeySym get_keysym_from_unicode(unsigned int p_unicode); }; -#endif +#endif // KEY_MAPPING_X11_H diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 8447a5cdcd4..e1953070a99 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -376,4 +376,4 @@ public: OS_X11(); }; -#endif +#endif // OS_X11_H diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index 43ae6588e51..4829500c35c 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -134,4 +134,4 @@ public: ~AudioStreamPlayer2D(); }; -#endif +#endif // AUDIO_STREAM_PLAYER_2D_H diff --git a/scene/2d/back_buffer_copy.h b/scene/2d/back_buffer_copy.h index 2b84040993b..825affdb65e 100644 --- a/scene/2d/back_buffer_copy.h +++ b/scene/2d/back_buffer_copy.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BACKBUFFERCOPY_H -#define BACKBUFFERCOPY_H +#ifndef BACK_BUFFER_COPY_H +#define BACK_BUFFER_COPY_H #include "scene/2d/node_2d.h" @@ -71,4 +71,4 @@ public: VARIANT_ENUM_CAST(BackBufferCopy::CopyMode); -#endif // BACKBUFFERCOPY_H +#endif // BACK_BUFFER_COPY_H diff --git a/scene/2d/canvas_modulate.h b/scene/2d/canvas_modulate.h index 8175ff987ae..5553180c6d1 100644 --- a/scene/2d/canvas_modulate.h +++ b/scene/2d/canvas_modulate.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CANVASMODULATE_H -#define CANVASMODULATE_H +#ifndef CANVAS_MODULATE_H +#define CANVAS_MODULATE_H #include "scene/2d/node_2d.h" @@ -52,4 +52,4 @@ public: ~CanvasModulate(); }; -#endif // CANVASMODULATE_H +#endif // CANVAS_MODULATE_H diff --git a/scene/2d/light_occluder_2d.h b/scene/2d/light_occluder_2d.h index 0d72cb9feac..af5b59a925e 100644 --- a/scene/2d/light_occluder_2d.h +++ b/scene/2d/light_occluder_2d.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef LIGHTOCCLUDER2D_H -#define LIGHTOCCLUDER2D_H +#ifndef LIGHT_OCCLUDER_2D_H +#define LIGHT_OCCLUDER_2D_H #include "scene/2d/node_2d.h" @@ -109,4 +109,4 @@ public: ~LightOccluder2D(); }; -#endif // LIGHTOCCLUDER2D_H +#endif // LIGHT_OCCLUDER_2D_H diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h index fd0c70c784e..9da38839d47 100644 --- a/scene/2d/line_2d.h +++ b/scene/2d/line_2d.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef LINE2D_H -#define LINE2D_H +#ifndef LINE_2D_H +#define LINE_2D_H #include "node_2d.h" @@ -138,4 +138,4 @@ private: bool _antialiased; }; -#endif // LINE2D_H +#endif // LINE_2D_H diff --git a/scene/2d/listener_2d.h b/scene/2d/listener_2d.h index 115bbba82c1..6cbab51c56f 100644 --- a/scene/2d/listener_2d.h +++ b/scene/2d/listener_2d.h @@ -56,4 +56,4 @@ public: bool is_current() const; }; -#endif +#endif // LISTENER_2D_H diff --git a/scene/2d/navigation_agent_2d.h b/scene/2d/navigation_agent_2d.h index b85d9703874..4409094d4a3 100644 --- a/scene/2d/navigation_agent_2d.h +++ b/scene/2d/navigation_agent_2d.h @@ -171,4 +171,4 @@ private: void _check_distance_to_target(); }; -#endif +#endif // NAVIGATION_AGENT_2D_H diff --git a/scene/2d/navigation_obstacle_2d.h b/scene/2d/navigation_obstacle_2d.h index 5923e390f5c..dc11644140e 100644 --- a/scene/2d/navigation_obstacle_2d.h +++ b/scene/2d/navigation_obstacle_2d.h @@ -84,4 +84,4 @@ private: real_t estimate_agent_radius() const; }; -#endif +#endif // NAVIGATION_OBSTACLE_2D_H diff --git a/scene/2d/navigation_polygon.h b/scene/2d/navigation_polygon.h index f5b09180518..256535994c5 100644 --- a/scene/2d/navigation_polygon.h +++ b/scene/2d/navigation_polygon.h @@ -142,4 +142,4 @@ public: ~NavigationPolygonInstance(); }; -#endif // NAVIGATIONPOLYGON_H +#endif // NAVIGATION_POLYGON_H diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h index 420f80fbaa7..55a48e16800 100644 --- a/scene/2d/node_2d.h +++ b/scene/2d/node_2d.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NODE2D_H -#define NODE2D_H +#ifndef NODE_2D_H +#define NODE_2D_H #include "scene/2d/canvas_item.h" @@ -123,4 +123,4 @@ public: Node2D(); }; -#endif // NODE2D_H +#endif // NODE_2D_H diff --git a/scene/3d/area.h b/scene/3d/area.h index 93245693ddb..96a5b78f89c 100644 --- a/scene/3d/area.h +++ b/scene/3d/area.h @@ -199,4 +199,4 @@ public: VARIANT_ENUM_CAST(Area::SpaceOverride); -#endif // AREA__H +#endif // AREA_H diff --git a/scene/3d/arvr_nodes.h b/scene/3d/arvr_nodes.h index 569088e0957..7753cd69278 100644 --- a/scene/3d/arvr_nodes.h +++ b/scene/3d/arvr_nodes.h @@ -170,4 +170,4 @@ public: ~ARVROrigin(); }; -#endif /* ARVR_NODES_H */ +#endif // ARVR_NODES_H diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h index c1b9cdad664..b4429a988a1 100644 --- a/scene/3d/audio_stream_player_3d.h +++ b/scene/3d/audio_stream_player_3d.h @@ -216,4 +216,5 @@ public: VARIANT_ENUM_CAST(AudioStreamPlayer3D::AttenuationModel) VARIANT_ENUM_CAST(AudioStreamPlayer3D::OutOfRangeMode) VARIANT_ENUM_CAST(AudioStreamPlayer3D::DopplerTracking) + #endif // AUDIO_STREAM_PLAYER_3D_H diff --git a/scene/3d/baked_lightmap.h b/scene/3d/baked_lightmap.h index 3c208ee5512..b5a1969175a 100644 --- a/scene/3d/baked_lightmap.h +++ b/scene/3d/baked_lightmap.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BAKED_INDIRECT_LIGHT_H -#define BAKED_INDIRECT_LIGHT_H +#ifndef BAKED_LIGHTMAP_H +#define BAKED_LIGHTMAP_H #include "core/local_vector.h" #include "multimesh_instance.h" @@ -285,4 +285,4 @@ VARIANT_ENUM_CAST(BakedLightmap::BakeQuality); VARIANT_ENUM_CAST(BakedLightmap::BakeError); VARIANT_ENUM_CAST(BakedLightmap::EnvironmentMode); -#endif // BAKED_INDIRECT_LIGHT_H +#endif // BAKED_LIGHTMAP_H diff --git a/scene/3d/camera.h b/scene/3d/camera.h index 090f1c91ddc..66246448c61 100644 --- a/scene/3d/camera.h +++ b/scene/3d/camera.h @@ -237,4 +237,5 @@ public: }; VARIANT_ENUM_CAST(ClippedCamera::ProcessMode); -#endif + +#endif // CAMERA_H diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index 8b4c4232093..13eeda8d4c6 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.h @@ -145,4 +145,4 @@ public: ~CollisionObject(); }; -#endif // COLLISION_OBJECT__H +#endif // COLLISION_OBJECT_H diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h index 375f10e38e2..2f40c4666cb 100644 --- a/scene/3d/collision_shape.h +++ b/scene/3d/collision_shape.h @@ -68,4 +68,4 @@ public: ~CollisionShape(); }; -#endif // BODY_VOLUME_H +#endif // COLLISION_SHAPE_H diff --git a/scene/3d/cull_instance.h b/scene/3d/cull_instance.h index 248f556164b..beb9ddc4c0c 100644 --- a/scene/3d/cull_instance.h +++ b/scene/3d/cull_instance.h @@ -78,4 +78,4 @@ private: int _portal_autoplace_priority; }; -#endif +#endif // CULL_INSTANCE_H diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index 0f310b87185..ce639483f6d 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GIPROBE_H -#define GIPROBE_H +#ifndef GI_PROBE_H +#define GI_PROBE_H #include "multimesh_instance.h" #include "scene/3d/visual_instance.h" @@ -175,4 +175,4 @@ public: VARIANT_ENUM_CAST(GIProbe::Subdiv) -#endif // GIPROBE_H +#endif // GI_PROBE_H diff --git a/scene/3d/light.h b/scene/3d/light.h index 8719becd980..c5c058d9485 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -221,4 +221,4 @@ public: Light(VisualServer::LIGHT_SPOT) {} }; -#endif +#endif // LIGHT_H diff --git a/scene/3d/listener.h b/scene/3d/listener.h index 6be314cc069..fd84bf1ddb0 100644 --- a/scene/3d/listener.h +++ b/scene/3d/listener.h @@ -68,4 +68,4 @@ public: ~Listener(); }; -#endif +#endif // LISTENER_H diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 22d3c63e52a..59d4aee065e 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -156,4 +156,4 @@ public: ~MeshInstance(); }; -#endif +#endif // MESH_INSTANCE_H diff --git a/scene/3d/navigation_agent.h b/scene/3d/navigation_agent.h index 018937ca196..f9cb6c64ef2 100644 --- a/scene/3d/navigation_agent.h +++ b/scene/3d/navigation_agent.h @@ -183,4 +183,4 @@ private: void _check_distance_to_target(); }; -#endif +#endif // NAVIGATION_AGENT_H diff --git a/scene/3d/navigation_obstacle.h b/scene/3d/navigation_obstacle.h index 686386c1f2c..51472c766c3 100644 --- a/scene/3d/navigation_obstacle.h +++ b/scene/3d/navigation_obstacle.h @@ -86,4 +86,4 @@ private: real_t estimate_agent_radius() const; }; -#endif +#endif // NAVIGATION_OBSTACLE_H diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index f35cd5ccc2d..8a254bc2aa2 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_BODY__H -#define PHYSICS_BODY__H +#ifndef PHYSICS_BODY_H +#define PHYSICS_BODY_H #include "core/vset.h" #include "scene/3d/collision_object.h" @@ -664,4 +664,4 @@ private: VARIANT_ENUM_CAST(PhysicalBone::JointType); -#endif // PHYSICS_BODY__H +#endif // PHYSICS_BODY_H diff --git a/scene/3d/portal.h b/scene/3d/portal.h index cfcd5f6ae47..c963f66d5f4 100644 --- a/scene/3d/portal.h +++ b/scene/3d/portal.h @@ -188,4 +188,4 @@ protected: void _notification(int p_what); }; -#endif +#endif // PORTAL_H diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 58e700c9db5..8cce7bf4f10 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REFLECTIONPROBE_H -#define REFLECTIONPROBE_H +#ifndef REFLECTION_PROBE_H +#define REFLECTION_PROBE_H #include "scene/3d/visual_instance.h" #include "scene/resources/sky.h" @@ -111,4 +111,4 @@ public: VARIANT_ENUM_CAST(ReflectionProbe::UpdateMode); -#endif // REFLECTIONPROBE_H +#endif // REFLECTION_PROBE_H diff --git a/scene/3d/remote_transform.h b/scene/3d/remote_transform.h index 052fc98d4bb..aa01604eb93 100644 --- a/scene/3d/remote_transform.h +++ b/scene/3d/remote_transform.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REMOTETRANSFORM_H -#define REMOTETRANSFORM_H +#ifndef REMOTE_TRANSFORM_H +#define REMOTE_TRANSFORM_H #include "scene/3d/spatial.h" @@ -75,4 +75,4 @@ public: RemoteTransform(); }; -#endif // REMOTETRANSFORM_H +#endif // REMOTE_TRANSFORM_H diff --git a/scene/3d/room.h b/scene/3d/room.h index b529d9ca001..1cb6c471001 100644 --- a/scene/3d/room.h +++ b/scene/3d/room.h @@ -172,4 +172,4 @@ bool Room::detect_nodes_using_lambda(const Node *p_node, T p_lambda, bool p_igno return false; } -#endif +#endif // ROOM_H diff --git a/scene/3d/room_group.h b/scene/3d/room_group.h index a5527bb4d3b..3f170e48b9e 100644 --- a/scene/3d/room_group.h +++ b/scene/3d/room_group.h @@ -78,4 +78,4 @@ protected: void _notification(int p_what); }; -#endif +#endif // ROOM_GROUP_H diff --git a/scene/3d/room_manager.h b/scene/3d/room_manager.h index 8f3171571bc..62586f6e2b4 100644 --- a/scene/3d/room_manager.h +++ b/scene/3d/room_manager.h @@ -277,4 +277,4 @@ protected: VARIANT_ENUM_CAST(RoomManager::PVSMode); -#endif +#endif // ROOM_MANAGER_H diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index 22c1742761e..1b8d1630836 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.h @@ -228,4 +228,4 @@ public: ~Skeleton(); }; -#endif +#endif // SKELETON_H diff --git a/scene/3d/soft_body.h b/scene/3d/soft_body.h index 2a24300b8a0..8f9549caf61 100644 --- a/scene/3d/soft_body.h +++ b/scene/3d/soft_body.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SOFT_PHYSICS_BODY_H -#define SOFT_PHYSICS_BODY_H +#ifndef SOFT_BODY_H +#define SOFT_BODY_H #include "scene/3d/mesh_instance.h" @@ -202,4 +202,4 @@ private: int _has_pinned_point(int p_point_index) const; }; -#endif // SOFT_PHYSICS_BODY_H +#endif // SOFT_BODY_H diff --git a/scene/3d/spatial.h b/scene/3d/spatial.h index 000b8cc6ccf..e2204d64bda 100644 --- a/scene/3d/spatial.h +++ b/scene/3d/spatial.h @@ -235,4 +235,4 @@ public: ~Spatial(); }; -#endif +#endif // SPATIAL_H diff --git a/scene/3d/spring_arm.h b/scene/3d/spring_arm.h index 16b4268ebc9..c1497861667 100644 --- a/scene/3d/spring_arm.h +++ b/scene/3d/spring_arm.h @@ -68,4 +68,4 @@ private: void process_spring(); }; -#endif +#endif // SPRING_ARM_H diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 163ff2f10e5..524cd5d5965 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -250,4 +250,5 @@ public: VARIANT_ENUM_CAST(SpriteBase3D::DrawFlags); VARIANT_ENUM_CAST(SpriteBase3D::AlphaCutMode); + #endif // SPRITE_3D_H diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index 0643aa17b67..65ad5decab0 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -167,4 +167,4 @@ VARIANT_ENUM_CAST(GeometryInstance::Flags); VARIANT_ENUM_CAST(GeometryInstance::LightmapScale); VARIANT_ENUM_CAST(GeometryInstance::ShadowCastingSetting); -#endif +#endif // VISUAL_INSTANCE_H diff --git a/scene/3d/world_environment.h b/scene/3d/world_environment.h index 2cb625fb3b6..1ee4c19f79e 100644 --- a/scene/3d/world_environment.h +++ b/scene/3d/world_environment.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SCENARIO_FX_H -#define SCENARIO_FX_H +#ifndef WORLD_ENVIRONMENT_H +#define WORLD_ENVIRONMENT_H #include "scene/3d/spatial.h" @@ -51,4 +51,4 @@ public: WorldEnvironment(); }; -#endif +#endif // WORLD_ENVIRONMENT_H diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index 8f44e6c1c9c..5e7a2556645 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -367,4 +367,4 @@ public: VARIANT_ENUM_CAST(AnimationPlayer::AnimationProcessMode); VARIANT_ENUM_CAST(AnimationPlayer::AnimationMethodCallMode); -#endif +#endif // ANIMATION_PLAYER_H diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index f7147306e95..12aece981cf 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ANIMATION_GRAPH_PLAYER_H -#define ANIMATION_GRAPH_PLAYER_H +#ifndef ANIMATION_TREE_H +#define ANIMATION_TREE_H #include "animation_player.h" #include "scene/3d/skeleton.h" @@ -329,4 +329,4 @@ public: VARIANT_ENUM_CAST(AnimationTree::AnimationProcessMode) -#endif // ANIMATION_GRAPH_PLAYER_H +#endif // ANIMATION_TREE_H diff --git a/scene/animation/easing_equations.h b/scene/animation/easing_equations.h index 6d246c7a939..094829e4064 100644 --- a/scene/animation/easing_equations.h +++ b/scene/animation/easing_equations.h @@ -402,4 +402,4 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) { } }; // namespace back -#endif +#endif // EASING_EQUATIONS_H diff --git a/scene/animation/scene_tree_tween.h b/scene/animation/scene_tree_tween.h index b2df797a34c..cf57d7b652d 100644 --- a/scene/animation/scene_tree_tween.h +++ b/scene/animation/scene_tree_tween.h @@ -253,4 +253,4 @@ private: Vector binds; }; -#endif +#endif // SCENE_TREE_TWEEN_H diff --git a/scene/animation/tween.h b/scene/animation/tween.h index aabd5f333a0..2a53979b4bd 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -196,4 +196,4 @@ VARIANT_ENUM_CAST(Tween::TweenProcessMode); VARIANT_ENUM_CAST(Tween::TransitionType); VARIANT_ENUM_CAST(Tween::EaseType); -#endif +#endif // TWEEN_H diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index 9a7dc3c7e3b..ed185133970 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -149,4 +149,4 @@ public: ButtonGroup(); }; -#endif +#endif // BASE_BUTTON_H diff --git a/scene/gui/button.h b/scene/gui/button.h index 016847b2de2..f41b9a9d91b 100644 --- a/scene/gui/button.h +++ b/scene/gui/button.h @@ -89,4 +89,4 @@ public: VARIANT_ENUM_CAST(Button::TextAlign); -#endif +#endif // BUTTON_H diff --git a/scene/gui/check_box.h b/scene/gui/check_box.h index 036dd5c0649..abfd738610f 100644 --- a/scene/gui/check_box.h +++ b/scene/gui/check_box.h @@ -50,4 +50,4 @@ public: ~CheckBox(); }; -#endif +#endif // CHECK_BOX_H diff --git a/scene/gui/check_button.h b/scene/gui/check_button.h index 4e568759b83..951f670d0f0 100644 --- a/scene/gui/check_button.h +++ b/scene/gui/check_button.h @@ -48,4 +48,4 @@ public: ~CheckButton(); }; -#endif +#endif // CHECK_BUTTON_H diff --git a/scene/gui/control.h b/scene/gui/control.h index 0a0d33665cc..a8a4c555fa8 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -514,4 +514,4 @@ VARIANT_ENUM_CAST(Control::MouseFilter); VARIANT_ENUM_CAST(Control::GrowDirection); VARIANT_ENUM_CAST(Control::Anchor); -#endif +#endif // CONTROL_H diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h index 66c0ac56dfa..36ce2258ca3 100644 --- a/scene/gui/dialogs.h +++ b/scene/gui/dialogs.h @@ -163,4 +163,4 @@ public: ConfirmationDialog(); }; -#endif +#endif // DIALOGS_H diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h index 11fba15b9d8..274a06ca1dd 100644 --- a/scene/gui/file_dialog.h +++ b/scene/gui/file_dialog.h @@ -197,4 +197,4 @@ public: VARIANT_ENUM_CAST(FileDialog::Mode); VARIANT_ENUM_CAST(FileDialog::Access); -#endif +#endif // FILE_DIALOG_H diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index 88de7cc4c3f..2e4365bf895 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -299,4 +299,4 @@ public: GraphEdit(); }; -#endif // GRAPHEdit_H +#endif // GRAPH_EDIT_H diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h index 069e18fe801..2c34f681fbe 100644 --- a/scene/gui/item_list.h +++ b/scene/gui/item_list.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ITEMLIST_H -#define ITEMLIST_H +#ifndef ITEM_LIST_H +#define ITEM_LIST_H #include "scene/gui/control.h" #include "scene/gui/scroll_bar.h" @@ -237,4 +237,4 @@ public: VARIANT_ENUM_CAST(ItemList::SelectMode); VARIANT_ENUM_CAST(ItemList::IconMode); -#endif // ITEMLIST_H +#endif // ITEM_LIST_H diff --git a/scene/gui/label.h b/scene/gui/label.h index 7eb632d0b78..1e78bb19698 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -146,4 +146,4 @@ public: VARIANT_ENUM_CAST(Label::Align); VARIANT_ENUM_CAST(Label::VAlign); -#endif +#endif // LABEL_H diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 14c3f4795c0..15d2bfc5487 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -267,4 +267,4 @@ public: VARIANT_ENUM_CAST(LineEdit::Align); VARIANT_ENUM_CAST(LineEdit::MenuItems); -#endif +#endif // LINE_EDIT_H diff --git a/scene/gui/link_button.h b/scene/gui/link_button.h index 6d388af8c83..2aa728e508d 100644 --- a/scene/gui/link_button.h +++ b/scene/gui/link_button.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef LINKBUTTON_H -#define LINKBUTTON_H +#ifndef LINK_BUTTON_H +#define LINK_BUTTON_H #include "scene/gui/base_button.h" #include "scene/resources/bit_map.h" @@ -66,4 +66,4 @@ public: VARIANT_ENUM_CAST(LinkButton::UnderlineMode); -#endif // LINKBUTTON_H +#endif // LINK_BUTTON_H diff --git a/scene/gui/menu_button.h b/scene/gui/menu_button.h index 08246ea1840..88fab89e16d 100644 --- a/scene/gui/menu_button.h +++ b/scene/gui/menu_button.h @@ -64,4 +64,4 @@ public: ~MenuButton(); }; -#endif +#endif // MENU_BUTTON_H diff --git a/scene/gui/nine_patch_rect.h b/scene/gui/nine_patch_rect.h index 35fe4d6c8e8..0979f3348a5 100644 --- a/scene/gui/nine_patch_rect.h +++ b/scene/gui/nine_patch_rect.h @@ -81,4 +81,5 @@ public: }; VARIANT_ENUM_CAST(NinePatchRect::AxisStretchMode) + #endif // NINE_PATCH_RECT_H diff --git a/scene/gui/option_button.h b/scene/gui/option_button.h index 5f873d194f4..4b89cf01802 100644 --- a/scene/gui/option_button.h +++ b/scene/gui/option_button.h @@ -95,4 +95,4 @@ public: ~OptionButton(); }; -#endif +#endif // OPTION_BUTTON_H diff --git a/scene/gui/panel.h b/scene/gui/panel.h index 6d387d3a72f..37551f21b25 100644 --- a/scene/gui/panel.h +++ b/scene/gui/panel.h @@ -44,4 +44,4 @@ public: ~Panel(); }; -#endif +#endif // PANEL_H diff --git a/scene/gui/popup.h b/scene/gui/popup.h index 3cdd5de401b..a64ae67c29e 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -84,4 +84,4 @@ public: PopupPanel(); }; -#endif +#endif // POPUP_H diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h index e2e367b9388..8834f90517c 100644 --- a/scene/gui/popup_menu.h +++ b/scene/gui/popup_menu.h @@ -222,4 +222,4 @@ public: ~PopupMenu(); }; -#endif +#endif // POPUP_MENU_H diff --git a/scene/gui/range.h b/scene/gui/range.h index c46522c5fd0..87f1455f57c 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -100,4 +100,4 @@ public: ~Range(); }; -#endif +#endif // RANGE_H diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h index f5229ec1dd8..c75382265e4 100644 --- a/scene/gui/scroll_bar.h +++ b/scene/gui/scroll_bar.h @@ -129,4 +129,4 @@ public: ScrollBar(VERTICAL) { set_h_size_flags(0); } }; -#endif +#endif // SCROLL_BAR_H diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index 99db7c6967f..b66e50fd709 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -108,4 +108,4 @@ public: ScrollContainer(); }; -#endif +#endif // SCROLL_CONTAINER_H diff --git a/scene/gui/separator.h b/scene/gui/separator.h index f32124acc84..ce9106509be 100644 --- a/scene/gui/separator.h +++ b/scene/gui/separator.h @@ -60,4 +60,4 @@ public: HSeparator(); }; -#endif +#endif // SEPARATOR_H diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h index 4cf0389c384..b27935df800 100644 --- a/scene/gui/texture_button.h +++ b/scene/gui/texture_button.h @@ -101,4 +101,5 @@ public: }; VARIANT_ENUM_CAST(TextureButton::StretchMode); + #endif // TEXTURE_BUTTON_H diff --git a/scene/gui/texture_rect.h b/scene/gui/texture_rect.h index 00e9f6ea1a4..40adc6690bb 100644 --- a/scene/gui/texture_rect.h +++ b/scene/gui/texture_rect.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TEXTURE_FRAME_H -#define TEXTURE_FRAME_H +#ifndef TEXTURE_RECT_H +#define TEXTURE_RECT_H #include "scene/gui/control.h" @@ -83,4 +83,5 @@ public: }; VARIANT_ENUM_CAST(TextureRect::StretchMode); -#endif // TEXTURE_FRAME_H + +#endif // TEXTURE_RECT_H diff --git a/scene/gui/tree.h b/scene/gui/tree.h index f0dfdd3d2ad..84418d101a5 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -610,4 +610,5 @@ public: VARIANT_ENUM_CAST(Tree::SelectMode); VARIANT_ENUM_CAST(Tree::DropModeFlags); -#endif + +#endif // TREE_H diff --git a/scene/gui/viewport_container.h b/scene/gui/viewport_container.h index 0a8c0add0ff..5b52c144216 100644 --- a/scene/gui/viewport_container.h +++ b/scene/gui/viewport_container.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VIEWPORTCONTAINER_H -#define VIEWPORTCONTAINER_H +#ifndef VIEWPORT_CONTAINER_H +#define VIEWPORT_CONTAINER_H #include "scene/gui/container.h" @@ -57,4 +57,4 @@ public: ViewportContainer(); }; -#endif // VIEWPORTCONTAINER_H +#endif // VIEWPORT_CONTAINER_H diff --git a/scene/main/http_request.h b/scene/main/http_request.h index 9aa293a251a..47fec1c1d4c 100644 --- a/scene/main/http_request.h +++ b/scene/main/http_request.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef HTTPREQUEST_H -#define HTTPREQUEST_H +#ifndef HTTP_REQUEST_H +#define HTTP_REQUEST_H #include "core/io/http_client.h" #include "core/os/file_access.h" @@ -156,4 +156,4 @@ public: VARIANT_ENUM_CAST(HTTPRequest::Result); -#endif // HTTPREQUEST_H +#endif // HTTP_REQUEST_H diff --git a/scene/main/node.h b/scene/main/node.h index f0ea3c5b40d..665c024e0c0 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -520,4 +520,4 @@ VARIANT_ENUM_CAST(Node::DuplicateFlags); typedef Set NodeSet; -#endif +#endif // NODE_H diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index 6ec06c4ffbd..b3c994b0b8c 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SCENE_MAIN_LOOP_H -#define SCENE_MAIN_LOOP_H +#ifndef SCENE_TREE_H +#define SCENE_TREE_H #include "core/io/multiplayer_api.h" #include "core/os/main_loop.h" @@ -437,4 +437,4 @@ VARIANT_ENUM_CAST(SceneTree::StretchMode); VARIANT_ENUM_CAST(SceneTree::StretchAspect); VARIANT_ENUM_CAST(SceneTree::GroupCallFlags); -#endif +#endif // SCENE_TREE_H diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 8d1de3dfa80..2ef9187b339 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -598,4 +598,4 @@ VARIANT_ENUM_CAST(Viewport::DebugDraw); VARIANT_ENUM_CAST(Viewport::ClearMode); VARIANT_ENUM_CAST(Viewport::RenderInfo); -#endif +#endif // VIEWPORT_H diff --git a/scene/register_scene_types.h b/scene/register_scene_types.h index f0a14387c12..dce87139766 100644 --- a/scene/register_scene_types.h +++ b/scene/register_scene_types.h @@ -36,4 +36,4 @@ void unregister_scene_types(); void initialize_theme(); -#endif +#endif // REGISTER_SCENE_TYPES_H diff --git a/scene/resources/animation.h b/scene/resources/animation.h index d8a7eb17bf4..ce15034019c 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -364,4 +364,4 @@ VARIANT_ENUM_CAST(Animation::TrackType); VARIANT_ENUM_CAST(Animation::InterpolationType); VARIANT_ENUM_CAST(Animation::UpdateMode); -#endif +#endif // ANIMATION_H diff --git a/scene/resources/concave_polygon_shape_2d.h b/scene/resources/concave_polygon_shape_2d.h index 4aaf588a473..d6b573ea92b 100644 --- a/scene/resources/concave_polygon_shape_2d.h +++ b/scene/resources/concave_polygon_shape_2d.h @@ -52,4 +52,4 @@ public: ConcavePolygonShape2D(); }; -#endif +#endif // CONCAVE_POLYGON_SHAPE_2D_H diff --git a/scene/resources/default_theme/default_theme.h b/scene/resources/default_theme/default_theme.h index 9e003906c5e..64937074d8f 100644 --- a/scene/resources/default_theme/default_theme.h +++ b/scene/resources/default_theme/default_theme.h @@ -37,4 +37,4 @@ void fill_default_theme(Ref &theme, const Ref &default_font, const void make_default_theme(bool p_hidpi, Ref p_font); void clear_default_theme(); -#endif +#endif // DEFAULT_THEME_H diff --git a/scene/resources/font.h b/scene/resources/font.h index 4b6fdf4089e..abde797bc52 100644 --- a/scene/resources/font.h +++ b/scene/resources/font.h @@ -226,4 +226,4 @@ public: VARIANT_ENUM_CAST(Font::ContourPointTag); -#endif +#endif // FONT_H diff --git a/scene/resources/height_map_shape.h b/scene/resources/height_map_shape.h index 73486294bec..13aed2fc8c4 100644 --- a/scene/resources/height_map_shape.h +++ b/scene/resources/height_map_shape.h @@ -60,4 +60,4 @@ public: HeightMapShape(); }; -#endif /* !HEIGHT_MAP_SHAPE_H */ +#endif // HEIGHT_MAP_SHAPE_H diff --git a/scene/resources/material.h b/scene/resources/material.h index 75b828dd132..a6725ee460d 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -662,4 +662,4 @@ VARIANT_ENUM_CAST(SpatialMaterial::AsyncMode) ////////////////////// -#endif +#endif // MATERIAL_H diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 21efe8e2190..582746261c1 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -247,4 +247,4 @@ VARIANT_ENUM_CAST(Mesh::ArrayFormat); VARIANT_ENUM_CAST(Mesh::PrimitiveType); VARIANT_ENUM_CAST(Mesh::BlendShapeMode); -#endif +#endif // MESH_H diff --git a/scene/resources/mesh_library.h b/scene/resources/mesh_library.h index 2c2afaaf47c..ac63308821b 100644 --- a/scene/resources/mesh_library.h +++ b/scene/resources/mesh_library.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GRID_THEME_H -#define GRID_THEME_H +#ifndef MESH_LIBRARY_H +#define MESH_LIBRARY_H #include "core/map.h" #include "core/resource.h" @@ -99,4 +99,4 @@ public: ~MeshLibrary(); }; -#endif // CUBE_GRID_THEME_H +#endif // MESH_LIBRARY_H diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h index 7698c8826d1..2eb5b400514 100644 --- a/scene/resources/multimesh.h +++ b/scene/resources/multimesh.h @@ -139,4 +139,4 @@ VARIANT_ENUM_CAST(MultiMesh::ColorFormat); VARIANT_ENUM_CAST(MultiMesh::CustomDataFormat); VARIANT_ENUM_CAST(MultiMesh::PhysicsInterpolationQuality); -#endif // MULTI_MESH_H +#endif // MULTIMESH_H diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 3fd4c381a51..fced3b86000 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -233,4 +233,4 @@ public: VARIANT_ENUM_CAST(PackedScene::GenEditState) -#endif // SCENE_PRELOADER_H +#endif // PACKED_SCENE_H diff --git a/scene/resources/physics_material.h b/scene/resources/physics_material.h index 89d5da46266..0e23ffda74e 100644 --- a/scene/resources/physics_material.h +++ b/scene/resources/physics_material.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef physics_material_override_H -#define physics_material_override_H +#ifndef PHYSICS_MATERIAL_H +#define PHYSICS_MATERIAL_H #include "core/resource.h" #include "servers/physics_server.h" @@ -71,4 +71,4 @@ public: PhysicsMaterial(); }; -#endif // physics_material_override_H +#endif // PHYSICS_MATERIAL_H diff --git a/scene/resources/plane_shape.h b/scene/resources/plane_shape.h index 73485d93496..bb6229e1677 100644 --- a/scene/resources/plane_shape.h +++ b/scene/resources/plane_shape.h @@ -53,4 +53,5 @@ public: PlaneShape(); }; + #endif // PLANE_SHAPE_H diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index 410735541bd..2b473e9dba9 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -461,4 +461,4 @@ public: VARIANT_ENUM_CAST(TextMesh::Align); -#endif +#endif // PRIMITIVE_MESHES_H diff --git a/scene/resources/ray_shape.h b/scene/resources/ray_shape.h index a11ef425fcc..4ea00f8578c 100644 --- a/scene/resources/ray_shape.h +++ b/scene/resources/ray_shape.h @@ -30,6 +30,7 @@ #ifndef RAY_SHAPE_H #define RAY_SHAPE_H + #include "scene/resources/shape.h" class RayShape : public Shape { @@ -53,4 +54,5 @@ public: RayShape(); }; + #endif // RAY_SHAPE_H diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index b075d6671b3..21bf6bec472 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -262,4 +262,4 @@ public: ~StyleBoxLine(); }; -#endif +#endif // STYLE_BOX_H diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index 00c1bd0f39d..3c8ad2a9b21 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -141,4 +141,4 @@ public: SurfaceTool(); }; -#endif +#endif // SURFACE_TOOL_H diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h index c0b618ca631..9cd26c9205d 100644 --- a/scene/resources/text_file.h +++ b/scene/resources/text_file.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TEXTFILE_H -#define TEXTFILE_H +#ifndef TEXT_FILE_H +#define TEXT_FILE_H #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" @@ -51,4 +51,4 @@ public: Error load_text(const String &p_path); }; -#endif // TEXTFILE_H +#endif // TEXT_FILE_H diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 6fde0c13548..10c6fa19013 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -895,4 +895,4 @@ public: ~ExternalTexture(); }; -#endif +#endif // TEXTURE_H diff --git a/scene/resources/theme.h b/scene/resources/theme.h index 6cec7ccdb9e..adbbe8eb59e 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -223,4 +223,4 @@ public: VARIANT_ENUM_CAST(Theme::DataType); -#endif +#endif // THEME_H diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h index e771a054dc1..2275100e0a1 100644 --- a/scene/resources/video_stream.h +++ b/scene/resources/video_stream.h @@ -74,4 +74,4 @@ public: virtual Ref instance_playback() = 0; }; -#endif +#endif // VIDEO_STREAM_H diff --git a/servers/arvr/arvr_interface.h b/servers/arvr/arvr_interface.h index 564f331f039..7e7bf2677bf 100644 --- a/servers/arvr/arvr_interface.h +++ b/servers/arvr/arvr_interface.h @@ -124,4 +124,4 @@ VARIANT_ENUM_CAST(ARVRInterface::Capabilities); VARIANT_ENUM_CAST(ARVRInterface::Eyes); VARIANT_ENUM_CAST(ARVRInterface::Tracking_status); -#endif +#endif // ARVR_INTERFACE_H diff --git a/servers/arvr/arvr_positional_tracker.h b/servers/arvr/arvr_positional_tracker.h index 64f1f488cfe..4b63f7f72ec 100644 --- a/servers/arvr/arvr_positional_tracker.h +++ b/servers/arvr/arvr_positional_tracker.h @@ -101,4 +101,4 @@ public: VARIANT_ENUM_CAST(ARVRPositionalTracker::TrackerHand); -#endif +#endif // ARVR_POSITIONAL_TRACKER_H diff --git a/servers/arvr_server.h b/servers/arvr_server.h index 02d7960bcc9..41f356ed16b 100644 --- a/servers/arvr_server.h +++ b/servers/arvr_server.h @@ -189,4 +189,4 @@ public: VARIANT_ENUM_CAST(ARVRServer::TrackerType); VARIANT_ENUM_CAST(ARVRServer::RotationMode); -#endif +#endif // ARVR_SERVER_H diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index b03414011da..5c93533a99b 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -71,4 +71,4 @@ public: ~AudioDriverDummy(); }; -#endif +#endif // AUDIO_DRIVER_DUMMY_H diff --git a/servers/audio/audio_effect.h b/servers/audio/audio_effect.h index f22712b3244..80cd9696bf8 100644 --- a/servers/audio/audio_effect.h +++ b/servers/audio/audio_effect.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECT_H -#define AUDIOEFFECT_H +#ifndef AUDIO_EFFECT_H +#define AUDIO_EFFECT_H #include "core/math/audio_frame.h" #include "core/resource.h" @@ -50,4 +50,4 @@ public: AudioEffect(); }; -#endif // AUDIOEFFECT_H +#endif // AUDIO_EFFECT_H diff --git a/servers/audio/effects/audio_effect_amplify.h b/servers/audio/effects/audio_effect_amplify.h index d332e006c4d..0abfb7a987b 100644 --- a/servers/audio/effects/audio_effect_amplify.h +++ b/servers/audio/effects/audio_effect_amplify.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTAMPLIFY_H -#define AUDIOEFFECTAMPLIFY_H +#ifndef AUDIO_EFFECT_AMPLIFY_H +#define AUDIO_EFFECT_AMPLIFY_H #include "servers/audio/audio_effect.h" @@ -63,4 +63,4 @@ public: AudioEffectAmplify(); }; -#endif // AUDIOEFFECTAMPLIFY_H +#endif // AUDIO_EFFECT_AMPLIFY_H diff --git a/servers/audio/effects/audio_effect_chorus.h b/servers/audio/effects/audio_effect_chorus.h index 573f5cc1ffb..9ef31035269 100644 --- a/servers/audio/effects/audio_effect_chorus.h +++ b/servers/audio/effects/audio_effect_chorus.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTCHORUS_H -#define AUDIOEFFECTCHORUS_H +#ifndef AUDIO_EFFECT_CHORUS_H +#define AUDIO_EFFECT_CHORUS_H #include "servers/audio/audio_effect.h" @@ -134,4 +134,4 @@ public: AudioEffectChorus(); }; -#endif // AUDIOEFFECTCHORUS_H +#endif // AUDIO_EFFECT_CHORUS_H diff --git a/servers/audio/effects/audio_effect_compressor.h b/servers/audio/effects/audio_effect_compressor.h index bee74aff833..72a54da8e7f 100644 --- a/servers/audio/effects/audio_effect_compressor.h +++ b/servers/audio/effects/audio_effect_compressor.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTCOMPRESSOR_H -#define AUDIOEFFECTCOMPRESSOR_H +#ifndef AUDIO_EFFECT_COMPRESSOR_H +#define AUDIO_EFFECT_COMPRESSOR_H #include "servers/audio/audio_effect.h" @@ -91,4 +91,4 @@ public: AudioEffectCompressor(); }; -#endif // AUDIOEFFECTCOMPRESSOR_H +#endif // AUDIO_EFFECT_COMPRESSOR_H diff --git a/servers/audio/effects/audio_effect_delay.h b/servers/audio/effects/audio_effect_delay.h index 5778a0260be..a55e7016a53 100644 --- a/servers/audio/effects/audio_effect_delay.h +++ b/servers/audio/effects/audio_effect_delay.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTDELAY_H -#define AUDIOEFFECTDELAY_H +#ifndef AUDIO_EFFECT_DELAY_H +#define AUDIO_EFFECT_DELAY_H #include "servers/audio/audio_effect.h" @@ -132,4 +132,4 @@ public: AudioEffectDelay(); }; -#endif // AUDIOEFFECTDELAY_H +#endif // AUDIO_EFFECT_DELAY_H diff --git a/servers/audio/effects/audio_effect_distortion.h b/servers/audio/effects/audio_effect_distortion.h index fdb6f74cd53..d0d076dd1cb 100644 --- a/servers/audio/effects/audio_effect_distortion.h +++ b/servers/audio/effects/audio_effect_distortion.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTDISTORTION_H -#define AUDIOEFFECTDISTORTION_H +#ifndef AUDIO_EFFECT_DISTORTION_H +#define AUDIO_EFFECT_DISTORTION_H #include "servers/audio/audio_effect.h" @@ -90,4 +90,4 @@ public: VARIANT_ENUM_CAST(AudioEffectDistortion::Mode) -#endif // AUDIOEFFECTDISTORTION_H +#endif // AUDIO_EFFECT_DISTORTION_H diff --git a/servers/audio/effects/audio_effect_eq.h b/servers/audio/effects/audio_effect_eq.h index 8f11f210a37..ad0e324f05f 100644 --- a/servers/audio/effects/audio_effect_eq.h +++ b/servers/audio/effects/audio_effect_eq.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTEQ_H -#define AUDIOEFFECTEQ_H +#ifndef AUDIO_EFFECT_EQ_H +#define AUDIO_EFFECT_EQ_H #include "servers/audio/audio_effect.h" -#include "servers/audio/effects/eq.h" +#include "servers/audio/effects/eq_filter.h" class AudioEffectEQ; @@ -98,4 +98,4 @@ public: AudioEffectEQ(EQ::PRESET_21_BANDS) {} }; -#endif // AUDIOEFFECTEQ_H +#endif // AUDIO_EFFECT_EQ_H diff --git a/servers/audio/effects/audio_effect_filter.h b/servers/audio/effects/audio_effect_filter.h index cf76b094d9b..19f8542e663 100644 --- a/servers/audio/effects/audio_effect_filter.h +++ b/servers/audio/effects/audio_effect_filter.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTFILTER_H -#define AUDIOEFFECTFILTER_H +#ifndef AUDIO_EFFECT_FILTER_H +#define AUDIO_EFFECT_FILTER_H #include "servers/audio/audio_effect.h" #include "servers/audio/audio_filter_sw.h" @@ -167,4 +167,4 @@ public: AudioEffectFilter(AudioFilterSW::HIGHSHELF) {} }; -#endif // AUDIOEFFECTFILTER_H +#endif // AUDIO_EFFECT_FILTER_H diff --git a/servers/audio/effects/audio_effect_panner.h b/servers/audio/effects/audio_effect_panner.h index 752cb93777c..5b22c214fd7 100644 --- a/servers/audio/effects/audio_effect_panner.h +++ b/servers/audio/effects/audio_effect_panner.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTPANNER_H -#define AUDIOEFFECTPANNER_H +#ifndef AUDIO_EFFECT_PANNER_H +#define AUDIO_EFFECT_PANNER_H #include "servers/audio/audio_effect.h" @@ -61,4 +61,4 @@ public: AudioEffectPanner(); }; -#endif // AUDIOEFFECTPANNER_H +#endif // AUDIO_EFFECT_PANNER_H diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h index 87d3a0fbbaa..be42970623b 100644 --- a/servers/audio/effects/audio_effect_record.h +++ b/servers/audio/effects/audio_effect_record.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTRECORD_H -#define AUDIOEFFECTRECORD_H +#ifndef AUDIO_EFFECT_RECORD_H +#define AUDIO_EFFECT_RECORD_H #include "core/io/marshalls.h" #include "core/os/file_access.h" @@ -103,4 +103,4 @@ public: AudioEffectRecord(); }; -#endif // AUDIOEFFECTRECORD_H +#endif // AUDIO_EFFECT_RECORD_H diff --git a/servers/audio/effects/audio_effect_reverb.h b/servers/audio/effects/audio_effect_reverb.h index 6116d9a450d..c73c295dacf 100644 --- a/servers/audio/effects/audio_effect_reverb.h +++ b/servers/audio/effects/audio_effect_reverb.h @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTREVERB_H -#define AUDIOEFFECTREVERB_H +#ifndef AUDIO_EFFECT_REVERB_H +#define AUDIO_EFFECT_REVERB_H #include "servers/audio/audio_effect.h" -#include "servers/audio/effects/reverb.h" +#include "servers/audio/effects/reverb_filter.h" class AudioEffectReverb; @@ -94,4 +94,4 @@ public: AudioEffectReverb(); }; -#endif // AUDIOEFFECTREVERB_H +#endif // AUDIO_EFFECT_REVERB_H diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h index 79530f73dc6..bc40d268e68 100644 --- a/servers/audio/effects/audio_effect_stereo_enhance.h +++ b/servers/audio/effects/audio_effect_stereo_enhance.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTSTEREOENHANCE_H -#define AUDIOEFFECTSTEREOENHANCE_H +#ifndef AUDIO_EFFECT_STEREO_ENHANCE_H +#define AUDIO_EFFECT_STEREO_ENHANCE_H #include "servers/audio/audio_effect.h" @@ -83,4 +83,4 @@ public: AudioEffectStereoEnhance(); }; -#endif // AUDIOEFFECTSTEREOENHANCE_H +#endif // AUDIO_EFFECT_STEREO_ENHANCE_H diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h index 88bad5d1d66..abe34bd3d4a 100644 --- a/servers/audio/effects/audio_stream_generator.h +++ b/servers/audio/effects/audio_stream_generator.h @@ -92,4 +92,5 @@ public: AudioStreamGeneratorPlayback(); }; + #endif // AUDIO_STREAM_GENERATOR_H diff --git a/servers/audio/effects/eq.cpp b/servers/audio/effects/eq_filter.cpp similarity index 98% rename from servers/audio/effects/eq.cpp rename to servers/audio/effects/eq_filter.cpp index eb58d1236ea..f43316fe796 100644 --- a/servers/audio/effects/eq.cpp +++ b/servers/audio/effects/eq_filter.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* eq.cpp */ +/* eq_filter.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,9 +30,11 @@ // Author: reduzio@gmail.com (C) 2006 -#include "eq.h" +#include "eq_filter.h" + #include "core/error_macros.h" #include "core/math/math_funcs.h" + #include #define POW2(v) ((v) * (v)) diff --git a/servers/audio/effects/eq.h b/servers/audio/effects/eq_filter.h similarity index 97% rename from servers/audio/effects/eq.h rename to servers/audio/effects/eq_filter.h index 19306d19f1a..96a4e355b90 100644 --- a/servers/audio/effects/eq.h +++ b/servers/audio/effects/eq_filter.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* eq.h */ +/* eq_filter.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -106,4 +106,4 @@ inline void EQ::BandProcess::process_one(float &p_data) { history.b2 = history.b1; } -#endif +#endif // EQ_FILTER_H diff --git a/servers/audio/effects/reverb.cpp b/servers/audio/effects/reverb_filter.cpp similarity index 98% rename from servers/audio/effects/reverb.cpp rename to servers/audio/effects/reverb_filter.cpp index faec5104845..5b25046420a 100644 --- a/servers/audio/effects/reverb.cpp +++ b/servers/audio/effects/reverb_filter.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* reverb.cpp */ +/* reverb_filter.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,8 +30,10 @@ // Author: Juan Linietsky , (C) 2006 -#include "reverb.h" +#include "reverb_filter.h" + #include "core/math/math_funcs.h" + #include const float Reverb::comb_tunings[MAX_COMBS] = { diff --git a/servers/audio/effects/reverb.h b/servers/audio/effects/reverb_filter.h similarity index 96% rename from servers/audio/effects/reverb.h rename to servers/audio/effects/reverb_filter.h index 4e52c0dcb75..17f40f7e846 100644 --- a/servers/audio/effects/reverb.h +++ b/servers/audio/effects/reverb_filter.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* reverb.h */ +/* reverb_filter.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,8 +30,8 @@ // Author: Juan Linietsky , (C) 2006 -#ifndef REVERB_H -#define REVERB_H +#ifndef REVERB_FILTER_H +#define REVERB_FILTER_H #include "core/math/audio_frame.h" #include "core/os/memory.h" @@ -131,4 +131,4 @@ public: ~Reverb(); }; -#endif +#endif // REVERB_FILTER_H diff --git a/servers/camera/camera_feed.h b/servers/camera/camera_feed.h index bb8a8681256..f0c43f3d6ed 100644 --- a/servers/camera/camera_feed.h +++ b/servers/camera/camera_feed.h @@ -112,4 +112,4 @@ public: VARIANT_ENUM_CAST(CameraFeed::FeedDataType); VARIANT_ENUM_CAST(CameraFeed::FeedPosition); -#endif /* !CAMERA_FEED_H */ +#endif // CAMERA_FEED_H diff --git a/servers/camera_server.h b/servers/camera_server.h index a19a7a34f2f..6876d4832e4 100644 --- a/servers/camera_server.h +++ b/servers/camera_server.h @@ -112,4 +112,4 @@ public: VARIANT_ENUM_CAST(CameraServer::FeedImage); -#endif /* CAMERA_SERVER_H */ +#endif // CAMERA_SERVER_H diff --git a/servers/physics/area_pair_sw.h b/servers/physics/area_pair_sw.h index 2623f825e62..788269df07a 100644 --- a/servers/physics/area_pair_sw.h +++ b/servers/physics/area_pair_sw.h @@ -67,4 +67,4 @@ public: ~Area2PairSW(); }; -#endif // AREA_PAIR__SW_H +#endif // AREA_PAIR_SW_H diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h index c5ceb3ff19f..c5d9dbb3de1 100644 --- a/servers/physics/area_sw.h +++ b/servers/physics/area_sw.h @@ -196,4 +196,4 @@ void AreaSW::remove_area_from_query(AreaSW *p_area, uint32_t p_area_shape, uint3 } } -#endif // AREA__SW_H +#endif // AREA_SW_H diff --git a/servers/physics/body_pair_sw.h b/servers/physics/body_pair_sw.h index 23f5eb1e0ec..1a8c93a307b 100644 --- a/servers/physics/body_pair_sw.h +++ b/servers/physics/body_pair_sw.h @@ -93,4 +93,4 @@ public: ~BodyPairSW(); }; -#endif // BODY_PAIR__SW_H +#endif // BODY_PAIR_SW_H diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h index 02fff887be7..3a2312d4027 100644 --- a/servers/physics/body_sw.h +++ b/servers/physics/body_sw.h @@ -486,4 +486,4 @@ public: PhysicsDirectBodyStateSW() {} }; -#endif // BODY__SW_H +#endif // BODY_SW_H diff --git a/servers/physics/broad_phase_sw.h b/servers/physics/broad_phase_sw.h index e275fa943b4..d715e5cf69e 100644 --- a/servers/physics/broad_phase_sw.h +++ b/servers/physics/broad_phase_sw.h @@ -70,4 +70,4 @@ public: virtual ~BroadPhaseSW(); }; -#endif // BROAD_PHASE__SW_H +#endif // BROAD_PHASE_SW_H diff --git a/servers/physics/collision_solver_sw.h b/servers/physics/collision_solver_sw.h index 2a1035c3e76..705619c0d89 100644 --- a/servers/physics/collision_solver_sw.h +++ b/servers/physics/collision_solver_sw.h @@ -50,4 +50,4 @@ public: static bool solve_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const AABB &p_concave_hint, Vector3 *r_sep_axis = nullptr); }; -#endif // COLLISION_SOLVER__SW_H +#endif // COLLISION_SOLVER_SW_H diff --git a/servers/physics/constraint_sw.h b/servers/physics/constraint_sw.h index 69e3ecd0c1c..4a5f9b2a77f 100644 --- a/servers/physics/constraint_sw.h +++ b/servers/physics/constraint_sw.h @@ -81,4 +81,4 @@ public: virtual ~ConstraintSW() {} }; -#endif // CONSTRAINT__SW_H +#endif // CONSTRAINT_SW_H diff --git a/servers/physics/gjk_epa.h b/servers/physics/gjk_epa.h index 4536922066e..5979577e2c8 100644 --- a/servers/physics/gjk_epa.h +++ b/servers/physics/gjk_epa.h @@ -37,4 +37,4 @@ bool gjk_epa_calculate_penetration(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, CollisionSolverSW::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, real_t p_margin_A = 0.0, real_t p_margin_B = 0.0); bool gjk_epa_calculate_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_result_A, Vector3 &r_result_B); -#endif +#endif // GJK_EPA_H diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index 610518d0ae9..d450795e497 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_SERVER_SW -#define PHYSICS_SERVER_SW +#ifndef PHYSICS_SERVER_SW_H +#define PHYSICS_SERVER_SW_H #include "joints_sw.h" #include "servers/physics_server.h" @@ -370,4 +370,4 @@ public: ~PhysicsServerSW(); }; -#endif +#endif // PHYSICS_SERVER_SW_H diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index c4369369e36..8dcf35498db 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -526,4 +526,4 @@ struct _ShapeTestConvexBSPSW { } }; -#endif // SHAPESW_H +#endif // SHAPE_SW_H diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 30e6709dfec..64e45d24ab7 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -208,4 +208,4 @@ public: ~SpaceSW(); }; -#endif // SPACE__SW_H +#endif // SPACE_SW_H diff --git a/servers/physics/step_sw.h b/servers/physics/step_sw.h index b0267f46324..0c156a5e7a1 100644 --- a/servers/physics/step_sw.h +++ b/servers/physics/step_sw.h @@ -46,4 +46,4 @@ public: StepSW(); }; -#endif // STEP__SW_H +#endif // STEP_SW_H diff --git a/servers/physics_2d/physics_2d_server_sw.h b/servers/physics_2d/physics_2d_server_sw.h index dec6880667a..29359e1a4c5 100644 --- a/servers/physics_2d/physics_2d_server_sw.h +++ b/servers/physics_2d/physics_2d_server_sw.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_2D_SERVER_SW -#define PHYSICS_2D_SERVER_SW +#ifndef PHYSICS_2D_SERVER_SW_H +#define PHYSICS_2D_SERVER_SW_H #include "joints_2d_sw.h" #include "servers/physics_2d_server.h" @@ -289,4 +289,4 @@ public: ~Physics2DServerSW(); }; -#endif +#endif // PHYSICS_2D_SERVER_SW_H diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index e6f485c4e5f..330af7f7a01 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS2DSERVERWRAPMT_H -#define PHYSICS2DSERVERWRAPMT_H +#ifndef PHYSICS_2D_SERVER_WRAP_MT_H +#define PHYSICS_2D_SERVER_WRAP_MT_H #include "core/command_queue_mt.h" #include "core/os/thread.h" @@ -334,4 +334,4 @@ public: #endif #undef SYNC_DEBUG -#endif // PHYSICS2DSERVERWRAPMT_H +#endif // PHYSICS_2D_SERVER_WRAP_MT_H diff --git a/servers/physics_2d/shape_2d_sw.h b/servers/physics_2d/shape_2d_sw.h index 0513657a77f..2c606774bc2 100644 --- a/servers/physics_2d/shape_2d_sw.h +++ b/servers/physics_2d/shape_2d_sw.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHAPE_2D_2DSW_H -#define SHAPE_2D_2DSW_H +#ifndef SHAPE_2D_SW_H +#define SHAPE_2D_SW_H #include "servers/physics_2d_server.h" #define _SEGMENT_IS_VALID_SUPPORT_THRESHOLD 0.99998 @@ -533,4 +533,4 @@ public: #undef DEFAULT_PROJECT_RANGE_CAST -#endif // SHAPE_2D_2DSW_H +#endif // SHAPE_2D_SW_H diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index f3424788963..ceb6f2ed1e5 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -664,4 +664,4 @@ VARIANT_ENUM_CAST(Physics2DServer::DampedStringParam); VARIANT_ENUM_CAST(Physics2DServer::AreaBodyStatus); VARIANT_ENUM_CAST(Physics2DServer::ProcessInfo); -#endif +#endif // PHYSICS_2D_SERVER_H diff --git a/servers/physics_server.h b/servers/physics_server.h index c642943d7e2..c2c5d74844d 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -840,4 +840,4 @@ VARIANT_ENUM_CAST(PhysicsServer::G6DOFJointAxisFlag); VARIANT_ENUM_CAST(PhysicsServer::AreaBodyStatus); VARIANT_ENUM_CAST(PhysicsServer::ProcessInfo); -#endif +#endif // PHYSICS_SERVER_H diff --git a/servers/server_wrap_mt_common.h b/servers/server_wrap_mt_common.h index 6df24506149..c453dadc4e8 100644 --- a/servers/server_wrap_mt_common.h +++ b/servers/server_wrap_mt_common.h @@ -28,6 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef SERVER_WRAP_MT_COMMON_H +#define SERVER_WRAP_MT_COMMON_H + #define FUNC0R(m_r, m_type) \ virtual m_r m_type() { \ if (Thread::get_caller_id() != server_thread) { \ @@ -820,3 +823,5 @@ server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); \ } \ } + +#endif // SERVER_WRAP_MT_COMMON_H diff --git a/servers/visual/portals/portal_gameplay_monitor.h b/servers/visual/portals/portal_gameplay_monitor.h index 00d2c44dc78..c187bcbb63b 100644 --- a/servers/visual/portals/portal_gameplay_monitor.h +++ b/servers/visual/portals/portal_gameplay_monitor.h @@ -93,4 +93,4 @@ private: bool _use_signals = false; }; -#endif +#endif // PORTAL_GAMEPLAY_MONITOR_H diff --git a/servers/visual/portals/portal_pvs.h b/servers/visual/portals/portal_pvs.h index d758d83e1d4..ca09d1c123a 100644 --- a/servers/visual/portals/portal_pvs.h +++ b/servers/visual/portals/portal_pvs.h @@ -56,4 +56,4 @@ private: bool _loaded = false; }; -#endif +#endif // PORTAL_PVS_H diff --git a/servers/visual/portals/portal_pvs_builder.h b/servers/visual/portals/portal_pvs_builder.h index 44ffe1a4bb1..7b939b38d34 100644 --- a/servers/visual/portals/portal_pvs_builder.h +++ b/servers/visual/portals/portal_pvs_builder.h @@ -71,4 +71,4 @@ private: static bool _log_active; }; -#endif +#endif // PORTAL_PVS_BUILDER_H diff --git a/servers/visual/portals/portal_rooms_bsp.h b/servers/visual/portals/portal_rooms_bsp.h index fa72a904944..b0f95b4d2c4 100644 --- a/servers/visual/portals/portal_rooms_bsp.h +++ b/servers/visual/portals/portal_rooms_bsp.h @@ -103,4 +103,4 @@ private: void _log(String p_string); }; -#endif +#endif // PORTAL_ROOMS_BSP_H diff --git a/servers/visual/portals/portal_tracer.h b/servers/visual/portals/portal_tracer.h index d5f85558d43..f79ae62f157 100644 --- a/servers/visual/portals/portal_tracer.h +++ b/servers/visual/portals/portal_tracer.h @@ -173,4 +173,4 @@ private: uint32_t _tick = 0; }; -#endif +#endif // PORTAL_TRACER_H diff --git a/servers/visual/portals/portal_types.h b/servers/visual/portals/portal_types.h index 6568316bac1..4798d1f7a25 100644 --- a/servers/visual/portals/portal_types.h +++ b/servers/visual/portals/portal_types.h @@ -512,4 +512,4 @@ struct VSOccluder_Poly { struct VSOccluder_Hole : public Occlusion::Poly { }; -#endif +#endif // PORTAL_TYPES_H diff --git a/servers/visual/shader_types.h b/servers/visual/shader_types.h index 2495b1e1a67..541a69b2439 100644 --- a/servers/visual/shader_types.h +++ b/servers/visual/shader_types.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADERTYPES_H -#define SHADERTYPES_H +#ifndef SHADER_TYPES_H +#define SHADER_TYPES_H #include "core/ordered_hash_map.h" #include "servers/visual_server.h" @@ -57,4 +57,4 @@ public: ShaderTypes(); }; -#endif // SHADERTYPES_H +#endif // SHADER_TYPES_H diff --git a/servers/visual/visual_server_canvas.h b/servers/visual/visual_server_canvas.h index a27b2fd72cb..f8fa0db1535 100644 --- a/servers/visual/visual_server_canvas.h +++ b/servers/visual/visual_server_canvas.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERCANVAS_H -#define VISUALSERVERCANVAS_H +#ifndef VISUAL_SERVER_CANVAS_H +#define VISUAL_SERVER_CANVAS_H #include "rasterizer.h" #include "visual_server_viewport.h" @@ -258,4 +258,4 @@ public: ~VisualServerCanvas(); }; -#endif // VISUALSERVERCANVAS_H +#endif // VISUAL_SERVER_CANVAS_H diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 7cec95877de..8bdab6bc0a4 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -827,4 +827,4 @@ public: #undef BIND10 }; -#endif +#endif // VISUAL_SERVER_RASTER_H diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index 06fc94825d2..826c1a9bee1 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERSCENE_H -#define VISUALSERVERSCENE_H +#ifndef VISUAL_SERVER_SCENE_H +#define VISUAL_SERVER_SCENE_H #include "servers/visual/rasterizer.h" @@ -905,4 +905,4 @@ public: virtual ~VisualServerScene(); }; -#endif // VISUALSERVERSCENE_H +#endif // VISUAL_SERVER_SCENE_H diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h index e794d9579ba..95956aa316f 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/visual/visual_server_viewport.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERVIEWPORT_H -#define VISUALSERVERVIEWPORT_H +#ifndef VISUAL_SERVER_VIEWPORT_H +#define VISUAL_SERVER_VIEWPORT_H #include "core/self_list.h" #include "rasterizer.h" @@ -205,4 +205,4 @@ public: virtual ~VisualServerViewport() {} }; -#endif // VISUALSERVERVIEWPORT_H +#endif // VISUAL_SERVER_VIEWPORT_H diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index de097369b41..a7e4be34264 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -732,4 +732,4 @@ public: #endif #undef SYNC_DEBUG -#endif +#endif // VISUAL_SERVER_WRAP_MT_H diff --git a/servers/visual_server.h b/servers/visual_server.h index 1a5d009d62d..a3f6878a7c5 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -1256,4 +1256,4 @@ VARIANT_ENUM_CAST(VisualServer::ChangedPriority); //typedef VisualServer VS; // makes it easier to use #define VS VisualServer -#endif +#endif // VISUAL_SERVER_H