From 13a9bfbca733821f773ca7ffd990ce962c728924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 25 Mar 2020 11:10:34 +0100 Subject: [PATCH] Style: Harmonize header guards to style guide [Core] --- core/color.h | 2 +- core/command_queue_mt.h | 2 +- core/core_builders.py | 24 ++++++++++++------------ core/core_string_names.h | 2 +- core/cowdata.h | 10 +++++----- core/debugger/script_debugger.h | 2 +- core/error_list.h | 2 +- core/error_macros.h | 2 +- core/hash_map.h | 2 +- core/hashfuncs.h | 3 ++- core/image.h | 2 +- core/int_types.h | 7 ++++++- 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_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/camera_matrix.h | 2 +- core/math/disjoint_set.h | 2 +- core/math/geometry.h | 2 +- core/math/octree.h | 2 +- core/math/quat.h | 2 +- core/math/triangulate.h | 2 +- core/method_bind.h | 2 +- core/node_path.h | 2 +- core/oa_hash_map.h | 2 +- core/object.h | 2 +- core/os/copymem.h | 2 +- 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/mutex.h | 2 +- core/os/os.h | 2 +- core/os/rw_lock.h | 6 +++--- core/os/semaphore.h | 2 +- core/os/thread.h | 2 +- core/os/thread_dummy.h | 2 +- core/os/thread_safe.h | 2 +- core/pool_allocator.h | 2 +- core/print_string.h | 2 +- core/project_settings.h | 6 +++--- core/register_core_types.h | 2 +- core/resource.h | 2 +- core/rid.h | 2 +- core/ring_buffer.h | 6 +++--- core/safe_refcount.h | 2 +- core/script_language.h | 3 ++- core/set.h | 2 +- core/simple_type.h | 2 +- core/string_buffer.h | 2 +- core/type_info.h | 6 +++--- core/ucaps.h | 3 ++- core/variant.h | 3 ++- core/vector.h | 2 +- core/version.h | 6 +++--- editor/project_settings_editor.h | 6 +++--- methods.py | 10 +++++++++- 69 files changed, 121 insertions(+), 104 deletions(-) diff --git a/core/color.h b/core/color.h index a7ab94ab08c..16dc721072d 100644 --- a/core/color.h +++ b/core/color.h @@ -239,4 +239,4 @@ bool Color::operator<(const Color &p_color) const { return r < p_color.r; } -#endif +#endif // COLOR_H diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index 90231546efa..cc08ae70042 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -508,4 +508,4 @@ public: #undef CMD_SYNC_TYPE #undef DECL_CMD_SYNC -#endif +#endif // COMMAND_QUEUE_MT_H diff --git a/core/core_builders.py b/core/core_builders.py index 77201835959..571e542c7f4 100644 --- a/core/core_builders.py +++ b/core/core_builders.py @@ -19,8 +19,8 @@ def make_certs_header(target, source, env): buf = zlib.compress(buf) g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _CERTS_RAW_H\n") - g.write("#define _CERTS_RAW_H\n") + g.write("#ifndef CERTS_COMPRESSED_GEN_H\n") + g.write("#define CERTS_COMPRESSED_GEN_H\n") # System certs path. Editor will use them if defined. (for package maintainers) path = env['system_certs_path'] @@ -34,7 +34,7 @@ def make_certs_header(target, source, env): for i in range(len(buf)): g.write("\t" + byte_to_str(buf[i]) + ",\n") g.write("};\n") - g.write("#endif") + g.write("#endif // CERTS_COMPRESSED_GEN_H") g.close() f.close() @@ -50,8 +50,8 @@ def make_authors_header(target, source, env): g = open_utf8(dst, "w") g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _EDITOR_AUTHORS_H\n") - g.write("#define _EDITOR_AUTHORS_H\n") + g.write("#ifndef AUTHORS_GEN_H\n") + g.write("#define AUTHORS_GEN_H\n") reading = False @@ -78,7 +78,7 @@ def make_authors_header(target, source, env): if reading: close_section() - g.write("#endif\n") + g.write("#endif // AUTHORS_GEN_H\n") g.close() f.close() @@ -96,8 +96,8 @@ def make_donors_header(target, source, env): g = open_utf8(dst, "w") g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#ifndef _EDITOR_DONORS_H\n") - g.write("#define _EDITOR_DONORS_H\n") + g.write("#ifndef DONORS_GEN_H\n") + g.write("#define DONORS_GEN_H\n") reading = False @@ -124,7 +124,7 @@ def make_donors_header(target, source, env): if reading: close_section() - g.write("#endif\n") + g.write("#endif // DONORS_GEN_H\n") g.close() f.close() @@ -193,8 +193,8 @@ def make_license_header(target, source, env): with open_utf8(dst, "w") as f: f.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - f.write("#ifndef _EDITOR_LICENSE_H\n") - f.write("#define _EDITOR_LICENSE_H\n") + f.write("#ifndef LICENSE_GEN_H\n") + f.write("#define LICENSE_GEN_H\n") f.write("const char *const GODOT_LICENSE_TEXT =") with open_utf8(src_license, "r") as license_file: @@ -262,7 +262,7 @@ def make_license_header(target, source, env): f.write("\t\"\",\n\n") f.write("};\n\n") - f.write("#endif\n") + f.write("#endif // LICENSE_GEN_H\n") if __name__ == '__main__': diff --git a/core/core_string_names.h b/core/core_string_names.h index 42416d3f75a..dce0244631d 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -97,4 +97,4 @@ public: StringName notification; }; -#endif // SCENE_STRING_NAMES_H +#endif // CORE_STRING_NAMES_H diff --git a/core/cowdata.h b/core/cowdata.h index fba3f648998..5de78be6d70 100644 --- a/core/cowdata.h +++ b/core/cowdata.h @@ -28,15 +28,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COWDATA_H_ -#define COWDATA_H_ - -#include +#ifndef COWDATA_H +#define COWDATA_H #include "core/error_macros.h" #include "core/os/memory.h" #include "core/safe_refcount.h" +#include + template class Vector; class String; @@ -371,4 +371,4 @@ CowData::~CowData() { _unref(_ptr); } -#endif /* COW_H_ */ +#endif // COWDATA_H diff --git a/core/debugger/script_debugger.h b/core/debugger/script_debugger.h index 2273073bf4f..a60b57c6372 100644 --- a/core/debugger/script_debugger.h +++ b/core/debugger/script_debugger.h @@ -77,4 +77,4 @@ public: ScriptDebugger() {} }; -#endif +#endif // SCRIPT_DEBUGGER_H diff --git a/core/error_list.h b/core/error_list.h index b464a933418..a0218cf0454 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 8818dcbe779..18c46c9e7d1 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -623,4 +623,4 @@ void _err_print_index_error(const char *p_function, const char *p_file, int p_li } else \ ((void)0) -#endif +#endif // ERROR_MACROS_H diff --git a/core/hash_map.h b/core/hash_map.h index c9d3a690e72..e40b00a67ad 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -599,4 +599,4 @@ public: } }; -#endif +#endif // HASH_MAP_H diff --git a/core/hashfuncs.h b/core/hashfuncs.h index d6cf04e5603..219b8b26589 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -38,6 +38,7 @@ #include "core/string_name.h" #include "core/typedefs.h" #include "core/ustring.h" + /** * Hashing functions */ @@ -171,4 +172,4 @@ struct HashMapComparatorDefault { } }; -#endif +#endif // HASHFUNCS_H diff --git a/core/image.h b/core/image.h index 4dc4bf13284..9453f41334b 100644 --- a/core/image.h +++ b/core/image.h @@ -396,4 +396,4 @@ VARIANT_ENUM_CAST(Image::UsedChannels) VARIANT_ENUM_CAST(Image::AlphaMode) VARIANT_ENUM_CAST(Image::RoughnessChannel) -#endif +#endif // IMAGE_H diff --git a/core/int_types.h b/core/int_types.h index e7de0537664..71caa2202d4 100644 --- a/core/int_types.h +++ b/core/int_types.h @@ -28,6 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef INT_TYPES_H +#define INT_TYPES_H + #ifdef _MSC_VER typedef signed __int8 int8_t; @@ -54,4 +57,6 @@ typedef unsigned long long uint64_t; #include #endif -#endif +#endif // _MSC_VER + +#endif // INT_TYPES_H diff --git a/core/io/image_loader.h b/core/io/image_loader.h index 3ba028b99c5..29352e9cd4d 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -79,4 +79,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 ab2f9d8bc7c..70285511854 100644 --- a/core/io/logger.h +++ b/core/io/logger.h @@ -107,4 +107,4 @@ public: virtual ~CompositeLogger(); }; -#endif +#endif // LOGGER_H diff --git a/core/io/marshalls.h b/core/io/marshalls.h index 484f0755de9..7d95bc4f862 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -202,4 +202,4 @@ public: Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len = NULL, bool p_allow_objects = false); Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects = false); -#endif +#endif // MARSHALLS_H diff --git a/core/io/multiplayer_api.h b/core/io/multiplayer_api.h index 52f918aefad..4eb4a53e997 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" @@ -148,4 +148,4 @@ public: VARIANT_ENUM_CAST(MultiplayerAPI::RPCMode); -#endif // MULTIPLAYER_PROTOCOL_H +#endif // MULTIPLAYER_API_H diff --git a/core/io/networked_multiplayer_peer.h b/core/io/networked_multiplayer_peer.h index bffd544589f..c1f1924051c 100644 --- a/core/io/networked_multiplayer_peer.h +++ b/core/io/networked_multiplayer_peer.h @@ -80,4 +80,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/resource_loader.h b/core/io/resource_loader.h index 5ba9e268588..a97b72e7df4 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 e749f54cfa3..2ddebf05810 100644 --- a/core/io/resource_saver.h +++ b/core/io/resource_saver.h @@ -90,4 +90,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 327aa3cc3b3..86df9ab8cf9 100644 --- a/core/io/stream_peer_tcp.h +++ b/core/io/stream_peer_tcp.h @@ -93,4 +93,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 47e276da280..26c3e6802fe 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -121,4 +121,4 @@ public: ~XMLParser(); }; -#endif +#endif // XML_PARSER_H diff --git a/core/list.h b/core/list.h index 5a7c9e572c1..d441c0230dc 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" @@ -708,4 +708,4 @@ public: }; }; -#endif +#endif // LIST_H diff --git a/core/map.h b/core/map.h index b97f735f1b3..010c47b0fba 100644 --- a/core/map.h +++ b/core/map.h @@ -682,4 +682,4 @@ public: } }; -#endif +#endif // MAP_H diff --git a/core/math/a_star.h b/core/math/a_star.h index cc6c4619e92..8c10ace33c7 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" @@ -210,4 +210,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 6477d029d53..e1dbb385e46 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" @@ -140,4 +140,4 @@ struct AudioFrame { _ALWAYS_INLINE_ AudioFrame() {} }; -#endif +#endif // AUDIO_FRAME_H diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 60f7d159744..c10193bc842 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -124,4 +124,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 fb89941ce4a..32b9875e4cc 100644 --- a/core/math/disjoint_set.h +++ b/core/math/disjoint_set.h @@ -152,4 +152,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 6453d161811..becbcdbf0f2 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -1019,4 +1019,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/octree.h b/core/math/octree.h index 5478bdaf771..b47c052b68b 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -1375,4 +1375,4 @@ Octree::Octree(real_t p_unit_size) { unpair_callback_userdata = NULL; } -#endif +#endif // OCTREE_H diff --git a/core/math/quat.h b/core/math/quat.h index 11ae03dffb5..b3135ad1ca0 100644 --- a/core/math/quat.h +++ b/core/math/quat.h @@ -231,4 +231,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 f9bcb37141c..c453b77ecf5 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 726ce512f83..a1ab4e58fcd 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -405,4 +405,4 @@ class __UnexistingClass; #include "method_bind.gen.inc" -#endif +#endif // METHOD_BIND_H diff --git a/core/node_path.h b/core/node_path.h index 05b6d844ff0..76de36cd9f1 100644 --- a/core/node_path.h +++ b/core/node_path.h @@ -97,4 +97,4 @@ public: ~NodePath(); }; -#endif +#endif // NODE_PATH_H diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index 7ceba26be8c..447b0db0eba 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -369,4 +369,4 @@ public: } }; -#endif +#endif // OA_HASH_MAP_H diff --git a/core/object.h b/core/object.h index 9bdcf0d3d82..0826686fb37 100644 --- a/core/object.h +++ b/core/object.h @@ -817,4 +817,4 @@ public: //needed by macros #include "core/class_db.h" -#endif +#endif // OBJECT_H diff --git a/core/os/copymem.h b/core/os/copymem.h index 1d6631ddb84..04ea3caeff5 100644 --- a/core/os/copymem.h +++ b/core/os/copymem.h @@ -47,4 +47,4 @@ #endif -#endif +#endif // COPYMEM_H diff --git a/core/os/dir_access.h b/core/os/dir_access.h index aac6c67f0ad..059f7aad2fd 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -149,4 +149,4 @@ struct DirAccessRef { } }; -#endif +#endif // DIR_ACCESS_H diff --git a/core/os/file_access.h b/core/os/file_access.h index 36a947c691e..4a82637eccb 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -196,4 +196,4 @@ struct FileAccessRef { } }; -#endif +#endif // FILE_ACCESS_H diff --git a/core/os/input_event.h b/core/os/input_event.h index c105fcd1c10..21549d811f3 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -622,4 +622,4 @@ public: InputEventMIDI(); }; -#endif +#endif // INPUT_EVENT_H diff --git a/core/os/keyboard.h b/core/os/keyboard.h index bac32e01dd8..5d11e6a3784 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 b1120aee8ad..3fdfb77af2a 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 207149b57e7..dcaedd92ba6 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -206,4 +206,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 4f53feb43ed..b7377a8a403 100644 --- a/core/os/midi_driver.h +++ b/core/os/midi_driver.h @@ -58,4 +58,4 @@ public: virtual ~MIDIDriver() {} }; -#endif +#endif // MIDI_DRIVER_H diff --git a/core/os/mutex.h b/core/os/mutex.h index b44b1994de2..526549dd936 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -105,4 +105,4 @@ using BinaryMutex = MutexImpl; // Non-recursive, handle with care #endif // !NO_THREADS -#endif +#endif // MUTEX_H diff --git a/core/os/os.h b/core/os/os.h index 1d3619b1e6c..3e2ee7affd7 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -527,4 +527,4 @@ public: virtual ~OS(); }; -#endif +#endif // OS_H diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h index 21648b6cbc8..64dfbef20c4 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" @@ -79,4 +79,4 @@ public: } }; -#endif // RWLOCK_H +#endif // RW_LOCK_H diff --git a/core/os/semaphore.h b/core/os/semaphore.h index 6f194d48876..3d9d1ab984b 100644 --- a/core/os/semaphore.h +++ b/core/os/semaphore.h @@ -80,4 +80,4 @@ public: #endif -#endif +#endif // SEMAPHORE_H diff --git a/core/os/thread.h b/core/os/thread.h index 0803fd1190e..76d296bcf7c 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -77,4 +77,4 @@ public: virtual ~Thread(); }; -#endif +#endif // THREAD_H diff --git a/core/os/thread_dummy.h b/core/os/thread_dummy.h index da8188f983c..066ee498acd 100644 --- a/core/os/thread_dummy.h +++ b/core/os/thread_dummy.h @@ -61,4 +61,4 @@ public: static void make_default(); }; -#endif +#endif // THREAD_DUMMY_H diff --git a/core/os/thread_safe.h b/core/os/thread_safe.h index 0221edf4911..670ee8b125d 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/pool_allocator.h b/core/pool_allocator.h index e34f5b11045..8c1710ebe0e 100644 --- a/core/pool_allocator.h +++ b/core/pool_allocator.h @@ -148,4 +148,4 @@ public: virtual ~PoolAllocator(); }; -#endif +#endif // POOL_ALLOCATOR_H diff --git a/core/print_string.h b/core/print_string.h index c2cf1c293b6..d83cc35dd61 100644 --- a/core/print_string.h +++ b/core/print_string.h @@ -60,4 +60,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 8695df560ec..7b3ca18c62c 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" @@ -166,4 +166,4 @@ Variant _GLOBAL_DEF(const String &p_var, const Variant &p_default, bool p_restar #define GLOBAL_DEF_RST(m_var, m_value) _GLOBAL_DEF(m_var, m_value, true) #define GLOBAL_GET(m_var) ProjectSettings::get_singleton()->get(m_var) -#endif +#endif // PROJECT_SETTINGS_H diff --git a/core/register_core_types.h b/core/register_core_types.h index 22c0025f0cf..bdd335f33ca 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 4b79a39d9d6..9f83848c042 100644 --- a/core/resource.h +++ b/core/resource.h @@ -167,4 +167,4 @@ public: static int get_cached_resource_count(); }; -#endif +#endif // RESOURCE_H diff --git a/core/rid.h b/core/rid.h index 0c4a96efed6..3cc0ee30840 100644 --- a/core/rid.h +++ b/core/rid.h @@ -75,4 +75,4 @@ public: } }; -#endif +#endif // RID_H diff --git a/core/ring_buffer.h b/core/ring_buffer.h index f5f43607fe2..620a3a3846c 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" @@ -221,4 +221,4 @@ public: ~RingBuffer(){}; }; -#endif +#endif // RING_BUFFER_H diff --git a/core/safe_refcount.h b/core/safe_refcount.h index 887282f556c..953a877397a 100644 --- a/core/safe_refcount.h +++ b/core/safe_refcount.h @@ -208,4 +208,4 @@ public: } }; -#endif +#endif // SAFE_REFCOUNT_H diff --git a/core/script_language.h b/core/script_language.h index bb7d74dd838..6219a423d05 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -459,4 +459,5 @@ public: PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref