diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-10-07 11:34:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-07 11:34:11 +0200 |
commit | 58ca3031419cacb35c530cebe68e87a4c27dde06 (patch) | |
tree | b0965bb65919bc1495ee02204a91e5ed3a9b56a7 /core/string/optimized_translation.cpp | |
parent | 5b7f62af55b7f322192f95258d825b163cbf9dc1 (diff) | |
parent | 0103af1ddda6a2aa31227965141dd7d3a513e081 (diff) | |
download | redot-engine-58ca3031419cacb35c530cebe68e87a4c27dde06.tar.gz |
Merge pull request #66808 from bruvzg/msvc_warn
Diffstat (limited to 'core/string/optimized_translation.cpp')
-rw-r--r-- | core/string/optimized_translation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/string/optimized_translation.cpp b/core/string/optimized_translation.cpp index 07302cc8c3..b130c2fc79 100644 --- a/core/string/optimized_translation.cpp +++ b/core/string/optimized_translation.cpp @@ -179,14 +179,14 @@ void OptimizedTranslation::generate(const Ref<Translation> &p_from) { } bool OptimizedTranslation::_set(const StringName &p_name, const Variant &p_value) { - String name = p_name.operator String(); - if (name == "hash_table") { + String prop_name = p_name.operator String(); + if (prop_name == "hash_table") { hash_table = p_value; - } else if (name == "bucket_table") { + } else if (prop_name == "bucket_table") { bucket_table = p_value; - } else if (name == "strings") { + } else if (prop_name == "strings") { strings = p_value; - } else if (name == "load_from") { + } else if (prop_name == "load_from") { generate(p_value); } else { return false; @@ -196,12 +196,12 @@ bool OptimizedTranslation::_set(const StringName &p_name, const Variant &p_value } bool OptimizedTranslation::_get(const StringName &p_name, Variant &r_ret) const { - String name = p_name.operator String(); - if (name == "hash_table") { + String prop_name = p_name.operator String(); + if (prop_name == "hash_table") { r_ret = hash_table; - } else if (name == "bucket_table") { + } else if (prop_name == "bucket_table") { r_ret = bucket_table; - } else if (name == "strings") { + } else if (prop_name == "strings") { r_ret = strings; } else { return false; |