Rename callable_method_pointer.h to callable_mp.h and include it explicitly

This allows removing it from `class_db.h`, significantly reducing the amount of files
that include it transitively.

Also includes some include cleanup in `control.h` and `rich_text_label.h` done while
ensure they don't depend on `callable_mp`.

core/config/project_settings.cpp

@@ -38,6 +38,7 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"

core/extension/gdextension.cpp

@@ -32,6 +32,7 @@
 #include "gdextension.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/method_bind.h"
 #include "gdextension_library_loader.h"

core/extension/gdextension_manager.cpp

@@ -36,6 +36,7 @@
 #include "core/extension/gdextension_special_compat_hashes.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"

core/io/resource_loader.cpp

@@ -36,6 +36,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_importer.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"

core/object/callable_mp.cpp

@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  callable_method_pointer.cpp                                           */
+/*  callable_mp.cpp                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "callable_method_pointer.h"
+#include "callable_mp.h"
 
 bool CallableCustomMethodPointerBase::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
 	const CallableCustomMethodPointerBase *a = static_cast<const CallableCustomMethodPointerBase *>(p_a);

core/object/callable_mp.h

@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  callable_method_pointer.h                                             */
+/*  callable_mp.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */

core/object/class_db.h

@@ -34,10 +34,6 @@
 #include "core/object/object.h"
 #include "core/os/rw_lock.h"
 #include "core/string/print_string.h"
-
-// Makes callable_mp readily available in all classes connecting signals.
-// Needs to come after method_bind and object have been included.
-#include "core/object/callable_method_pointer.h"
 #include "core/templates/a_hash_map.h"
 #include "core/templates/hash_set.h"
 

core/object/script_language.cpp

@@ -36,6 +36,7 @@
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/templates/sort_array.h"

editor/animation/animation_bezier_editor.cpp

@@ -30,6 +30,7 @@
 
 #include "animation_bezier_editor.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"

editor/animation/animation_blend_space_1d_editor.cpp

@@ -30,6 +30,7 @@
 
 #include "animation_blend_space_1d_editor.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"

editor/animation/animation_blend_space_2d_editor.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"

editor/animation/animation_blend_tree_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/templates/rb_set.h"
 #include "editor/editor_node.h"

editor/animation/animation_library_editor.cpp

@@ -31,6 +31,7 @@
 #include "animation_library_editor.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"

editor/animation/animation_player_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/animation/animation_state_machine_editor.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"

editor/animation/animation_track_editor.cpp

@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_bezier_editor.h"

editor/animation/animation_track_editor.h

@@ -909,7 +909,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	// Public for use with callable_mp.
+	// Public for use as signal callback.
 	void _clear_selection(bool p_update = false);
 	void _key_selected(int p_key, bool p_single, int p_track);
 	void _key_deselected(int p_key, int p_track);

editor/animation/animation_track_editor_plugins.cpp

@@ -30,6 +30,7 @@
 
 #include "animation_track_editor_plugins.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"

editor/animation/animation_tree_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "animation_blend_space_2d_editor.h"
 #include "animation_blend_tree_editor_plugin.h"
 #include "animation_state_machine_editor.h"
+#include "core/object/callable_mp.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_bottom_panel.h"

editor/asset_library/asset_library_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/stream_peer_tls.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/asset_library/editor_asset_installer.cpp

@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/zip_io.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/audio/audio_stream_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_stream_editor_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"

editor/audio/audio_stream_preview.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_stream_preview.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 
 /////////////////////

editor/audio/audio_stream_randomizer_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_stream_randomizer_editor_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "servers/audio/audio_stream.h"

editor/audio/editor_audio_buses.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/docks/editor_dock_manager.h"

editor/debugger/debug_adapter/debug_adapter_protocol.cpp

@@ -34,6 +34,7 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "editor/debugger/debug_adapter/debug_adapter_parser.h"
 #include "editor/debugger/script_editor_debugger.h"

editor/debugger/debugger_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "debugger_editor_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"

editor/debugger/editor_debugger_inspector.cpp

@@ -33,6 +33,7 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/variant/typed_dictionary.h"
 #include "editor/docks/inspector_dock.h"

editor/debugger/editor_debugger_node.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/undo_redo.h"
 #include "editor/debugger/editor_debugger_plugin.h"

editor/debugger/editor_debugger_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_debugger_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/debugger/script_editor_debugger.h"
 

editor/debugger/editor_debugger_tree.cpp

@@ -31,6 +31,7 @@
 #include "editor_debugger_tree.h"
 
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/scene_tree_dock.h"

editor/debugger/editor_expression_evaluator.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_expression_evaluator.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_string_names.h"

