Code quality: Fix header guards consistency

Adds `header_guards.sh` bash script, used in CI to validate future
changes. Can be run locally to fix invalid header guards.
This commit is contained in:
Rémi Verschelde 2022-07-23 23:41:51 +02:00
parent 3084a48ace
commit 90019676b0
491 changed files with 1009 additions and 863 deletions

View File

@ -37,6 +37,10 @@ jobs:
run: |
bash ./misc/scripts/clang_format.sh
- name: Header guards formatting checks (header_guards.sh)
run: |
bash ./misc/scripts/header_guards.sh
- name: Python style checks via black (black_format.sh)
run: |
bash ./misc/scripts/black_format.sh

View File

@ -42,4 +42,4 @@ public:
static int64_t get_global_constant_value(int p_idx);
};
#endif // GLOBAL_CONSTANTS_H
#endif // CORE_CONSTANTS_H

View File

@ -115,4 +115,5 @@ public:
static Error sha1(const uint8_t *p_src, int p_src_len, unsigned char r_hash[20]);
static Error sha256(const uint8_t *p_src, int p_src_len, unsigned char r_hash[32]);
};
#endif // CRYPTO_CORE_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef DEBUGGER_MARSHARLLS_H
#define DEBUGGER_MARSHARLLS_H
#ifndef DEBUGGER_MARSHALLS_H
#define DEBUGGER_MARSHALLS_H
#include "core/object/script_language.h"
@ -69,4 +69,4 @@ struct DebuggerMarshalls {
};
};
#endif // DEBUGGER_MARSHARLLS_H
#endif // DEBUGGER_MARSHALLS_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef API_DUMP_H
#define API_DUMP_H
#ifndef EXTENSION_API_DUMP_H
#define EXTENSION_API_DUMP_H
#include "core/extension/native_extension.h"
@ -42,4 +42,4 @@ public:
};
#endif
#endif // API_DUMP_H
#endif // EXTENSION_API_DUMP_H

View File

@ -582,4 +582,4 @@ typedef GDNativeBool (*GDNativeInitializationFunction)(const GDNativeInterface *
}
#endif
#endif
#endif // GDNATIVE_INTERFACE_H

View File

@ -97,4 +97,4 @@ public:
virtual String get_resource_type(const String &p_path) const;
};
#endif // NATIVEEXTENSION_H
#endif // NATIVE_EXTENSION_H

View File

@ -71,4 +71,4 @@ public:
VARIANT_ENUM_CAST(NativeExtensionManager::LoadStatus)
#endif // NATIVEEXTENSIONMANAGER_H
#endif // NATIVE_EXTENSION_MANAGER_H

View File

@ -55,4 +55,5 @@ public:
static bool is_event_array_equal(const Array &p_event_array1, const Array &p_event_array2);
};
#endif // SHORTCUT_H

View File

@ -127,4 +127,4 @@ public:
PacketPeerStream();
};
#endif // PACKET_STREAM_H
#endif // PACKET_PEER_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCE_UUID_H
#define RESOURCE_UUID_H
#ifndef RESOURCE_UID_H
#define RESOURCE_UID_H
#include "core/object/ref_counted.h"
#include "core/string/string_name.h"
@ -85,4 +85,4 @@ public:
~ResourceUID();
};
#endif // RESOURCEUUID_H
#endif // RESOURCE_UID_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef CAMERA_MATRIX_H
#define CAMERA_MATRIX_H
#ifndef PROJECTION_H
#define PROJECTION_H
#include "core/math/math_defs.h"
#include "core/math/vector3.h"
@ -164,4 +164,4 @@ Vector3 Projection::xform(const Vector3 &p_vec3) const {
return ret / w;
}
#endif // CAMERA_MATRIX_H
#endif // PROJECTION_H

View File

