From a647fb3e623c8e5c14427c2631ee61f132951709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 31 Mar 2022 14:06:10 +0200 Subject: [PATCH] Fix typos with codespell Using codespell 2.2-dev from current git. Fix a couple incorrect uses of gendered pronouns. --- core/object/make_virtuals.py | 2 +- doc/classes/DisplayServer.xml | 2 +- doc/classes/Font.xml | 2 +- doc/classes/InputEventJoypadButton.xml | 2 +- doc/classes/PortableCompressedTexture2D.xml | 4 ++-- doc/classes/ProjectSettings.xml | 2 +- doc/classes/TextServerExtension.xml | 2 +- drivers/vulkan/vulkan_context.cpp | 2 +- misc/scripts/codespell.sh | 2 +- modules/gdscript/gdscript_analyzer.cpp | 2 +- modules/mono/mono_gd/gd_mono_class.cpp | 2 +- modules/openxr/SCsub | 2 +- modules/openxr/action_map/openxr_action_map.cpp | 2 +- modules/openxr/doc_classes/OpenXRActionMap.xml | 2 +- modules/openxr/openxr_api.cpp | 4 ++-- modules/openxr/openxr_interface.cpp | 2 +- platform/windows/display_server_windows.cpp | 2 +- scene/gui/rich_text_label.cpp | 2 +- servers/extensions/physics_server_3d_extension.h | 4 ++-- servers/rendering/renderer_rd/uniform_set_cache_rd.cpp | 2 +- servers/rendering/rendering_device.h | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py index 64ee5940b04..c18d70d9f6e 100644 --- a/core/object/make_virtuals.py +++ b/core/object/make_virtuals.py @@ -28,7 +28,7 @@ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ }\\ \\ if (required) {\\ - ERR_PRINT_ONCE("Required virtual method: "+get_class()+"::" + #m_name + " must be overriden before calling.");\\ + ERR_PRINT_ONCE("Required virtual method " + get_class() + "::" + #m_name + " must be overridden before calling.");\\ $RVOID\\ }\\ \\ diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index 16a20191490..0d99c600d5a 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -1287,7 +1287,7 @@ Window can't be focused. No-focus window will ignore all input, except mouse clicks. - Window is part of menu or [OptionButton] dropdown. This flag can't be changed when window is visible. An active popup window will exclusivly receive all input, without stealing focus from its parent. Popup windows are automatically closed when uses click outside it, or when an application is switched. Popup window must have [constant WINDOW_FLAG_TRANSPARENT] set. + Window is part of menu or [OptionButton] dropdown. This flag can't be changed when window is visible. An active popup window will exclusively receive all input, without stealing focus from its parent. Popup windows are automatically closed when uses click outside it, or when an application is switched. Popup window must have [constant WINDOW_FLAG_TRANSPARENT] set. diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml index f357cb05b55..dae42ddf346 100644 --- a/doc/classes/Font.xml +++ b/doc/classes/Font.xml @@ -194,7 +194,7 @@ - Returns [Array] of valid [FontData] [RID]s, which can be passsed to the [TextServer] methods. + Returns [Array] of valid [FontData] [RID]s, which can be passed to the [TextServer] methods. diff --git a/doc/classes/InputEventJoypadButton.xml b/doc/classes/InputEventJoypadButton.xml index 5066fb29d31..edbc5b1e0bb 100644 --- a/doc/classes/InputEventJoypadButton.xml +++ b/doc/classes/InputEventJoypadButton.xml @@ -17,7 +17,7 @@ If [code]true[/code], the button's state is pressed. If [code]false[/code], the button's state is released. - Represents the pressure the user puts on the button with his finger, if the controller supports it. Ranges from [code]0[/code] to [code]1[/code]. + Represents the pressure the user puts on the button with their finger, if the controller supports it. Ranges from [code]0[/code] to [code]1[/code]. diff --git a/doc/classes/PortableCompressedTexture2D.xml b/doc/classes/PortableCompressedTexture2D.xml index 7b46a0bf077..aad72bbb483 100644 --- a/doc/classes/PortableCompressedTexture2D.xml +++ b/doc/classes/PortableCompressedTexture2D.xml @@ -40,14 +40,14 @@ - Return whether the flag is overriden for all textures of this type. + Return whether the flag is overridden for all textures of this type. - Overrides the flag globally for all textures of this type. This is used primarly by the editor. + Overrides the flag globally for all textures of this type. This is used primarily by the editor. diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index ab36c9473c0..44b16de0cfb 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -1936,7 +1936,7 @@ Specify the default reference space. - Specify the view configuration with which to configure OpenXR settting up either Mono or Stereo rendering. + Specify the view configuration with which to configure OpenXR setting up either Mono or Stereo rendering. If [code]true[/code], Godot will compile shaders required for XR. diff --git a/doc/classes/TextServerExtension.xml b/doc/classes/TextServerExtension.xml index 25647e2668e..e7c5edd2663 100644 --- a/doc/classes/TextServerExtension.xml +++ b/doc/classes/TextServerExtension.xml @@ -373,7 +373,7 @@ - Retruns 2D transform applied to the font outlines. + Returns 2D transform applied to the font outlines. diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp index 3551b5d6c49..a09a757842f 100644 --- a/drivers/vulkan/vulkan_context.cpp +++ b/drivers/vulkan/vulkan_context.cpp @@ -900,7 +900,7 @@ Error VulkanContext::_create_physical_device(VkSurfaceKHR p_surface) { free(device_queue_props); print_verbose(" #" + itos(i) + ": " + vendor + " " + name + " - " + (present_supported ? "Supported" : "Unsupported") + ", " + dev_type); - if (present_supported) { // Select first supported device of preffered type: Discrete > Integrated > Virtual > CPU > Other. + if (present_supported) { // Select first supported device of preferred type: Discrete > Integrated > Virtual > CPU > Other. switch (props.deviceType) { case VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU: { if (type_selected < 4) { diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh index 2822c6421bd..7c5f824b5e4 100644 --- a/misc/scripts/codespell.sh +++ b/misc/scripts/codespell.sh @@ -1,5 +1,5 @@ #!/bin/sh SKIP_LIST="./thirdparty,*.gen.*,*.po,*.pot,package-lock.json,./core/string/locales.h,./DONORS.md,./misc/scripts/codespell.sh" -IGNORE_LIST="ba,childs,curvelinear,expct,fave,findn,gird,inout,lod,nd,numer,ois,ro,statics,te,varn" +IGNORE_LIST="ba,childs,complies,curvelinear,expct,fave,findn,gird,inout,lod,nd,numer,ois,ro,statics,te,varn" codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 6f25b06e879..00931961b76 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -647,7 +647,7 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas } } - // Check if initalizer is an unset identifier (ie: a variable within scope, but declared below) + // Check if initializer is an unset identifier (ie: a variable within scope, but declared below) if (member.variable->initializer && !member.variable->initializer->get_datatype().is_set()) { if (member.variable->initializer->type == GDScriptParser::Node::IDENTIFIER) { GDScriptParser::IdentifierNode *initializer_identifier = static_cast(member.variable->initializer); diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp index 89c37e087b2..3fc0f16e055 100644 --- a/modules/mono/mono_gd/gd_mono_class.cpp +++ b/modules/mono/mono_gd/gd_mono_class.cpp @@ -194,7 +194,7 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base #ifdef DEBUG_ENABLED // For debug builds, we also fetched from native base classes as well before if this is not a native base class. - // This allows us to warn the user here if he is using snake_case by mistake. + // This allows us to warn the user here if they are using snake_case by mistake. if (p_native_base != this) { GDMonoClass *native_top = p_native_base; diff --git a/modules/openxr/SCsub b/modules/openxr/SCsub index 37a8f3909ac..32cab1bef1a 100644 --- a/modules/openxr/SCsub +++ b/modules/openxr/SCsub @@ -75,7 +75,7 @@ module_obj = [] env_openxr.add_source_files(module_obj, "*.cpp") env_openxr.add_source_files(module_obj, "action_map/*.cpp") -# We're a little more targetted with our extensions +# We're a little more targeted with our extensions if env["platform"] == "android": env_openxr.add_source_files(module_obj, "extensions/openxr_android_extension.cpp") if env["vulkan"]: diff --git a/modules/openxr/action_map/openxr_action_map.cpp b/modules/openxr/action_map/openxr_action_map.cpp index 5391f9569a1..e14c68079d1 100644 --- a/modules/openxr/action_map/openxr_action_map.cpp +++ b/modules/openxr/action_map/openxr_action_map.cpp @@ -165,7 +165,7 @@ void OpenXRActionMap::create_default_action_sets() { profile->add_new_binding(menu_button, "/user/hand/left/input/menu/click,/user/hand/right/input/menu/click"); // wmr controller has no a/b/x/y buttons profile->add_new_binding(trigger, "/user/hand/left/input/trigger/value,/user/hand/right/input/trigger/value"); - profile->add_new_binding(trigger_click, "/user/hand/left/input/trigger/value,/user/hand/right/input/trigger/value"); // OpenXR will conver float to bool + profile->add_new_binding(trigger_click, "/user/hand/left/input/trigger/value,/user/hand/right/input/trigger/value"); // OpenXR will convert float to bool profile->add_new_binding(grip, "/user/hand/left/input/squeeze/click,/user/hand/right/input/squeeze/click"); // OpenXR will convert bool to float profile->add_new_binding(grip_click, "/user/hand/left/input/squeeze/click,/user/hand/right/input/squeeze/click"); // primary on our wmr controller is our thumbstick, no touch diff --git a/modules/openxr/doc_classes/OpenXRActionMap.xml b/modules/openxr/doc_classes/OpenXRActionMap.xml index f1def8aad8d..4dd2b83ca7d 100644 --- a/modules/openxr/doc_classes/OpenXRActionMap.xml +++ b/modules/openxr/doc_classes/OpenXRActionMap.xml @@ -6,7 +6,7 @@ OpenXR uses an action system similar to Godots Input map system to bind inputs and outputs on various types of XR controllers to named actions. OpenXR specifies more detail on these inputs and outputs than Godot supports. Another important distinction is that OpenXR offers no control over these bindings. The bindings we register are suggestions, it is up to the XR runtime to offer users the ability to change these bindings. This allows the XR runtime to fill in the gaps if new hardware becomes available. - The action map therefor needs to be loaded at startup and can't be changed afterwards. This resource is a container for the entire action map. + The action map therefore needs to be loaded at startup and can't be changed afterwards. This resource is a container for the entire action map. diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index f7ff6cc89d6..7752878d82e 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -100,7 +100,7 @@ String OpenXRAPI::get_error_string(XrResult result) { } String OpenXRAPI::get_swapchain_format_name(int64_t p_swapchain_format) const { - // This is rendering engine dependend... + // This is rendering engine dependent... if (graphics_extension) { return graphics_extension->get_swapchain_format_name(p_swapchain_format); } @@ -339,7 +339,7 @@ bool OpenXRAPI::get_system_info() { } bool OpenXRAPI::load_supported_view_configuration_types() { - // This queries the supported configuration types, likely there will only be one chosing between Mono (phone AR) and Stereo (HMDs) + // This queries the supported configuration types, likely there will only be one choosing between Mono (phone AR) and Stereo (HMDs) ERR_FAIL_COND_V(instance == XR_NULL_HANDLE, false); diff --git a/modules/openxr/openxr_interface.cpp b/modules/openxr/openxr_interface.cpp index 7152cdb605b..41ce8c019eb 100644 --- a/modules/openxr/openxr_interface.cpp +++ b/modules/openxr/openxr_interface.cpp @@ -384,7 +384,7 @@ void OpenXRInterface::handle_tracker(Tracker *p_tracker) { // profiles are suggested bindings for controller types we know about. OpenXR runtimes can stray away from these // and rebind them or even offer bindings to controllers that are not known to us. - // We don't really have a consistant way to detect whether a controller is active however as long as it is + // We don't really have a consistent way to detect whether a controller is active however as long as it is // unbound it seems to be unavailable, so far unknown controller seem to mimic one of the profiles we've // supplied. if (p_tracker->interaction_profile.is_null()) { diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index d73239614f4..877e82e707e 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -2849,7 +2849,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA } } } else { - // For reasons unknown to mankind, wheel comes in screen coordinates. + // For reasons unknown to humanity, wheel comes in screen coordinates. POINT coords; coords.x = mb->get_position().x; coords.y = mb->get_position().y; diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index d585fb3a7a1..70755a2870f 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -4500,7 +4500,7 @@ void RichTextLabel::_bind_methods() { ClassDB::bind_method(D_METHOD("get_effects"), &RichTextLabel::get_effects); ClassDB::bind_method(D_METHOD("install_effect", "effect"), &RichTextLabel::install_effect); - // Note: set "bbcode_enabled" first, to avoid unnecessery "text" resets. + // Note: set "bbcode_enabled" first, to avoid unnecessary "text" resets. ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bbcode_enabled"), "set_use_bbcode", "is_using_bbcode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "tab_size", PROPERTY_HINT_RANGE, "0,24,1"), "set_tab_size", "get_tab_size"); diff --git a/servers/extensions/physics_server_3d_extension.h b/servers/extensions/physics_server_3d_extension.h index 41a77461836..77e867a05a1 100644 --- a/servers/extensions/physics_server_3d_extension.h +++ b/servers/extensions/physics_server_3d_extension.h @@ -45,7 +45,7 @@ protected: static void _bind_methods(); public: - // The warning is valid, but unavoidable. If the function is not overriden it will error anyway. + // The warning is valid, but unavoidable. If the function is not overridden it will error anyway. EXBIND0RC(Vector3, get_total_gravity) EXBIND0RC(real_t, get_total_angular_damp) @@ -208,7 +208,7 @@ protected: static void _bind_methods(); public: - // The warning is valid, but unavoidable. If the function is not overriden it will error anyway. + // The warning is valid, but unavoidable. If the function is not overridden it will error anyway. EXBIND0R(RID, world_boundary_shape_create) EXBIND0R(RID, separation_ray_shape_create) diff --git a/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp index 5843b9db24d..84529ca400a 100644 --- a/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp +++ b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp @@ -36,7 +36,7 @@ void UniformSetCacheRD::_invalidate(Cache *p_cache) { if (p_cache->prev) { p_cache->prev->next = p_cache->next; } else { - // At begining of table + // At beginning of table uint32_t table_idx = p_cache->hash % HASH_TABLE_SIZE; hash_table[table_idx] = p_cache->next; } diff --git a/servers/rendering/rendering_device.h b/servers/rendering/rendering_device.h index 6ed44486386..ecbb11efcaf 100644 --- a/servers/rendering/rendering_device.h +++ b/servers/rendering/rendering_device.h @@ -729,7 +729,7 @@ public: int binding; // Binding index as specified in shader. private: - // In most cases only one ID is provided per binding, so avoid allocating memory unnecesarily for performance. + // In most cases only one ID is provided per binding, so avoid allocating memory unnecessarily for performance. RID id; // If only one is provided, this is used. Vector ids; // If multiple ones are provided, this is used instead.