Reworked signal connection system, added support for Callable and Signal objects and made them default.

1 files changed, 37 insertions, 37 deletions

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 9f1e2f0353..2069c035fb 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -53,24 +53,24 @@ void ConnectionInfoDialog::popup_connections(String p_method, Vector<Node *> p_n
 		for (List<Connection>::Element *E = all_connections.front(); E; E = E->next()) {
 			Connection connection = E->get();
 
-			if (connection.method != p_method) {
+			if (connection.callable.get_method() != p_method) {
 				continue;
 			}
 
 			TreeItem *node_item = tree->create_item(root);
 
-			node_item->set_text(0, Object::cast_to<Node>(connection.source)->get_name());
-			node_item->set_icon(0, EditorNode::get_singleton()->get_object_icon(connection.source, "Node"));
+			node_item->set_text(0, Object::cast_to<Node>(connection.signal.get_object())->get_name());
+			node_item->set_icon(0, EditorNode::get_singleton()->get_object_icon(connection.signal.get_object(), "Node"));
 			node_item->set_selectable(0, false);
 			node_item->set_editable(0, false);
 
-			node_item->set_text(1, connection.signal);
+			node_item->set_text(1, connection.signal.get_name());
 			node_item->set_icon(1, get_parent_control()->get_icon("Slot", "EditorIcons"));
 			node_item->set_selectable(1, false);
 			node_item->set_editable(1, false);
 
-			node_item->set_text(2, Object::cast_to<Node>(connection.target)->get_name());
-			node_item->set_icon(2, EditorNode::get_singleton()->get_object_icon(connection.target, "Node"));
+			node_item->set_text(2, Object::cast_to<Node>(connection.callable.get_object())->get_name());
+			node_item->set_icon(2, EditorNode::get_singleton()->get_object_icon(connection.callable.get_object(), "Node"));
 			node_item->set_selectable(2, false);
 			node_item->set_editable(2, false);
 		}
@@ -603,12 +603,12 @@ void ScriptTextEditor::_validate_script() {
 				Connection connection = E->get();
 
 				String base_path = base->get_name();
-				String source_path = base == connection.source ? base_path : base_path + "/" + base->get_path_to(Object::cast_to<Node>(connection.source));
-				String target_path = base == connection.target ? base_path : base_path + "/" + base->get_path_to(Object::cast_to<Node>(connection.target));
+				String source_path = base == connection.signal.get_object() ? base_path : base_path + "/" + base->get_path_to(Object::cast_to<Node>(connection.signal.get_object()));
+				String target_path = base == connection.callable.get_object() ? base_path : base_path + "/" + base->get_path_to(Object::cast_to<Node>(connection.callable.get_object()));
 
 				warnings_panel->push_cell();
 				warnings_panel->push_color(warnings_panel->get_color("warning_color", "Editor"));
-				warnings_panel->add_text(vformat(TTR("Missing connected method '%s' for signal '%s' from node '%s' to node '%s'."), connection.method, connection.signal, source_path, target_path));
+				warnings_panel->add_text(vformat(TTR("Missing connected method '%s' for signal '%s' from node '%s' to node '%s'."), connection.callable.get_method(), connection.signal.get_name(), source_path, target_path));
 				warnings_panel->pop(); // Color.
 				warnings_panel->pop(); // Cell.
 			}
@@ -1006,24 +1006,24 @@ void ScriptTextEditor::_update_connected_methods() {
 			}
 
 			// As deleted nodes are still accessible via the undo/redo system, check if they're still on the tree.
-			Node *source = Object::cast_to<Node>(connection.source);
+			Node *source = Object::cast_to<Node>(connection.signal.get_object());
 			if (source && !source->is_inside_tree()) {
 				continue;
 			}
 
-			if (methods_found.has(connection.method)) {
+			if (methods_found.has(connection.callable.get_method())) {
 				continue;
 			}
 
-			if (!ClassDB::has_method(script->get_instance_base_type(), connection.method)) {
+			if (!ClassDB::has_method(script->get_instance_base_type(), connection.callable.get_method())) {
 				int line = -1;
 
 				for (int j = 0; j < functions.size(); j++) {
 					String name = functions[j].get_slice(":", 0);
-					if (name == connection.method) {
+					if (name == connection.callable.get_method()) {
 						line = functions[j].get_slice(":", 1).to_int();
-						text_edit->set_line_info_icon(line - 1, get_parent_control()->get_icon("Slot", "EditorIcons"), connection.method);
-						methods_found.insert(connection.method);
+						text_edit->set_line_info_icon(line - 1, get_parent_control()->get_icon("Slot", "EditorIcons"), connection.callable.get_method());
+						methods_found.insert(connection.callable.get_method());
 						break;
 					}
 				}
@@ -1036,7 +1036,7 @@ void ScriptTextEditor::_update_connected_methods() {
 				bool found_inherited_function = false;
 				Ref<Script> inherited_script = script->get_base_script();
 				while (!inherited_script.is_null()) {
-					if (inherited_script->has_method(connection.method)) {
+					if (inherited_script->has_method(connection.callable.get_method())) {
 						found_inherited_function = true;
 						break;
 					}
@@ -1774,12 +1774,12 @@ ScriptTextEditor::ScriptTextEditor() {
 	editor_box->add_child(code_editor);
 	code_editor->add_constant_override("separation", 2);
 	code_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE);
-	code_editor->connect("validate_script", this, "_validate_script");
-	code_editor->connect("load_theme_settings", this, "_load_theme_settings");
+	code_editor->connect_compat("validate_script", this, "_validate_script");
+	code_editor->connect_compat("load_theme_settings", this, "_load_theme_settings");
 	code_editor->set_code_complete_func(_code_complete_scripts, this);
-	code_editor->get_text_edit()->connect("breakpoint_toggled", this, "_breakpoint_toggled");
-	code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol");
-	code_editor->get_text_edit()->connect("info_clicked", this, "_lookup_connections");
+	code_editor->get_text_edit()->connect_compat("breakpoint_toggled", this, "_breakpoint_toggled");
+	code_editor->get_text_edit()->connect_compat("symbol_lookup", this, "_lookup_symbol");
+	code_editor->get_text_edit()->connect_compat("info_clicked", this, "_lookup_connections");
 	code_editor->set_v_size_flags(SIZE_EXPAND_FILL);
 	code_editor->show_toggle_scripts_button();
 
@@ -1792,9 +1792,9 @@ ScriptTextEditor::ScriptTextEditor() {
 	warnings_panel->set_focus_mode(FOCUS_CLICK);
 	warnings_panel->hide();
 
-	code_editor->connect("error_pressed", this, "_error_pressed");
-	code_editor->connect("show_warnings_panel", this, "_show_warnings_panel");
-	warnings_panel->connect("meta_clicked", this, "_warning_clicked");
+	code_editor->connect_compat("error_pressed", this, "_error_pressed");
+	code_editor->connect_compat("show_warnings_panel", this, "_show_warnings_panel");
+	warnings_panel->connect_compat("meta_clicked", this, "_warning_clicked");
 
 	update_settings();
 
@@ -1804,11 +1804,11 @@ ScriptTextEditor::ScriptTextEditor() {
 
 	code_editor->get_text_edit()->set_select_identifiers_on_hover(true);
 	code_editor->get_text_edit()->set_context_menu_enabled(false);
-	code_editor->get_text_edit()->connect("gui_input", this, "_text_edit_gui_input");
+	code_editor->get_text_edit()->connect_compat("gui_input", this, "_text_edit_gui_input");
 
 	context_menu = memnew(PopupMenu);
 	add_child(context_menu);
-	context_menu->connect("id_pressed", this, "_edit_option");
+	context_menu->connect_compat("id_pressed", this, "_edit_option");
 	context_menu->set_hide_on_window_lose_focus(true);
 
 	color_panel = memnew(PopupPanel);
@@ -1816,7 +1816,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	color_picker = memnew(ColorPicker);
 	color_picker->set_deferred_mode(true);
 	color_panel->add_child(color_picker);
-	color_picker->connect("color_changed", this, "_color_changed");
+	color_picker->connect_compat("color_changed", this, "_color_changed");
 
 	// get default color picker mode from editor settings
 	int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode");
@@ -1857,7 +1857,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_spaces"), EDIT_CONVERT_INDENT_TO_SPACES);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_tabs"), EDIT_CONVERT_INDENT_TO_TABS);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/auto_indent"), EDIT_AUTO_INDENT);
-	edit_menu->get_popup()->connect("id_pressed", this, "_edit_option");
+	edit_menu->get_popup()->connect_compat("id_pressed", this, "_edit_option");
 	edit_menu->get_popup()->add_separator();
 
 	PopupMenu *convert_case = memnew(PopupMenu);
@@ -1867,7 +1867,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	convert_case->add_shortcut(ED_SHORTCUT("script_text_editor/convert_to_uppercase", TTR("Uppercase"), KEY_MASK_SHIFT | KEY_F4), EDIT_TO_UPPERCASE);
 	convert_case->add_shortcut(ED_SHORTCUT("script_text_editor/convert_to_lowercase", TTR("Lowercase"), KEY_MASK_SHIFT | KEY_F5), EDIT_TO_LOWERCASE);
 	convert_case->add_shortcut(ED_SHORTCUT("script_text_editor/capitalize", TTR("Capitalize"), KEY_MASK_SHIFT | KEY_F6), EDIT_CAPITALIZE);
-	convert_case->connect("id_pressed", this, "_edit_option");
+	convert_case->connect_compat("id_pressed", this, "_edit_option");
 
 	highlighters[TTR("Standard")] = NULL;
 	highlighter_menu = memnew(PopupMenu);
@@ -1875,7 +1875,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	edit_menu->get_popup()->add_child(highlighter_menu);
 	edit_menu->get_popup()->add_submenu_item(TTR("Syntax Highlighter"), "highlighter_menu");
 	highlighter_menu->add_radio_check_item(TTR("Standard"));
-	highlighter_menu->connect("id_pressed", this, "_change_syntax_highlighter");
+	highlighter_menu->connect_compat("id_pressed", this, "_change_syntax_highlighter");
 
 	search_menu = memnew(MenuButton);
 	edit_hb->add_child(search_menu);
@@ -1891,7 +1891,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace_in_files"), REPLACE_IN_FILES);
 	search_menu->get_popup()->add_separator();
 	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/contextual_help"), HELP_CONTEXTUAL);
-	search_menu->get_popup()->connect("id_pressed", this, "_edit_option");
+	search_menu->get_popup()->connect_compat("id_pressed", this, "_edit_option");
 
 	edit_hb->add_child(edit_menu);
 
@@ -1899,7 +1899,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	edit_hb->add_child(goto_menu);
 	goto_menu->set_text(TTR("Go To"));
 	goto_menu->set_switch_on_hover(true);
-	goto_menu->get_popup()->connect("id_pressed", this, "_edit_option");
+	goto_menu->get_popup()->connect_compat("id_pressed", this, "_edit_option");
 
 	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_function"), SEARCH_LOCATE_FUNCTION);
 	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_line"), SEARCH_GOTO_LINE);
@@ -1910,20 +1910,20 @@ ScriptTextEditor::ScriptTextEditor() {
 	goto_menu->get_popup()->add_child(bookmarks_menu);
 	goto_menu->get_popup()->add_submenu_item(TTR("Bookmarks"), "Bookmarks");
 	_update_bookmark_list();
-	bookmarks_menu->connect("about_to_show", this, "_update_bookmark_list");
-	bookmarks_menu->connect("index_pressed", this, "_bookmark_item_pressed");
+	bookmarks_menu->connect_compat("about_to_show", this, "_update_bookmark_list");
+	bookmarks_menu->connect_compat("index_pressed", this, "_bookmark_item_pressed");
 
 	breakpoints_menu = memnew(PopupMenu);
 	breakpoints_menu->set_name("Breakpoints");
 	goto_menu->get_popup()->add_child(breakpoints_menu);
 	goto_menu->get_popup()->add_submenu_item(TTR("Breakpoints"), "Breakpoints");
 	_update_breakpoint_list();
-	breakpoints_menu->connect("about_to_show", this, "_update_breakpoint_list");
-	breakpoints_menu->connect("index_pressed", this, "_breakpoint_item_pressed");
+	breakpoints_menu->connect_compat("about_to_show", this, "_update_breakpoint_list");
+	breakpoints_menu->connect_compat("index_pressed", this, "_breakpoint_item_pressed");
 
 	quick_open = memnew(ScriptEditorQuickOpen);
 	add_child(quick_open);
-	quick_open->connect("goto_line", this, "_goto_line");
+	quick_open->connect_compat("goto_line", this, "_goto_line");
 
 	goto_line_dialog = memnew(GotoLineDialog);
 	add_child(goto_line_dialog);