diff options
author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-08-14 19:19:05 +0200 |
---|---|---|
committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-08-14 19:19:05 +0200 |
commit | 21d285e30fac8753bf2e1422054907d6b9c21150 (patch) | |
tree | e9437b2ae07f068eaa7fc22cdb207fe91d4adb1e /core | |
parent | a71a5fc0c3f5d487d3f18c3b9e9a768052795e86 (diff) | |
download | redot-engine-21d285e30fac8753bf2e1422054907d6b9c21150.tar.gz |
Dictionary: remove erase_checked(key), make erase(key) return bool
Diffstat (limited to 'core')
-rw-r--r-- | core/dictionary.cpp | 7 | ||||
-rw-r--r-- | core/dictionary.h | 3 | ||||
-rw-r--r-- | core/variant_call.cpp | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 42d9eab310..9cc913fa0d 100644 --- a/core/dictionary.cpp +++ b/core/dictionary.cpp @@ -135,12 +135,7 @@ bool Dictionary::has_all(const Array &p_keys) const { return true; } -void Dictionary::erase(const Variant &p_key) { - - _p->variant_map.erase(p_key); -} - -bool Dictionary::erase_checked(const Variant &p_key) { +bool Dictionary::erase(const Variant &p_key) { return _p->variant_map.erase(p_key); } diff --git a/core/dictionary.h b/core/dictionary.h index 00ec67fb99..dbf2233819 100644 --- a/core/dictionary.h +++ b/core/dictionary.h @@ -65,8 +65,7 @@ public: bool has(const Variant &p_key) const; bool has_all(const Array &p_keys) const; - void erase(const Variant &p_key); - bool erase_checked(const Variant &p_key); + bool erase(const Variant &p_key); bool operator==(const Dictionary &p_dictionary) const; diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 20a2929dc0..f5173deabf 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1649,7 +1649,7 @@ void register_variant_methods() { ADDFUNC0NC(DICTIONARY, NIL, Dictionary, clear, varray()); ADDFUNC1R(DICTIONARY, BOOL, Dictionary, has, NIL, "key", varray()); ADDFUNC1R(DICTIONARY, BOOL, Dictionary, has_all, ARRAY, "keys", varray()); - ADDFUNC1(DICTIONARY, NIL, Dictionary, erase, NIL, "key", varray()); + ADDFUNC1R(DICTIONARY, BOOL, Dictionary, erase, NIL, "key", varray()); ADDFUNC0R(DICTIONARY, INT, Dictionary, hash, varray()); ADDFUNC0R(DICTIONARY, ARRAY, Dictionary, keys, varray()); ADDFUNC0R(DICTIONARY, ARRAY, Dictionary, values, varray()); |