@ -272,4 +272,5 @@ _FORCE_INLINE_ Vector4 operator*(const int32_t p_scalar, const Vector4 &p_vec) {
_FORCE_INLINE_ Vector4 operator*(const int64_t p_scalar, const Vector4 &p_vec) {
return p_vec * p_scalar;
}
#endif // VECTOR4_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef NETWORKED_MULTIPLAYER_PEER_H
#define NETWORKED_MULTIPLAYER_PEER_H
#ifndef MULTIPLAYER_PEER_H
#define MULTIPLAYER_PEER_H
#include "core/io/packet_peer.h"
#include "core/multiplayer/multiplayer.h"
@ -147,4 +147,4 @@ public:
GDVIRTUAL0RC(int, _get_connection_status);
};
#endif // NETWORKED_MULTIPLAYER_PEER_H
#endif // MULTIPLAYER_PEER_H

View File

@ -48,4 +48,5 @@ public:
locked.clear(std::memory_order_release);
}
};
#endif // SPIN_LOCK_H

View File

@ -123,4 +123,5 @@ public:
};
#endif // THREAD_H
#endif // PLATFORM_THREAD_OVERRIDE

View File

@ -28,9 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
// Note: _GODOT suffix added to avoid conflict with ICU header with the same guard.
#ifndef USTRING_GODOT_H
#define USTRING_GODOT_H
// Note: Renamed to avoid conflict with ICU header with the same name.
#include "core/string/char_utils.h"
#include "core/templates/cowdata.h"

View File

@ -178,4 +178,4 @@ public:
}
};
#endif //BIN_SORTED_ARRAY_H
#endif // BIN_SORTED_ARRAY_H

View File

@ -124,4 +124,4 @@ public:
}
};
#endif
#endif // LRU_H

View File

@ -758,4 +758,4 @@ public:
}
};
#endif // MAP_H
#endif // RB_MAP_H

View File

@ -708,4 +708,4 @@ public:
}
};
#endif // SET_H
#endif // RB_SET_H

View File

@ -154,4 +154,4 @@ public:
~ThreadWorkPool();
};
#endif // THREAD_POOL_H
#endif // THREAD_WORK_POOL_H

View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef COREAUDIO_ENABLED
#ifndef AUDIO_DRIVER_COREAUDIO_H
#define AUDIO_DRIVER_COREAUDIO_H
#ifdef COREAUDIO_ENABLED
#include "servers/audio_server.h"
#import <AudioUnit/AudioUnit.h>
@ -120,6 +120,6 @@ public:
~AudioDriverCoreAudio() {}
};
#endif
#endif // COREAUDIO_ENABLED
#endif
#endif // AUDIO_DRIVER_COREAUDIO_H

View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef COREMIDI_ENABLED
#ifndef MIDI_DRIVER_COREMIDI_H
#define MIDI_DRIVER_COREMIDI_H
#ifdef COREMIDI_ENABLED
#include "core/os/midi_driver.h"
#include "core/templates/vector.h"
@ -57,5 +57,6 @@ public:
virtual ~MIDIDriverCoreMidi();
};
#endif // MIDI_DRIVER_COREMIDI_H
#endif // COREMIDI_ENABLED
#endif // MIDI_DRIVER_COREMIDI_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef COPY_GL_H
#define COPY_GL_H
#ifndef COPY_EFFECTS_GLES3_H
#define COPY_EFFECTS_GLES3_H
#ifdef GLES3_ENABLED
@ -70,4 +70,5 @@ public:
} //namespace GLES3
#endif // GLES3_ENABLED
#endif // !COPY_GL_H
#endif // COPY_EFFECTS_GLES3_H

View File

@ -59,4 +59,4 @@ public:
#endif // GLES3_ENABLED
#endif // !FOG_GLES3_H
#endif // FOG_GLES3_H

View File

