From cf7b59b6c8503abf6b5c33811ddac6b1546fcf18 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 1 Mar 2024 16:25:19 +0100 Subject: [PATCH] Fix small formatting inconsistencies. --- core/io/networked_multiplayer_custom.h | 6 +++--- core/math/projection.h | 6 +++--- core/math/vector3i.h | 6 +++--- core/math/vector4.h | 6 +++--- core/math/vector4i.h | 6 +++--- core/os/thread_work_pool.h | 6 +++--- core/string/char_utils.h | 6 +++--- editor/editor_zoom_widget.h | 6 +++--- editor/plugins/bit_map_editor_plugin.h | 6 +++--- editor/plugins/gradient_texture_2d_editor_plugin.h | 6 +++--- editor/plugins/packed_scene_editor_plugin.h | 6 +++--- editor/plugins/ray_cast_2d_editor_plugin.h | 6 +++--- main/tests/test_theme.h | 6 +++--- main/tests/test_tools.h | 6 +++--- modules/jsonrpc/jsonrpc.h | 6 +++--- modules/jsonrpc/register_types.h | 6 +++--- modules/layered_tile_map/editor/atlas_merging_dialog.cpp | 2 +- modules/layered_tile_map/editor/atlas_merging_dialog.h | 2 +- modules/layered_tile_map/editor/layered_tile_atlas_view.h | 2 +- .../layered_tile_map/editor/layered_tile_data_editors.cpp | 2 +- .../layered_tile_map/editor/layered_tile_data_editors.h | 2 +- .../editor/layered_tile_map_layer_editor.cpp | 2 +- .../editor/layered_tile_map_layer_editor.h | 2 +- .../editor/layered_tile_proxies_manager_dialog.h | 2 +- .../editor/layered_tile_set_atlas_source_editor.cpp | 2 +- .../editor/layered_tile_set_atlas_source_editor.h | 2 +- .../layered_tile_map/editor/layered_tile_set_editor.cpp | 2 +- modules/layered_tile_map/editor/layered_tile_set_editor.h | 4 ++-- .../layered_tile_set_scenes_collection_source_editor.h | 2 +- .../editor/layered_tiles_editor_plugin.cpp | 8 ++++---- modules/layered_tile_map/layered_tile_map.cpp | 2 +- modules/layered_tile_map/layered_tile_map_layer.h | 2 +- modules/layered_tile_map/layered_tile_set.cpp | 6 +++--- modules/layered_tile_map/layered_tile_set.h | 4 ++-- platform/android/file_access_filesystem_jandroid.h | 6 +++--- platform/frt/frt.h | 6 +++--- platform/frt/import/gdkeys.h | 6 +++--- platform/frt/import/key_mapping_x11.h | 6 +++--- platform/frt_sdl/frt_lib.h | 6 +++--- platform/uwp/context_egl_uwp.h | 6 +++--- platform/uwp/joypad_uwp.h | 6 +++--- platform/uwp/os_uwp.h | 6 +++--- platform/uwp/power_uwp.h | 6 +++--- scene/2d/shape_cast_2d.h | 6 +++--- scene/3d/importer_mesh_instance_3d.h | 6 +++--- scene/3d/label_3d.h | 6 +++--- scene/3d/navigation_geometry_parser_3d.h | 6 +++--- scene/3d/shape_cast.h | 6 +++--- scene/animation/easing_equations.h | 6 +++--- scene/animation/scene_tree_tween.h | 6 +++--- scene/gui/resources/syntax_highlighter.h | 6 +++--- scene/resources/mesh/immediate_mesh.h | 6 +++--- scene/resources/mesh/importer_mesh.h | 6 +++--- 53 files changed, 130 insertions(+), 130 deletions(-) diff --git a/core/io/networked_multiplayer_custom.h b/core/io/networked_multiplayer_custom.h index 8a8fa5157..f6c11f9ba 100644 --- a/core/io/networked_multiplayer_custom.h +++ b/core/io/networked_multiplayer_custom.h @@ -1,3 +1,6 @@ +#ifndef NETWORKED_MULTIPLAYER_CUSTOM_H +#define NETWORKED_MULTIPLAYER_CUSTOM_H + /*************************************************************************/ /* networked_multiplayer_custom.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NETWORKED_MULTIPLAYER_CUSTOM_H -#define NETWORKED_MULTIPLAYER_CUSTOM_H - #include "core/io/networked_multiplayer_peer.h" class NetworkedMultiplayerCustom : public NetworkedMultiplayerPeer { diff --git a/core/math/projection.h b/core/math/projection.h index ece792d7d..4844706a3 100644 --- a/core/math/projection.h +++ b/core/math/projection.h @@ -1,3 +1,6 @@ +#ifndef PROJECTION_H +#define PROJECTION_H + /*************************************************************************/ /* projection.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PROJECTION_H -#define PROJECTION_H - #include "core/containers/vector.h" #include "core/math/math_defs.h" #include "core/math/vector3.h" diff --git a/core/math/vector3i.h b/core/math/vector3i.h index 0375e5bea..8a05089dc 100644 --- a/core/math/vector3i.h +++ b/core/math/vector3i.h @@ -1,3 +1,6 @@ +#ifndef VECTOR3I_H +#define VECTOR3I_H + /*************************************************************************/ /* vector3i.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VECTOR3I_H -#define VECTOR3I_H - #include "core/error/error_macros.h" #include "core/math/math_funcs.h" diff --git a/core/math/vector4.h b/core/math/vector4.h index f7d76145c..88646b8eb 100644 --- a/core/math/vector4.h +++ b/core/math/vector4.h @@ -1,3 +1,6 @@ +#ifndef VECTOR4_H +#define VECTOR4_H + /*************************************************************************/ /* vector4.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VECTOR4_H -#define VECTOR4_H - #include "core/math/math_defs.h" #include "core/math/math_funcs.h" #include "core/string/ustring.h" diff --git a/core/math/vector4i.h b/core/math/vector4i.h index 61b0a4e0d..cb38df03f 100644 --- a/core/math/vector4i.h +++ b/core/math/vector4i.h @@ -1,3 +1,6 @@ +#ifndef VECTOR4I_H +#define VECTOR4I_H + /*************************************************************************/ /* vector4i.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VECTOR4I_H -#define VECTOR4I_H - #include "core/error/error_macros.h" #include "core/math/math_funcs.h" diff --git a/core/os/thread_work_pool.h b/core/os/thread_work_pool.h index be5e3ced3..69e7585f8 100644 --- a/core/os/thread_work_pool.h +++ b/core/os/thread_work_pool.h @@ -1,3 +1,6 @@ +#ifndef THREAD_WORK_POOL_H +#define THREAD_WORK_POOL_H + /*************************************************************************/ /* thread_work_pool.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef THREAD_WORK_POOL_H -#define THREAD_WORK_POOL_H - #include "core/os/memory.h" #include "core/os/semaphore.h" #include "core/os/thread.h" diff --git a/core/string/char_utils.h b/core/string/char_utils.h index ff4dc0e0c..94bc86b87 100644 --- a/core/string/char_utils.h +++ b/core/string/char_utils.h @@ -1,3 +1,6 @@ +#ifndef CHAR_UTILS_H +#define CHAR_UTILS_H + /*************************************************************************/ /* char_utils.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CHAR_UTILS_H -#define CHAR_UTILS_H - #include "core/typedefs.h" #include "char_range.inc" diff --git a/editor/editor_zoom_widget.h b/editor/editor_zoom_widget.h index 822e8bfdf..b37db92e3 100644 --- a/editor/editor_zoom_widget.h +++ b/editor/editor_zoom_widget.h @@ -1,3 +1,6 @@ +#ifndef EDITOR_ZOOM_WIDGET_H +#define EDITOR_ZOOM_WIDGET_H + /*************************************************************************/ /* editor_zoom_widget.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_ZOOM_WIDGET_H -#define EDITOR_ZOOM_WIDGET_H - #include "scene/gui/box_container.h" class Button; diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/plugins/bit_map_editor_plugin.h index a645bcf7e..e3183d238 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/plugins/bit_map_editor_plugin.h @@ -1,3 +1,6 @@ +#ifndef BIT_MAP_EDITOR_PLUGIN_H +#define BIT_MAP_EDITOR_PLUGIN_H + /*************************************************************************/ /* bit_map_editor_plugin.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BIT_MAP_EDITOR_PLUGIN_H -#define BIT_MAP_EDITOR_PLUGIN_H - #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" #include "scene/resources/bit_map.h" diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/plugins/gradient_texture_2d_editor_plugin.h index 4fcf3264f..3d1876d52 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.h +++ b/editor/plugins/gradient_texture_2d_editor_plugin.h @@ -1,3 +1,6 @@ +#ifndef GRADIENT_TEXTURE_2D_EDITOR +#define GRADIENT_TEXTURE_2D_EDITOR + /*************************************************************************/ /* gradient_texture_2d_editor_plugin.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GRADIENT_TEXTURE_2D_EDITOR -#define GRADIENT_TEXTURE_2D_EDITOR - #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/packed_scene_editor_plugin.h b/editor/plugins/packed_scene_editor_plugin.h index 41646a90b..8d11e5167 100644 --- a/editor/plugins/packed_scene_editor_plugin.h +++ b/editor/plugins/packed_scene_editor_plugin.h @@ -1,3 +1,6 @@ +#ifndef PACKED_SCENE_EDITOR_PLUGIN_H +#define PACKED_SCENE_EDITOR_PLUGIN_H + /*************************************************************************/ /* packed_scene_editor_plugin.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PACKED_SCENE_EDITOR_PLUGIN_H -#define PACKED_SCENE_EDITOR_PLUGIN_H - #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/ray_cast_2d_editor_plugin.h b/editor/plugins/ray_cast_2d_editor_plugin.h index 725ff1a46..b9aad9900 100644 --- a/editor/plugins/ray_cast_2d_editor_plugin.h +++ b/editor/plugins/ray_cast_2d_editor_plugin.h @@ -1,3 +1,6 @@ +#ifndef RAY_CAST_2D_EDITOR_PLUGIN_H +#define RAY_CAST_2D_EDITOR_PLUGIN_H + /*************************************************************************/ /* ray_cast_2d_editor_plugin.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RAY_CAST_2D_EDITOR_PLUGIN_H -#define RAY_CAST_2D_EDITOR_PLUGIN_H - #include "editor/editor_plugin.h" #include "scene/2d/ray_cast_2d.h" diff --git a/main/tests/test_theme.h b/main/tests/test_theme.h index a545855c9..75899dc60 100644 --- a/main/tests/test_theme.h +++ b/main/tests/test_theme.h @@ -1,3 +1,6 @@ +#ifndef TEST_THEME_H +#define TEST_THEME_H + /*************************************************************************/ /* test_theme.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TEST_THEME_H -#define TEST_THEME_H - #include "core/os/main_loop.h" namespace TestTheme { diff --git a/main/tests/test_tools.h b/main/tests/test_tools.h index f0294aaee..2cdb5fd9c 100644 --- a/main/tests/test_tools.h +++ b/main/tests/test_tools.h @@ -1,3 +1,6 @@ +#ifndef TEST_TOOLS_H +#define TEST_TOOLS_H + /*************************************************************************/ /* test_tools.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TEST_TOOLS_H -#define TEST_TOOLS_H - #include "core/error/error_macros.h" struct ErrorDetector { diff --git a/modules/jsonrpc/jsonrpc.h b/modules/jsonrpc/jsonrpc.h index 1d7746336..6b6428e32 100644 --- a/modules/jsonrpc/jsonrpc.h +++ b/modules/jsonrpc/jsonrpc.h @@ -1,3 +1,6 @@ +#ifndef JSONRPC_H +#define JSONRPC_H + /*************************************************************************/ /* jsonrpc.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JSONRPC_H -#define JSONRPC_H - #include "core/object/object.h" #include "core/variant/variant.h" diff --git a/modules/jsonrpc/register_types.h b/modules/jsonrpc/register_types.h index cee29561c..2ff5670b7 100644 --- a/modules/jsonrpc/register_types.h +++ b/modules/jsonrpc/register_types.h @@ -1,3 +1,6 @@ +#ifndef JSONRPC_REGISTER_TYPES_H +#define JSONRPC_REGISTER_TYPES_H + /*************************************************************************/ /* register_types.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JSONRPC_REGISTER_TYPES_H -#define JSONRPC_REGISTER_TYPES_H - #include "modules/register_module_types.h" void register_jsonrpc_types(ModuleRegistrationLevel p_level); diff --git a/modules/layered_tile_map/editor/atlas_merging_dialog.cpp b/modules/layered_tile_map/editor/atlas_merging_dialog.cpp index 08b9f24f0..3975b3cc0 100644 --- a/modules/layered_tile_map/editor/atlas_merging_dialog.cpp +++ b/modules/layered_tile_map/editor/atlas_merging_dialog.cpp @@ -35,8 +35,8 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" -#include "scene/main/control.h" #include "scene/gui/split_container.h" +#include "scene/main/control.h" #include "scene/resources/texture.h" void AtlasMergingDialog::_property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) { diff --git a/modules/layered_tile_map/editor/atlas_merging_dialog.h b/modules/layered_tile_map/editor/atlas_merging_dialog.h index 9b011c9fb..27245d0ba 100644 --- a/modules/layered_tile_map/editor/atlas_merging_dialog.h +++ b/modules/layered_tile_map/editor/atlas_merging_dialog.h @@ -32,11 +32,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "../layered_tile_set.h" #include "editor/editor_properties.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" #include "scene/gui/texture_rect.h" -#include "../layered_tile_set.h" class EditorFileDialog; class EditorPropertyVector2i; diff --git a/modules/layered_tile_map/editor/layered_tile_atlas_view.h b/modules/layered_tile_map/editor/layered_tile_atlas_view.h index 217a9ca48..9f53b352e 100644 --- a/modules/layered_tile_map/editor/layered_tile_atlas_view.h +++ b/modules/layered_tile_map/editor/layered_tile_atlas_view.h @@ -32,13 +32,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "../layered_tile_set.h" #include "editor/gui/editor_zoom_widget.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/center_container.h" #include "scene/gui/label.h" #include "scene/gui/margin_container.h" -#include "../layered_tile_set.h" class ViewPanner; diff --git a/modules/layered_tile_map/editor/layered_tile_data_editors.cpp b/modules/layered_tile_map/editor/layered_tile_data_editors.cpp index 7ee023444..b364e746e 100644 --- a/modules/layered_tile_map/editor/layered_tile_data_editors.cpp +++ b/modules/layered_tile_map/editor/layered_tile_data_editors.cpp @@ -43,12 +43,12 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" -#include "scene/main/control.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" +#include "scene/main/control.h" #include "servers/navigation_2d_server.h" diff --git a/modules/layered_tile_map/editor/layered_tile_data_editors.h b/modules/layered_tile_map/editor/layered_tile_data_editors.h index 55ba75b45..4f505a309 100644 --- a/modules/layered_tile_map/editor/layered_tile_data_editors.h +++ b/modules/layered_tile_map/editor/layered_tile_data_editors.h @@ -34,8 +34,8 @@ #include "tile_atlas_view.h" -#include "editor/editor_properties.h" #include "../layered_tile_map.h" +#include "editor/editor_properties.h" #include "scene/gui/box_container.h" #include "scene/gui/panel_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp index c3a509649..606aeeb66 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp @@ -40,8 +40,8 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" -#include "scene/2d/camera_2d.h" #include "../layered_tile_map_layer.h" +#include "scene/2d/camera_2d.h" #include "scene/gui/center_container.h" #include "scene/gui/split_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h index 4b5b4966b..59efa5ace 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h @@ -34,9 +34,9 @@ #include "tile_atlas_view.h" +#include "../layered_tile_map.h" #include "core/os/thread.h" #include "core/typedefs.h" -#include "../layered_tile_map.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h index 1e303470b..9f29b4a9b 100644 --- a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h +++ b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h @@ -32,8 +32,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "editor/editor_properties.h" #include "../layered_tile_map.h" +#include "editor/editor_properties.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" diff --git a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp index fbc6d0c5a..d0de68415 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp @@ -45,11 +45,11 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/main/control.h" #include "scene/gui/item_list.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/tab_container.h" +#include "scene/main/control.h" #include "core/core_string_names.h" #include "core/math/geometry_2d.h" diff --git a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h index 064482f48..63ff0e6b2 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h @@ -35,8 +35,8 @@ #include "layered_tile_atlas_view.h" #include "layered_tile_data_editors.h" -#include "scene/gui/split_container.h" #include "../layered_tile_set.h" +#include "scene/gui/split_container.h" class Popup; class LayeredTileSet; diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp index cfffa260d..3b682fb14 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp @@ -43,9 +43,9 @@ #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" -#include "scene/main/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/tab_container.h" +#include "scene/main/control.h" LayeredTileSetEditor *LayeredTileSetEditor::singleton = nullptr; diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.h b/modules/layered_tile_map/editor/layered_tile_set_editor.h index a102ef1e1..667ba7b70 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.h @@ -32,12 +32,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "atlas_merging_dialog.h" -#include "scene/gui/tab_bar.h" #include "../layered_tile_set.h" +#include "atlas_merging_dialog.h" #include "layered_tile_proxies_manager_dialog.h" #include "layered_tile_set_atlas_source_editor.h" #include "layered_tile_set_scenes_collection_source_editor.h" +#include "scene/gui/tab_bar.h" class AcceptDialog; class SpinBox; diff --git a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h index 0f9268eac..7f3afc327 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h @@ -32,9 +32,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "../layered_tile_set.h" #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" -#include "../layered_tile_set.h" class Button; class ItemList; diff --git a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp index 3bfa7594c..7b143f48c 100644 --- a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp +++ b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp @@ -35,6 +35,9 @@ #include "core/os/mutex.h" +#include "../layered_tile_map.h" +#include "../layered_tile_map_layer.h" +#include "../layered_tile_set.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" @@ -42,13 +45,10 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" -#include "../layered_tile_map.h" -#include "../layered_tile_map_layer.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/main/control.h" #include "scene/gui/separator.h" -#include "../layered_tile_set.h" +#include "scene/main/control.h" #include "scene/resources/image_texture.h" LayeredTilesEditorUtils *LayeredTilesEditorUtils::singleton = nullptr; diff --git a/modules/layered_tile_map/layered_tile_map.cpp b/modules/layered_tile_map/layered_tile_map.cpp index 259ff114b..80c60840e 100644 --- a/modules/layered_tile_map/layered_tile_map.cpp +++ b/modules/layered_tile_map/layered_tile_map.cpp @@ -29,8 +29,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "layered_tile_map.compat.inc" #include "layered_tile_map.h" +#include "layered_tile_map.compat.inc" #include "core/core_string_names.h" #include "scene/2d/tile_map_layer.h" diff --git a/modules/layered_tile_map/layered_tile_map_layer.h b/modules/layered_tile_map/layered_tile_map_layer.h index 7a475e0f7..7d03672aa 100644 --- a/modules/layered_tile_map/layered_tile_map_layer.h +++ b/modules/layered_tile_map/layered_tile_map_layer.h @@ -32,8 +32,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/2d/tile_map.h" #include "layered_tile_set.h" +#include "scene/2d/tile_map.h" class LayeredTileSetAtlasSource; diff --git a/modules/layered_tile_map/layered_tile_set.cpp b/modules/layered_tile_map/layered_tile_set.cpp index 547f5d9e0..773fb9642 100644 --- a/modules/layered_tile_map/layered_tile_set.cpp +++ b/modules/layered_tile_map/layered_tile_set.cpp @@ -29,13 +29,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "layered_tile_set.compat.inc" #include "layered_tile_set.h" +#include "layered_tile_set.compat.inc" -#include "core/io/marshalls.h" -#include "core/math/geometry.h" #include "core/containers/local_vector.h" #include "core/containers/rb_set.h" +#include "core/io/marshalls.h" +#include "core/math/geometry.h" #include "scene/main/control.h" #include "scene/resources/texture.h" #include "servers/navigation_2d_server.h" diff --git a/modules/layered_tile_map/layered_tile_set.h b/modules/layered_tile_map/layered_tile_set.h index 8e132a5d1..3e3160caa 100644 --- a/modules/layered_tile_map/layered_tile_set.h +++ b/modules/layered_tile_map/layered_tile_set.h @@ -35,17 +35,17 @@ #include "core/containers/local_vector.h" #include "core/containers/rb_set.h" -#include "core/object/resource.h" #include "core/object/object.h" +#include "core/object/resource.h" #include "scene/2d/light_occluder_2d.h" #include "scene/main/canvas_item.h" -#include "scene/resources/texture.h" #include "scene/resources/navigation_2d/navigation_polygon.h" #include "scene/resources/packed_scene.h" #include "scene/resources/physics_material.h" #include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/texture.h" #ifndef DISABLE_DEPRECATED #include "scene/resources/shader.h" diff --git a/platform/android/file_access_filesystem_jandroid.h b/platform/android/file_access_filesystem_jandroid.h index 14f1c4d2d..5111f2282 100644 --- a/platform/android/file_access_filesystem_jandroid.h +++ b/platform/android/file_access_filesystem_jandroid.h @@ -1,3 +1,6 @@ +#ifndef FILE_ACCESS_FILESYSTEM_JANDROID_H +#define FILE_ACCESS_FILESYSTEM_JANDROID_H + /*************************************************************************/ /* file_access_filesystem_jandroid.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FILE_ACCESS_FILESYSTEM_JANDROID_H -#define FILE_ACCESS_FILESYSTEM_JANDROID_H - #include "core/os/file_access.h" #include "java_pandemonium_lib_jni.h" diff --git a/platform/frt/frt.h b/platform/frt/frt.h index 6ceb57ecf..a3627c15b 100644 --- a/platform/frt/frt.h +++ b/platform/frt/frt.h @@ -1,3 +1,6 @@ +#ifndef FRT_H +#define FRT_H + /*************************************************************************/ /* frt.h */ /*************************************************************************/ @@ -54,9 +57,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef FRT_H -#define FRT_H - #define FRT_WINDOW_TITLE "Pandemonium / FRT" #define FRT_VERSION "1.1.0" diff --git a/platform/frt/import/gdkeys.h b/platform/frt/import/gdkeys.h index b396a0026..f71337fee 100644 --- a/platform/frt/import/gdkeys.h +++ b/platform/frt/import/gdkeys.h @@ -1,3 +1,6 @@ +#ifndef IMPORT_GDKEYS_H +#define IMPORT_GDKEYS_H + /*************************************************************************/ /* gdkeys.h */ /*************************************************************************/ @@ -32,9 +35,6 @@ // imported from godot (core/os/keyboard.h), adding prefixes to avoid // clashes with the linux input api -#ifndef IMPORT_GDKEYS_H -#define IMPORT_GDKEYS_H - enum { GD_SPKEY = (1 << 24) }; enum GdKeyList { diff --git a/platform/frt/import/key_mapping_x11.h b/platform/frt/import/key_mapping_x11.h index db9360dd0..9e571495d 100644 --- a/platform/frt/import/key_mapping_x11.h +++ b/platform/frt/import/key_mapping_x11.h @@ -1,3 +1,6 @@ +#ifndef KEY_MAPPING_X11_H +#define KEY_MAPPING_X11_H + /*************************************************************************/ /* key_mapping_x11.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef KEY_MAPPING_X11_H -#define KEY_MAPPING_X11_H - /** @author Juan Linietsky */ diff --git a/platform/frt_sdl/frt_lib.h b/platform/frt_sdl/frt_lib.h index 4f451b0aa..c2fedd2df 100644 --- a/platform/frt_sdl/frt_lib.h +++ b/platform/frt_sdl/frt_lib.h @@ -1,3 +1,6 @@ +#ifndef FRT_LIB_H +#define FRT_LIB_H + /*************************************************************************/ /* frt_lib.h */ /*************************************************************************/ @@ -36,9 +39,6 @@ SPDX-License-Identifier: MIT */ -#ifndef FRT_LIB_H -#define FRT_LIB_H - #ifdef __cplusplus extern "C" { #endif diff --git a/platform/uwp/context_egl_uwp.h b/platform/uwp/context_egl_uwp.h index 2d479c274..5b7bd3223 100644 --- a/platform/uwp/context_egl_uwp.h +++ b/platform/uwp/context_egl_uwp.h @@ -1,3 +1,6 @@ +#ifndef CONTEXT_EGL_UWP_H +#define CONTEXT_EGL_UWP_H + /*************************************************************************/ /* context_egl_uwp.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CONTEXT_EGL_UWP_H -#define CONTEXT_EGL_UWP_H - #include #include diff --git a/platform/uwp/joypad_uwp.h b/platform/uwp/joypad_uwp.h index 0d379d449..e9efd5461 100644 --- a/platform/uwp/joypad_uwp.h +++ b/platform/uwp/joypad_uwp.h @@ -1,3 +1,6 @@ +#ifndef JOYPAD_UWP_H +#define JOYPAD_UWP_H + /*************************************************************************/ /* joypad_uwp.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOYPAD_UWP_H -#define JOYPAD_UWP_H - #include "main/input_default.h" ref class JoypadUWP sealed { diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index 10e6dc7da..fafb9d8c1 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -1,3 +1,6 @@ +#ifndef OS_UWP_H +#define OS_UWP_H + /*************************************************************************/ /* os_uwp.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_UWP_H -#define OS_UWP_H - #include "context_egl_uwp.h" #include "core/math/transform_2d.h" #include "core/os/input.h" diff --git a/platform/uwp/power_uwp.h b/platform/uwp/power_uwp.h index e0fa1771a..ed8919c5a 100644 --- a/platform/uwp/power_uwp.h +++ b/platform/uwp/power_uwp.h @@ -1,3 +1,6 @@ +#ifndef POWER_UWP_H +#define POWER_UWP_H + /*************************************************************************/ /* power_uwp.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_UWP_H -#define POWER_UWP_H - #include "core/os/dir_access.h" #include "core/os/file_access.h" #include "core/os/os.h" diff --git a/scene/2d/shape_cast_2d.h b/scene/2d/shape_cast_2d.h index 058b2941d..0fa51ed44 100644 --- a/scene/2d/shape_cast_2d.h +++ b/scene/2d/shape_cast_2d.h @@ -1,3 +1,6 @@ +#ifndef SHAPE_CAST_2D_H +#define SHAPE_CAST_2D_H + /*************************************************************************/ /* shape_cast_2d.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHAPE_CAST_2D_H -#define SHAPE_CAST_2D_H - #include "scene/main/node_2d.h" #include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/world_2d.h" diff --git a/scene/3d/importer_mesh_instance_3d.h b/scene/3d/importer_mesh_instance_3d.h index c22a05bda..c568b359c 100644 --- a/scene/3d/importer_mesh_instance_3d.h +++ b/scene/3d/importer_mesh_instance_3d.h @@ -1,3 +1,6 @@ +#ifndef IMPORTER_MESH_INSTANCE_3D_H +#define IMPORTER_MESH_INSTANCE_3D_H + /*************************************************************************/ /* importer_mesh_instance_3d.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMPORTER_MESH_INSTANCE_3D_H -#define IMPORTER_MESH_INSTANCE_3D_H - #include "scene/main/spatial.h" #include "modules/modules_enabled.gen.h" diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h index 34543e3df..d86174fde 100644 --- a/scene/3d/label_3d.h +++ b/scene/3d/label_3d.h @@ -1,3 +1,6 @@ +#ifndef LABEL_3D_H +#define LABEL_3D_H + /*************************************************************************/ /* label_3d.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef LABEL_3D_H -#define LABEL_3D_H - #include "scene/3d/visual_instance.h" #include "scene/resources/font/font.h" #include "scene/resources/material/material.h" diff --git a/scene/3d/navigation_geometry_parser_3d.h b/scene/3d/navigation_geometry_parser_3d.h index 15224383b..4d119fc96 100644 --- a/scene/3d/navigation_geometry_parser_3d.h +++ b/scene/3d/navigation_geometry_parser_3d.h @@ -1,3 +1,6 @@ +#ifndef NAVIGATION_GEOMETRY_PARSER_3D_H +#define NAVIGATION_GEOMETRY_PARSER_3D_H + /*************************************************************************/ /* navigation_geometry_parser_3d.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NAVIGATION_GEOMETRY_PARSER_3D_H -#define NAVIGATION_GEOMETRY_PARSER_3D_H - #include "core/object/reference.h" class NavigationMesh; diff --git a/scene/3d/shape_cast.h b/scene/3d/shape_cast.h index 52c897fdd..6486e330a 100644 --- a/scene/3d/shape_cast.h +++ b/scene/3d/shape_cast.h @@ -1,3 +1,6 @@ +#ifndef SHAPE_CAST_H +#define SHAPE_CAST_H + /*************************************************************************/ /* shape_cast.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHAPE_CAST_H -#define SHAPE_CAST_H - #include "core/math/color.h" #include "scene/main/spatial.h" diff --git a/scene/animation/easing_equations.h b/scene/animation/easing_equations.h index 7383ed59f..5e779f5a2 100644 --- a/scene/animation/easing_equations.h +++ b/scene/animation/easing_equations.h @@ -1,3 +1,6 @@ +#ifndef EASING_EQUATIONS_H +#define EASING_EQUATIONS_H + /*************************************************************************/ /* easing_equations.h */ /*************************************************************************/ @@ -53,9 +56,6 @@ * SOFTWARE. */ -#ifndef EASING_EQUATIONS_H -#define EASING_EQUATIONS_H - namespace linear { static real_t in(real_t t, real_t b, real_t c, real_t d) { return c * t / d + b; diff --git a/scene/animation/scene_tree_tween.h b/scene/animation/scene_tree_tween.h index 0c69f211f..c05d20998 100644 --- a/scene/animation/scene_tree_tween.h +++ b/scene/animation/scene_tree_tween.h @@ -1,3 +1,6 @@ +#ifndef SCENE_TREE_TWEEN_H +#define SCENE_TREE_TWEEN_H + /*************************************************************************/ /* scene_tree_tween.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SCENE_TREE_TWEEN_H -#define SCENE_TREE_TWEEN_H - #include "core/object/reference.h" #include "scene/animation/tween.h" diff --git a/scene/gui/resources/syntax_highlighter.h b/scene/gui/resources/syntax_highlighter.h index f7a1bcd80..68a15336c 100644 --- a/scene/gui/resources/syntax_highlighter.h +++ b/scene/gui/resources/syntax_highlighter.h @@ -1,3 +1,6 @@ +#ifndef SYNTAX_HIGHLIGHTER_H +#define SYNTAX_HIGHLIGHTER_H + /*************************************************************************/ /* syntax_highlighter.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SYNTAX_HIGHLIGHTER_H -#define SYNTAX_HIGHLIGHTER_H - #include "core/object/resource.h" class TextEdit; diff --git a/scene/resources/mesh/immediate_mesh.h b/scene/resources/mesh/immediate_mesh.h index f096b7628..a420d7bba 100644 --- a/scene/resources/mesh/immediate_mesh.h +++ b/scene/resources/mesh/immediate_mesh.h @@ -1,3 +1,6 @@ +#ifndef IMMEDIATE_MESH_H +#define IMMEDIATE_MESH_H + /*************************************************************************/ /* immediate_mesh.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMMEDIATE_MESH_H -#define IMMEDIATE_MESH_H - #include "core/containers/vector.h" #include "scene/resources/mesh/mesh.h" diff --git a/scene/resources/mesh/importer_mesh.h b/scene/resources/mesh/importer_mesh.h index 7cc942cba..46f231f68 100644 --- a/scene/resources/mesh/importer_mesh.h +++ b/scene/resources/mesh/importer_mesh.h @@ -1,3 +1,6 @@ +#ifndef IMPORTER_MESH_H +#define IMPORTER_MESH_H + /*************************************************************************/ /* importer_mesh.h */ /*************************************************************************/ @@ -29,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMPORTER_MESH_H -#define IMPORTER_MESH_H - #include "core/containers/local_vector.h" #include "core/object/resource.h" #include "scene/resources/mesh/mesh.h"