From 51fdb562be325fd576bf9a8c67258dc5db56dd9b Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 1 Mar 2024 11:47:11 +0100 Subject: [PATCH] Pandemonium style header guards. --- modules/layered_tile_map/editor/atlas_merging_dialog.h | 6 ++++-- modules/layered_tile_map/editor/layered_tile_atlas_view.h | 6 ++++-- modules/layered_tile_map/editor/layered_tile_data_editors.h | 6 ++++-- .../layered_tile_map/editor/layered_tile_map_layer_editor.h | 6 ++++-- .../editor/layered_tile_proxies_manager_dialog.h | 6 ++++-- .../editor/layered_tile_set_atlas_source_editor.h | 6 ++++-- modules/layered_tile_map/editor/layered_tile_set_editor.h | 6 ++++-- .../layered_tile_set_scenes_collection_source_editor.h | 6 ++++-- .../layered_tile_map/editor/layered_tiles_editor_plugin.h | 6 ++++-- modules/layered_tile_map/layered_tile_map.h | 6 ++++-- modules/layered_tile_map/layered_tile_map_layer.h | 6 ++++-- modules/layered_tile_map/layered_tile_map_layer_group.h | 6 ++++-- modules/layered_tile_map/layered_tile_set.h | 6 ++++-- 13 files changed, 52 insertions(+), 26 deletions(-) diff --git a/modules/layered_tile_map/editor/atlas_merging_dialog.h b/modules/layered_tile_map/editor/atlas_merging_dialog.h index 83389c2e2..d90e700d1 100644 --- a/modules/layered_tile_map/editor/atlas_merging_dialog.h +++ b/modules/layered_tile_map/editor/atlas_merging_dialog.h @@ -1,3 +1,5 @@ +#ifndef ATLAS_MERGING_DIALOG_H +#define ATLAS_MERGING_DIALOG_H /**************************************************************************/ /* atlas_merging_dialog.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef ATLAS_MERGING_DIALOG_H -#define ATLAS_MERGING_DIALOG_H + + #include "editor/editor_properties.h" #include "scene/gui/dialogs.h" 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 e5b4863b0..5b679dad8 100644 --- a/modules/layered_tile_map/editor/layered_tile_atlas_view.h +++ b/modules/layered_tile_map/editor/layered_tile_atlas_view.h @@ -1,3 +1,5 @@ +#ifndef TILE_ATLAS_VIEW_H +#define TILE_ATLAS_VIEW_H /**************************************************************************/ /* tile_atlas_view.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_ATLAS_VIEW_H -#define TILE_ATLAS_VIEW_H + + #include "editor/gui/editor_zoom_widget.h" #include "scene/gui/box_container.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 40c049f70..1e42ea69f 100644 --- a/modules/layered_tile_map/editor/layered_tile_data_editors.h +++ b/modules/layered_tile_map/editor/layered_tile_data_editors.h @@ -1,3 +1,5 @@ +#ifndef TILE_DATA_EDITORS_H +#define TILE_DATA_EDITORS_H /**************************************************************************/ /* tile_data_editors.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_DATA_EDITORS_H -#define TILE_DATA_EDITORS_H + + #include "tile_atlas_view.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 a7fea2abc..0b7936105 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 @@ -1,3 +1,5 @@ +#ifndef TILE_MAP_LAYER_EDITOR_H +#define TILE_MAP_LAYER_EDITOR_H /**************************************************************************/ /* tile_map_layer_editor.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_MAP_LAYER_EDITOR_H -#define TILE_MAP_LAYER_EDITOR_H + + #include "tile_atlas_view.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 357eefcb1..9929c7368 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 @@ -1,3 +1,5 @@ +#ifndef TILE_PROXIES_MANAGER_DIALOG_H +#define TILE_PROXIES_MANAGER_DIALOG_H /**************************************************************************/ /* tile_proxies_manager_dialog.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_PROXIES_MANAGER_DIALOG_H -#define TILE_PROXIES_MANAGER_DIALOG_H + + #include "editor/editor_properties.h" #include "scene/2d/tile_map.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 34077a55a..140f04f65 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 @@ -1,3 +1,5 @@ +#ifndef TILE_SET_ATLAS_SOURCE_EDITOR_H +#define TILE_SET_ATLAS_SOURCE_EDITOR_H /**************************************************************************/ /* tile_set_atlas_source_editor.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_SET_ATLAS_SOURCE_EDITOR_H -#define TILE_SET_ATLAS_SOURCE_EDITOR_H + + #include "tile_atlas_view.h" #include "tile_data_editors.h" 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 106be5acb..af182e7e9 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.h @@ -1,3 +1,5 @@ +#ifndef TILE_SET_EDITOR_H +#define TILE_SET_EDITOR_H /**************************************************************************/ /* tile_set_editor.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_SET_EDITOR_H -#define TILE_SET_EDITOR_H + + #include "atlas_merging_dialog.h" #include "scene/gui/tab_bar.h" 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 b969421b2..d9816b324 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 @@ -1,3 +1,5 @@ +#ifndef TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H +#define TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H /**************************************************************************/ /* tile_set_scenes_collection_source_editor.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H -#define TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H + + #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" diff --git a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h index ac3e8986d..2e939dad7 100644 --- a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h +++ b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h @@ -1,3 +1,5 @@ +#ifndef TILES_EDITOR_PLUGIN_H +#define TILES_EDITOR_PLUGIN_H /**************************************************************************/ /* tiles_editor_plugin.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILES_EDITOR_PLUGIN_H -#define TILES_EDITOR_PLUGIN_H + + #include "editor/editor_plugin.h" #include "scene/gui/box_container.h" diff --git a/modules/layered_tile_map/layered_tile_map.h b/modules/layered_tile_map/layered_tile_map.h index edea90fa9..49e14c2e3 100644 --- a/modules/layered_tile_map/layered_tile_map.h +++ b/modules/layered_tile_map/layered_tile_map.h @@ -1,3 +1,5 @@ +#ifndef TILE_MAP_H +#define TILE_MAP_H /**************************************************************************/ /* tile_map.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_MAP_H -#define TILE_MAP_H + + #include "scene/2d/tile_map_layer_group.h" #include "scene/resources/2d/tile_set.h" diff --git a/modules/layered_tile_map/layered_tile_map_layer.h b/modules/layered_tile_map/layered_tile_map_layer.h index c58c72949..cffdffbf6 100644 --- a/modules/layered_tile_map/layered_tile_map_layer.h +++ b/modules/layered_tile_map/layered_tile_map_layer.h @@ -1,3 +1,5 @@ +#ifndef TILE_MAP_LAYER_H +#define TILE_MAP_LAYER_H /**************************************************************************/ /* tile_map_layer.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_MAP_LAYER_H -#define TILE_MAP_LAYER_H + + #include "scene/2d/tile_map.h" #include "scene/resources/2d/tile_set.h" diff --git a/modules/layered_tile_map/layered_tile_map_layer_group.h b/modules/layered_tile_map/layered_tile_map_layer_group.h index d80c244f8..47daf4107 100644 --- a/modules/layered_tile_map/layered_tile_map_layer_group.h +++ b/modules/layered_tile_map/layered_tile_map_layer_group.h @@ -1,3 +1,5 @@ +#ifndef TILE_MAP_LAYER_GROUP_H +#define TILE_MAP_LAYER_GROUP_H /**************************************************************************/ /* tile_map_layer_group.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_MAP_LAYER_GROUP_H -#define TILE_MAP_LAYER_GROUP_H + + #include "scene/2d/node_2d.h" diff --git a/modules/layered_tile_map/layered_tile_set.h b/modules/layered_tile_map/layered_tile_set.h index b55afd2de..3a075290b 100644 --- a/modules/layered_tile_map/layered_tile_set.h +++ b/modules/layered_tile_map/layered_tile_set.h @@ -1,3 +1,5 @@ +#ifndef TILE_SET_H +#define TILE_SET_H /**************************************************************************/ /* tile_set.h */ /**************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef TILE_SET_H -#define TILE_SET_H + + #include "core/io/resource.h" #include "core/object/object.h"