Merge pull request #20945 from neikeq/dict-erase-retbool

Dictionary: remove erase_checked(key), make erase(key) return bool

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 b312316f9a..80cb869db2 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -1668,7 +1668,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());