From 81dc812e6f1efe87c5cd1d46f232d766a2c26654 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 7 Aug 2022 20:56:19 +0200 Subject: [PATCH] Move include guards to the top of the files. --- modules/gltf/editor/editor_scene_exporter_gltf_plugin.h | 6 +++--- modules/gltf/editor/editor_scene_importer_blend.h | 6 +++--- modules/gltf/editor/editor_scene_importer_fbx.h | 6 +++--- modules/gltf/editor/editor_scene_importer_gltf.h | 6 +++--- modules/gltf/extensions/gltf_light.h | 6 +++--- modules/gltf/extensions/gltf_spec_gloss.h | 6 +++--- modules/gltf/gltf_defines.h | 6 +++--- modules/gltf/gltf_document.h | 6 +++--- modules/gltf/gltf_document_extension.h | 6 +++--- .../gltf/gltf_document_extension_convert_importer_mesh.h | 6 +++--- modules/gltf/gltf_state.h | 6 +++--- modules/gltf/gltf_template_convert.h | 6 +++--- modules/gltf/structures/gltf_accessor.h | 6 +++--- modules/gltf/structures/gltf_animation.h | 6 +++--- modules/gltf/structures/gltf_buffer_view.h | 6 +++--- modules/gltf/structures/gltf_camera.h | 6 +++--- modules/gltf/structures/gltf_mesh.h | 6 +++--- modules/gltf/structures/gltf_node.h | 6 +++--- modules/gltf/structures/gltf_skeleton.h | 6 +++--- modules/gltf/structures/gltf_skin.h | 6 +++--- modules/gltf/structures/gltf_texture.h | 6 +++--- 21 files changed, 63 insertions(+), 63 deletions(-) diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h index 5af46bc75..d19137d41 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h @@ -1,3 +1,6 @@ +#ifndef EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H +#define EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H + /*************************************************************************/ /* editor_scene_exporter_gltf_plugin.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H -#define EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H - #ifdef TOOLS_ENABLED #include "editor/editor_plugin.h" diff --git a/modules/gltf/editor/editor_scene_importer_blend.h b/modules/gltf/editor/editor_scene_importer_blend.h index dd1c1b988..3121ed5e6 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.h +++ b/modules/gltf/editor/editor_scene_importer_blend.h @@ -1,3 +1,6 @@ +#ifndef EDITOR_SCENE_IMPORTER_BLEND_H +#define EDITOR_SCENE_IMPORTER_BLEND_H + /*************************************************************************/ /* editor_scene_importer_blend.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_SCENE_IMPORTER_BLEND_H -#define EDITOR_SCENE_IMPORTER_BLEND_H - #ifdef TOOLS_ENABLED #include "editor/editor_file_system.h" diff --git a/modules/gltf/editor/editor_scene_importer_fbx.h b/modules/gltf/editor/editor_scene_importer_fbx.h index b0039b1c8..d76455641 100644 --- a/modules/gltf/editor/editor_scene_importer_fbx.h +++ b/modules/gltf/editor/editor_scene_importer_fbx.h @@ -1,3 +1,6 @@ +#ifndef EDITOR_SCENE_IMPORTER_FBX_H +#define EDITOR_SCENE_IMPORTER_FBX_H + /*************************************************************************/ /* editor_scene_importer_fbx.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_SCENE_IMPORTER_FBX_H -#define EDITOR_SCENE_IMPORTER_FBX_H - #ifdef TOOLS_ENABLED #include "editor/import/resource_importer_scene.h" diff --git a/modules/gltf/editor/editor_scene_importer_gltf.h b/modules/gltf/editor/editor_scene_importer_gltf.h index b17a1e4ea..909683749 100644 --- a/modules/gltf/editor/editor_scene_importer_gltf.h +++ b/modules/gltf/editor/editor_scene_importer_gltf.h @@ -1,3 +1,6 @@ +#ifndef EDITOR_SCENE_IMPORTER_GLTF_H +#define EDITOR_SCENE_IMPORTER_GLTF_H + /*************************************************************************/ /* editor_scene_importer_gltf.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef EDITOR_SCENE_IMPORTER_GLTF_H -#define EDITOR_SCENE_IMPORTER_GLTF_H - #ifdef TOOLS_ENABLED #include "../gltf_document_extension.h" diff --git a/modules/gltf/extensions/gltf_light.h b/modules/gltf/extensions/gltf_light.h index 58fa299df..1aa727b6b 100644 --- a/modules/gltf/extensions/gltf_light.h +++ b/modules/gltf/extensions/gltf_light.h @@ -1,3 +1,6 @@ +#ifndef GLTF_LIGHT_H +#define GLTF_LIGHT_H + /*************************************************************************/ /* gltf_light.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_LIGHT_H -#define GLTF_LIGHT_H - #include "core/config/engine.h" #include "core/io/resource.h" #include "scene/3d/light_3d.h" diff --git a/modules/gltf/extensions/gltf_spec_gloss.h b/modules/gltf/extensions/gltf_spec_gloss.h index a45fa4296..7e217863c 100644 --- a/modules/gltf/extensions/gltf_spec_gloss.h +++ b/modules/gltf/extensions/gltf_spec_gloss.h @@ -1,3 +1,6 @@ +#ifndef GLTF_SPEC_GLOSS_H +#define GLTF_SPEC_GLOSS_H + /*************************************************************************/ /* gltf_spec_gloss.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_SPEC_GLOSS_H -#define GLTF_SPEC_GLOSS_H - #include "core/io/image.h" #include "core/io/resource.h" diff --git a/modules/gltf/gltf_defines.h b/modules/gltf/gltf_defines.h index c20c87f79..9c653e080 100644 --- a/modules/gltf/gltf_defines.h +++ b/modules/gltf/gltf_defines.h @@ -1,3 +1,6 @@ +#ifndef GLTF_DEFINES_H +#define GLTF_DEFINES_H + /*************************************************************************/ /* gltf_defines.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_DEFINES_H -#define GLTF_DEFINES_H - // This file should only be included by other headers. // Godot classes used by GLTF headers. diff --git a/modules/gltf/gltf_document.h b/modules/gltf/gltf_document.h index 36a2f94a4..403ac077e 100644 --- a/modules/gltf/gltf_document.h +++ b/modules/gltf/gltf_document.h @@ -1,3 +1,6 @@ +#ifndef GLTF_DOCUMENT_H +#define GLTF_DOCUMENT_H + /*************************************************************************/ /* gltf_document.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_DOCUMENT_H -#define GLTF_DOCUMENT_H - #include "gltf_defines.h" #include "structures/gltf_animation.h" diff --git a/modules/gltf/gltf_document_extension.h b/modules/gltf/gltf_document_extension.h index 0ef910958..156a8ce69 100644 --- a/modules/gltf/gltf_document_extension.h +++ b/modules/gltf/gltf_document_extension.h @@ -1,3 +1,6 @@ +#ifndef GLTF_DOCUMENT_EXTENSION_H +#define GLTF_DOCUMENT_EXTENSION_H + /*************************************************************************/ /* gltf_document_extension.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_DOCUMENT_EXTENSION_H -#define GLTF_DOCUMENT_EXTENSION_H - #include "gltf_state.h" #include "structures/gltf_node.h" diff --git a/modules/gltf/gltf_document_extension_convert_importer_mesh.h b/modules/gltf/gltf_document_extension_convert_importer_mesh.h index 00e664e73..cdb089bba 100644 --- a/modules/gltf/gltf_document_extension_convert_importer_mesh.h +++ b/modules/gltf/gltf_document_extension_convert_importer_mesh.h @@ -1,3 +1,6 @@ +#ifndef GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H +#define GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H + /*************************************************************************/ /* gltf_document_extension_convert_importer_mesh.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H -#define GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H - #include "gltf_document_extension.h" #include "scene/3d/importer_mesh_instance_3d.h" diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h index d2a4948f0..a206b6114 100644 --- a/modules/gltf/gltf_state.h +++ b/modules/gltf/gltf_state.h @@ -1,3 +1,6 @@ +#ifndef GLTF_STATE_H +#define GLTF_STATE_H + /*************************************************************************/ /* gltf_state.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_STATE_H -#define GLTF_STATE_H - #include "extensions/gltf_light.h" #include "gltf_template_convert.h" #include "structures/gltf_accessor.h" diff --git a/modules/gltf/gltf_template_convert.h b/modules/gltf/gltf_template_convert.h index c915d3deb..d4466247e 100644 --- a/modules/gltf/gltf_template_convert.h +++ b/modules/gltf/gltf_template_convert.h @@ -1,3 +1,6 @@ +#ifndef GLTF_TEMPLATE_CONVERT_H +#define GLTF_TEMPLATE_CONVERT_H + /*************************************************************************/ /* gltf_template_convert.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_TEMPLATE_CONVERT_H -#define GLTF_TEMPLATE_CONVERT_H - #include "core/templates/hash_set.h" #include "core/variant/array.h" #include "core/variant/dictionary.h" diff --git a/modules/gltf/structures/gltf_accessor.h b/modules/gltf/structures/gltf_accessor.h index bfb71d57f..b2c105e37 100644 --- a/modules/gltf/structures/gltf_accessor.h +++ b/modules/gltf/structures/gltf_accessor.h @@ -1,3 +1,6 @@ +#ifndef GLTF_ACCESSOR_H +#define GLTF_ACCESSOR_H + /*************************************************************************/ /* gltf_accessor.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_ACCESSOR_H -#define GLTF_ACCESSOR_H - #include "core/io/resource.h" #include "../gltf_defines.h" diff --git a/modules/gltf/structures/gltf_animation.h b/modules/gltf/structures/gltf_animation.h index 3777f579f..f490d402d 100644 --- a/modules/gltf/structures/gltf_animation.h +++ b/modules/gltf/structures/gltf_animation.h @@ -1,3 +1,6 @@ +#ifndef GLTF_ANIMATION_H +#define GLTF_ANIMATION_H + /*************************************************************************/ /* gltf_animation.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_ANIMATION_H -#define GLTF_ANIMATION_H - #include "core/io/resource.h" class GLTFAnimation : public Resource { diff --git a/modules/gltf/structures/gltf_buffer_view.h b/modules/gltf/structures/gltf_buffer_view.h index b1f500de2..20b1aecdf 100644 --- a/modules/gltf/structures/gltf_buffer_view.h +++ b/modules/gltf/structures/gltf_buffer_view.h @@ -1,3 +1,6 @@ +#ifndef GLTF_BUFFER_VIEW_H +#define GLTF_BUFFER_VIEW_H + /*************************************************************************/ /* gltf_buffer_view.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_BUFFER_VIEW_H -#define GLTF_BUFFER_VIEW_H - #include "../gltf_defines.h" #include "core/io/resource.h" diff --git a/modules/gltf/structures/gltf_camera.h b/modules/gltf/structures/gltf_camera.h index b7df74182..efbe2ac7a 100644 --- a/modules/gltf/structures/gltf_camera.h +++ b/modules/gltf/structures/gltf_camera.h @@ -1,3 +1,6 @@ +#ifndef GLTF_CAMERA_H +#define GLTF_CAMERA_H + /*************************************************************************/ /* gltf_camera.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_CAMERA_H -#define GLTF_CAMERA_H - #include "core/io/resource.h" class GLTFCamera : public Resource { diff --git a/modules/gltf/structures/gltf_mesh.h b/modules/gltf/structures/gltf_mesh.h index dc26120b4..daef66aa9 100644 --- a/modules/gltf/structures/gltf_mesh.h +++ b/modules/gltf/structures/gltf_mesh.h @@ -1,3 +1,6 @@ +#ifndef GLTF_MESH_H +#define GLTF_MESH_H + /*************************************************************************/ /* gltf_mesh.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_MESH_H -#define GLTF_MESH_H - #include "core/io/resource.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/resources/importer_mesh.h" diff --git a/modules/gltf/structures/gltf_node.h b/modules/gltf/structures/gltf_node.h index 1a57ea32e..387876a33 100644 --- a/modules/gltf/structures/gltf_node.h +++ b/modules/gltf/structures/gltf_node.h @@ -1,3 +1,6 @@ +#ifndef GLTF_NODE_H +#define GLTF_NODE_H + /*************************************************************************/ /* gltf_node.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_NODE_H -#define GLTF_NODE_H - #include "../gltf_defines.h" #include "core/io/resource.h" diff --git a/modules/gltf/structures/gltf_skeleton.h b/modules/gltf/structures/gltf_skeleton.h index db8862321..618849f10 100644 --- a/modules/gltf/structures/gltf_skeleton.h +++ b/modules/gltf/structures/gltf_skeleton.h @@ -1,3 +1,6 @@ +#ifndef GLTF_SKELETON_H +#define GLTF_SKELETON_H + /*************************************************************************/ /* gltf_skeleton.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_SKELETON_H -#define GLTF_SKELETON_H - #include "../gltf_defines.h" #include "core/io/resource.h" diff --git a/modules/gltf/structures/gltf_skin.h b/modules/gltf/structures/gltf_skin.h index 59b6a300a..02eb06b4b 100644 --- a/modules/gltf/structures/gltf_skin.h +++ b/modules/gltf/structures/gltf_skin.h @@ -1,3 +1,6 @@ +#ifndef GLTF_SKIN_H +#define GLTF_SKIN_H + /*************************************************************************/ /* gltf_skin.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_SKIN_H -#define GLTF_SKIN_H - #include "../gltf_defines.h" #include "core/io/resource.h" diff --git a/modules/gltf/structures/gltf_texture.h b/modules/gltf/structures/gltf_texture.h index b1d12dddf..7c569ad8b 100644 --- a/modules/gltf/structures/gltf_texture.h +++ b/modules/gltf/structures/gltf_texture.h @@ -1,3 +1,6 @@ +#ifndef GLTF_TEXTURE_H +#define GLTF_TEXTURE_H + /*************************************************************************/ /* gltf_texture.h */ /*************************************************************************/ @@ -28,9 +31,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GLTF_TEXTURE_H -#define GLTF_TEXTURE_H - #include "../gltf_defines.h" #include "core/io/resource.h"