diff options
author | kobewi <kobewi4e@gmail.com> | 2023-09-04 17:01:33 +0200 |
---|---|---|
committer | kobewi <kobewi4e@gmail.com> | 2024-05-11 18:53:08 +0200 |
commit | a262d2d8811a43c906a4cac55b7126ebec7699be (patch) | |
tree | 0507fff0aed8778e71a2afc0a2d4ac15184e7803 /scene/main/node.cpp | |
parent | 916ea002c15e82879f3eada7c635daaecccc9e35 (diff) | |
download | redot-engine-a262d2d8811a43c906a4cac55b7126ebec7699be.tar.gz |
Add shorthand for using singleton string names
Diffstat (limited to 'scene/main/node.cpp')
-rw-r--r-- | scene/main/node.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index e54209c1dd..c326ca77f5 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -266,7 +266,7 @@ void Node::_propagate_ready() { if (data.ready_first) { data.ready_first = false; notification(NOTIFICATION_READY); - emit_signal(SceneStringNames::get_singleton()->ready); + emit_signal(SceneStringName(ready)); } } @@ -295,7 +295,7 @@ void Node::_propagate_enter_tree() { GDVIRTUAL_CALL(_enter_tree); - emit_signal(SceneStringNames::get_singleton()->tree_entered); + emit_signal(SceneStringName(tree_entered)); data.tree->node_added(this); @@ -350,7 +350,7 @@ void Node::_propagate_after_exit_tree() { data.blocked--; - emit_signal(SceneStringNames::get_singleton()->tree_exited); + emit_signal(SceneStringName(tree_exited)); } void Node::_propagate_exit_tree() { @@ -372,7 +372,7 @@ void Node::_propagate_exit_tree() { GDVIRTUAL_CALL(_exit_tree); - emit_signal(SceneStringNames::get_singleton()->tree_exiting); + emit_signal(SceneStringName(tree_exiting)); notification(NOTIFICATION_EXIT_TREE, true); if (data.tree) { @@ -1738,11 +1738,11 @@ Node *Node::get_node_or_null(const NodePath &p_path) const { StringName name = p_path.get_name(i); Node *next = nullptr; - if (name == SceneStringNames::get_singleton()->dot) { // . + if (name == SceneStringName(dot)) { // . next = current; - } else if (name == SceneStringNames::get_singleton()->doubledot) { // .. + } else if (name == SceneStringName(doubledot)) { // .. if (current == nullptr || !current->data.parent) { return nullptr; @@ -2667,7 +2667,7 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c node->data.editable_instance = data.editable_instance; } - StringName script_property_name = CoreStringNames::get_singleton()->_script; + StringName script_property_name = CoreStringName(script); List<const Node *> hidden_roots; List<const Node *> node_tree; @@ -3323,7 +3323,7 @@ void Node::update_configuration_warnings() { return; } if (get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root() == this || get_tree()->get_edited_scene_root()->is_ancestor_of(this))) { - get_tree()->emit_signal(SceneStringNames::get_singleton()->node_configuration_warning_changed, this); + get_tree()->emit_signal(SceneStringName(node_configuration_warning_changed), this); } #endif } |