@ -93,4 +93,4 @@ public:
#endif // GLES3_ENABLED
#endif // !GI_GLES3_H
#endif // GI_GLES3_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_CANVAS_OPENGL_H
#define RASTERIZER_CANVAS_OPENGL_H
#ifndef RASTERIZER_CANVAS_GLES3_H
#define RASTERIZER_CANVAS_GLES3_H
#ifdef GLES3_ENABLED
@ -262,4 +262,5 @@ public:
};
#endif // GLES3_ENABLED
#endif // RASTERIZER_CANVAS_OPENGL_H
#endif // RASTERIZER_CANVAS_GLES3_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_OPENGL_H
#define RASTERIZER_OPENGL_H
#ifndef RASTERIZER_GLES3_H
#define RASTERIZER_GLES3_H
#ifdef GLES3_ENABLED
@ -112,4 +112,4 @@ public:
#endif // GLES3_ENABLED
#endif
#endif // RASTERIZER_GLES3_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_SCENE_OPENGL_H
#define RASTERIZER_SCENE_OPENGL_H
#ifndef RASTERIZER_SCENE_GLES3_H
#define RASTERIZER_SCENE_GLES3_H
#ifdef GLES3_ENABLED
@ -947,4 +947,4 @@ public:
#endif // GLES3_ENABLED
#endif // RASTERIZER_SCENE_OPENGL_H
#endif // RASTERIZER_SCENE_GLES3_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHADER_OPENGL_H
#define SHADER_OPENGL_H
#ifndef SHADER_GLES3_H
#define SHADER_GLES3_H
#include "core/math/projection.h"
#include "core/os/mutex.h"
@ -248,5 +248,6 @@ public:
virtual ~ShaderGLES3();
};
#endif // SHADER_OPENGL_H
#endif
#endif // GLES3_ENABLED
#endif // SHADER_GLES3_H

View File

@ -90,4 +90,4 @@ public:
#endif // GLES3_ENABLED
#endif // !CONFIG_GLES3_H
#endif // CONFIG_GLES3_H

View File

@ -342,6 +342,6 @@ public:
} // namespace GLES3
#endif // !GLES3_ENABLED
#endif // GLES3_ENABLED
#endif // !LIGHT_STORAGE_GLES3_H
#endif // LIGHT_STORAGE_GLES3_H

View File

@ -599,4 +599,4 @@ public:
#endif // GLES3_ENABLED
#endif // !MATERIAL_STORAGE_GLES3_H
#endif // MATERIAL_STORAGE_GLES3_H

View File

@ -543,4 +543,4 @@ public:
#endif // GLES3_ENABLED
#endif // !MESH_STORAGE_GLES3_H
#endif // MESH_STORAGE_GLES3_H

View File

@ -137,4 +137,4 @@ public:
#endif // GLES3_ENABLED
#endif // !PARTICLES_STORAGE_GLES3_H
#endif // PARTICLES_STORAGE_GLES3_H

View File

@ -577,6 +577,6 @@ inline String TextureStorage::get_framebuffer_error(GLenum p_status) {
} // namespace GLES3
#endif // !GLES3_ENABLED
#endif // GLES3_ENABLED
#endif // !TEXTURE_STORAGE_GLES3_H
#endif // TEXTURE_STORAGE_GLES3_H

View File

@ -156,4 +156,4 @@ public:
#endif // GLES3_ENABLED
#endif // !UTILITIES_GLES3_H
#endif // UTILITIES_GLES3_H

View File

@ -45,4 +45,4 @@ public:
ImageLoaderPNG();
};
#endif
#endif // IMAGE_LOADER_PNG_H

View File

@ -43,4 +43,4 @@ Error png_to_image(const uint8_t *p_source, size_t p_size, bool p_force_linear,
Error image_to_png(const Ref<Image> &p_image, Vector<uint8_t> &p_buffer);
} // namespace PNGDriverCommon
#endif
#endif // PNG_DRIVER_COMMON_H

View File

@ -37,4 +37,4 @@ void unregister_core_driver_types();
void register_driver_types();
void unregister_driver_types();
#endif
#endif // REGISTER_DRIVER_TYPES_H

View File

@ -516,4 +516,4 @@ DirAccessUnix::~DirAccessUnix() {
list_dir_end();
}
#endif //posix_enabled
#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED

