From 459f526119da43efae52307a6165a8ccd5cb2288 Mon Sep 17 00:00:00 2001 From: Poommetee Ketson Date: Sat, 2 Sep 2017 21:19:06 +0700 Subject: [PATCH] Fix typos 'a' and 'an' --- core/bind/core_bind.cpp | 2 +- core/io/resource_format_binary.cpp | 4 ++-- core/list.h | 4 ++-- core/method_bind.h | 2 +- doc/base/classes.xml | 20 +++++++++---------- editor/project_settings_editor.cpp | 2 +- misc/hooks/pre-commit-clang-format | 4 ++-- modules/gdscript/gd_function.cpp | 2 +- modules/gdscript/gd_parser.cpp | 8 ++++---- modules/openssl/SCsub | 2 +- .../visual_script_expression.cpp | 2 +- platform/x11/os_x11.cpp | 2 +- scene/gui/tree.h | 2 +- scene/resources/packed_scene.cpp | 2 +- servers/visual/shader_language.cpp | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index a446094643e..0f217c82350 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -568,7 +568,7 @@ Dictionary _OS::get_time(bool utc) const { } /** - * Get a epoch time value from a dictionary of time values + * Get an epoch time value from a dictionary of time values * @p datetime must be populated with the following keys: * day, hour, minute, month, second, year. (dst is ignored). * diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index d090d7a20b4..c5909981eab 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -878,7 +878,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) { if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) { f->close(); - ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a a new engine version: " + local_path); + ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path); ERR_FAIL(); } @@ -1178,7 +1178,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons memdelete(f); memdelete(fw); - ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a a new engine version: " + local_path); + ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path); ERR_FAIL_V(ERR_FILE_UNRECOGNIZED); } diff --git a/core/list.h b/core/list.h index 0cad6038ff1..a67287a9abd 100644 --- a/core/list.h +++ b/core/list.h @@ -180,7 +180,7 @@ private: public: /** - * return an const iterator to the beginning of the list. + * return a const iterator to the beginning of the list. */ _FORCE_INLINE_ const Element *front() const { @@ -195,7 +195,7 @@ public: }; /** - * return an const iterator to the last member of the list. + * return a const iterator to the last member of the list. */ _FORCE_INLINE_ const Element *back() const { diff --git a/core/method_bind.h b/core/method_bind.h index 75f09b2cd95..3c43f86b544 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -369,7 +369,7 @@ MethodBind *create_vararg_method_bind(Variant (T::*p_method)(const Variant **, i // tale of an amazing hack.. // -// if you declare an nonexistent class.. +// if you declare a nonexistent class.. class __UnexistingClass; #include "method_bind.gen.inc" diff --git a/doc/base/classes.xml b/doc/base/classes.xml index b537a7b1525..96d515de5e6 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -4829,7 +4829,7 @@ - Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. + Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have a space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important. @@ -5297,7 +5297,7 @@ - Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. + Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have a space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important. @@ -16763,7 +16763,7 @@ - Get the specific project settings path. Projects all have an unique sub-directory inside the settings path where project specific settings are saved. + Get the specific project settings path. Projects all have a unique sub-directory inside the settings path where project specific settings are saved. @@ -18893,7 +18893,7 @@ Internationalized font and text drawing support. - Font contains an unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc. + Font contains a unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc. @@ -20406,7 +20406,7 @@ GraphEdit is an area capable of showing various GraphNodes. It manages connection events between them. - GraphEdit manages the showing of GraphNodes it contains, as well as connections an disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default. + GraphEdit manages the showing of GraphNodes it contains, as well as connections and disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default. It is greatly advised to enable low processor usage mode (see [method OS.set_low_processor_usage_mode]) when using GraphEdits. @@ -22722,7 +22722,7 @@ - Simple helper to draw an uvsphere, with given latitudes, longitude and radius. + Simple helper to draw a uvsphere, with given latitudes, longitude and radius. @@ -47999,7 +47999,7 @@ - Get an utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8). + Get a utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8). @@ -48726,7 +48726,7 @@ - Convert a string containing an hexadecimal number into an int. + Convert a string containing a hexadecimal number into an int. @@ -52300,7 +52300,7 @@ - Set an half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument). + Set a half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument). Half offset sets every other tile off by a half tile size in the specified direction. @@ -55065,7 +55065,7 @@ Means that the animation is interpolated with a quadratic (to the power of 2) function. - Means that the animation is interpolated with a exponential (some number to the power of x) function. + Means that the animation is interpolated with an exponential (some number to the power of x) function. Means that the animation is interpolated with elasticity, wiggling around the edges. diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 9817ab176ea..2cd0221ab63 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -929,7 +929,7 @@ void ProjectSettingsEditor::_copy_to_platform(int p_which) { String path = globals_editor->get_property_editor()->get_selected_path(); if (path == String()) { - EditorNode::get_singleton()->show_warning(TTR("Select an setting item first!")); + EditorNode::get_singleton()->show_warning(TTR("Select a setting item first!")); return; } diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index 0971ebe23a5..d2d65a7428c 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -1,6 +1,6 @@ #!/bin/bash -# git pre-commit hook that runs an clang-format stylecheck. +# git pre-commit hook that runs a clang-format stylecheck. # Features: # - abort commit when commit does not comply with the style guidelines # - create a patch of the proposed style changes @@ -97,7 +97,7 @@ do # The sed call is necessary to transform the patch from # --- $file timestamp # +++ - timestamp - # to both lines working on the same file and having a a/ and b/ prefix. + # to both lines working on the same file and having a/ and b/ prefix. # Else it can not be applied with 'git apply'. "$CLANG_FORMAT" -style=file "$file" | \ diff -u "$file" - | \ diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index cba1baaca38..ddee7b25215 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -1026,7 +1026,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a } case OPCODE_ITERATE_BEGIN: { - CHECK_SPACE(8); //space for this an regular iterate + CHECK_SPACE(8); //space for this a regular iterate GET_VARIANT_PTR(counter, 1); GET_VARIANT_PTR(container, 2); diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 072937a5216..72c3f9612a8 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -1284,7 +1284,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators after ternary if."); @@ -1294,7 +1294,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 3].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators after ternary else."); @@ -1331,7 +1331,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators."); @@ -1857,7 +1857,7 @@ GDParser::PatternNode *GDParser::_parse_pattern(bool p_static) { tokenizer->advance(1); break; } else { - _set_error("'..' pattern only allowed at the end of an dictionary pattern"); + _set_error("'..' pattern only allowed at the end of a dictionary pattern"); return NULL; } } diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index add7d4dcfc7..eb3c0e64d81 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -655,7 +655,7 @@ if (env['builtin_openssl'] != 'no'): env_openssl.add_source_files(env.modules_sources, thirdparty_sources) - # FIXME: Clone the environment to make a env_openssl and not pollute the modules env + # FIXME: Clone the environment to make env_openssl and not pollute the modules env thirdparty_include_paths = [ "", "crypto", diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 6bd052fe26d..d0e9b5bb860 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -1179,7 +1179,7 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() { if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators."); diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 2d33d25773a..f96343c92cc 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1237,7 +1237,7 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) { unsigned int keycode = KeyMappingX11::get_keycode(keysym_keycode); - /* Phase 3, obtain an unicode character from the keysym */ + /* Phase 3, obtain a unicode character from the keysym */ // KeyMappingX11 also translates keysym to unicode. // It does a binary search on a table to translate diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 1fb1eb27920..06d6d3ad5ab 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -54,7 +54,7 @@ public: CELL_MODE_CHECK, ///< string + check CELL_MODE_RANGE, ///< Contains a range CELL_MODE_RANGE_EXPRESSION, ///< Contains a range - CELL_MODE_ICON, ///< Contains a icon, not editable + CELL_MODE_ICON, ///< Contains an icon, not editable CELL_MODE_CUSTOM, ///< Contains a custom value, show a string, and an edit button }; diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 19fab5d587d..c525ca600a4 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -145,7 +145,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const { node = parent->_get_child_by_name(snames[n.name]); #ifdef DEBUG_ENABLED if (!node) { - WARN_PRINT(String("Node '" + String(ret_nodes[0]->get_path_to(parent)) + "/" + String(snames[n.name]) + "' was modified from inside a instance, but it has vanished.").ascii().get_data()); + WARN_PRINT(String("Node '" + String(ret_nodes[0]->get_path_to(parent)) + "/" + String(snames[n.name]) + "' was modified from inside an instance, but it has vanished.").ascii().get_data()); } #endif } diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index c7b537c8ea7..0684cb1701b 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2953,7 +2953,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Parser bug..");