diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-13 16:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 16:10:44 +0100 |
| commit | 0b409d89d04d4cfed9fb559df8a3b379aba6ea2b (patch) | |
| tree | 4e753cc811a27180dc88d7fadfdb1cf937b799ac /modules/mono/editor | |
| parent | 59495adb7c4b4dc2374a4a4d8cd0360ccf293a32 (diff) | |
| parent | af878716f2620fb9142b960253dc82f60ab23df2 (diff) | |
Merge pull request #45136 from akien-mga/clang-format-11
CI: Update to clang-format 11 and apply ternary operator changes
Diffstat (limited to 'modules/mono/editor')
| -rw-r--r-- | modules/mono/editor/bindings_generator.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/editor/script_class_parser.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 59ce617990..38e403b2e1 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -365,7 +365,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf xml_output.append("</c>"); } else if (link_tag == "enum") { StringName search_cname = !target_itype ? target_cname : - StringName(target_itype->name + "." + (String)target_cname); + StringName(target_itype->name + "." + (String)target_cname); const Map<StringName, TypeInterface>::Element *enum_match = enum_types.find(search_cname); diff --git a/modules/mono/editor/script_class_parser.cpp b/modules/mono/editor/script_class_parser.cpp index 8f9a31a5b9..e81cbe4ebd 100644 --- a/modules/mono/editor/script_class_parser.cpp +++ b/modules/mono/editor/script_class_parser.cpp @@ -735,9 +735,9 @@ Error ScriptClassParser::parse_file(const String &p_filepath) { ERR_FAIL_COND_V_MSG(ferr != OK, ferr, ferr == ERR_INVALID_DATA ? - "File '" + p_filepath + "' contains invalid unicode (UTF-8), so it was not loaded." + "File '" + p_filepath + "' contains invalid unicode (UTF-8), so it was not loaded." " Please ensure that scripts are saved in valid UTF-8 unicode." : - "Failed to read file: '" + p_filepath + "'."); + "Failed to read file: '" + p_filepath + "'."); run_dummy_preprocessor(source, p_filepath); |