diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-14 18:23:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-14 18:23:39 +0200 |
commit | 5b759ff16069a307def0390dc6e9422f29f05e53 (patch) | |
tree | 09df6f817b413ef4ff112931947410456d6f8f0a /core | |
parent | 111a3ca09711862e08ced7fa445801e2b89ffe4c (diff) | |
parent | a3a029d4c6a6834851fc40029ef8561ac193cf4d (diff) | |
download | redot-engine-5b759ff16069a307def0390dc6e9422f29f05e53.tar.gz |
Merge pull request #62030 from KoBeWi/SetName/GetName
Diffstat (limited to 'core')
-rw-r--r-- | core/object/object.cpp | 6 | ||||
-rw-r--r-- | core/object/object.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 0912ea55f0..9dec417b11 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -1196,7 +1196,7 @@ Array Object::_get_signal_list() const { return ret; } -Array Object::_get_signal_connection_list(const String &p_signal) const { +Array Object::_get_signal_connection_list(const StringName &p_signal) const { List<Connection> conns; get_all_signal_connections(&conns); @@ -1422,11 +1422,11 @@ void Object::_disconnect(const StringName &p_signal, const Callable &p_callable, } } -void Object::_set_bind(const String &p_set, const Variant &p_value) { +void Object::_set_bind(const StringName &p_set, const Variant &p_value) { set(p_set, p_value); } -Variant Object::_get_bind(const String &p_name) const { +Variant Object::_get_bind(const StringName &p_name) const { return get(p_name); } diff --git a/core/object/object.h b/core/object/object.h index 69531ee5f5..7cbedd29d9 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -524,10 +524,10 @@ private: bool _has_user_signal(const StringName &p_name) const; Error _emit_signal(const Variant **p_args, int p_argcount, Callable::CallError &r_error); Array _get_signal_list() const; - Array _get_signal_connection_list(const String &p_signal) const; + Array _get_signal_connection_list(const StringName &p_signal) const; Array _get_incoming_connections() const; - void _set_bind(const String &p_set, const Variant &p_value); - Variant _get_bind(const String &p_name) const; + void _set_bind(const StringName &p_set, const Variant &p_value); + Variant _get_bind(const StringName &p_name) const; void _set_indexed_bind(const NodePath &p_name, const Variant &p_value); Variant _get_indexed_bind(const NodePath &p_name) const; |