diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-07 08:51:10 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-07 08:51:10 +0200 |
| commit | 5c5079b3984b9f25478aa1897fcf247a0a1d0639 (patch) | |
| tree | b82c8e7afc122b59dcd921128af3d1c3c83dca52 /core | |
| parent | 351538239058a1ab517a9e98d1ef6b3a67c08288 (diff) | |
| parent | dd26ecdd31c01ab02a64b589fa169dbba6c124d5 (diff) | |
Merge pull request #65197 from Mickeon/rename-connect-one-shot
Rename CONNECT_ONESHOT to CONNECT_ONE_SHOT
Diffstat (limited to 'core')
| -rw-r--r-- | core/object/object.cpp | 4 | ||||
| -rw-r--r-- | core/object/object.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 33208be539..c275164b14 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -1060,7 +1060,7 @@ Error Object::emit_signalp(const StringName &p_name, const Variant **p_args, int } } - bool disconnect = c.flags & CONNECT_ONESHOT; + bool disconnect = c.flags & CONNECT_ONE_SHOT; #ifdef TOOLS_ENABLED if (disconnect && (c.flags & CONNECT_PERSIST) && Engine::get_singleton()->is_editor_hint()) { //this signal was connected from the editor, and is being edited. just don't disconnect for now @@ -1575,7 +1575,7 @@ void Object::_bind_methods() { BIND_ENUM_CONSTANT(CONNECT_DEFERRED); BIND_ENUM_CONSTANT(CONNECT_PERSIST); - BIND_ENUM_CONSTANT(CONNECT_ONESHOT); + BIND_ENUM_CONSTANT(CONNECT_ONE_SHOT); BIND_ENUM_CONSTANT(CONNECT_REFERENCE_COUNTED); } diff --git a/core/object/object.h b/core/object/object.h index 97608c7938..8ade5a204a 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -537,7 +537,7 @@ public: enum ConnectFlags { CONNECT_DEFERRED = 1, CONNECT_PERSIST = 2, // hint for scene to save this connection - CONNECT_ONESHOT = 4, + CONNECT_ONE_SHOT = 4, CONNECT_REFERENCE_COUNTED = 8, }; |