View File

@ -90,5 +90,6 @@ public:
~DirAccessUnix();
};
#endif //UNIX ENABLED
#endif
#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED
#endif // DIR_ACCESS_UNIX_H

View File

@ -339,4 +339,4 @@ FileAccessUnix::~FileAccessUnix() {
_close();
}
#endif
#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED

View File

@ -86,5 +86,6 @@ public:
virtual ~FileAccessUnix();
};
#endif
#endif
#endif // UNIX_ENABLED || LIBC_FILEIO_ENABLED
#endif // FILE_ACCESS_UNIX_H

View File

@ -50,4 +50,5 @@ public:
};
#endif
#endif // IP_UNIX_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef NET_SOCKET_UNIX_H
#define NET_SOCKET_UNIX_H
#ifndef NET_SOCKET_POSIX_H
#define NET_SOCKET_POSIX_H
#include "core/io/net_socket.h"
@ -104,4 +104,4 @@ public:
~NetSocketPosix();
};
#endif
#endif // NET_SOCKET_POSIX_H

View File

@ -98,6 +98,6 @@ public:
virtual ~UnixTerminalLogger();
};
#endif
#endif // UNIX_ENABLED
#endif
#endif // OS_UNIX_H

View File

@ -43,6 +43,6 @@ public:
virtual ~SyslogLogger();
};
#endif
#endif // UNIX_ENABLED
#endif
#endif // SYSLOG_LOGGER_H

View File

@ -35,4 +35,4 @@
void init_thread_posix();
#endif
#endif
#endif // THREAD_POSIX_H

View File

@ -330,4 +330,4 @@ public:
virtual ~VulkanContext();
};
#endif // VULKAN_DEVICE_H
#endif // VULKAN_CONTEXT_H

View File

@ -45,4 +45,4 @@ public:
virtual ~VulkanHooks(){};
};
#endif
#endif // VULKAN_HOOKS_H

View File

@ -120,4 +120,5 @@ public:
};
#endif // WASAPI_ENABLED
#endif // AUDIO_DRIVER_WASAPI_H

View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef WINMIDI_ENABLED
#ifndef MIDI_DRIVER_WINMIDI_H
#define MIDI_DRIVER_WINMIDI_H
#ifdef WINMIDI_ENABLED
#include "core/os/midi_driver.h"
#include "core/templates/vector.h"
@ -57,5 +57,6 @@ public:
virtual ~MIDIDriverWinMidi();
};
#endif // MIDI_DRIVER_WINMIDI_H
#endif // WINMIDI_ENABLED
#endif // MIDI_DRIVER_WINMIDI_H

View File

@ -106,4 +106,4 @@ public:
~AudioDriverXAudio2() {}
};
#endif
#endif // AUDIO_DRIVER_XAUDIO2_H

View File

@ -209,4 +209,4 @@ public:
ActionMapEditor();
};
#endif
#endif // ACTION_MAP_EDITOR_H

View File

@ -125,4 +125,4 @@ public:
CreateDialog();
};
#endif
#endif // CREATE_DIALOG_H

View File

@ -93,4 +93,4 @@ public:
Dictionary ev_breakpoint(const DAP::Breakpoint &p_breakpoint, const bool &p_enabled) const;
};
#endif
#endif // DEBUG_ADAPTER_PARSER_H

View File

@ -152,4 +152,4 @@ public:
~DebugAdapterProtocol();
};
#endif
#endif // DEBUG_ADAPTER_PROTOCOL_H

View File

@ -54,4 +54,4 @@ public:
void stop();
};
#endif
#endif // DEBUG_ADAPTER_SERVER_H

View File

@ -278,4 +278,4 @@ struct Variable {
} // namespace DAP
#endif
#endif // DEBUG_ADAPTER_TYPES_H

View File