editor/debugger/editor_performance_profiler.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_performance_profiler.h"
 
+#include "core/object/callable_mp.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_property_name_processor.h"

editor/debugger/editor_profiler.cpp

@@ -31,6 +31,7 @@
 #include "editor_profiler.h"
 
 #include "core/io/image.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"

editor/debugger/editor_visual_profiler.cpp

@@ -31,6 +31,7 @@
 #include "editor_visual_profiler.h"
 
 #include "core/io/image.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"

editor/debugger/script_editor_debugger.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/remote_debugger.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"

editor/doc/editor_help.cpp

@@ -36,6 +36,7 @@
 #include "core/extension/gdextension.h"
 #include "core/input/input.h"
 #include "core/io/json.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"

editor/doc/editor_help_search.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_help_search.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/editor_main_screen.h"

editor/docks/dock_tab_container.cpp

@@ -30,7 +30,7 @@
 
 #include "dock_tab_container.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"

editor/docks/editor_dock.cpp

@@ -32,6 +32,7 @@
 
 #include "core/input/shortcut.h"
 #include "core/io/config_file.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/docks/dock_tab_container.h"
 #include "editor/docks/editor_dock_manager.h"

editor/docks/editor_dock_manager.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_dock_manager.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/docks/dock_tab_container.h"
 #include "editor/docks/editor_dock.h"

editor/docks/filesystem_dock.cpp

@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/docks/groups_editor.cpp

@@ -30,6 +30,7 @@
 
 #include "groups_editor.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"

editor/docks/history_dock.cpp

@@ -31,6 +31,7 @@
 #include "history_dock.h"
 
 #include "core/io/config_file.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"

editor/docks/import_dock.cpp

@@ -31,6 +31,7 @@
 #include "import_dock.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/docks/inspector_dock.cpp

@@ -30,6 +30,7 @@
 
 #include "inspector_dock.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"

editor/docks/scene_tree_dock.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/animation/animation_player_editor_plugin.h"

editor/editor_data.cpp

@@ -34,6 +34,7 @@
 #include "core/extension/gdextension_manager.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/time.h"
 #include "editor/editor_node.h"

editor/editor_interface.cpp

@@ -34,6 +34,7 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
@@ -61,6 +62,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/main/window.h"
+#include "scene/resources/image_texture.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/theme.h"
 #include "servers/display/display_server.h"

editor/editor_log.cpp

@@ -31,6 +31,7 @@
 #include "editor_log.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/editor_main_screen.cpp

@@ -31,7 +31,7 @@
 #include "editor_main_screen.h"
 
 #include "core/io/config_file.h"
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_plugin.h"

editor/editor_node.cpp

@@ -39,6 +39,7 @@
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/editor_node.h

@@ -734,10 +734,11 @@ protected:
 	void _notification(int p_what);
 
 public:
-	// Public for use with callable_mp.
-	void init_plugins();
+	// Public for use as signal callback.
 	void _on_plugin_ready(Object *p_script, const String &p_activate_name);
 
+	void init_plugins();
+
 	bool call_build();
 	void call_run_scene(const String &p_scene, Vector<String> &r_args);
 

editor/export/editor_export.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/main/timer.h"

editor/export/editor_export_platform_apple_embedded.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/json.h"
 #include "core/io/plist.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "core/os/process_id.h"
 #include "core/string/translation_server.h"

editor/export/export_template_manager.cpp

@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "core/templates/rb_set.h"
 #include "core/version.h"

editor/export/project_export.cpp

@@ -31,6 +31,7 @@
 #include "project_export.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/version.h"

editor/file_system/dependency_editor.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"

editor/file_system/editor_file_system.cpp

@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"

editor/gui/code_editor.cpp

@@ -31,6 +31,7 @@
 #include "code_editor.h"
 
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"

editor/gui/create_dialog.cpp

@@ -31,6 +31,7 @@
 #include "create_dialog.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"

editor/gui/credits_roll.cpp

@@ -34,7 +34,7 @@
 #include "core/donors.gen.h"
 #include "core/input/input.h"
 #include "core/license.gen.h"
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "core/string/string_builder.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/gui/directory_create_dialog.cpp

@@ -31,6 +31,7 @@
 #include "directory_create_dialog.h"
 
 #include "core/io/dir_access.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/themes/editor_scale.h"

editor/gui/editor_about.cpp

@@ -33,6 +33,7 @@
 #include "core/authors.gen.h"
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/gui/editor_bottom_panel.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_bottom_panel.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"

editor/gui/editor_dir_dialog.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_dir_dialog.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/file_system/editor_file_system.h"

editor/gui/editor_object_selector.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_object_selector.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/editor_data.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/gui/editor_quick_open_dialog.cpp

