Rename queue_delete => queue_free
# Conflicts: # editor/plugins/tiles/tiles_editor_plugin.cpp
This commit is contained in:
parent
040f49ed6e
commit
7543a5e014
29 changed files with 55 additions and 55 deletions
|
|
@ -460,7 +460,7 @@ void EditorAssetLibraryItemDownload::_notification(int p_what) {
|
|||
void EditorAssetLibraryItemDownload::_close() {
|
||||
// Clean up downloaded file.
|
||||
DirAccess::remove_file_or_error(download->get_download_file());
|
||||
queue_delete();
|
||||
queue_free();
|
||||
}
|
||||
|
||||
bool EditorAssetLibraryItemDownload::can_install() const {
|
||||
|
|
@ -832,7 +832,7 @@ void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, cons
|
|||
}
|
||||
}
|
||||
|
||||
image_queue[p_queue_id].request->queue_delete();
|
||||
image_queue[p_queue_id].request->queue_free();
|
||||
image_queue.erase(p_queue_id);
|
||||
|
||||
_update_image_queue();
|
||||
|
|
@ -868,7 +868,7 @@ void EditorAssetLibrary::_update_image_queue() {
|
|||
}
|
||||
|
||||
while (to_delete.size()) {
|
||||
image_queue[to_delete.front()->get()].request->queue_delete();
|
||||
image_queue[to_delete.front()->get()].request->queue_free();
|
||||
image_queue.erase(to_delete.front()->get());
|
||||
to_delete.pop_front();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5543,7 +5543,7 @@ void CanvasItemEditorViewport::_remove_preview() {
|
|||
if (preview_node->get_parent()) {
|
||||
for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = preview_node->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
preview_node->remove_child(node);
|
||||
}
|
||||
EditorNode::get_singleton()->get_scene_root()->remove_child(preview_node);
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ void EditorPropertyFontMetaOverride::update_property() {
|
|||
} else {
|
||||
// Queue children for deletion, deleting immediately might cause errors.
|
||||
for (int i = property_vbox->get_child_count() - 1; i >= 0; i--) {
|
||||
property_vbox->get_child(i)->queue_delete();
|
||||
property_vbox->get_child(i)->queue_free();
|
||||
}
|
||||
button_add = nullptr;
|
||||
}
|
||||
|
|
@ -457,7 +457,7 @@ void EditorPropertyOTVariation::update_property() {
|
|||
} else {
|
||||
// Queue children for deletion, deleting immediately might cause errors.
|
||||
for (int i = property_vbox->get_child_count() - 1; i >= 0; i--) {
|
||||
property_vbox->get_child(i)->queue_delete();
|
||||
property_vbox->get_child(i)->queue_free();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -662,7 +662,7 @@ void EditorPropertyOTFeatures::update_property() {
|
|||
} else {
|
||||
// Queue children for deletion, deleting immediately might cause errors.
|
||||
for (int i = property_vbox->get_child_count() - 1; i >= 0; i--) {
|
||||
property_vbox->get_child(i)->queue_delete();
|
||||
property_vbox->get_child(i)->queue_free();
|
||||
}
|
||||
button_add = nullptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3862,7 +3862,7 @@ void Node3DEditorViewport::_remove_preview_node() {
|
|||
if (preview_node->get_parent()) {
|
||||
for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = preview_node->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
preview_node->remove_child(node);
|
||||
}
|
||||
EditorNode::get_singleton()->get_scene_root()->remove_child(preview_node);
|
||||
|
|
|
|||
|
|
@ -1082,7 +1082,7 @@ void Skeleton3DEditor::select_bone(int p_idx) {
|
|||
Skeleton3DEditor::~Skeleton3DEditor() {
|
||||
singleton = nullptr;
|
||||
|
||||
handles_mesh_instance->queue_delete();
|
||||
handles_mesh_instance->queue_free();
|
||||
|
||||
Node3DEditor *ne = Node3DEditor::get_singleton();
|
||||
|
||||
|
|
|
|||
|
|
@ -2481,7 +2481,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = color_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = color_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
color_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
@ -2510,7 +2510,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = constant_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = constant_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
constant_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
@ -2543,7 +2543,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = font_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = font_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
font_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
@ -2581,7 +2581,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = font_size_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = font_size_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
font_size_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
@ -2614,7 +2614,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = icon_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = icon_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
icon_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
@ -2652,7 +2652,7 @@ void ThemeTypeEditor::_update_type_items() {
|
|||
{
|
||||
for (int i = stylebox_items_list->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = stylebox_items_list->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
stylebox_items_list->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -459,7 +459,7 @@ void SceneThemeEditorPreview::_reload_scene() {
|
|||
|
||||
for (int i = preview_content->get_child_count() - 1; i >= 0; i--) {
|
||||
Node *node = preview_content->get_child(i);
|
||||
node->queue_delete();
|
||||
node->queue_free();
|
||||
preview_content->remove_child(node);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1141,7 +1141,7 @@ void TileDataDefaultEditor::setup_property_editor(Variant::Type p_type, String p
|
|||
|
||||
// Update everything.
|
||||
if (property_editor) {
|
||||
property_editor->queue_delete();
|
||||
property_editor->queue_free();
|
||||
}
|
||||
|
||||
// Update the dummy object.
|
||||
|
|
@ -1200,7 +1200,7 @@ TileDataDefaultEditor::TileDataDefaultEditor() {
|
|||
}
|
||||
|
||||
TileDataDefaultEditor::~TileDataDefaultEditor() {
|
||||
toolbar->queue_delete();
|
||||
toolbar->queue_free();
|
||||
memdelete(dummy_object);
|
||||
}
|
||||
|
||||
|
|
@ -1403,11 +1403,11 @@ void TileDataCollisionEditor::_polygons_changed() {
|
|||
dummy_object->remove_dummy_property(vformat("polygon_%d_one_way_margin", i));
|
||||
}
|
||||
for (int i = polygon_editor->get_polygon_count(); property_editors.has(vformat("polygon_%d_one_way", i)); i++) {
|
||||
property_editors[vformat("polygon_%d_one_way", i)]->queue_delete();
|
||||
property_editors[vformat("polygon_%d_one_way", i)]->queue_free();
|
||||
property_editors.erase(vformat("polygon_%d_one_way", i));
|
||||
}
|
||||
for (int i = polygon_editor->get_polygon_count(); property_editors.has(vformat("polygon_%d_one_way_margin", i)); i++) {
|
||||
property_editors[vformat("polygon_%d_one_way_margin", i)]->queue_delete();
|
||||
property_editors[vformat("polygon_%d_one_way_margin", i)]->queue_free();
|
||||
property_editors.erase(vformat("polygon_%d_one_way_margin", i));
|
||||
}
|
||||
}
|
||||
|
|
@ -2658,7 +2658,7 @@ TileDataTerrainsEditor::TileDataTerrainsEditor() {
|
|||
}
|
||||
|
||||
TileDataTerrainsEditor::~TileDataTerrainsEditor() {
|
||||
toolbar->queue_delete();
|
||||
toolbar->queue_free();
|
||||
memdelete(dummy_object);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
|
|||
}
|
||||
}
|
||||
for (int i = tile_set->get_occlusion_layers_count(); tile_data_editors.has(vformat("occlusion_layer_%d", i)); i++) {
|
||||
tile_data_editors[vformat("occlusion_layer_%d", i)]->queue_delete();
|
||||
tile_data_editors[vformat("occlusion_layer_%d", i)]->queue_free();
|
||||
tile_data_editors.erase(vformat("occlusion_layer_%d", i));
|
||||
}
|
||||
|
||||
|
|
@ -710,7 +710,7 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
|
|||
}
|
||||
}
|
||||
for (int i = tile_set->get_physics_layers_count(); tile_data_editors.has(vformat("physics_layer_%d", i)); i++) {
|
||||
tile_data_editors[vformat("physics_layer_%d", i)]->queue_delete();
|
||||
tile_data_editors[vformat("physics_layer_%d", i)]->queue_free();
|
||||
tile_data_editors.erase(vformat("physics_layer_%d", i));
|
||||
}
|
||||
|
||||
|
|
@ -728,7 +728,7 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
|
|||
}
|
||||
}
|
||||
for (int i = tile_set->get_navigation_layers_count(); tile_data_editors.has(vformat("navigation_layer_%d", i)); i++) {
|
||||
tile_data_editors[vformat("navigation_layer_%d", i)]->queue_delete();
|
||||
tile_data_editors[vformat("navigation_layer_%d", i)]->queue_free();
|
||||
tile_data_editors.erase(vformat("navigation_layer_%d", i));
|
||||
}
|
||||
|
||||
|
|
@ -750,7 +750,7 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
|
|||
}
|
||||
}
|
||||
for (int i = tile_set->get_custom_data_layers_count(); tile_data_editors.has(vformat("custom_data_%d", i)); i++) {
|
||||
tile_data_editors[vformat("custom_data_%d", i)]->queue_delete();
|
||||
tile_data_editors[vformat("custom_data_%d", i)]->queue_free();
|
||||
tile_data_editors.erase(vformat("custom_data_%d", i));
|
||||
}
|
||||
|
||||
|
|
@ -884,7 +884,7 @@ void TileSetAtlasSourceEditor::_update_atlas_view() {
|
|||
|
||||
// Create a bunch of buttons to add alternative tiles.
|
||||
for (int i = 0; i < alternative_tiles_control->get_child_count(); i++) {
|
||||
alternative_tiles_control->get_child(i)->queue_delete();
|
||||
alternative_tiles_control->get_child(i)->queue_free();
|
||||
}
|
||||
|
||||
Vector2i pos;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ void TilesEditorPlugin::_thread() {
|
|||
Callable::CallError error;
|
||||
item.callback.callp(args_ptr, 2, r, error);
|
||||
|
||||
viewport->queue_delete();
|
||||
viewport->queue_free();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue