From dd86bdbb75e86900232dc8c06fbc23edabd01e5a Mon Sep 17 00:00:00 2001 From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> Date: Wed, 8 May 2024 12:34:55 +0200 Subject: [PATCH] Subscript cases --- core/debugger/remote_debugger_peer.cpp | 4 +- core/io/udp_server.cpp | 2 +- editor/debugger/editor_debugger_tree.cpp | 2 +- editor/editor_inspector.cpp | 4 +- editor/export/project_export.cpp | 2 +- editor/import/3d/resource_importer_scene.cpp | 6 +- editor/import/3d/scene_import_settings.cpp | 2 +- editor/plugins/canvas_item_editor_plugin.cpp | 88 +++++++++---------- editor/plugins/node_3d_editor_plugin.cpp | 6 +- editor/plugins/script_text_editor.cpp | 4 +- .../plugins/sprite_frames_editor_plugin.cpp | 2 +- .../plugins/visual_shader_editor_plugin.cpp | 2 +- editor/scene_tree_dock.cpp | 22 ++--- modules/enet/enet_multiplayer_peer.cpp | 4 +- .../gdscript_extend_parser.cpp | 2 +- .../language_server/gdscript_workspace.cpp | 2 +- .../gdscript/tests/gdscript_test_runner.cpp | 4 +- modules/mono/editor/bindings_generator.cpp | 12 +-- .../scene_replication_interface.cpp | 2 +- .../remote_debugger_peer_websocket.cpp | 4 +- scene/2d/animated_sprite_2d.cpp | 2 +- scene/3d/sprite_3d.cpp | 2 +- scene/debugger/scene_debugger.cpp | 2 +- ...skeleton_modification_2d_physicalbones.cpp | 2 +- servers/rendering/renderer_viewport.cpp | 2 +- tests/core/object/test_object.h | 2 +- tests/core/variant/test_dictionary.h | 2 +- 27 files changed, 95 insertions(+), 95 deletions(-) diff --git a/core/debugger/remote_debugger_peer.cpp b/core/debugger/remote_debugger_peer.cpp index 9dca47a0b4f2..1f93c849757f 100644 --- a/core/debugger/remote_debugger_peer.cpp +++ b/core/debugger/remote_debugger_peer.cpp @@ -45,7 +45,7 @@ bool RemoteDebuggerPeerTCP::has_message() { Array RemoteDebuggerPeerTCP::get_message() { MutexLock lock(mutex); ERR_FAIL_COND_V(!has_message(), Array()); - Array out = in_queue.front()->get(); + Array out = in_queue.get_front(); in_queue.pop_front(); return out; } @@ -100,7 +100,7 @@ void RemoteDebuggerPeerTCP::_write_out() { break; // Nothing left to send } mutex.lock(); - Variant var = out_queue.front()->get(); + Variant var = out_queue.get_front(); out_queue.pop_front(); mutex.unlock(); int size = 0; diff --git a/core/io/udp_server.cpp b/core/io/udp_server.cpp index 75ba784dbd16..d4e9913ea745 100644 --- a/core/io/udp_server.cpp +++ b/core/io/udp_server.cpp @@ -161,7 +161,7 @@ Ref UDPServer::take_connection() { return conn; } - Peer peer = pending.front()->get(); + Peer peer = pending.get_front(); pending.pop_front(); peers.push_back(peer); return peer.peer; diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index c4d7899b2d18..38e9145e5349 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -156,7 +156,7 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int for (const SceneDebuggerTree::RemoteNode &node : p_tree->nodes) { TreeItem *parent = nullptr; if (parents.size()) { // Find last parent. - Pair &p = parents.front()->get(); + Pair &p = parents.get_front(); parent = p.first; if (!(--p.second)) { // If no child left, remove it. parents.pop_front(); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 21f67772ea24..10f91dbb8e9d 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2605,12 +2605,12 @@ EditorProperty *EditorInspector::instantiate_property_editor(Object *p_object, c memdelete(E->get().property_editor); } - EditorProperty *prop = Object::cast_to(inspector_plugins[i]->added_editors.front()->get().property_editor); + EditorProperty *prop = Object::cast_to(inspector_plugins[i]->added_editors.get_front().property_editor); if (prop) { inspector_plugins[i]->added_editors.clear(); return prop; } else { - memdelete(inspector_plugins[i]->added_editors.front()->get().property_editor); + memdelete(inspector_plugins[i]->added_editors.get_front().property_editor); inspector_plugins[i]->added_editors.clear(); } } diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index f9137082d70c..c1d8e8ac6130 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -1247,7 +1247,7 @@ void ProjectExportDialog::_export_project() { export_project->set_current_path(current->get_export_path()); } else { if (extension_list.size() >= 1) { - export_project->set_current_file(default_filename + "." + extension_list.front()->get()); + export_project->set_current_file(default_filename + "." + extension_list.get_front()); } else { export_project->set_current_file(default_filename); } diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index cb348f713c12..57f12d7885ed 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -1434,7 +1434,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap< List anim_list; anim_player->get_animation_list(&anim_list); if (anim_list.size() == 1) { - selected_animation_name = anim_list.front()->get(); + selected_animation_name = anim_list.get_front(); } rest_animation = anim_player->get_animation(selected_animation_name); if (rest_animation.is_valid()) { @@ -1450,7 +1450,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap< List anim_list; library->get_animation_list(&anim_list); if (anim_list.size() == 1) { - selected_animation_name = String(anim_list.front()->get()); + selected_animation_name = String(anim_list.get_front()); } rest_animation = library->get_animation(selected_animation_name); } @@ -2250,7 +2250,7 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor List anim_list; library->get_animation_list(&anim_list); if (anim_list.size() == 1) { - selected_animation_name = String(anim_list.front()->get()); + selected_animation_name = String(anim_list.get_front()); } if (library->has_animation(selected_animation_name)) { anim = library->get_animation(selected_animation_name); diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 011d0135b448..615a0a3a1466 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -150,7 +150,7 @@ class SceneImportSettingsData : public Object { List anim_names; library->get_animation_list(&anim_names); if (anim_names.size() == 1) { - (*settings)["rest_pose/selected_animation"] = String(anim_names.front()->get()); + (*settings)["rest_pose/selected_animation"] = String(anim_names.get_front()); } for (StringName anim_name : anim_names) { hint_string += "," + anim_name; // Include preceding, as a catch-all. diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index e9a796dae723..25d893b84141 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -457,8 +457,8 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig Point2 offset = grid_offset; if (snap_relative) { List selection = _get_edited_canvas_items(); - if (selection.size() == 1 && Object::cast_to(selection.front()->get())) { - offset = Object::cast_to(selection.front()->get())->get_global_position(); + if (selection.size() == 1 && Object::cast_to(selection.get_front())) { + offset = Object::cast_to(selection.get_front())->get_global_position(); } else if (selection.size() > 0) { offset = _get_encompassing_rect_from_list(selection).position; } @@ -760,7 +760,7 @@ bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_po still_selected = false; if (editor_selection->get_selected_node_list().size() == 1) { - EditorNode::get_singleton()->push_item(editor_selection->get_selected_node_list().front()->get()); + EditorNode::get_singleton()->push_item(editor_selection->get_selected_node_list().get_front()); } } else { // Add the item to the selection @@ -1381,7 +1381,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref &p_event) { drag_from = transform.affine_inverse().xform(event_pos); Vector2 new_pos; if (drag_selection.size() == 1) { - new_pos = snap_point(drag_from, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection.front()->get()); + new_pos = snap_point(drag_from, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection.get_front()); } else { new_pos = snap_point(drag_from, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, nullptr, drag_selection); } @@ -1402,7 +1402,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref &p_event) { _restore_canvas_item_state(drag_selection); Vector2 new_pos; if (drag_selection.size() == 1) { - new_pos = snap_point(drag_to, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection.front()->get()); + new_pos = snap_point(drag_to, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection.get_front()); } else { new_pos = snap_point(drag_to, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL); } @@ -1420,9 +1420,9 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref &p_event) { drag_selection, vformat( TTR("Set CanvasItem \"%s\" Pivot Offset to (%d, %d)"), - drag_selection.front()->get()->get_name(), - drag_selection.front()->get()->_edit_get_pivot().x, - drag_selection.front()->get()->_edit_get_pivot().y)); + drag_selection.get_front()->get_name(), + drag_selection.get_front()->_edit_get_pivot().x, + drag_selection.get_front()->_edit_get_pivot().y)); _reset_drag(); return true; } @@ -1474,7 +1474,7 @@ bool CanvasItemEditor::_gui_input_rotate(const Ref &p_event) { if (drag_selection.size() > 0) { drag_type = DRAG_ROTATE; drag_from = transform.affine_inverse().xform(b->get_position()); - CanvasItem *ci = drag_selection.front()->get(); + CanvasItem *ci = drag_selection.get_front(); if (!Math::is_inf(temp_pivot.x) || !Math::is_inf(temp_pivot.y)) { drag_rotation_center = temp_pivot; } else if (ci->_edit_use_pivot()) { @@ -1528,8 +1528,8 @@ bool CanvasItemEditor::_gui_input_rotate(const Ref &p_event) { _commit_canvas_item_state( drag_selection, vformat(TTR("Rotate CanvasItem \"%s\" to %d degrees"), - drag_selection.front()->get()->get_name(), - Math::rad_to_deg(drag_selection.front()->get()->_edit_get_rotation())), + drag_selection.get_front()->get_name(), + Math::rad_to_deg(drag_selection.get_front()->_edit_get_rotation())), true); } @@ -1559,7 +1559,7 @@ bool CanvasItemEditor::_gui_input_open_scene_on_double_click(const Refget_button_index() == MouseButton::LEFT && b->is_pressed() && b->is_double_click() && tool == TOOL_SELECT) { List selection = _get_edited_canvas_items(); if (selection.size() == 1) { - CanvasItem *ci = selection.front()->get(); + CanvasItem *ci = selection.get_front(); if (!ci->get_scene_file_path().is_empty() && ci != EditorNode::get_singleton()->get_edited_scene()) { EditorNode::get_singleton()->open_request(ci->get_scene_file_path()); return true; @@ -1578,7 +1578,7 @@ bool CanvasItemEditor::_gui_input_anchors(const Ref &p_event) { if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT) { List selection = _get_edited_canvas_items(); if (selection.size() == 1) { - Control *control = Object::cast_to(selection.front()->get()); + Control *control = Object::cast_to(selection.get_front()); if (control && _is_node_movable(control)) { Vector2 anchor_pos[4]; anchor_pos[0] = Vector2(control->get_anchor(SIDE_LEFT), control->get_anchor(SIDE_TOP)); @@ -1627,7 +1627,7 @@ bool CanvasItemEditor::_gui_input_anchors(const Ref &p_event) { // Drag the anchor if (m.is_valid()) { _restore_canvas_item_state(drag_selection); - Control *control = Object::cast_to(drag_selection.front()->get()); + Control *control = Object::cast_to(drag_selection.get_front()); drag_to = transform.affine_inverse().xform(m->get_position()); @@ -1698,7 +1698,7 @@ bool CanvasItemEditor::_gui_input_anchors(const Ref &p_event) { if (drag_selection.size() >= 1 && b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) { _commit_canvas_item_state( drag_selection, - vformat(TTR("Move CanvasItem \"%s\" Anchor"), drag_selection.front()->get()->get_name())); + vformat(TTR("Move CanvasItem \"%s\" Anchor"), drag_selection.get_front()->get_name())); snap_target[0] = SNAP_TARGET_NONE; snap_target[1] = SNAP_TARGET_NONE; _reset_drag(); @@ -1728,7 +1728,7 @@ bool CanvasItemEditor::_gui_input_resize(const Ref &p_event) { if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT) { List selection = _get_edited_canvas_items(); if (selection.size() == 1) { - CanvasItem *ci = selection.front()->get(); + CanvasItem *ci = selection.get_front(); if (ci->_edit_use_rect() && _is_node_movable(ci)) { Rect2 rect = ci->_edit_get_rect(); Transform2D xform = transform * ci->get_global_transform_with_canvas(); @@ -1789,7 +1789,7 @@ bool CanvasItemEditor::_gui_input_resize(const Ref &p_event) { drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT || drag_type == DRAG_BOTTOM_LEFT || drag_type == DRAG_BOTTOM_RIGHT) { // Resize the node if (m.is_valid()) { - CanvasItem *ci = drag_selection.front()->get(); + CanvasItem *ci = drag_selection.get_front(); CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data(ci); //Reset state ci->_edit_set_state(se->undo_state); @@ -1874,7 +1874,7 @@ bool CanvasItemEditor::_gui_input_resize(const Ref &p_event) { // Confirm resize if (drag_selection.size() >= 1 && b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) { - const Node2D *node2d = Object::cast_to(drag_selection.front()->get()); + const Node2D *node2d = Object::cast_to(drag_selection.get_front()); if (node2d) { // Extends from Node2D. // Node2D doesn't have an actual stored rect size, unlike Controls. @@ -1882,9 +1882,9 @@ bool CanvasItemEditor::_gui_input_resize(const Ref &p_event) { drag_selection, vformat( TTR("Scale Node2D \"%s\" to (%s, %s)"), - drag_selection.front()->get()->get_name(), - Math::snapped(drag_selection.front()->get()->_edit_get_scale().x, 0.01), - Math::snapped(drag_selection.front()->get()->_edit_get_scale().y, 0.01)), + drag_selection.get_front()->get_name(), + Math::snapped(drag_selection.get_front()->_edit_get_scale().x, 0.01), + Math::snapped(drag_selection.get_front()->_edit_get_scale().y, 0.01)), true); } else { // Extends from Control. @@ -1892,9 +1892,9 @@ bool CanvasItemEditor::_gui_input_resize(const Ref &p_event) { drag_selection, vformat( TTR("Resize Control \"%s\" to (%d, %d)"), - drag_selection.front()->get()->get_name(), - drag_selection.front()->get()->_edit_get_rect().size.x, - drag_selection.front()->get()->_edit_get_rect().size.y), + drag_selection.get_front()->get_name(), + drag_selection.get_front()->_edit_get_rect().size.x, + drag_selection.get_front()->_edit_get_rect().size.y), true); } @@ -1932,7 +1932,7 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { bool has_locked_items = false; List selection = _get_edited_canvas_items(false, true, &has_locked_items); if (selection.size() == 1) { - CanvasItem *ci = selection.front()->get(); + CanvasItem *ci = selection.get_front(); if (_is_node_movable(ci)) { Transform2D xform = transform * ci->get_global_transform_with_canvas(); @@ -1972,7 +1972,7 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { // Resize the node if (m.is_valid()) { _restore_canvas_item_state(drag_selection); - CanvasItem *ci = drag_selection.front()->get(); + CanvasItem *ci = drag_selection.get_front(); drag_to = transform.affine_inverse().xform(m->get_position()); @@ -2040,9 +2040,9 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { _commit_canvas_item_state( drag_selection, vformat(TTR("Scale CanvasItem \"%s\" to (%s, %s)"), - drag_selection.front()->get()->get_name(), - Math::snapped(drag_selection.front()->get()->_edit_get_scale().x, 0.01), - Math::snapped(drag_selection.front()->get()->_edit_get_scale().y, 0.01)), + drag_selection.get_front()->get_name(), + Math::snapped(drag_selection.get_front()->_edit_get_scale().x, 0.01), + Math::snapped(drag_selection.get_front()->_edit_get_scale().y, 0.01)), true); } if (key_auto_insert_button->is_pressed()) { @@ -2087,7 +2087,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { drag_type = DRAG_MOVE; - CanvasItem *ci = selection.front()->get(); + CanvasItem *ci = selection.get_front(); Transform2D parent_xform = ci->get_global_transform_with_canvas() * ci->get_transform().affine_inverse(); Transform2D unscaled_transform = (transform * parent_xform * ci->_edit_get_transform()).orthonormalized(); Transform2D simple_xform = viewport->get_transform() * unscaled_transform; @@ -2126,8 +2126,8 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { drag_to = transform.affine_inverse().xform(m->get_position()); Point2 previous_pos; if (drag_selection.size() == 1) { - Transform2D parent_xform = drag_selection.front()->get()->get_global_transform_with_canvas() * drag_selection.front()->get()->get_transform().affine_inverse(); - previous_pos = parent_xform.xform(drag_selection.front()->get()->_edit_get_position()); + Transform2D parent_xform = drag_selection.get_front()->get_global_transform_with_canvas() * drag_selection.get_front()->get_transform().affine_inverse(); + previous_pos = parent_xform.xform(drag_selection.get_front()->_edit_get_position()); } else { previous_pos = _get_encompassing_rect_from_list(drag_selection).position; } @@ -2178,9 +2178,9 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { drag_selection, vformat( TTR("Move CanvasItem \"%s\" to (%d, %d)"), - drag_selection.front()->get()->get_name(), - drag_selection.front()->get()->_edit_get_position().x, - drag_selection.front()->get()->_edit_get_position().y), + drag_selection.get_front()->get_name(), + drag_selection.get_front()->_edit_get_position().x, + drag_selection.get_front()->_edit_get_position().y), true); } } @@ -2256,15 +2256,15 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { Point2 previous_pos; if (drag_selection.size() == 1) { - Transform2D xform = drag_selection.front()->get()->get_global_transform_with_canvas() * drag_selection.front()->get()->get_transform().affine_inverse(); - previous_pos = xform.xform(drag_selection.front()->get()->_edit_get_position()); + Transform2D xform = drag_selection.get_front()->get_global_transform_with_canvas() * drag_selection.get_front()->get_transform().affine_inverse(); + previous_pos = xform.xform(drag_selection.get_front()->_edit_get_position()); } else { previous_pos = _get_encompassing_rect_from_list(drag_selection).position; } Point2 new_pos; if (drag_selection.size() == 1) { - Node2D *node_2d = Object::cast_to(drag_selection.front()->get()); + Node2D *node_2d = Object::cast_to(drag_selection.get_front()); if (node_2d && move_local_base_rotated) { Transform2D m2; m2.rotate(node_2d->get_rotation()); @@ -2302,9 +2302,9 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { _commit_canvas_item_state( drag_selection, vformat(TTR("Move CanvasItem \"%s\" to (%d, %d)"), - drag_selection.front()->get()->get_name(), - drag_selection.front()->get()->_edit_get_position().x, - drag_selection.front()->get()->_edit_get_position().y), + drag_selection.get_front()->get_name(), + drag_selection.get_front()->_edit_get_position().x, + drag_selection.get_front()->_edit_get_position().y), true); } _reset_drag(); @@ -2516,7 +2516,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref &p_event) { _find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems); if (selitems.size() == 1 && editor_selection->get_selected_node_list().is_empty()) { - EditorNode::get_singleton()->push_item(selitems.front()->get()); + EditorNode::get_singleton()->push_item(selitems.get_front()); } for (CanvasItem *E : selitems) { editor_selection->add_node(E); @@ -2770,7 +2770,7 @@ Control::CursorShape CanvasItemEditor::get_cursor_shape(const Point2 &p_pos) con List selection = _get_edited_canvas_items(); if (selection.size() == 1) { - const double angle = Math::fposmod((double)selection.front()->get()->get_global_transform_with_canvas().get_rotation(), Math_PI); + const double angle = Math::fposmod((double)selection.get_front()->get_global_transform_with_canvas().get_rotation(), Math_PI); if (angle > Math_PI * 7.0 / 8.0) { rotation_array_index = 0; } else if (angle > Math_PI * 5.0 / 8.0) { @@ -6233,7 +6233,7 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p List selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list(); Node *root_node = EditorNode::get_singleton()->get_edited_scene(); if (selected_nodes.size() > 0) { - Node *selected_node = selected_nodes.front()->get(); + Node *selected_node = selected_nodes.get_front(); if (is_alt) { target_node = root_node; } else if (is_shift) { diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index fe7301975f38..3d3a2c2bce9b 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -787,7 +787,7 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) { } if (editor_selection->get_selected_node_list().size() == 1) { - EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().front()->get()); + EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().get_front()); } } } @@ -1118,7 +1118,7 @@ void Node3DEditorViewport::_select_region() { } if (editor_selection->get_selected_node_list().size() == 1) { - EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().front()->get()); + EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().get_front()); } } @@ -4813,7 +4813,7 @@ void Node3DEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_ List selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list(); Node *root_node = EditorNode::get_singleton()->get_edited_scene(); if (selected_nodes.size() > 0) { - Node *selected_node = selected_nodes.front()->get(); + Node *selected_node = selected_nodes.get_front(); if (is_alt) { target_node = root_node; } else if (is_shift) { diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index b45b30b52ec1..22d9f635e8da 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -542,9 +542,9 @@ void ScriptTextEditor::_validate_script() { if (errors.size() > 0) { // TRANSLATORS: Script error pointing to a line and column number. - String error_text = vformat(TTR("Error at (%d, %d):"), errors.front()->get().line, errors.front()->get().column) + " " + errors.front()->get().message; + String error_text = vformat(TTR("Error at (%d, %d):"), errors.get_front().line, errors.get_front().column) + " " + errors.get_front().message; code_editor->set_error(error_text); - code_editor->set_error_pos(errors.front()->get().line - 1, errors.front()->get().column - 1); + code_editor->set_error_pos(errors.get_front().line - 1, errors.get_front().column - 1); } script_is_valid = false; } else { diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 37d5b787eb90..747aa5dc1a45 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -1766,7 +1766,7 @@ void SpriteFramesEditor::_fetch_sprite_node() { Node *selected = nullptr; EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection(); if (editor_selection->get_selected_node_list().size() == 1) { - selected = editor_selection->get_selected_node_list().front()->get(); + selected = editor_selection->get_selected_node_list().get_front(); } bool show_node_edit = false; diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index ede8351e413e..df7e74c1c80a 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -4241,7 +4241,7 @@ void VisualShaderEditor::_handle_node_drop_on_connection() { return; } - int selected_node_id = drag_buffer.front()->get().node; + int selected_node_id = drag_buffer.get_front().node; VisualShader::Type shader_type = get_current_shader_type(); Ref selected_vsnode = visual_shader->get_node(shader_type, selected_node_id); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index bcab0c2883c7..d5ea20b0eea0 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1081,7 +1081,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { msg = vformat(any_children ? TTR("Delete %d nodes and any children?") : TTR("Delete %d nodes?"), remove_list.size()); } else { if (!p_confirm_override) { - Node *node = remove_list.front()->get(); + Node *node = remove_list.get_front(); if (node == editor_data->get_edited_scene_root()) { msg = vformat(TTR("Delete the root node \"%s\"?"), node->get_name()); } else if (node->get_scene_file_path().is_empty() && node->get_child_count() > 0) { @@ -2791,7 +2791,7 @@ void SceneTreeDock::_update_script_button() { button_create_script->hide(); button_detach_script->hide(); } else if (editor_selection->get_selection().size() == 1) { - Node *n = editor_selection->get_selected_node_list().front()->get(); + Node *n = editor_selection->get_selected_node_list().get_front(); if (n->get_script().is_null()) { button_create_script->show(); button_detach_script->hide(); @@ -3490,7 +3490,7 @@ void SceneTreeDock::_files_dropped(const Vector &p_files, NodePath p_to, return; } if (!valid_properties.is_empty()) { - _perform_property_drop(node, valid_properties.front()->get(), ResourceLoader::load(res_path)); + _perform_property_drop(node, valid_properties.get_front(), ResourceLoader::load(res_path)); return; } } @@ -3650,7 +3650,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) { Ref