@@ -31,6 +31,7 @@
 #include "editor_quick_open_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/fuzzy_search.h"

editor/gui/editor_spin_slider.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/input/input.h"
 #include "core/math/expression.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/gui/editor_title_bar.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_title_bar.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "servers/display/display_server.h"
 
 void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {

editor/gui/editor_toaster.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_toaster.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"

editor/gui/editor_validation_panel.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_validation_panel.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"

editor/gui/editor_zoom_widget.cpp

@@ -31,6 +31,7 @@
 #include "editor_zoom_widget.h"
 
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"

editor/gui/progress_dialog.cpp

@@ -30,7 +30,7 @@
 
 #include "progress_dialog.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"

editor/gui/touch_actions_panel.cpp

@@ -31,7 +31,7 @@
 #include "touch_actions_panel.h"
 
 #include "core/input/input.h"
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/box_container.h"

editor/gui/window_wrapper.cpp

@@ -30,6 +30,7 @@
 
 #include "window_wrapper.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/import/3d/scene_import_settings.cpp

@@ -31,6 +31,7 @@
 #include "scene_import_settings.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"

editor/import/audio_stream_import_settings.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_stream_import_settings.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"

editor/import/dynamic_font_import_settings.cpp

@@ -33,6 +33,7 @@
 #include "unicode_ranges.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "core/string/translation.h"
 #include "editor/editor_node.h"

editor/import/fbx_importer_manager.cpp

@@ -31,6 +31,7 @@
 #include "fbx_importer_manager.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/import/import_defaults_editor.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_importer.h"
+#include "core/object/callable_mp.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/editor_sectioned_inspector.h"
 #include "editor/settings/action_map_editor.h"

editor/import/resource_importer_shader_file.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/shader/shader_file_editor_plugin.h"
 #include "servers/rendering/rendering_device_binds.h"

editor/inspector/add_metadata_dialog.cpp

@@ -30,6 +30,7 @@
 
 #include "add_metadata_dialog.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/gui/editor_variant_type_selectors.h"
 #include "editor/themes/editor_scale.h"

editor/inspector/editor_inspector.cpp

@@ -32,6 +32,7 @@
 #include "editor_inspector.compat.inc"
 
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/variant/typed_dictionary.h"

editor/inspector/editor_properties.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
 #include "core/io/marshalls.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/inspector_dock.h"

editor/inspector/editor_properties_array_dict.cpp

@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
+#include "core/object/callable_mp.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/inspector/editor_properties_vector.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_properties_vector.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/settings/editor_settings.h"

editor/inspector/editor_resource_picker.cpp

@@ -31,6 +31,7 @@
 #include "editor_resource_picker.h"
 
 #include "core/input/input.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/audio/audio_stream_preview.h"

editor/inspector/editor_resource_preview.cpp

@@ -34,6 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/variant_utility.h"

editor/inspector/editor_resource_tooltip_plugins.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_resource_tooltip_plugins.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/inspector/editor_sectioned_inspector.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_sectioned_inspector.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_inspector.h"

editor/inspector/input_event_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "input_event_editor_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/settings/event_listener_line_edit.h"
 #include "editor/settings/input_event_configuration_dialog.h"

editor/inspector/multi_node_edit.cpp

@@ -31,6 +31,7 @@
 #include "multi_node_edit.h"
 
 #include "core/math/math_fieldwise.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"

editor/inspector/property_selector.cpp

@@ -30,6 +30,7 @@
 
 #include "property_selector.h"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"

editor/inspector/sub_viewport_preview_editor_plugin.cpp

@@ -30,10 +30,9 @@
 
 #include "sub_viewport_preview_editor_plugin.h"
 
+#include "core/object/callable_mp.h"
 #include "scene/main/viewport.h"
 
-#include "core/object/callable_method_pointer.h"
-
 bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) {
 	return Object::cast_to<SubViewport>(p_object) != nullptr;
 }

editor/inspector/tool_button_editor_plugin.cpp

@@ -30,7 +30,7 @@
 
 #include "tool_button_editor_plugin.h"
 
-#include "core/object/callable_method_pointer.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/inspector/multi_node_edit.h"
 

editor/plugins/editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "editor_plugin.h"
 #include "editor_plugin.compat.inc"
 
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_plugin.h"

editor/plugins/editor_plugin_settings.cpp

@@ -35,6 +35,7 @@
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"

editor/plugins/plugin_config_dialog.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/editor_node.h"

editor/project_manager/engine_update_label.cpp

@@ -31,6 +31,7 @@
 #include "engine_update_label.h"
 
 #include "core/io/json.h"
+#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/version.h"