@ -30,6 +30,7 @@
#ifndef EDITOR_DEBUGGER_INSPECTOR_H
#define EDITOR_DEBUGGER_INSPECTOR_H
#include "editor/editor_inspector.h"
class EditorDebuggerRemoteObject : public Object {

View File

@ -205,4 +205,5 @@ public:
void add_debugger_plugin(const Ref<Script> &p_script);
void remove_debugger_plugin(const Ref<Script> &p_script);
};
#endif // EDITOR_DEBUGGER_NODE_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITOR_DEBUGGER_CONNECTION_H
#define EDITOR_DEBUGGER_CONNECTION_H
#ifndef EDITOR_DEBUGGER_SERVER_H
#define EDITOR_DEBUGGER_SERVER_H
#include "core/debugger/remote_debugger_peer.h"
#include "core/object/ref_counted.h"
@ -57,4 +57,4 @@ public:
virtual Ref<RemoteDebuggerPeer> take_connection() = 0;
};
#endif // EDITOR_DEBUGGER_CONNECTION_H
#endif // EDITOR_DEBUGGER_SERVER_H

View File

@ -71,4 +71,5 @@ public:
void update_scene_tree(const SceneDebuggerTree *p_tree, int p_debugger);
EditorDebuggerTree();
};
#endif // EDITOR_DEBUGGER_TREE_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITORNETWORKPROFILER_H
#define EDITORNETWORKPROFILER_H
#ifndef EDITOR_NETWORK_PROFILER_H
#define EDITOR_NETWORK_PROFILER_H
#include "scene/debugger/scene_debugger.h"
#include "scene/gui/box_container.h"
@ -69,4 +69,4 @@ public:
EditorNetworkProfiler();
};
#endif //EDITORNETWORKPROFILER_H
#endif // EDITOR_NETWORK_PROFILER_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITORPROFILER_H
#define EDITORPROFILER_H
#ifndef EDITOR_PROFILER_H
#define EDITOR_PROFILER_H
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
@ -165,4 +165,4 @@ public:
EditorProfiler();
};
#endif // EDITORPROFILER_H
#endif // EDITOR_PROFILER_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITOR_FRAME_PROFILER_H
#define EDITOR_FRAME_PROFILER_H
#ifndef EDITOR_VISUAL_PROFILER_H
#define EDITOR_VISUAL_PROFILER_H
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
@ -144,4 +144,4 @@ public:
EditorVisualProfiler();
};
#endif // EDITOR_FRAME_PROFILER_H
#endif // EDITOR_VISUAL_PROFILER_H

View File

@ -53,4 +53,4 @@ public:
Error load_compressed(const uint8_t *p_data, int p_compressed_size, int p_uncompressed_size);
};
#endif // DOC_DATA_H
#endif // DOC_TOOLS_H

View File

@ -75,4 +75,4 @@ public:
~EditorAbout();
};
#endif
#endif // EDITOR_ABOUT_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITORASSETINSTALLER_H
#define EDITORASSETINSTALLER_H
#ifndef EDITOR_ASSET_INSTALLER_H
#define EDITOR_ASSET_INSTALLER_H
#include "scene/gui/dialogs.h"
#include "scene/gui/tree.h"
@ -59,4 +59,4 @@ public:
EditorAssetInstaller();
};
#endif // EDITORASSETINSTALLER_H
#endif // EDITOR_ASSET_INSTALLER_H

View File

@ -112,4 +112,4 @@ public:
~EditorAutoloadSettings();
};
#endif
#endif // EDITOR_AUTOLOAD_SETTINGS_H

View File

@ -101,4 +101,4 @@ public:
Ref<Shortcut> ED_SHORTCUT_AND_COMMAND(const String &p_path, const String &p_name, Key p_keycode = Key::NONE, String p_command = "");
#endif //EDITOR_COMMAND_PALETTE_H
#endif // EDITOR_COMMAND_PALETTE_H

View File

@ -529,4 +529,4 @@ public:
EditorExportTextSceneToBinaryPlugin();
};
#endif // EDITOR_IMPORT_EXPORT_H
#endif // EDITOR_EXPORT_H

