gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 01:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Dictionary: remove erase_checked(key), make erase(key) return bool
This commit is contained in:
Rémi Verschelde 2018-08-15 01:08:23 +02:00 committed by GitHub
parent 5d86b1e155 21d285e30f
commit 4548ec4a49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/dictionary.cpp
View file

@ -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);
}

3
core/dictionary.h
View file

@ -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;

2
core/variant_call.cpp
View file

@ -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());

4
modules/mono/glue/collections_glue.cpp
View file

@ -182,7 +182,7 @@ bool godot_icall_Dictionary_ContainsKey(Dictionary *ptr, MonoObject *key) {
}
bool godot_icall_Dictionary_RemoveKey(Dictionary *ptr, MonoObject *key) {
return ptr->erase_checked(GDMonoMarshal::mono_object_to_variant(key));
return ptr->erase(GDMonoMarshal::mono_object_to_variant(key));
}
bool godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, MonoObject *value) {
@ -191,7 +191,7 @@ bool godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, MonoObject
// no dupes
Variant *ret = ptr->getptr(varKey);
if (ret != NULL && *ret == GDMonoMarshal::mono_object_to_variant(value)) {
ptr->erase_checked(varKey);
ptr->erase(varKey);
return true;
}