Skip to content

Commit 0e8f90f

Browse files
KoBeWiKoBeWi
committed
Update deferred calls to use Callables
1 parent 8297ec9 commit 0e8f90f

File tree

92 files changed

+192
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+192
-350
lines changed

‎core/variant/callable.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
#include "callable.h"
3232

3333
#include "callable_bind.h"
34-
#include "core/object/message_queue.h"
3534
#include "core/object/object.h"
3635
#include "core/object/ref_counted.h"
3736
#include "core/object/script_language.h"
3837

3938
void Callable::call_deferredp(const Variant **p_arguments, int p_argcount) const {
40-
MessageQueue::get_singleton()->push_callablep(*this, p_arguments, p_argcount);
39+
MessageQueue::get_singleton()->push_callablep(*this, p_arguments, p_argcount, true);
4140
}
4241

4342
void Callable::callp(const Variant **p_arguments, int p_argcount, Variant &r_return_value, CallError &r_call_error) const {

‎editor/animation_bezier_editor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
908908

909909
if (Math::is_finite(minimum_time) && Math::is_finite(maximum_time) && maximum_time - minimum_time > CMP_EPSILON) {
910910
timeline->get_zoom()->set_value(zoom_value);
911-
timeline->call_deferred("set_value", minimum_time);
911+
callable_mp((Range *)timeline, &Range::set_value).call_deferred(minimum_time);
912912
}
913913

914914
if (Math::is_finite(minimum_value) && Math::is_finite(maximum_value)) {

‎editor/animation_track_editor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -4613,7 +4613,7 @@ void AnimationTrackEditor::_animation_changed() {
46134613
}
46144614

46154615
animation_changing_awaiting_update = true;
4616-
call_deferred(SNAME("_animation_update"));
4616+
callable_mp(this, &AnimationTrackEditor::_animation_update).call_deferred();
46174617
}
46184618

46194619
void AnimationTrackEditor::_snap_mode_changed(int p_mode) {
@@ -6478,7 +6478,6 @@ void AnimationTrackEditor::_select_all_tracks_for_copy() {
64786478
}
64796479

64806480
void AnimationTrackEditor::_bind_methods() {
6481-
ClassDB::bind_method("_animation_update", &AnimationTrackEditor::_animation_update);
64826481
ClassDB::bind_method("_track_grab_focus", &AnimationTrackEditor::_track_grab_focus);
64836482
ClassDB::bind_method("_redraw_tracks", &AnimationTrackEditor::_redraw_tracks);
64846483
ClassDB::bind_method("_clear_selection_for_anim", &AnimationTrackEditor::_clear_selection_for_anim);

‎editor/audio_stream_preview.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void AudioStreamPreviewGenerator::_preview_thread(void *p_preview) {
158158
}
159159

160160
frames_todo -= to_read;
161-
singleton->call_deferred(SNAME("_update_emit"), preview->id);
161+
callable_mp(singleton, &AudioStreamPreviewGenerator::_update_emit).call_deferred(preview->id);
162162
}
163163

164164
preview->preview->version++;
@@ -216,7 +216,6 @@ Ref<AudioStreamPreview> AudioStreamPreviewGenerator::generate_preview(const Ref<
216216
}
217217

218218
void AudioStreamPreviewGenerator::_bind_methods() {
219-
ClassDB::bind_method("_update_emit", &AudioStreamPreviewGenerator::_update_emit);
220219
ClassDB::bind_method(D_METHOD("generate_preview", "stream"), &AudioStreamPreviewGenerator::generate_preview);
221220

222221
ADD_SIGNAL(MethodInfo("preview_updated", PropertyInfo(Variant::INT, "obj_id")));

‎editor/code_editor.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void FindReplaceBar::_replace_all() {
336336
matches_label->add_theme_color_override("font_color", rc > 0 ? get_theme_color(SNAME("font_color"), SNAME("Label")) : get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
337337
matches_label->set_text(vformat(TTR("%d replaced."), rc));
338338

339-
text_editor->call_deferred(SNAME("connect"), "text_changed", callable_mp(this, &FindReplaceBar::_editor_text_changed));
339+
callable_mp((Object *)text_editor, &Object::connect).call_deferred("text_changed", callable_mp(this, &FindReplaceBar::_editor_text_changed), 0U);
340340
results_count = -1;
341341
results_count_to_current = -1;
342342
needs_to_count_results = true;
@@ -517,10 +517,10 @@ void FindReplaceBar::_show_search(bool p_focus_replace, bool p_show_only) {
517517

518518
if (p_focus_replace) {
519519
search_text->deselect();
520-
replace_text->call_deferred(SNAME("grab_focus"));
520+
callable_mp((Control *)replace_text, &Control::grab_focus).call_deferred();
521521
} else {
522522
replace_text->deselect();
523-
search_text->call_deferred(SNAME("grab_focus"));
523+
callable_mp((Control *)search_text, &Control::grab_focus).call_deferred();
524524
}
525525

526526
if (text_editor->has_selection(0) && !is_selection_only()) {
@@ -1572,20 +1572,20 @@ void CodeTextEditor::goto_line(int p_line) {
15721572
text_editor->remove_secondary_carets();
15731573
text_editor->deselect();
15741574
text_editor->unfold_line(p_line);
1575-
text_editor->call_deferred(SNAME("set_caret_line"), p_line);
1575+
callable_mp((TextEdit *)text_editor, &TextEdit::set_caret_line).call_deferred(p_line, true, true, 0, 0);
15761576
}
15771577

15781578
void CodeTextEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
15791579
text_editor->remove_secondary_carets();
15801580
text_editor->unfold_line(p_line);
1581-
text_editor->call_deferred(SNAME("set_caret_line"), p_line);
1582-
text_editor->call_deferred(SNAME("set_caret_column"), p_begin);
1581+
callable_mp((TextEdit *)text_editor, &TextEdit::set_caret_line).call_deferred(p_line, true, true, 0, 0);
1582+
callable_mp((TextEdit *)text_editor, &TextEdit::set_caret_column).call_deferred(p_begin, true, 0);
15831583
text_editor->select(p_line, p_begin, p_line, p_end);
15841584
}
15851585

15861586
void CodeTextEditor::goto_line_centered(int p_line) {
15871587
goto_line(p_line);
1588-
text_editor->call_deferred(SNAME("center_viewport_to_caret"));
1588+
callable_mp((TextEdit *)text_editor, &TextEdit::center_viewport_to_caret).call_deferred(0);
15891589
}
15901590

15911591
void CodeTextEditor::set_executing_line(int p_line) {

‎editor/create_dialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ void CreateDialog::_notification(int p_what) {
474474

475475
case NOTIFICATION_VISIBILITY_CHANGED: {
476476
if (is_visible()) {
477-
search_box->call_deferred(SNAME("grab_focus")); // still not visible
477+
callable_mp((Control *)search_box, &Control::grab_focus).call_deferred(); // Still not visible.
478478
search_box->select_all();
479479
} else {
480480
EditorSettings::get_singleton()->set_project_metadata("dialog_bounds", "create_new_node", Rect2(get_position(), get_size()));

‎editor/debugger/editor_debugger_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ void EditorDebuggerNode::_debugger_wants_stop(int p_id) {
455455
// Ask editor to kill PID.
456456
int pid = get_debugger(p_id)->get_remote_pid();
457457
if (pid) {
458-
EditorNode::get_singleton()->call_deferred(SNAME("stop_child_process"), pid);
458+
callable_mp(EditorNode::get_singleton(), &EditorNode::stop_child_process).call_deferred(pid);
459459
}
460460
}
461461

‎editor/debugger/editor_debugger_tree.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
253253
}
254254
debugger_id = p_debugger; // Needed by hook, could be avoided if every debugger had its own tree
255255
if (scroll_item) {
256-
call_deferred(SNAME("scroll_to_item"), scroll_item);
256+
callable_mp((Tree *)this, &Tree::scroll_to_item).call_deferred(scroll_item, false);
257257
}
258258
last_filter = filter;
259259
updating_scene_tree = false;

‎editor/editor_audio_buses.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ void EditorAudioBuses::_load_default_layout() {
12341234
AudioServer::get_singleton()->set_bus_layout(state);
12351235
_rebuild_buses();
12361236
EditorUndoRedoManager::get_singleton()->clear_history(true, EditorUndoRedoManager::GLOBAL_HISTORY);
1237-
call_deferred(SNAME("_select_layout"));
1237+
callable_mp(this, &EditorAudioBuses::_select_layout).call_deferred();
12381238
}
12391239

12401240
void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
@@ -1250,7 +1250,7 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
12501250
AudioServer::get_singleton()->set_bus_layout(state);
12511251
_rebuild_buses();
12521252
EditorUndoRedoManager::get_singleton()->clear_history(true, EditorUndoRedoManager::GLOBAL_HISTORY);
1253-
call_deferred(SNAME("_select_layout"));
1253+
callable_mp(this, &EditorAudioBuses::_select_layout).call_deferred();
12541254

12551255
} else if (file_dialog->get_file_mode() == EditorFileDialog::FILE_MODE_SAVE_FILE) {
12561256
if (new_layout) {
@@ -1270,14 +1270,13 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
12701270
file->set_text(String(TTR("Layout:")) + " " + p_string.get_file());
12711271
_rebuild_buses();
12721272
EditorUndoRedoManager::get_singleton()->clear_history(true, EditorUndoRedoManager::GLOBAL_HISTORY);
1273-
call_deferred(SNAME("_select_layout"));
1273+
callable_mp(this, &EditorAudioBuses::_select_layout).call_deferred();
12741274
}
12751275
}
12761276

12771277
void EditorAudioBuses::_bind_methods() {
12781278
ClassDB::bind_method("_update_bus", &EditorAudioBuses::_update_bus);
12791279
ClassDB::bind_method("_update_sends", &EditorAudioBuses::_update_sends);
1280-
ClassDB::bind_method("_select_layout", &EditorAudioBuses::_select_layout);
12811280
}
12821281

12831282
EditorAudioBuses::EditorAudioBuses() {
@@ -1370,7 +1369,7 @@ void EditorAudioBuses::open_layout(const String &p_path) {
13701369
AudioServer::get_singleton()->set_bus_layout(state);
13711370
_rebuild_buses();
13721371
EditorUndoRedoManager::get_singleton()->clear_history(true, EditorUndoRedoManager::GLOBAL_HISTORY);
1373-
call_deferred(SNAME("_select_layout"));
1372+
callable_mp(this, &EditorAudioBuses::_select_layout).call_deferred();
13741373
}
13751374

13761375
void AudioBusesEditorPlugin::edit(Object *p_node) {

‎editor/editor_autoload_settings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void EditorAutoloadSettings::_notification(int p_what) {
5757

5858
for (const AutoloadInfo &info : autoload_cache) {
5959
if (info.node && info.in_editor) {
60-
get_tree()->get_root()->call_deferred(SNAME("add_child"), info.node);
60+
callable_mp((Node *)get_tree()->get_root(), &Node::add_child).call_deferred(info.node, false, Node::INTERNAL_MODE_DISABLED);
6161
}
6262
}
6363
browse_button->set_icon(get_editor_theme_icon(SNAME("Folder")));
@@ -533,7 +533,7 @@ void EditorAutoloadSettings::update_autoload() {
533533
}
534534
if (info.in_editor) {
535535
ERR_CONTINUE(!info.node);
536-
get_tree()->get_root()->call_deferred(SNAME("remove_child"), info.node);
536+
callable_mp((Node *)get_tree()->get_root(), &Node::remove_child).call_deferred(info.node);
537537
}
538538

539539
if (info.node) {

‎editor/editor_data.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,6 @@ void EditorSelection::_bind_methods() {
12421242
ClassDB::bind_method(D_METHOD("remove_node", "node"), &EditorSelection::remove_node);
12431243
ClassDB::bind_method(D_METHOD("get_selected_nodes"), &EditorSelection::get_selected_nodes);
12441244
ClassDB::bind_method(D_METHOD("get_transformable_selected_nodes"), &EditorSelection::_get_transformable_selected_nodes);
1245-
ClassDB::bind_method(D_METHOD("_emit_change"), &EditorSelection::_emit_change);
12461245
ADD_SIGNAL(MethodInfo("selection_changed"));
12471246
}
12481247

@@ -1290,7 +1289,7 @@ void EditorSelection::update() {
12901289
changed = false;
12911290
if (!emitted) {
12921291
emitted = true;
1293-
call_deferred(SNAME("_emit_change"));
1292+
callable_mp(this, &EditorSelection::_emit_change).call_deferred();
12941293
}
12951294
}
12961295

‎editor/editor_file_system.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2693,7 +2693,7 @@ EditorFileSystem::EditorFileSystem() {
26932693
using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT");
26942694

26952695
scan_total = 0;
2696-
MessageQueue::get_singleton()->push_callable(callable_mp(ResourceUID::get_singleton(), &ResourceUID::clear)); // Will be updated on scan.
2696+
callable_mp(ResourceUID::get_singleton(), &ResourceUID::clear).call_deferred(); // Will be updated on scan.
26972697
ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
26982698
}
26992699

‎editor/editor_help.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1966,7 +1966,7 @@ void EditorHelp::_help_callback(const String &p_topic) {
19661966
}
19671967

19681968
if (class_desc->is_ready()) {
1969-
class_desc->call_deferred(SNAME("scroll_to_paragraph"), line);
1969+
callable_mp(class_desc, &RichTextLabel::scroll_to_paragraph).call_deferred(line);
19701970
} else {
19711971
scroll_to = line;
19721972
}

‎editor/editor_help_search.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void EditorHelpSearch::_notification(int p_what) {
9696
switch (p_what) {
9797
case NOTIFICATION_VISIBILITY_CHANGED: {
9898
if (!is_visible()) {
99-
results_tree->call_deferred(SNAME("clear")); // Wait for the Tree's mouse event propagation.
99+
callable_mp(results_tree, &Tree::clear).call_deferred(); // Wait for the Tree's mouse event propagation.
100100
get_ok_button()->set_disabled(true);
101101
EditorSettings::get_singleton()->set_project_metadata("dialog_bounds", "search_help", Rect2(get_position(), get_size()));
102102
}

‎editor/editor_inspector.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -695,15 +695,14 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
695695
new_coords.y++;
696696
}
697697
if (new_coords.x < int64_t(object->get("hframes")) && new_coords.y < int64_t(object->get("vframes"))) {
698-
call_deferred(SNAME("emit_changed"), property, new_coords, "", false);
698+
callable_mp(this, &EditorProperty::emit_changed).call_deferred(property, new_coords, "", false);
699699
}
700700
} else {
701701
if (int64_t(object->get(property)) + 1 < (int64_t(object->get("hframes")) * int64_t(object->get("vframes")))) {
702-
call_deferred(SNAME("emit_changed"), property, object->get(property).operator int64_t() + 1, "", false);
702+
callable_mp(this, &EditorProperty::emit_changed).call_deferred(property, object->get(property).operator int64_t() + 1, "", false);
703703
}
704704
}
705-
706-
call_deferred(SNAME("update_property"));
705+
callable_mp(this, &EditorProperty::update_property).call_deferred();
707706
}
708707
}
709708
if (delete_rect.has_point(mpos)) {
@@ -3980,7 +3979,7 @@ void EditorInspector::_notification(int p_what) {
39803979

39813980
case NOTIFICATION_PROCESS: {
39823981
if (update_scroll_request >= 0) {
3983-
get_v_scroll_bar()->call_deferred(SNAME("set_value"), update_scroll_request);
3982+
callable_mp((Range *)get_v_scroll_bar(), &Range::set_value).call_deferred(update_scroll_request);
39843983
update_scroll_request = -1;
39853984
}
39863985
if (update_tree_pending) {

‎editor/editor_node.cpp

+6-13
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "core/io/resource_loader.h"
3939
#include "core/io/resource_saver.h"
4040
#include "core/object/class_db.h"
41-
#include "core/object/message_queue.h"
4241
#include "core/os/keyboard.h"
4342
#include "core/os/os.h"
4443
#include "core/os/time.h"
@@ -668,7 +667,7 @@ void EditorNode::_notification(int p_what) {
668667

669668
command_palette->register_shortcuts_as_command();
670669

671-
MessageQueue::get_singleton()->push_callable(callable_mp(this, &EditorNode::_begin_first_scan));
670+
callable_mp(this, &EditorNode::_begin_first_scan).call_deferred();
672671

673672
/* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */
674673
} break;
@@ -1107,7 +1106,7 @@ void EditorNode::_scan_external_changes() {
11071106
}
11081107

11091108
if (need_reload) {
1110-
disk_changed->call_deferred(SNAME("popup_centered_ratio"), 0.3);
1109+
callable_mp((Window *)disk_changed, &Window::popup_centered_ratio).call_deferred(0.3);
11111110
}
11121111
}
11131112

@@ -3707,7 +3706,7 @@ void EditorNode::_set_current_scene_nocheck(int p_idx) {
37073706
callable_mp(scene_tabs, &EditorSceneTabs::update_scene_tabs).call_deferred();
37083707

37093708
if (tabs_to_close.is_empty()) {
3710-
call_deferred(SNAME("_set_main_scene_state"), state, get_edited_scene()); // Do after everything else is done setting up.
3709+
callable_mp(this, &EditorNode::_set_main_scene_state).call_deferred(state, get_edited_scene()); // Do after everything else is done setting up.
37113710
}
37123711
}
37133712

@@ -4097,7 +4096,7 @@ bool EditorNode::has_previous_scenes() const {
40974096

40984097
void EditorNode::edit_foreign_resource(Ref<Resource> p_resource) {
40994098
load_scene(p_resource->get_path().get_slice("::", 0));
4100-
InspectorDock::get_singleton()->call_deferred("edit_resource", p_resource);
4099+
callable_mp(InspectorDock::get_singleton(), &InspectorDock::edit_resource).call_deferred(p_resource);
41014100
}
41024101

41034102
bool EditorNode::is_resource_read_only(Ref<Resource> p_resource, bool p_foreign_resources_are_writable) {
@@ -4176,7 +4175,7 @@ void EditorNode::_add_to_recent_scenes(const String &p_scene) {
41764175
void EditorNode::_open_recent_scene(int p_idx) {
41774176
if (p_idx == recent_scenes->get_item_count() - 1) {
41784177
EditorSettings::get_singleton()->set_project_metadata("recent_files", "scenes", Array());
4179-
call_deferred(SNAME("_update_recent_scenes"));
4178+
callable_mp(this, &EditorNode::_update_recent_scenes).call_deferred();
41804179
} else {
41814180
Array rc = EditorSettings::get_singleton()->get_project_metadata("recent_files", "scenes", Array());
41824181
ERR_FAIL_INDEX(p_idx, rc.size());
@@ -5259,7 +5258,7 @@ void EditorNode::_load_docks_from_config(Ref<ConfigFile> p_layout, const String
52595258

52605259
int selected_tab_idx = p_layout->get_value(p_section, "dock_" + itos(i + 1) + "_selected_tab_idx");
52615260
if (selected_tab_idx >= 0 && selected_tab_idx < dock_slot[i]->get_tab_count()) {
5262-
dock_slot[i]->call_deferred("set_current_tab", selected_tab_idx);
5261+
callable_mp(dock_slot[i], &TabContainer::set_current_tab).call_deferred(selected_tab_idx);
52635262
}
52645263
}
52655264

@@ -6677,15 +6676,9 @@ void EditorNode::_bind_methods() {
66776676
ClassDB::bind_method(D_METHOD("push_item", "object", "property", "inspector_only"), &EditorNode::push_item, DEFVAL(""), DEFVAL(false));
66786677

66796678
ClassDB::bind_method("set_edited_scene", &EditorNode::set_edited_scene);
6680-
ClassDB::bind_method("open_request", &EditorNode::open_request);
6681-
ClassDB::bind_method("edit_foreign_resource", &EditorNode::edit_foreign_resource);
6682-
ClassDB::bind_method("is_resource_read_only", &EditorNode::is_resource_read_only);
66836679

66846680
ClassDB::bind_method("stop_child_process", &EditorNode::stop_child_process);
66856681

6686-
ClassDB::bind_method("_set_main_scene_state", &EditorNode::_set_main_scene_state);
6687-
ClassDB::bind_method("_update_recent_scenes", &EditorNode::_update_recent_scenes);
6688-
66896682
ADD_SIGNAL(MethodInfo("request_help_search"));
66906683
ADD_SIGNAL(MethodInfo("script_add_function_request", PropertyInfo(Variant::OBJECT, "obj"), PropertyInfo(Variant::STRING, "function"), PropertyInfo(Variant::PACKED_STRING_ARRAY, "args")));
66916684
ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "obj")));

‎editor/editor_plugin.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ void EditorPlugin::remove_translation_parser_plugin(const Ref<EditorTranslationP
402402
void EditorPlugin::add_import_plugin(const Ref<EditorImportPlugin> &p_importer, bool p_first_priority) {
403403
ERR_FAIL_COND(!p_importer.is_valid());
404404
ResourceFormatImporter::get_singleton()->add_importer(p_importer, p_first_priority);
405-
EditorFileSystem::get_singleton()->call_deferred(SNAME("scan"));
405+
callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan).call_deferred();
406406
}
407407

408408
void EditorPlugin::remove_import_plugin(const Ref<EditorImportPlugin> &p_importer) {
409409
ERR_FAIL_COND(!p_importer.is_valid());
410410
ResourceFormatImporter::get_singleton()->remove_importer(p_importer);
411-
EditorFileSystem::get_singleton()->call_deferred(SNAME("scan"));
411+
callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan).call_deferred();
412412
}
413413

414414
void EditorPlugin::add_export_plugin(const Ref<EditorExportPlugin> &p_exporter) {

‎editor/editor_properties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3013,7 +3013,7 @@ void EditorPropertyResource::_resource_selected(const Ref<Resource> &p_resource,
30133013
if (extensions.find(parent.get_extension()) && (!EditorNode::get_singleton()->get_edited_scene() || EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path() != parent)) {
30143014
// If the resource belongs to another (non-imported) scene, edit it in that scene instead.
30153015
if (!FileAccess::exists(parent + ".import")) {
3016-
EditorNode::get_singleton()->call_deferred("edit_foreign_resource", p_resource);
3016+
callable_mp(EditorNode::get_singleton(), &EditorNode::edit_foreign_resource).call_deferred(p_resource);
30173017
return;
30183018
}
30193019
}

‎editor/editor_properties_array_dict.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ void EditorPropertyArray::update_property() {
407407
new_prop->connect(SNAME("object_id_selected"), callable_mp(this, &EditorPropertyArray::_object_id_selected));
408408
new_prop->set_h_size_flags(SIZE_EXPAND_FILL);
409409
new_prop->set_read_only(is_read_only());
410-
slot.prop->call_deferred("add_sibling", new_prop);
411-
slot.prop->call_deferred("queue_free");
410+
callable_mp((Node *)slot.prop, &Node::add_sibling).call_deferred(new_prop, false);
411+
callable_mp((Node *)slot.prop, &Node::queue_free).call_deferred();
412412
slot.prop = new_prop;
413413
slot.set_index(idx);
414414
}

‎editor/editor_resource_preview.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "core/io/file_access.h"
3535
#include "core/io/resource_loader.h"
3636
#include "core/io/resource_saver.h"
37-
#include "core/object/message_queue.h"
3837
#include "core/variant/variant_utility.h"
3938
#include "editor/editor_node.h"
4039
#include "editor/editor_paths.h"
@@ -123,7 +122,7 @@ void EditorResourcePreview::_preview_ready(const String &p_path, int p_hash, con
123122
cache[p_path] = item;
124123
}
125124

126-
MessageQueue::get_singleton()->push_call(id, p_func, p_path, p_texture, p_small_texture, p_ud);
125+
Callable(id, p_func).call_deferred(p_path, p_texture, p_small_texture, p_ud);
127126
}
128127

129128
void EditorResourcePreview::_generate_preview(Ref<ImageTexture> &r_texture, Ref<ImageTexture> &r_small_texture, const QueueItem &p_item, const String &cache_base, Dictionary &p_metadata) {

0 commit comments

Comments
 (0)