View File

@ -35,4 +35,4 @@
void editor_register_fonts(Ref<Theme> p_theme);
#endif
#endif // EDITOR_FONTS_H

View File

@ -602,4 +602,4 @@ public:
EditorInspector();
};
#endif // INSPECTOR_H
#endif // EDITOR_INSPECTOR_H

View File

@ -91,6 +91,7 @@
#include "editor/editor_plugin.h"
#include "editor/editor_properties.h"
#include "editor/editor_property_name_processor.h"
#include "editor/editor_quick_open.h"
#include "editor/editor_resource_picker.h"
#include "editor/editor_resource_preview.h"
#include "editor/editor_run.h"
@ -200,7 +201,6 @@
#include "editor/progress_dialog.h"
#include "editor/project_export.h"
#include "editor/project_settings_editor.h"
#include "editor/quick_open.h"
#include "editor/register_exporters.h"
#include "editor/scene_tree_dock.h"

View File

@ -346,4 +346,4 @@ public:
}
};
#endif
#endif // EDITOR_PLUGIN_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITORPLUGINSETTINGS_H
#define EDITORPLUGINSETTINGS_H
#ifndef EDITOR_PLUGIN_SETTINGS_H
#define EDITOR_PLUGIN_SETTINGS_H
#include "core/object/undo_redo.h"
#include "editor/editor_data.h"
@ -65,4 +65,4 @@ public:
EditorPluginSettings();
};
#endif // EDITORPLUGINSETTINGS_H
#endif // EDITOR_PLUGIN_SETTINGS_H

View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* quick_open.cpp */
/* editor_quick_open.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "quick_open.h"
#include "editor_quick_open.h"
#include "core/os/keyboard.h"

View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* quick_open.h */
/* editor_quick_open.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

View File

@ -33,12 +33,12 @@
#include "editor/audio_stream_preview.h"
#include "editor/editor_file_dialog.h"
#include "editor/editor_node.h"
#include "editor/editor_quick_open.h"
#include "editor/editor_resource_preview.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/filesystem_dock.h"
#include "editor/plugins/script_editor_plugin.h"
#include "editor/quick_open.h"
#include "editor/scene_tree_dock.h"
HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITORRESOURCEPREVIEW_H
#define EDITORRESOURCEPREVIEW_H
#ifndef EDITOR_RESOURCE_PREVIEW_H
#define EDITOR_RESOURCE_PREVIEW_H
#include "core/os/semaphore.h"
#include "core/os/thread.h"
@ -124,4 +124,4 @@ public:
~EditorResourcePreview();
};
#endif // EDITORRESOURCEPREVIEW_H
#endif // EDITOR_RESOURCE_PREVIEW_H

View File

@ -35,4 +35,5 @@ void editor_set_scale(float p_scale);
float editor_get_scale();
#define EDSCALE (editor_get_scale())
#endif // EDITOR_SCALE_H

View File

@ -76,4 +76,5 @@ public:
SectionedInspector();
~SectionedInspector();
};
#endif // EDITOR_SECTIONED_INSPECTOR_H

View File

@ -40,4 +40,4 @@ Ref<Theme> create_custom_theme(Ref<Theme> p_theme = nullptr);
Ref<ImageTexture> create_unscaled_default_project_icon();
#endif
#endif // EDITOR_THEMES_H

View File

@ -85,4 +85,4 @@ public:
virtual ~EditorVCSInterface();
};
#endif // !EDITOR_VCS_INTERFACE_H
#endif // EDITOR_VCS_INTERFACE_H

View File

@ -342,4 +342,4 @@ public:
~FileSystemDock();
};
#endif // SCENES_DOCK_H
#endif // FILESYSTEM_DOCK_H

View File

@ -144,4 +144,4 @@ public:
~GroupsEditor();
};
#endif
#endif // GROUPS_EDITOR_H

View File

@ -44,4 +44,4 @@ public:
EditorSceneFormatImporterCollada();
};
#endif
#endif // EDITOR_IMPORT_COLLADA_H

View File

@ -68,4 +68,4 @@ public:
virtual Error import(const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr) override;
};
#endif //EDITOR_IMPORT_PLUGIN_H
#endif // EDITOR_IMPORT_PLUGIN_H

View File

@ -53,4 +53,5 @@ public:
ResourceImporterBitMap();
~ResourceImporterBitMap();
};
#endif // RESOURCE_IMPORTER_BITMASK_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCEIMPORTERCSVTRANSLATION_H
#define RESOURCEIMPORTERCSVTRANSLATION_H
#ifndef RESOURCE_IMPORTER_CSV_TRANSLATION_H
#define RESOURCE_IMPORTER_CSV_TRANSLATION_H
#include "core/io/resource_importer.h"
@ -54,4 +54,4 @@ public:
ResourceImporterCSVTranslation();
};
#endif // RESOURCEIMPORTERCSVTRANSLATION_H
#endif // RESOURCE_IMPORTER_CSV_TRANSLATION_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCE_IMPORTER_IMAGE_FONT_H
#define RESOURCE_IMPORTER_IMAGE_FONT_H
#ifndef RESOURCE_IMPORTER_IMAGEFONT_H
#define RESOURCE_IMPORTER_IMAGEFONT_H
#include "core/io/resource_importer.h"
#include "scene/resources/font.h"
@ -55,4 +55,4 @@ public:
ResourceImporterImageFont();
};
#endif // RESOURCE_IMPORTER_IMAGE_FONT_H
#endif // RESOURCE_IMPORTER_IMAGEFONT_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCEIMPORTEROBJ_H
#define RESOURCEIMPORTEROBJ_H
#ifndef RESOURCE_IMPORTER_OBJ_H
#define RESOURCE_IMPORTER_OBJ_H
#include "resource_importer_scene.h"
@ -69,4 +69,4 @@ public:
ResourceImporterOBJ();
};
#endif // RESOURCEIMPORTEROBJ_H
#endif // RESOURCE_IMPORTER_OBJ_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCEIMPORTERSCENE_H
#define RESOURCEIMPORTERSCENE_H
#ifndef RESOURCE_IMPORTER_SCENE_H
#define RESOURCE_IMPORTER_SCENE_H
#include "core/error/error_macros.h"
#include "core/io/resource_importer.h"
@ -479,4 +479,4 @@ Transform3D ResourceImporterScene::get_collision_shapes_transform(const M &p_opt
return transform;
}
#endif // RESOURCEIMPORTERSCENE_H
#endif // RESOURCE_IMPORTER_SCENE_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCEIMPORTTEXTURE_H
#define RESOURCEIMPORTTEXTURE_H
#ifndef RESOURCE_IMPORTER_TEXTURE_H
#define RESOURCE_IMPORTER_TEXTURE_H
#include "core/io/file_access.h"
#include "core/io/image.h"
@ -109,4 +109,4 @@ public:
~ResourceImporterTexture();
};
#endif // RESOURCEIMPORTTEXTURE_H
#endif // RESOURCE_IMPORTER_TEXTURE_H

View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef IMPORTDOCK_H
#define IMPORTDOCK_H
#ifndef IMPORT_DOCK_H
#define IMPORT_DOCK_H
#include "core/io/config_file.h"
#include "core/io/resource_importer.h"
@ -105,4 +105,4 @@ public:
~ImportDock();
};
#endif // IMPORTDOCK_H
#endif // IMPORT_DOCK_H

View File

@ -153,4 +153,4 @@ public:
~InspectorDock();
};
#endif
#endif // INSPECTOR_DOCK_H

View File

@ -116,4 +116,4 @@ public:
AnimationLibraryEditor();
};
#endif // ANIMATIONPLAYERLIBRARYEDITOR_H
#endif // ANIMATION_LIBRARY_EDITOR_H

Some files were not shown because too many files have changed in this diff Show More