diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 1772a4a9b8..60703a25a4 100644 --- a/core/config/project_settings.cpp +++ b/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" diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp index 61210127c6..bc1212cee2 100644 --- a/core/extension/gdextension.cpp +++ b/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" diff --git a/core/extension/gdextension_manager.cpp b/core/extension/gdextension_manager.cpp index 67b44860ad..86aacfd691 100644 --- a/core/extension/gdextension_manager.cpp +++ b/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" diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index b41c379b3a..b6abee964d 100644 --- a/core/io/resource_loader.cpp +++ b/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" diff --git a/core/object/callable_method_pointer.cpp b/core/object/callable_mp.cpp similarity index 97% rename from core/object/callable_method_pointer.cpp rename to core/object/callable_mp.cpp index ed400788b1..6506643f1f 100644 --- a/core/object/callable_method_pointer.cpp +++ b/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(p_a); diff --git a/core/object/callable_method_pointer.h b/core/object/callable_mp.h similarity index 99% rename from core/object/callable_method_pointer.h rename to core/object/callable_mp.h index 218799933d..aad45a0048 100644 --- a/core/object/callable_method_pointer.h +++ b/core/object/callable_mp.h @@ -1,5 +1,5 @@ /**************************************************************************/ -/* callable_method_pointer.h */ +/* callable_mp.h */ /**************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/object/class_db.h b/core/object/class_db.h index 5eaaa826ac..2596ae85fd 100644 --- a/core/object/class_db.h +++ b/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" diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp index 0899e67ea1..275a95ad83 100644 --- a/core/object/script_language.cpp +++ b/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" diff --git a/editor/animation/animation_bezier_editor.cpp b/editor/animation/animation_bezier_editor.cpp index 65bb264752..7a42fe188c 100644 --- a/editor/animation/animation_bezier_editor.cpp +++ b/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" diff --git a/editor/animation/animation_blend_space_1d_editor.cpp b/editor/animation/animation_blend_space_1d_editor.cpp index 225857e2aa..f3a6fb19cf 100644 --- a/editor/animation/animation_blend_space_1d_editor.cpp +++ b/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" diff --git a/editor/animation/animation_blend_space_2d_editor.cpp b/editor/animation/animation_blend_space_2d_editor.cpp index aa9bb4e6bc..930077fcb6 100644 --- a/editor/animation/animation_blend_space_2d_editor.cpp +++ b/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" diff --git a/editor/animation/animation_blend_tree_editor_plugin.cpp b/editor/animation/animation_blend_tree_editor_plugin.cpp index 1dc91df739..7dbe52f130 100644 --- a/editor/animation/animation_blend_tree_editor_plugin.cpp +++ b/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" diff --git a/editor/animation/animation_library_editor.cpp b/editor/animation/animation_library_editor.cpp index 422fdfc405..adc358547a 100644 --- a/editor/animation/animation_library_editor.cpp +++ b/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" diff --git a/editor/animation/animation_player_editor_plugin.cpp b/editor/animation/animation_player_editor_plugin.cpp index 10270ce9e8..fc6e005954 100644 --- a/editor/animation/animation_player_editor_plugin.cpp +++ b/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" diff --git a/editor/animation/animation_state_machine_editor.cpp b/editor/animation/animation_state_machine_editor.cpp index ad96475b1b..8385122801 100644 --- a/editor/animation/animation_state_machine_editor.cpp +++ b/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" diff --git a/editor/animation/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp index 6bfdbe91ba..698c02d89b 100644 --- a/editor/animation/animation_track_editor.cpp +++ b/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" diff --git a/editor/animation/animation_track_editor.h b/editor/animation/animation_track_editor.h index f31e14d091..7425d6a3ef 100644 --- a/editor/animation/animation_track_editor.h +++ b/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); diff --git a/editor/animation/animation_track_editor_plugins.cpp b/editor/animation/animation_track_editor_plugins.cpp index bc26a9a392..66762dff04 100644 --- a/editor/animation/animation_track_editor_plugins.cpp +++ b/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" diff --git a/editor/animation/animation_tree_editor_plugin.cpp b/editor/animation/animation_tree_editor_plugin.cpp index 08f116172a..c3b2f2ea15 100644 --- a/editor/animation/animation_tree_editor_plugin.cpp +++ b/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" diff --git a/editor/asset_library/asset_library_editor_plugin.cpp b/editor/asset_library/asset_library_editor_plugin.cpp index fe808c0c1d..4fd692819d 100644 --- a/editor/asset_library/asset_library_editor_plugin.cpp +++ b/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" diff --git a/editor/asset_library/editor_asset_installer.cpp b/editor/asset_library/editor_asset_installer.cpp index 6d7cb1c408..77cc2e24ad 100644 --- a/editor/asset_library/editor_asset_installer.cpp +++ b/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" diff --git a/editor/audio/audio_stream_editor_plugin.cpp b/editor/audio/audio_stream_editor_plugin.cpp index 93b666f67d..04eea59c74 100644 --- a/editor/audio/audio_stream_editor_plugin.cpp +++ b/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" diff --git a/editor/audio/audio_stream_preview.cpp b/editor/audio/audio_stream_preview.cpp index d80753f74a..f72b7d6cb4 100644 --- a/editor/audio/audio_stream_preview.cpp +++ b/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" ///////////////////// diff --git a/editor/audio/audio_stream_randomizer_editor_plugin.cpp b/editor/audio/audio_stream_randomizer_editor_plugin.cpp index 5e364b1116..c0c231e5cf 100644 --- a/editor/audio/audio_stream_randomizer_editor_plugin.cpp +++ b/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" diff --git a/editor/audio/editor_audio_buses.cpp b/editor/audio/editor_audio_buses.cpp index 5852f62dd9..b5f25c9a85 100644 --- a/editor/audio/editor_audio_buses.cpp +++ b/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" diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 7cbba5dc44..367b956640 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/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" diff --git a/editor/debugger/debugger_editor_plugin.cpp b/editor/debugger/debugger_editor_plugin.cpp index 285b368f34..cf27dde5ef 100644 --- a/editor/debugger/debugger_editor_plugin.cpp +++ b/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" diff --git a/editor/debugger/editor_debugger_inspector.cpp b/editor/debugger/editor_debugger_inspector.cpp index 0022e4f708..a9a66c7b23 100644 --- a/editor/debugger/editor_debugger_inspector.cpp +++ b/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" diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp index ef5743c761..8b3a65ca03 100644 --- a/editor/debugger/editor_debugger_node.cpp +++ b/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" diff --git a/editor/debugger/editor_debugger_plugin.cpp b/editor/debugger/editor_debugger_plugin.cpp index 02c0104005..e385feb8d6 100644 --- a/editor/debugger/editor_debugger_plugin.cpp +++ b/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" diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index 5245f3a41e..141880d03b 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/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" diff --git a/editor/debugger/editor_expression_evaluator.cpp b/editor/debugger/editor_expression_evaluator.cpp index 557dbba948..609fc401b0 100644 --- a/editor/debugger/editor_expression_evaluator.cpp +++ b/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" diff --git a/editor/debugger/editor_performance_profiler.cpp b/editor/debugger/editor_performance_profiler.cpp index 9d5da01081..c2f7a71f1c 100644 --- a/editor/debugger/editor_performance_profiler.cpp +++ b/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" diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index ecf33ce93b..0258c68ef4 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/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" diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 2e8981e34a..942e6a4fc0 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/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" diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index a274cb3ea5..dc5889cf5d 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/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" diff --git a/editor/doc/editor_help.cpp b/editor/doc/editor_help.cpp index 521a8f620e..17d14801d5 100644 --- a/editor/doc/editor_help.cpp +++ b/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" diff --git a/editor/doc/editor_help_search.cpp b/editor/doc/editor_help_search.cpp index 612c754a0f..1e07b564d4 100644 --- a/editor/doc/editor_help_search.cpp +++ b/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" diff --git a/editor/docks/dock_tab_container.cpp b/editor/docks/dock_tab_container.cpp index 14861e078b..7a5f895da2 100644 --- a/editor/docks/dock_tab_container.cpp +++ b/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" diff --git a/editor/docks/editor_dock.cpp b/editor/docks/editor_dock.cpp index fd6c9655c9..293444b132 100644 --- a/editor/docks/editor_dock.cpp +++ b/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" diff --git a/editor/docks/editor_dock_manager.cpp b/editor/docks/editor_dock_manager.cpp index 4d27ba3cec..a346d305ba 100644 --- a/editor/docks/editor_dock_manager.cpp +++ b/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" diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp index 537947f454..b472c7a8fe 100644 --- a/editor/docks/filesystem_dock.cpp +++ b/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" diff --git a/editor/docks/groups_editor.cpp b/editor/docks/groups_editor.cpp index 979fb021c7..e248fe5ccb 100644 --- a/editor/docks/groups_editor.cpp +++ b/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" diff --git a/editor/docks/history_dock.cpp b/editor/docks/history_dock.cpp index 9fe390a77d..7301de3664 100644 --- a/editor/docks/history_dock.cpp +++ b/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" diff --git a/editor/docks/import_dock.cpp b/editor/docks/import_dock.cpp index 7ed771f29a..36dade9959 100644 --- a/editor/docks/import_dock.cpp +++ b/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" diff --git a/editor/docks/inspector_dock.cpp b/editor/docks/inspector_dock.cpp index ce00b9f60e..55861a0b45 100644 --- a/editor/docks/inspector_dock.cpp +++ b/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" diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp index 937cbbea39..cb62d219f3 100644 --- a/editor/docks/scene_tree_dock.cpp +++ b/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" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index e40f8077ff..89ed86bbbe 100644 --- a/editor/editor_data.cpp +++ b/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" diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp index b87e79dc35..d5d1b5e025 100644 --- a/editor/editor_interface.cpp +++ b/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" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 7880475b96..4b9aedc2c4 100644 --- a/editor/editor_log.cpp +++ b/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" diff --git a/editor/editor_main_screen.cpp b/editor/editor_main_screen.cpp index a68b90d4d1..730be32ead 100644 --- a/editor/editor_main_screen.cpp +++ b/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" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3eb893b7b8..c688161151 100644 --- a/editor/editor_node.cpp +++ b/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" diff --git a/editor/editor_node.h b/editor/editor_node.h index b9d1476645..bf39898dea 100644 --- a/editor/editor_node.h +++ b/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 &r_args); diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp index 0c68516b38..66910a3c27 100644 --- a/editor/export/editor_export.cpp +++ b/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" diff --git a/editor/export/editor_export_platform_apple_embedded.cpp b/editor/export/editor_export_platform_apple_embedded.cpp index e9233a57b6..57eccb9238 100644 --- a/editor/export/editor_export_platform_apple_embedded.cpp +++ b/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" diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index fcf6283aab..c4f9869507 100644 --- a/editor/export/export_template_manager.cpp +++ b/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" diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 45bc7b2601..ae77fda1c1 100644 --- a/editor/export/project_export.cpp +++ b/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" diff --git a/editor/file_system/dependency_editor.cpp b/editor/file_system/dependency_editor.cpp index 5377d6c0e8..0195261c1b 100644 --- a/editor/file_system/dependency_editor.cpp +++ b/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" diff --git a/editor/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp index e913b1028a..69fbfb5a3a 100644 --- a/editor/file_system/editor_file_system.cpp +++ b/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" diff --git a/editor/gui/code_editor.cpp b/editor/gui/code_editor.cpp index 3b99d3b436..13a4381f00 100644 --- a/editor/gui/code_editor.cpp +++ b/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" diff --git a/editor/gui/create_dialog.cpp b/editor/gui/create_dialog.cpp index d28da5e7b8..22efd422e4 100644 --- a/editor/gui/create_dialog.cpp +++ b/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" diff --git a/editor/gui/credits_roll.cpp b/editor/gui/credits_roll.cpp index 8a7ca74538..c2f9b681c5 100644 --- a/editor/gui/credits_roll.cpp +++ b/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" diff --git a/editor/gui/directory_create_dialog.cpp b/editor/gui/directory_create_dialog.cpp index f56cda8b54..d5ce82187a 100644 --- a/editor/gui/directory_create_dialog.cpp +++ b/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" diff --git a/editor/gui/editor_about.cpp b/editor/gui/editor_about.cpp index 717ceba636..f372ccf90a 100644 --- a/editor/gui/editor_about.cpp +++ b/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" diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp index 237982a62d..8c5f287afb 100644 --- a/editor/gui/editor_bottom_panel.cpp +++ b/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" diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp index 10e9e9ac1d..475723f61f 100644 --- a/editor/gui/editor_dir_dialog.cpp +++ b/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" diff --git a/editor/gui/editor_object_selector.cpp b/editor/gui/editor_object_selector.cpp index f19119d9f2..2dba594f2b 100644 --- a/editor/gui/editor_object_selector.cpp +++ b/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" diff --git a/editor/gui/editor_quick_open_dialog.cpp b/editor/gui/editor_quick_open_dialog.cpp index 841e71a1a4..e063ac5bc7 100644 --- a/editor/gui/editor_quick_open_dialog.cpp +++ b/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" diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp index e4ddfcc0eb..f0e569d47f 100644 --- a/editor/gui/editor_spin_slider.cpp +++ b/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" diff --git a/editor/gui/editor_title_bar.cpp b/editor/gui/editor_title_bar.cpp index 5c2ed89eb1..dd84c0a84f 100644 --- a/editor/gui/editor_title_bar.cpp +++ b/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 &p_event) { diff --git a/editor/gui/editor_toaster.cpp b/editor/gui/editor_toaster.cpp index 3acf336c04..68ff49350b 100644 --- a/editor/gui/editor_toaster.cpp +++ b/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" diff --git a/editor/gui/editor_validation_panel.cpp b/editor/gui/editor_validation_panel.cpp index 3a8b7bed48..7ae0ae2c7e 100644 --- a/editor/gui/editor_validation_panel.cpp +++ b/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" diff --git a/editor/gui/editor_zoom_widget.cpp b/editor/gui/editor_zoom_widget.cpp index 44be97db12..c7c9b300a2 100644 --- a/editor/gui/editor_zoom_widget.cpp +++ b/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" diff --git a/editor/gui/progress_dialog.cpp b/editor/gui/progress_dialog.cpp index c7f02f035c..639ba2e96c 100644 --- a/editor/gui/progress_dialog.cpp +++ b/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" diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp index 57cf193919..d5e7801461 100644 --- a/editor/gui/touch_actions_panel.cpp +++ b/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" diff --git a/editor/gui/window_wrapper.cpp b/editor/gui/window_wrapper.cpp index b6bf4e5edf..07f0f2c9d0 100644 --- a/editor/gui/window_wrapper.cpp +++ b/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" diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index fa99487ed7..eff60946b5 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/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" diff --git a/editor/import/audio_stream_import_settings.cpp b/editor/import/audio_stream_import_settings.cpp index 0bc3a976c5..ab11038046 100644 --- a/editor/import/audio_stream_import_settings.cpp +++ b/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" diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 1e97553cb7..73c5de94b7 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/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" diff --git a/editor/import/fbx_importer_manager.cpp b/editor/import/fbx_importer_manager.cpp index b8d35786a4..dcfed306f5 100644 --- a/editor/import/fbx_importer_manager.cpp +++ b/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" diff --git a/editor/import/import_defaults_editor.cpp b/editor/import/import_defaults_editor.cpp index 2cebe0c982..89abbe27fd 100644 --- a/editor/import/import_defaults_editor.cpp +++ b/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" diff --git a/editor/import/resource_importer_shader_file.cpp b/editor/import/resource_importer_shader_file.cpp index 25bd106154..118eb97edf 100644 --- a/editor/import/resource_importer_shader_file.cpp +++ b/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" diff --git a/editor/inspector/add_metadata_dialog.cpp b/editor/inspector/add_metadata_dialog.cpp index 161a1c66c5..1c16cec2e8 100644 --- a/editor/inspector/add_metadata_dialog.cpp +++ b/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" diff --git a/editor/inspector/editor_inspector.cpp b/editor/inspector/editor_inspector.cpp index 659b97b5bb..be32f1808d 100644 --- a/editor/inspector/editor_inspector.cpp +++ b/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" diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp index 5158b271b7..8f5f755689 100644 --- a/editor/inspector/editor_properties.cpp +++ b/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" diff --git a/editor/inspector/editor_properties_array_dict.cpp b/editor/inspector/editor_properties_array_dict.cpp index 043b2128e5..a55fdefba7 100644 --- a/editor/inspector/editor_properties_array_dict.cpp +++ b/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" diff --git a/editor/inspector/editor_properties_vector.cpp b/editor/inspector/editor_properties_vector.cpp index 61e8dac055..e6fec73211 100644 --- a/editor/inspector/editor_properties_vector.cpp +++ b/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" diff --git a/editor/inspector/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp index 7a7d916017..581717e039 100644 --- a/editor/inspector/editor_resource_picker.cpp +++ b/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" diff --git a/editor/inspector/editor_resource_preview.cpp b/editor/inspector/editor_resource_preview.cpp index 5c0d95e131..d3f5b41106 100644 --- a/editor/inspector/editor_resource_preview.cpp +++ b/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" diff --git a/editor/inspector/editor_resource_tooltip_plugins.cpp b/editor/inspector/editor_resource_tooltip_plugins.cpp index 20e4ab9fa7..cb16173d22 100644 --- a/editor/inspector/editor_resource_tooltip_plugins.cpp +++ b/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" diff --git a/editor/inspector/editor_sectioned_inspector.cpp b/editor/inspector/editor_sectioned_inspector.cpp index d4a94d9183..5d23bf83ac 100644 --- a/editor/inspector/editor_sectioned_inspector.cpp +++ b/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" diff --git a/editor/inspector/input_event_editor_plugin.cpp b/editor/inspector/input_event_editor_plugin.cpp index 6d3e4da296..2ff6c88af8 100644 --- a/editor/inspector/input_event_editor_plugin.cpp +++ b/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" diff --git a/editor/inspector/multi_node_edit.cpp b/editor/inspector/multi_node_edit.cpp index e65593a565..2f669b03fe 100644 --- a/editor/inspector/multi_node_edit.cpp +++ b/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" diff --git a/editor/inspector/property_selector.cpp b/editor/inspector/property_selector.cpp index 79ca8ca7b0..3684005f88 100644 --- a/editor/inspector/property_selector.cpp +++ b/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" diff --git a/editor/inspector/sub_viewport_preview_editor_plugin.cpp b/editor/inspector/sub_viewport_preview_editor_plugin.cpp index 5904dc82fb..9999d176b3 100644 --- a/editor/inspector/sub_viewport_preview_editor_plugin.cpp +++ b/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(p_object) != nullptr; } diff --git a/editor/inspector/tool_button_editor_plugin.cpp b/editor/inspector/tool_button_editor_plugin.cpp index 1fd66c5413..65ddf43d71 100644 --- a/editor/inspector/tool_button_editor_plugin.cpp +++ b/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" diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp index 6a4d122422..70b30b35e2 100644 --- a/editor/plugins/editor_plugin.cpp +++ b/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" diff --git a/editor/plugins/editor_plugin_settings.cpp b/editor/plugins/editor_plugin_settings.cpp index a8b655e8b6..1deaa3e5eb 100644 --- a/editor/plugins/editor_plugin_settings.cpp +++ b/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" diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index 8f27923320..6f3c90f5e0 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/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" diff --git a/editor/project_manager/engine_update_label.cpp b/editor/project_manager/engine_update_label.cpp index 78cc2a3846..a48008b1bf 100644 --- a/editor/project_manager/engine_update_label.cpp +++ b/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" diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index 4cc8ffca43..cb20a11475 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/zip_io.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/version.h" diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp index 677c1228e1..2fb9f4f2ec 100644 --- a/editor/project_manager/project_list.cpp +++ b/editor/project_manager/project_list.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/io/dir_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/os/time.h" diff --git a/editor/project_manager/project_manager.cpp b/editor/project_manager/project_manager.cpp index 561ad74e9b..07459871b3 100644 --- a/editor/project_manager/project_manager.cpp +++ b/editor/project_manager/project_manager.cpp @@ -36,6 +36,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 "core/os/keyboard.h" #include "core/os/os.h" #include "core/version.h" diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp index 30b684cb69..741bd91bd3 100644 --- a/editor/project_manager/quick_settings_dialog.cpp +++ b/editor/project_manager/quick_settings_dialog.cpp @@ -30,6 +30,7 @@ #include "quick_settings_dialog.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/translation_server.h" #include "editor/doc/editor_help.h" diff --git a/editor/project_upgrade/project_upgrade_tool.cpp b/editor/project_upgrade/project_upgrade_tool.cpp index 79ba9afe00..9324c8a007 100644 --- a/editor/project_upgrade/project_upgrade_tool.cpp +++ b/editor/project_upgrade/project_upgrade_tool.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/file_system/editor_file_system.h" diff --git a/editor/run/editor_run_bar.cpp b/editor/run/editor_run_bar.cpp index c61b8b5ebd..e2967d4b2d 100644 --- a/editor/run/editor_run_bar.cpp +++ b/editor/run/editor_run_bar.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" diff --git a/editor/run/editor_run_native.cpp b/editor/run/editor_run_native.cpp index 2c99d66ce0..e9b506e7d2 100644 --- a/editor/run/editor_run_native.cpp +++ b/editor/run/editor_run_native.cpp @@ -30,6 +30,7 @@ #include "editor_run_native.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/export/editor_export.h" diff --git a/editor/run/embedded_process.cpp b/editor/run/embedded_process.cpp index 377c967d95..9caac4c56a 100644 --- a/editor/run/embedded_process.cpp +++ b/editor/run/embedded_process.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/os.h" #include "editor/editor_string_names.h" diff --git a/editor/run/game_view_plugin.cpp b/editor/run/game_view_plugin.cpp index a556249992..4f1f773d98 100644 --- a/editor/run/game_view_plugin.cpp +++ b/editor/run/game_view_plugin.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/debugger/debugger_marshalls.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/process_id.h" #include "core/string/translation_server.h" diff --git a/editor/run/run_instances_dialog.cpp b/editor/run/run_instances_dialog.cpp index 645c521d48..41b6217379 100644 --- a/editor/run/run_instances_dialog.cpp +++ b/editor/run/run_instances_dialog.cpp @@ -31,6 +31,7 @@ #include "run_instances_dialog.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/2d/abstract_polygon_2d_editor.cpp b/editor/scene/2d/abstract_polygon_2d_editor.cpp index 5a6994f192..f4567876e0 100644 --- a/editor/scene/2d/abstract_polygon_2d_editor.cpp +++ b/editor/scene/2d/abstract_polygon_2d_editor.cpp @@ -31,6 +31,7 @@ #include "abstract_polygon_2d_editor.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/2d/camera_2d_editor_plugin.cpp b/editor/scene/2d/camera_2d_editor_plugin.cpp index 7aae3fb142..400f704718 100644 --- a/editor/scene/2d/camera_2d_editor_plugin.cpp +++ b/editor/scene/2d/camera_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "camera_2d_editor_plugin.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_undo_redo_manager.h" diff --git a/editor/scene/2d/parallax_background_editor_plugin.cpp b/editor/scene/2d/parallax_background_editor_plugin.cpp index f079bef8f5..c1d315e27d 100644 --- a/editor/scene/2d/parallax_background_editor_plugin.cpp +++ b/editor/scene/2d/parallax_background_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "parallax_background_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" diff --git a/editor/scene/2d/particles_2d_editor_plugin.cpp b/editor/scene/2d/particles_2d_editor_plugin.cpp index 789bbd2bda..7a3c2ef8c5 100644 --- a/editor/scene/2d/particles_2d_editor_plugin.cpp +++ b/editor/scene/2d/particles_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "particles_2d_editor_plugin.h" #include "core/io/image_loader.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/2d/path_2d_editor_plugin.cpp b/editor/scene/2d/path_2d_editor_plugin.cpp index 53db1b7b1d..0170537911 100644 --- a/editor/scene/2d/path_2d_editor_plugin.cpp +++ b/editor/scene/2d/path_2d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "path_2d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" diff --git a/editor/scene/2d/physics/cast_2d_editor_plugin.cpp b/editor/scene/2d/physics/cast_2d_editor_plugin.cpp index 79b91a0aad..e9eab537db 100644 --- a/editor/scene/2d/physics/cast_2d_editor_plugin.cpp +++ b/editor/scene/2d/physics/cast_2d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "cast_2d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/scene/canvas_item_editor_plugin.h" diff --git a/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp b/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp index bc908a7021..b05f621f3a 100644 --- a/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp +++ b/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "collision_shape_2d_editor_plugin.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" diff --git a/editor/scene/2d/polygon_2d_editor_plugin.cpp b/editor/scene/2d/polygon_2d_editor_plugin.cpp index 9b91a25d5d..4650faf0d7 100644 --- a/editor/scene/2d/polygon_2d_editor_plugin.cpp +++ b/editor/scene/2d/polygon_2d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/input/input_event.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "editor/docks/editor_dock.h" diff --git a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp index 66c4183784..13d4ee608a 100644 --- a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp +++ b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "scene_paint_2d_editor_plugin.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "editor/docks/filesystem_dock.h" #include "editor/docks/inspector_dock.h" #include "editor/docks/scene_tree_dock.h" diff --git a/editor/scene/2d/skeleton_2d_editor_plugin.cpp b/editor/scene/2d/skeleton_2d_editor_plugin.cpp index 10f6621f4b..91b4bad222 100644 --- a/editor/scene/2d/skeleton_2d_editor_plugin.cpp +++ b/editor/scene/2d/skeleton_2d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "skeleton_2d_editor_plugin.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" diff --git a/editor/scene/2d/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp index 5bfb610ade..84af8cead6 100644 --- a/editor/scene/2d/sprite_2d_editor_plugin.cpp +++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "sprite_2d_editor_plugin.h" #include "core/math/geometry_2d.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" diff --git a/editor/scene/2d/tiles/atlas_merging_dialog.cpp b/editor/scene/2d/tiles/atlas_merging_dialog.cpp index e27e687f06..0e10b58433 100644 --- a/editor/scene/2d/tiles/atlas_merging_dialog.cpp +++ b/editor/scene/2d/tiles/atlas_merging_dialog.cpp @@ -30,6 +30,7 @@ #include "atlas_merging_dialog.h" +#include "core/object/callable_mp.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/2d/tiles/tile_atlas_view.cpp b/editor/scene/2d/tiles/tile_atlas_view.cpp index 9fdac2ec3f..0a653795a0 100644 --- a/editor/scene/2d/tiles/tile_atlas_view.cpp +++ b/editor/scene/2d/tiles/tile_atlas_view.cpp @@ -30,6 +30,7 @@ #include "tile_atlas_view.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/2d/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp index 50a55c71d6..7db36289da 100644 --- a/editor/scene/2d/tiles/tile_data_editors.cpp +++ b/editor/scene/2d/tiles/tile_data_editors.cpp @@ -34,6 +34,7 @@ #include "core/math/geometry_2d.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" diff --git a/editor/scene/2d/tiles/tile_map_layer_editor.cpp b/editor/scene/2d/tiles/tile_map_layer_editor.cpp index 9fb6367a46..08d23e4e7f 100644 --- a/editor/scene/2d/tiles/tile_map_layer_editor.cpp +++ b/editor/scene/2d/tiles/tile_map_layer_editor.cpp @@ -35,6 +35,7 @@ #include "core/input/input.h" #include "core/math/geometry_2d.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp index 68679ee556..5d51dfc962 100644 --- a/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp +++ b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp @@ -30,6 +30,7 @@ #include "tile_proxies_manager_dialog.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_undo_redo_manager.h" #include "editor/inspector/editor_properties_vector.h" diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp index 3ddf833596..2684b1d5e8 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp @@ -32,6 +32,7 @@ #include "tiles_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/2d/tiles/tile_set_editor.cpp b/editor/scene/2d/tiles/tile_set_editor.cpp index 9dd71bab14..101891326d 100644 --- a/editor/scene/2d/tiles/tile_set_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_editor.cpp @@ -33,6 +33,7 @@ #include "tile_data_editors.h" #include "tiles_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/file_system/editor_file_system.h" diff --git a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp index cc7f1bb224..f3862a1387 100644 --- a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp @@ -30,6 +30,7 @@ #include "tile_set_scenes_collection_source_editor.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" diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.cpp b/editor/scene/2d/tiles/tiles_editor_plugin.cpp index 83aec5f8d3..9e57009197 100644 --- a/editor/scene/2d/tiles/tiles_editor_plugin.cpp +++ b/editor/scene/2d/tiles/tiles_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "tile_set_editor.h" +#include "core/object/callable_mp.h" #include "core/os/mutex.h" #include "core/os/os.h" #include "editor/docks/editor_dock_manager.h" diff --git a/editor/scene/3d/bone_map_editor_plugin.cpp b/editor/scene/3d/bone_map_editor_plugin.cpp index 5d4ab4d99d..7779098c87 100644 --- a/editor/scene/3d/bone_map_editor_plugin.cpp +++ b/editor/scene/3d/bone_map_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "bone_map_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/import/3d/post_import_plugin_skeleton_renamer.h" #include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h" diff --git a/editor/scene/3d/camera_3d_editor_plugin.cpp b/editor/scene/3d/camera_3d_editor_plugin.cpp index 5f61200916..d5b10fdb27 100644 --- a/editor/scene/3d/camera_3d_editor_plugin.cpp +++ b/editor/scene/3d/camera_3d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "camera_3d_editor_plugin.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "node_3d_editor_plugin.h" #include "scene/gui/aspect_ratio_container.h" diff --git a/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp index c9906b73d8..e186ffa99f 100644 --- a/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp @@ -30,7 +30,7 @@ #include "joint_3d_gizmo_plugin.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/settings/editor_settings.h" #include "scene/3d/physics/joints/cone_twist_joint_3d.h" diff --git a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp index f32e31b108..48903e6540 100644 --- a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp +++ b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "gpu_particles_collision_sdf_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/3d/lightmap_gi_editor_plugin.cpp b/editor/scene/3d/lightmap_gi_editor_plugin.cpp index 79cec706ca..27547779f7 100644 --- a/editor/scene/3d/lightmap_gi_editor_plugin.cpp +++ b/editor/scene/3d/lightmap_gi_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "lightmap_gi_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "editor/editor_node.h" diff --git a/editor/scene/3d/mesh_editor_plugin.cpp b/editor/scene/3d/mesh_editor_plugin.cpp index 53f2686667..8bac7ea3b4 100644 --- a/editor/scene/3d/mesh_editor_plugin.cpp +++ b/editor/scene/3d/mesh_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "mesh_editor_plugin.h" #include "core/config/project_settings.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" diff --git a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp index a1efa2a20a..18a53829c8 100644 --- a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "mesh_instance_3d_editor_plugin.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" diff --git a/editor/scene/3d/mesh_library_editor_plugin.cpp b/editor/scene/3d/mesh_library_editor_plugin.cpp index a4f92aed1e..3c65a0e608 100644 --- a/editor/scene/3d/mesh_library_editor_plugin.cpp +++ b/editor/scene/3d/mesh_library_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "mesh_library_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/docks/inspector_dock.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" diff --git a/editor/scene/3d/multimesh_editor_plugin.cpp b/editor/scene/3d/multimesh_editor_plugin.cpp index c5c57d22be..f6b832cfdd 100644 --- a/editor/scene/3d/multimesh_editor_plugin.cpp +++ b/editor/scene/3d/multimesh_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "multimesh_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/templates/rb_map.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp index dc43dae6d5..f6e01f6920 100644 --- a/editor/scene/3d/node_3d_editor_plugin.cpp +++ b/editor/scene/3d/node_3d_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "core/math/geometry_3d.h" #include "core/math/math_funcs.h" #include "core/math/projection.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp index c444d62c17..b8cb563fad 100644 --- a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "occluder_instance_3d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/3d/particles_3d_editor_plugin.cpp b/editor/scene/3d/particles_3d_editor_plugin.cpp index c3d76523d0..32f6288576 100644 --- a/editor/scene/3d/particles_3d_editor_plugin.cpp +++ b/editor/scene/3d/particles_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "particles_3d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" diff --git a/editor/scene/3d/path_3d_editor_plugin.cpp b/editor/scene/3d/path_3d_editor_plugin.cpp index 7d437c08fa..1b2b240543 100644 --- a/editor/scene/3d/path_3d_editor_plugin.cpp +++ b/editor/scene/3d/path_3d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/math/geometry_2d.h" #include "core/math/geometry_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" diff --git a/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp b/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp index 84348f724d..89a890aaac 100644 --- a/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp +++ b/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "physical_bone_3d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/scene/3d/node_3d_editor_plugin.h" diff --git a/editor/scene/3d/polygon_3d_editor_plugin.cpp b/editor/scene/3d/polygon_3d_editor_plugin.cpp index 4a5d357b1a..af11024f6c 100644 --- a/editor/scene/3d/polygon_3d_editor_plugin.cpp +++ b/editor/scene/3d/polygon_3d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/input/input.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" diff --git a/editor/scene/3d/root_motion_editor_plugin.cpp b/editor/scene/3d/root_motion_editor_plugin.cpp index c6f1f45ac3..8cf69cb5cf 100644 --- a/editor/scene/3d/root_motion_editor_plugin.cpp +++ b/editor/scene/3d/root_motion_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "root_motion_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/3d/skeleton_3d.h" diff --git a/editor/scene/3d/skeleton_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_3d_editor_plugin.cpp index 6c9635bccd..3f65eb86a7 100644 --- a/editor/scene/3d/skeleton_3d_editor_plugin.cpp +++ b/editor/scene/3d/skeleton_3d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "skeleton_3d_editor_plugin.h" #include "core/io/resource_saver.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/animation/animation_player_editor_plugin.h" #include "editor/editor_node.h" diff --git a/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp index fca19af074..8811b5ca5f 100644 --- a/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp +++ b/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "skeleton_ik_3d_editor_plugin.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 "scene/3d/skeleton_ik_3d.h" diff --git a/editor/scene/3d/voxel_gi_editor_plugin.cpp b/editor/scene/3d/voxel_gi_editor_plugin.cpp index 72e9e54f3e..e3eeda9bcf 100644 --- a/editor/scene/3d/voxel_gi_editor_plugin.cpp +++ b/editor/scene/3d/voxel_gi_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index ac20cba4da..ab1b925295 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #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/string/translation_server.h" diff --git a/editor/scene/connections_dialog.cpp b/editor/scene/connections_dialog.cpp index 476a5d1dd1..137aaf362b 100644 --- a/editor/scene/connections_dialog.cpp +++ b/editor/scene/connections_dialog.cpp @@ -31,6 +31,7 @@ #include "connections_dialog.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/hash_set.h" #include "editor/doc/editor_help.h" diff --git a/editor/scene/curve_editor_plugin.cpp b/editor/scene/curve_editor_plugin.cpp index 4ab84b87e2..7d689e6e8a 100644 --- a/editor/scene/curve_editor_plugin.cpp +++ b/editor/scene/curve_editor_plugin.cpp @@ -33,6 +33,7 @@ #include "canvas_item_editor_plugin.h" #include "core/input/input.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_interface.h" diff --git a/editor/scene/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp index 991895d21a..cc712258a6 100644 --- a/editor/scene/editor_scene_tabs.cpp +++ b/editor/scene/editor_scene_tabs.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/os/os.h" #include "editor/docks/inspector_dock.h" diff --git a/editor/scene/gradient_editor_plugin.cpp b/editor/scene/gradient_editor_plugin.cpp index 23ffb621c1..66dc7276c8 100644 --- a/editor/scene/gradient_editor_plugin.cpp +++ b/editor/scene/gradient_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "gradient_editor_plugin.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" diff --git a/editor/scene/group_settings_editor.cpp b/editor/scene/group_settings_editor.cpp index 845977636e..ff2b981abe 100644 --- a/editor/scene/group_settings_editor.cpp +++ b/editor/scene/group_settings_editor.cpp @@ -31,6 +31,7 @@ #include "group_settings_editor.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/filesystem_dock.h" #include "editor/docks/scene_tree_dock.h" diff --git a/editor/scene/gui/control_editor_plugin.cpp b/editor/scene/gui/control_editor_plugin.cpp index 6c871418a7..223c6ce1f0 100644 --- a/editor/scene/gui/control_editor_plugin.cpp +++ b/editor/scene/gui/control_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "control_editor_plugin.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" diff --git a/editor/scene/gui/font_config_plugin.cpp b/editor/scene/gui/font_config_plugin.cpp index f19cba091e..ccb02f474d 100644 --- a/editor/scene/gui/font_config_plugin.cpp +++ b/editor/scene/gui/font_config_plugin.cpp @@ -30,6 +30,7 @@ #include "font_config_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/string/translation_server.h" diff --git a/editor/scene/gui/margin_container_editor_plugin.cpp b/editor/scene/gui/margin_container_editor_plugin.cpp index bc86b026c1..c25d04b6af 100644 --- a/editor/scene/gui/margin_container_editor_plugin.cpp +++ b/editor/scene/gui/margin_container_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "margin_container_editor_plugin.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/scene/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/gui/style_box_editor_plugin.cpp b/editor/scene/gui/style_box_editor_plugin.cpp index 209316c9ae..72ca1af3a1 100644 --- a/editor/scene/gui/style_box_editor_plugin.cpp +++ b/editor/scene/gui/style_box_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "style_box_editor_plugin.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/resources/style_box_texture.h" diff --git a/editor/scene/gui/theme_editor_plugin.cpp b/editor/scene/gui/theme_editor_plugin.cpp index 10dcfc4dd3..4770d656d4 100644 --- a/editor/scene/gui/theme_editor_plugin.cpp +++ b/editor/scene/gui/theme_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "theme_editor_plugin.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/doc/editor_help.h" #include "editor/docks/editor_dock_manager.h" diff --git a/editor/scene/gui/theme_editor_preview.cpp b/editor/scene/gui/theme_editor_preview.cpp index 152eda8b25..d4392f124a 100644 --- a/editor/scene/gui/theme_editor_preview.cpp +++ b/editor/scene/gui/theme_editor_preview.cpp @@ -31,6 +31,7 @@ #include "theme_editor_preview.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" diff --git a/editor/scene/gui/virtual_joystick_editor_plugin.cpp b/editor/scene/gui/virtual_joystick_editor_plugin.cpp index 1f1f21bc62..3c3f7a5a3d 100644 --- a/editor/scene/gui/virtual_joystick_editor_plugin.cpp +++ b/editor/scene/gui/virtual_joystick_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "virtual_joystick_editor_plugin.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/scene/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/gui/virtual_joystick.h" diff --git a/editor/scene/material_editor_plugin.cpp b/editor/scene/material_editor_plugin.cpp index 9f4559f443..1d6e593e2f 100644 --- a/editor/scene/material_editor_plugin.cpp +++ b/editor/scene/material_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "material_editor_plugin.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/editor_undo_redo_manager.h" diff --git a/editor/scene/packed_scene_editor_plugin.cpp b/editor/scene/packed_scene_editor_plugin.cpp index 497a168588..e96ee2ffb5 100644 --- a/editor/scene/packed_scene_editor_plugin.cpp +++ b/editor/scene/packed_scene_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "packed_scene_editor_plugin.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "scene/resources/packed_scene.h" diff --git a/editor/scene/particle_process_material_editor_plugin.cpp b/editor/scene/particle_process_material_editor_plugin.cpp index cd06fbb487..b5dc75870e 100644 --- a/editor/scene/particle_process_material_editor_plugin.cpp +++ b/editor/scene/particle_process_material_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "particle_process_material_editor_plugin.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" diff --git a/editor/scene/particles_editor_plugin.cpp b/editor/scene/particles_editor_plugin.cpp index b2815b0072..5f17b5c0cf 100644 --- a/editor/scene/particles_editor_plugin.cpp +++ b/editor/scene/particles_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "particles_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/docks/scene_tree_dock.h" #include "editor/editor_undo_redo_manager.h" #include "editor/settings/editor_settings.h" diff --git a/editor/scene/rename_dialog.cpp b/editor/scene/rename_dialog.cpp index e90d98e08e..b45fe85659 100644 --- a/editor/scene/rename_dialog.cpp +++ b/editor/scene/rename_dialog.cpp @@ -30,6 +30,7 @@ #include "rename_dialog.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/scene/reparent_dialog.cpp b/editor/scene/reparent_dialog.cpp index 06ddd15038..07475df542 100644 --- a/editor/scene/reparent_dialog.cpp +++ b/editor/scene/reparent_dialog.cpp @@ -30,6 +30,7 @@ #include "reparent_dialog.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/scene/scene_tree_editor.h" #include "scene/gui/box_container.h" diff --git a/editor/scene/resource_preloader_editor_plugin.cpp b/editor/scene/resource_preloader_editor_plugin.cpp index 5f5b71849a..dda2c1d944 100644 --- a/editor/scene/resource_preloader_editor_plugin.cpp +++ b/editor/scene/resource_preloader_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "resource_preloader_editor_plugin.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/editor_dock_manager.h" #include "editor/editor_interface.h" diff --git a/editor/scene/scene_create_dialog.cpp b/editor/scene/scene_create_dialog.cpp index 9d1289f66f..4ab9ab2ed7 100644 --- a/editor/scene/scene_create_dialog.cpp +++ b/editor/scene/scene_create_dialog.cpp @@ -32,6 +32,7 @@ #include "core/io/dir_access.h" #include "core/io/resource_saver.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/create_dialog.h" diff --git a/editor/scene/scene_tree_editor.cpp b/editor/scene/scene_tree_editor.cpp index 1cb1a07051..3ff213a42e 100644 --- a/editor/scene/scene_tree_editor.cpp +++ b/editor/scene/scene_tree_editor.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/script_language.h" #include "editor/animation/animation_player_editor_plugin.h" diff --git a/editor/scene/scene_tree_editor.h b/editor/scene/scene_tree_editor.h index 1cf5dc0c37..cc8ea568b2 100644 --- a/editor/scene/scene_tree_editor.h +++ b/editor/scene/scene_tree_editor.h @@ -228,7 +228,7 @@ class SceneTreeEditor : public Control { void _revoke_unique_name(); public: - // Public for use with callable_mp. + // Public for use as signal callback. void _update_tree(bool p_scroll_to_selected = false); void rename_node(Node *p_node, const String &p_name, TreeItem *p_item = nullptr); diff --git a/editor/scene/sprite_frames_editor_plugin.cpp b/editor/scene/sprite_frames_editor_plugin.cpp index 7e3409d9f6..051165b90a 100644 --- a/editor/scene/sprite_frames_editor_plugin.cpp +++ b/editor/scene/sprite_frames_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/input/input.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/string/translation_server.h" diff --git a/editor/scene/texture/bit_map_editor_plugin.cpp b/editor/scene/texture/bit_map_editor_plugin.cpp index 19fa26b024..ae2e545130 100644 --- a/editor/scene/texture/bit_map_editor_plugin.cpp +++ b/editor/scene/texture/bit_map_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "bit_map_editor_plugin.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/aspect_ratio_container.h" diff --git a/editor/scene/texture/color_channel_selector.cpp b/editor/scene/texture/color_channel_selector.cpp index c9b2175a8e..82ac2ee38a 100644 --- a/editor/scene/texture/color_channel_selector.cpp +++ b/editor/scene/texture/color_channel_selector.cpp @@ -30,6 +30,7 @@ #include "color_channel_selector.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" diff --git a/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp b/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp index 2ef1cd42c5..995a759e76 100644 --- a/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp +++ b/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "gradient_texture_2d_editor_plugin.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/texture/texture_3d_editor_plugin.cpp b/editor/scene/texture/texture_3d_editor_plugin.cpp index da34d90db2..b2ab6c78e0 100644 --- a/editor/scene/texture/texture_3d_editor_plugin.cpp +++ b/editor/scene/texture/texture_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "texture_3d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_string_names.h" #include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/texture/texture_editor_plugin.cpp b/editor/scene/texture/texture_editor_plugin.cpp index c64a4d3b84..701ba37812 100644 --- a/editor/scene/texture/texture_editor_plugin.cpp +++ b/editor/scene/texture/texture_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "texture_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_string_names.h" #include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/texture/texture_layered_editor_plugin.cpp b/editor/scene/texture/texture_layered_editor_plugin.cpp index cd6ea2a079..3c2d6fbb31 100644 --- a/editor/scene/texture/texture_layered_editor_plugin.cpp +++ b/editor/scene/texture/texture_layered_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "texture_layered_editor_plugin.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "editor/editor_string_names.h" #include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/texture/texture_region_editor_plugin.cpp b/editor/scene/texture/texture_region_editor_plugin.cpp index 265d0b5de5..3ec4e2fab1 100644 --- a/editor/scene/texture/texture_region_editor_plugin.cpp +++ b/editor/scene/texture/texture_region_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "texture_region_editor_plugin.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" diff --git a/editor/script/editor_script_plugin.cpp b/editor/script/editor_script_plugin.cpp index e50fe6db10..11ffda49b4 100644 --- a/editor/script/editor_script_plugin.cpp +++ b/editor/script/editor_script_plugin.cpp @@ -31,6 +31,7 @@ #include "editor_script_plugin.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/script/editor_script.h" #include "editor/settings/editor_command_palette.h" diff --git a/editor/script/find_in_files.cpp b/editor/script/find_in_files.cpp index 6b9af88bc0..afe0f05039 100644 --- a/editor/script/find_in_files.cpp +++ b/editor/script/find_in_files.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "editor/editor_node.h" diff --git a/editor/script/script_create_dialog.cpp b/editor/script/script_create_dialog.cpp index e69fd72896..85c83ee523 100644 --- a/editor/script/script_create_dialog.cpp +++ b/editor/script/script_create_dialog.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.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 "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/script/script_editor_base.cpp b/editor/script/script_editor_base.cpp index 7eeb842a10..bf2a41aa75 100644 --- a/editor/script/script_editor_base.cpp +++ b/editor/script/script_editor_base.cpp @@ -31,6 +31,7 @@ #include "script_editor_base.h" #include "core/io/json.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/script/script_editor_plugin.h" diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp index 5838169c46..d51b077681 100644 --- a/editor/script/script_editor_plugin.cpp +++ b/editor/script/script_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "core/io/file_access.h" #include "core/io/json.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" diff --git a/editor/script/script_text_editor.cpp b/editor/script/script_text_editor.cpp index 27aa476019..fac2a90e07 100644 --- a/editor/script/script_text_editor.cpp +++ b/editor/script/script_text_editor.cpp @@ -35,6 +35,7 @@ #include "core/io/dir_access.h" #include "core/io/json.h" #include "core/math/expression.h" +#include "core/object/callable_mp.h" #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/doc/editor_help.h" diff --git a/editor/settings/action_map_editor.cpp b/editor/settings/action_map_editor.cpp index 97312ef12b..205ec43766 100644 --- a/editor/settings/action_map_editor.cpp +++ b/editor/settings/action_map_editor.cpp @@ -30,6 +30,7 @@ #include "action_map_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "editor/settings/editor_event_search_bar.h" diff --git a/editor/settings/editor_autoload_settings.cpp b/editor/settings/editor_autoload_settings.cpp index 72e1952cee..3174ba4975 100644 --- a/editor/settings/editor_autoload_settings.cpp +++ b/editor/settings/editor_autoload_settings.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/core_constants.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/filesystem_dock.h" #include "editor/editor_node.h" diff --git a/editor/settings/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp index 9e411bf48e..07b48c450d 100644 --- a/editor/settings/editor_build_profile.cpp +++ b/editor/settings/editor_build_profile.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/json.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/settings/editor_command_palette.cpp b/editor/settings/editor_command_palette.cpp index cd7274ef53..16339563b7 100644 --- a/editor/settings/editor_command_palette.cpp +++ b/editor/settings/editor_command_palette.cpp @@ -30,6 +30,7 @@ #include "editor_command_palette.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/editor/settings/editor_event_search_bar.cpp b/editor/settings/editor_event_search_bar.cpp index 4cc11bf66c..8c3faba6cc 100644 --- a/editor/settings/editor_event_search_bar.cpp +++ b/editor/settings/editor_event_search_bar.cpp @@ -30,6 +30,7 @@ #include "editor_event_search_bar.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/settings/event_listener_line_edit.h" #include "scene/gui/button.h" diff --git a/editor/settings/editor_feature_profile.cpp b/editor/settings/editor_feature_profile.cpp index 2476eef46d..29eddfba8c 100644 --- a/editor/settings/editor_feature_profile.cpp +++ b/editor/settings/editor_feature_profile.cpp @@ -32,6 +32,7 @@ #include "core/io/dir_access.h" #include "core/io/json.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/settings/editor_layouts_dialog.cpp b/editor/settings/editor_layouts_dialog.cpp index 018ec4236f..2eedeef59d 100644 --- a/editor/settings/editor_layouts_dialog.cpp +++ b/editor/settings/editor_layouts_dialog.cpp @@ -31,6 +31,7 @@ #include "editor_layouts_dialog.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 "editor/themes/editor_scale.h" diff --git a/editor/settings/editor_settings.cpp b/editor/settings/editor_settings.cpp index eb03b34e04..c699aa0eb6 100644 --- a/editor/settings/editor_settings.cpp +++ b/editor/settings/editor_settings.cpp @@ -41,6 +41,7 @@ #include "core/io/ip.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" diff --git a/editor/settings/editor_settings_dialog.cpp b/editor/settings/editor_settings_dialog.cpp index 2cdec3e0b5..9048d19a17 100644 --- a/editor/settings/editor_settings_dialog.cpp +++ b/editor/settings/editor_settings_dialog.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" diff --git a/editor/settings/event_listener_line_edit.cpp b/editor/settings/event_listener_line_edit.cpp index 923d3b1caf..f5032877ad 100644 --- a/editor/settings/event_listener_line_edit.cpp +++ b/editor/settings/event_listener_line_edit.cpp @@ -31,6 +31,7 @@ #include "event_listener_line_edit.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/gui/dialogs.h" diff --git a/editor/settings/input_event_configuration_dialog.cpp b/editor/settings/input_event_configuration_dialog.cpp index 259c60264b..5c79248383 100644 --- a/editor/settings/input_event_configuration_dialog.cpp +++ b/editor/settings/input_event_configuration_dialog.cpp @@ -31,6 +31,7 @@ #include "input_event_configuration_dialog.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "editor/editor_string_names.h" #include "editor/settings/event_listener_line_edit.h" #include "editor/themes/editor_scale.h" diff --git a/editor/settings/project_settings_editor.cpp b/editor/settings/project_settings_editor.cpp index b480b71a76..f6fdf333a4 100644 --- a/editor/settings/project_settings_editor.cpp +++ b/editor/settings/project_settings_editor.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/shader/shader_create_dialog.cpp b/editor/shader/shader_create_dialog.cpp index 54e6a3bfdc..6378b0b7b7 100644 --- a/editor/shader/shader_create_dialog.cpp +++ b/editor/shader/shader_create_dialog.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/gui/editor_file_dialog.h" diff --git a/editor/shader/shader_editor_plugin.cpp b/editor/shader/shader_editor_plugin.cpp index e43eb8607e..2654434cf7 100644 --- a/editor/shader/shader_editor_plugin.cpp +++ b/editor/shader/shader_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "shader_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/docks/editor_dock_manager.h" #include "editor/docks/filesystem_dock.h" #include "editor/docks/inspector_dock.h" diff --git a/editor/shader/shader_file_editor_plugin.cpp b/editor/shader/shader_file_editor_plugin.cpp index e6d5560334..c73a5e4e49 100644 --- a/editor/shader/shader_file_editor_plugin.cpp +++ b/editor/shader/shader_file_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "shader_file_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/docks/editor_dock_manager.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/shader/shader_globals_editor.cpp b/editor/shader/shader_globals_editor.cpp index 5f4e669cf1..a6b4eae766 100644 --- a/editor/shader/shader_globals_editor.cpp +++ b/editor/shader/shader_globals_editor.cpp @@ -31,6 +31,7 @@ #include "shader_globals_editor.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_undo_redo_manager.h" diff --git a/editor/shader/text_shader_editor.cpp b/editor/shader/text_shader_editor.cpp index bb15eeb0a7..7f621dc0d6 100644 --- a/editor/shader/text_shader_editor.cpp +++ b/editor/shader/text_shader_editor.cpp @@ -31,6 +31,7 @@ #include "text_shader_editor.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_generated.gen.h" diff --git a/editor/shader/visual_shader_editor_plugin.cpp b/editor/shader/visual_shader_editor_plugin.cpp index 4fd839b458..7336472ef2 100644 --- a/editor/shader/visual_shader_editor_plugin.cpp +++ b/editor/shader/visual_shader_editor_plugin.cpp @@ -34,6 +34,7 @@ #include "core/input/input.h" #include "core/io/resource_loader.h" #include "core/math/math_defs.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/editor/themes/editor_theme_manager.cpp b/editor/themes/editor_theme_manager.cpp index 0b5ce33b93..8d13c11ba9 100644 --- a/editor/themes/editor_theme_manager.cpp +++ b/editor/themes/editor_theme_manager.cpp @@ -32,6 +32,7 @@ #include "core/error/error_macros.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "editor/editor_string_names.h" #include "editor/file_system/editor_paths.h" diff --git a/editor/translations/editor_locale_dialog.cpp b/editor/translations/editor_locale_dialog.cpp index 16e59c6bc6..464b23494c 100644 --- a/editor/translations/editor_locale_dialog.cpp +++ b/editor/translations/editor_locale_dialog.cpp @@ -31,6 +31,7 @@ #include "editor_locale_dialog.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/translation_server.h" #include "editor/editor_undo_redo_manager.h" diff --git a/editor/translations/editor_translation_preview_button.cpp b/editor/translations/editor_translation_preview_button.cpp index 6a385a6701..655bb1c1e5 100644 --- a/editor/translations/editor_translation_preview_button.cpp +++ b/editor/translations/editor_translation_preview_button.cpp @@ -30,7 +30,7 @@ #include "editor_translation_preview_button.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/string/translation_server.h" #include "editor/editor_node.h" diff --git a/editor/translations/editor_translation_preview_menu.cpp b/editor/translations/editor_translation_preview_menu.cpp index 17268bd478..6a33d00944 100644 --- a/editor/translations/editor_translation_preview_menu.cpp +++ b/editor/translations/editor_translation_preview_menu.cpp @@ -30,6 +30,7 @@ #include "editor_translation_preview_menu.h" +#include "core/object/callable_mp.h" #include "core/string/translation_server.h" #include "editor/editor_node.h" diff --git a/editor/translations/localization_editor.cpp b/editor/translations/localization_editor.cpp index 4e6ccf335a..c387074545 100644 --- a/editor/translations/localization_editor.cpp +++ b/editor/translations/localization_editor.cpp @@ -31,6 +31,7 @@ #include "localization_editor.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/translation_server.h" #include "editor/docks/filesystem_dock.h" diff --git a/editor/version_control/version_control_editor_plugin.cpp b/editor/version_control/version_control_editor_plugin.cpp index 1a61c6e110..b1921751e8 100644 --- a/editor/version_control/version_control_editor_plugin.cpp +++ b/editor/version_control/version_control_editor_plugin.cpp @@ -31,6 +31,7 @@ #include "version_control_editor_plugin.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/modules/betsy/image_compress_betsy.cpp b/modules/betsy/image_compress_betsy.cpp index ae97c1f8ed..63d6c59b03 100644 --- a/modules/betsy/image_compress_betsy.cpp +++ b/modules/betsy/image_compress_betsy.cpp @@ -39,6 +39,7 @@ #include "rgb_to_rgba.glsl.gen.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "servers/display/display_server.h" #include "servers/rendering/rendering_context_driver.h" diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 4a59988d16..51a6faa72e 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation_mesh.h" diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp index 9f8064d755..1cc5707859 100644 --- a/modules/csg/editor/csg_gizmos.cpp +++ b/modules/csg/editor/csg_gizmos.cpp @@ -31,6 +31,7 @@ #include "csg_gizmos.h" #include "core/math/geometry_3d.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/scene/3d/gizmos/gizmo_3d_helper.h" diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 4ea1ea207e..ab4d08f9e4 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -30,6 +30,7 @@ #include "gdscript.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "gdscript_analyzer.h" #include "gdscript_cache.h" diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index 1e21fa5e71..dfbdb3cd4a 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -31,6 +31,7 @@ #include "gdscript_language_protocol.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 "editor/doc/doc_tools.h" diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp index 14e40c21ea..94822e0b26 100644 --- a/modules/gdscript/language_server/gdscript_text_document.cpp +++ b/modules/gdscript/language_server/gdscript_text_document.cpp @@ -34,6 +34,7 @@ #include "gdscript_extend_parser.h" #include "gdscript_language_protocol.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/script/script_text_editor.h" #include "editor/settings/editor_settings.h" diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index 236f3295a6..b757cc97c9 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -35,6 +35,7 @@ #include "gdscript_language_protocol.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/script_language.h" #include "editor/doc/doc_tools.h" diff --git a/modules/gltf/editor/editor_import_blend_runner.cpp b/modules/gltf/editor/editor_import_blend_runner.cpp index 8dd20ed088..b11800c4eb 100644 --- a/modules/gltf/editor/editor_import_blend_runner.cpp +++ b/modules/gltf/editor/editor_import_blend_runner.cpp @@ -31,7 +31,7 @@ #include "editor_import_blend_runner.h" #include "core/io/http_client.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/file_system/editor_file_system.h" diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp index 579c8a03a8..904613ff1f 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp @@ -32,6 +32,7 @@ #include "editor_scene_exporter_gltf_settings.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp index bd8abedadf..dc4e90ecd0 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp @@ -30,6 +30,7 @@ #include "editor_scene_exporter_gltf_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" const uint32_t PROP_EDITOR_SCRIPT_VAR = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_SCRIPT_VARIABLE; diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 8f01c72661..b8b0a25904 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -35,6 +35,7 @@ #include "editor_import_blend_runner.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" diff --git a/modules/godot_physics_2d/register_types.cpp b/modules/godot_physics_2d/register_types.cpp index 9c79b8bab2..80094fdb7b 100644 --- a/modules/godot_physics_2d/register_types.cpp +++ b/modules/godot_physics_2d/register_types.cpp @@ -31,6 +31,7 @@ #include "register_types.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "godot_physics_server_2d.h" #include "servers/physics_2d/physics_server_2d.h" #include "servers/physics_2d/physics_server_2d_wrap_mt.h" diff --git a/modules/godot_physics_3d/register_types.cpp b/modules/godot_physics_3d/register_types.cpp index 6b9c210ff5..19292f9f90 100644 --- a/modules/godot_physics_3d/register_types.cpp +++ b/modules/godot_physics_3d/register_types.cpp @@ -33,7 +33,7 @@ #include "godot_physics_server_3d.h" #include "core/config/project_settings.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "servers/physics_3d/physics_server_3d.h" #include "servers/physics_3d/physics_server_3d_wrap_mt.h" diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index d439799bc3..cb8560ab9f 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/input/input.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/docks/editor_dock_manager.h" diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 0b51aad7df..9da813a03d 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/a_hash_map.h" #include "scene/resources/3d/mesh_library.h" diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp index 3a2f2e40fa..5dd0af8eff 100644 --- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp +++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "../audio_stream_interactive.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/modules/jolt_physics/jolt_project_settings.cpp b/modules/jolt_physics/jolt_project_settings.cpp index 5d58a5fd32..43d6642251 100644 --- a/modules/jolt_physics/jolt_project_settings.cpp +++ b/modules/jolt_physics/jolt_project_settings.cpp @@ -31,7 +31,7 @@ #include "jolt_project_settings.h" #include "core/config/project_settings.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" void JoltProjectSettings::register_settings() { GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/simulation/velocity_steps", PROPERTY_HINT_RANGE, U"2,16,or_greater"), 10); diff --git a/modules/jolt_physics/register_types.cpp b/modules/jolt_physics/register_types.cpp index 408addff7c..51aadf0607 100644 --- a/modules/jolt_physics/register_types.cpp +++ b/modules/jolt_physics/register_types.cpp @@ -35,7 +35,7 @@ #include "jolt_project_settings.h" #include "core/config/project_settings.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "servers/physics_3d/physics_server_3d_wrap_mt.h" PhysicsServer3D *create_jolt_physics_server() { diff --git a/modules/jsonrpc/tests/test_jsonrpc.h b/modules/jsonrpc/tests/test_jsonrpc.h index 9e855d8e97..3732596bee 100644 --- a/modules/jsonrpc/tests/test_jsonrpc.h +++ b/modules/jsonrpc/tests/test_jsonrpc.h @@ -30,6 +30,7 @@ #pragma once +#include "core/object/callable_mp.h" #include "tests/test_macros.h" #include "tests/test_utils.h" diff --git a/modules/mono/editor/editor_internal_calls.cpp b/modules/mono/editor/editor_internal_calls.cpp index 927adbe08d..097c69ad9c 100644 --- a/modules/mono/editor/editor_internal_calls.cpp +++ b/modules/mono/editor/editor_internal_calls.cpp @@ -38,6 +38,7 @@ #include "code_completion.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/version.h" #include "editor/debugger/editor_debugger_node.h" diff --git a/modules/multiplayer/editor/editor_network_profiler.cpp b/modules/multiplayer/editor/editor_network_profiler.cpp index f4eab40e58..170946263d 100644 --- a/modules/multiplayer/editor/editor_network_profiler.cpp +++ b/modules/multiplayer/editor/editor_network_profiler.cpp @@ -31,6 +31,7 @@ #include "editor_network_profiler.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "editor/run/editor_run_bar.h" diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp index e18ce3df16..58dd7e4b05 100644 --- a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp +++ b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp @@ -34,6 +34,7 @@ #include "editor_network_profiler.h" #include "replication_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/editor_dock_manager.h" #include "editor/editor_interface.h" diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index dfccbd36b1..351bbdc6c4 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -32,6 +32,7 @@ #include "../multiplayer_synchronizer.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp index c19936134f..0e8b6dfed9 100644 --- a/modules/multiplayer/multiplayer_spawner.cpp +++ b/modules/multiplayer/multiplayer_spawner.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 "scene/main/multiplayer_api.h" diff --git a/modules/multiplayer/scene_cache_interface.cpp b/modules/multiplayer/scene_cache_interface.cpp index 9764f8af84..e14b90a207 100644 --- a/modules/multiplayer/scene_cache_interface.cpp +++ b/modules/multiplayer/scene_cache_interface.cpp @@ -33,6 +33,7 @@ #include "scene_multiplayer.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "scene/main/node.h" #include "scene/main/window.h" diff --git a/modules/multiplayer/scene_multiplayer.cpp b/modules/multiplayer/scene_multiplayer.cpp index 5fca05fc80..80d188d8b4 100644 --- a/modules/multiplayer/scene_multiplayer.cpp +++ b/modules/multiplayer/scene_multiplayer.cpp @@ -32,6 +32,7 @@ #include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" diff --git a/modules/multiplayer/scene_replication_interface.cpp b/modules/multiplayer/scene_replication_interface.cpp index 0ca97ea456..6db7f1e295 100644 --- a/modules/multiplayer/scene_replication_interface.cpp +++ b/modules/multiplayer/scene_replication_interface.cpp @@ -34,6 +34,7 @@ #include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "scene/main/node.h" diff --git a/modules/multiplayer/scene_rpc_interface.cpp b/modules/multiplayer/scene_rpc_interface.cpp index a169f89731..3abbec5082 100644 --- a/modules/multiplayer/scene_rpc_interface.cpp +++ b/modules/multiplayer/scene_rpc_interface.cpp @@ -34,6 +34,7 @@ #include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "scene/main/multiplayer_api.h" #include "scene/main/node.h" #include "scene/main/window.h" diff --git a/modules/multiplayer/tests/test_scene_multiplayer.h b/modules/multiplayer/tests/test_scene_multiplayer.h index afb4dc94a7..198886d659 100644 --- a/modules/multiplayer/tests/test_scene_multiplayer.h +++ b/modules/multiplayer/tests/test_scene_multiplayer.h @@ -30,6 +30,7 @@ #pragma once +#include "core/object/callable_mp.h" #include "tests/test_macros.h" #include "tests/test_utils.h" diff --git a/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp b/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp index d3f427e510..699e4d31f1 100644 --- a/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp +++ b/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "navigation_link_2d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/scene/canvas_item_editor_plugin.h" diff --git a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp index b9ed1bd2c7..928d69980e 100644 --- a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp +++ b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "navigation_region_2d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/settings/editor_settings.h" diff --git a/modules/navigation_2d/register_types.cpp b/modules/navigation_2d/register_types.cpp index 3fa091653f..25bc3fe443 100644 --- a/modules/navigation_2d/register_types.cpp +++ b/modules/navigation_2d/register_types.cpp @@ -33,6 +33,7 @@ #include "2d/godot_navigation_server_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "servers/navigation_2d/navigation_server_2d.h" #ifdef TOOLS_ENABLED diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp index 98e76b4c74..0378b73ee7 100644 --- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "core/input/input.h" #include "core/math/geometry_2d.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" diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp index f93686adc8..8d3990ff16 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp @@ -30,6 +30,7 @@ #include "navigation_region_3d_editor_plugin.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/inspector/multi_node_edit.h" diff --git a/modules/navigation_3d/register_types.cpp b/modules/navigation_3d/register_types.cpp index e2ccd21bb9..aed4bd48fa 100644 --- a/modules/navigation_3d/register_types.cpp +++ b/modules/navigation_3d/register_types.cpp @@ -43,6 +43,7 @@ #endif #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "servers/navigation_3d/navigation_server_3d.h" #ifndef DISABLE_DEPRECATED diff --git a/modules/noise/editor/noise_editor_plugin.cpp b/modules/noise/editor/noise_editor_plugin.cpp index e260448f27..38c354ead9 100644 --- a/modules/noise/editor/noise_editor_plugin.cpp +++ b/modules/noise/editor/noise_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "../noise.h" #include "../noise_texture_2d.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/inspector/editor_inspector.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" diff --git a/modules/noise/noise_texture_2d.cpp b/modules/noise/noise_texture_2d.cpp index f84592eea5..c09d15841a 100644 --- a/modules/noise/noise_texture_2d.cpp +++ b/modules/noise/noise_texture_2d.cpp @@ -33,6 +33,7 @@ #include "noise.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/modules/noise/noise_texture_3d.cpp b/modules/noise/noise_texture_3d.cpp index d777194ef6..81283b083c 100644 --- a/modules/noise/noise_texture_3d.cpp +++ b/modules/noise/noise_texture_3d.cpp @@ -33,6 +33,7 @@ #include "noise.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/modules/noise/tests/test_noise_texture_2d.h b/modules/noise/tests/test_noise_texture_2d.h index e0908d7552..4b90917618 100644 --- a/modules/noise/tests/test_noise_texture_2d.h +++ b/modules/noise/tests/test_noise_texture_2d.h @@ -32,6 +32,7 @@ #include "../noise_texture_2d.h" +#include "core/object/callable_mp.h" #include "tests/test_macros.h" namespace TestNoiseTexture2D { diff --git a/modules/noise/tests/test_noise_texture_3d.h b/modules/noise/tests/test_noise_texture_3d.h index eb9cc544a4..a6eeb1e382 100644 --- a/modules/noise/tests/test_noise_texture_3d.h +++ b/modules/noise/tests/test_noise_texture_3d.h @@ -32,6 +32,7 @@ #include "../noise_texture_3d.h" +#include "core/object/callable_mp.h" #include "tests/test_macros.h" namespace TestNoiseTexture3D { diff --git a/modules/objectdb_profiler/editor/data_viewers/class_view.cpp b/modules/objectdb_profiler/editor/data_viewers/class_view.cpp index cba670332f..f434666986 100644 --- a/modules/objectdb_profiler/editor/data_viewers/class_view.cpp +++ b/modules/objectdb_profiler/editor/data_viewers/class_view.cpp @@ -32,6 +32,7 @@ #include "shared_controls.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" diff --git a/modules/objectdb_profiler/editor/data_viewers/node_view.cpp b/modules/objectdb_profiler/editor/data_viewers/node_view.cpp index 9bef5c31d6..119bf9a609 100644 --- a/modules/objectdb_profiler/editor/data_viewers/node_view.cpp +++ b/modules/objectdb_profiler/editor/data_viewers/node_view.cpp @@ -30,6 +30,7 @@ #include "node_view.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" diff --git a/modules/objectdb_profiler/editor/data_viewers/object_view.cpp b/modules/objectdb_profiler/editor/data_viewers/object_view.cpp index aef84232ae..5784a79a46 100644 --- a/modules/objectdb_profiler/editor/data_viewers/object_view.cpp +++ b/modules/objectdb_profiler/editor/data_viewers/object_view.cpp @@ -30,6 +30,7 @@ #include "object_view.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/gui/rich_text_label.h" diff --git a/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp b/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp index b84d663a66..9e698b3d00 100644 --- a/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp +++ b/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp @@ -30,6 +30,7 @@ #include "refcounted_view.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/gui/rich_text_label.h" diff --git a/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp b/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp index 9bf026d1f7..c1c24e29e0 100644 --- a/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp +++ b/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp @@ -30,6 +30,7 @@ #include "shared_controls.h" +#include "core/object/callable_mp.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" diff --git a/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp b/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp index 80e31515b8..16498a512a 100644 --- a/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp +++ b/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp @@ -38,6 +38,7 @@ #include "data_viewers/summary_view.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/os/time.h" #include "editor/debugger/editor_debugger_node.h" diff --git a/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp b/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp index 88b4baba05..c0500faa3b 100644 --- a/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp +++ b/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp @@ -32,7 +32,7 @@ #include "objectdb_profiler_panel.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" bool ObjectDBProfilerDebuggerPlugin::has_capture(const String &p_capture) const { return p_capture == "snapshot"; diff --git a/modules/openxr/editor/openxr_action_editor.cpp b/modules/openxr/editor/openxr_action_editor.cpp index 28143dbb97..88836121d7 100644 --- a/modules/openxr/editor/openxr_action_editor.cpp +++ b/modules/openxr/editor/openxr_action_editor.cpp @@ -30,6 +30,7 @@ #include "openxr_action_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" diff --git a/modules/openxr/editor/openxr_action_map_editor.cpp b/modules/openxr/editor/openxr_action_map_editor.cpp index bcc25eb17f..f1c81e7912 100644 --- a/modules/openxr/editor/openxr_action_map_editor.cpp +++ b/modules/openxr/editor/openxr_action_map_editor.cpp @@ -34,6 +34,7 @@ #include "core/io/dir_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 "editor/editor_node.h" #include "editor/gui/editor_file_dialog.h" diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp index b8ea7fb64e..e739e2f866 100644 --- a/modules/openxr/editor/openxr_action_set_editor.cpp +++ b/modules/openxr/editor/openxr_action_set_editor.cpp @@ -30,6 +30,7 @@ #include "openxr_action_set_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_spin_slider.h" diff --git a/modules/openxr/editor/openxr_binding_modifier_editor.cpp b/modules/openxr/editor/openxr_binding_modifier_editor.cpp index a184f0dd93..02b9901799 100644 --- a/modules/openxr/editor/openxr_binding_modifier_editor.cpp +++ b/modules/openxr/editor/openxr_binding_modifier_editor.cpp @@ -30,6 +30,7 @@ #include "openxr_binding_modifier_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "scene/gui/option_button.h" diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp index 6eecaee7c6..28615e1618 100644 --- a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp +++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp @@ -32,6 +32,7 @@ #include "../action_map/openxr_interaction_profile_metadata.h" #include "openxr_action_map_editor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/themes/editor_scale.h" diff --git a/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/modules/openxr/editor/openxr_interaction_profile_editor.cpp index 9a6af7f786..f3db8e9a1e 100644 --- a/modules/openxr/editor/openxr_interaction_profile_editor.cpp +++ b/modules/openxr/editor/openxr_interaction_profile_editor.cpp @@ -32,6 +32,7 @@ #include "../openxr_api.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" diff --git a/modules/openxr/editor/openxr_select_action_dialog.cpp b/modules/openxr/editor/openxr_select_action_dialog.cpp index 58222e6a92..abb2d037fc 100644 --- a/modules/openxr/editor/openxr_select_action_dialog.cpp +++ b/modules/openxr/editor/openxr_select_action_dialog.cpp @@ -30,6 +30,7 @@ #include "openxr_select_action_dialog.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/themes/editor_scale.h" diff --git a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp b/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp index c3513524c5..16fb95d738 100644 --- a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp +++ b/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp @@ -33,6 +33,7 @@ #include "../action_map/openxr_interaction_profile_metadata.h" #include "../openxr_api.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/themes/editor_scale.h" diff --git a/modules/openxr/editor/openxr_select_runtime.cpp b/modules/openxr/editor/openxr_select_runtime.cpp index 5e80511b75..5cd139d044 100644 --- a/modules/openxr/editor/openxr_select_runtime.cpp +++ b/modules/openxr/editor/openxr_select_runtime.cpp @@ -37,6 +37,7 @@ #include "core/io/dir_access.h" #include "core/io/json.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "editor/settings/editor_settings.h" diff --git a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp index a3702b0dcf..df53c46826 100644 --- a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp +++ b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp @@ -30,7 +30,7 @@ #include "openxr_android_thread_settings_extension.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/print_string.h" #include "servers/rendering/rendering_server.h" diff --git a/modules/openxr/extensions/openxr_composition_layer_extension.cpp b/modules/openxr/extensions/openxr_composition_layer_extension.cpp index bd6b816abd..78cab82102 100644 --- a/modules/openxr/extensions/openxr_composition_layer_extension.cpp +++ b/modules/openxr/extensions/openxr_composition_layer_extension.cpp @@ -32,6 +32,7 @@ #include "openxr_fb_update_swapchain_extension.h" +#include "core/object/callable_mp.h" #include "platform/android/api/java_class_wrapper.h" #include "servers/rendering/rendering_server.h" #include "servers/rendering/rendering_server_globals.h" diff --git a/modules/openxr/extensions/openxr_fb_foveation_extension.cpp b/modules/openxr/extensions/openxr_fb_foveation_extension.cpp index 908d08318e..14d957700f 100644 --- a/modules/openxr/extensions/openxr_fb_foveation_extension.cpp +++ b/modules/openxr/extensions/openxr_fb_foveation_extension.cpp @@ -34,6 +34,7 @@ #include "openxr_eye_gaze_interaction.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "servers/rendering/rendering_server.h" OpenXRFBFoveationExtension *OpenXRFBFoveationExtension::singleton = nullptr; diff --git a/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp b/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp index 3af1041955..86624a5835 100644 --- a/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp +++ b/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp @@ -31,6 +31,7 @@ #include "openxr_frame_synthesis_extension.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" #include "servers/xr/xr_server.h" diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp index 253b3b3c2b..a7b30841b9 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp @@ -35,6 +35,7 @@ #include "../openxr_future_extension.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/xr/xr_server.h" diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp index b9e98c409e..61d9f51307 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp @@ -33,6 +33,7 @@ #include "../../openxr_api.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/xr/xr_server.h" diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp index 1f771eeaeb..c881eadc82 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp @@ -33,6 +33,7 @@ #include "../../openxr_api.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "openxr_spatial_entity_extension.h" #include "servers/xr/xr_server.h" diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp index ad83bf1062..78f703ff43 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp @@ -33,6 +33,7 @@ #include "../../openxr_api.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/3d/box_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h" diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index 3b4dcf6160..04aa2cc49f 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -35,6 +35,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/memory.h" #include "core/os/os.h" #include "core/profiling/profiling.h" diff --git a/modules/openxr/scene/openxr_composition_layer.cpp b/modules/openxr/scene/openxr_composition_layer.cpp index 06cd8adf24..a21be98934 100644 --- a/modules/openxr/scene/openxr_composition_layer.cpp +++ b/modules/openxr/scene/openxr_composition_layer.cpp @@ -35,6 +35,7 @@ #include "../openxr_interface.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/xr/xr_nodes.h" diff --git a/modules/openxr/scene/openxr_render_model.cpp b/modules/openxr/scene/openxr_render_model.cpp index 5777fbf2e3..9c637dd32d 100644 --- a/modules/openxr/scene/openxr_render_model.cpp +++ b/modules/openxr/scene/openxr_render_model.cpp @@ -35,6 +35,7 @@ #include "../extensions/openxr_render_model_extension.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/xr/xr_nodes.h" diff --git a/modules/openxr/scene/openxr_render_model_manager.cpp b/modules/openxr/scene/openxr_render_model_manager.cpp index 85d23cf7b6..e1515c609a 100644 --- a/modules/openxr/scene/openxr_render_model_manager.cpp +++ b/modules/openxr/scene/openxr_render_model_manager.cpp @@ -36,6 +36,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/xr/xr_nodes.h" #include "servers/xr/xr_server.h" diff --git a/modules/openxr/scene/openxr_visibility_mask.cpp b/modules/openxr/scene/openxr_visibility_mask.cpp index f8daf12a54..e482b15070 100644 --- a/modules/openxr/scene/openxr_visibility_mask.cpp +++ b/modules/openxr/scene/openxr_visibility_mask.cpp @@ -33,6 +33,7 @@ #include "../extensions/openxr_visibility_mask_extension.h" #include "../openxr_interface.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/xr/xr_nodes.h" #include "servers/rendering/rendering_server.h" diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index fbcc81a7a0..9dcedadff3 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -38,7 +38,6 @@ #include #include #include -#include using namespace godot; @@ -50,7 +49,7 @@ using namespace godot; #include "core/config/project_settings.h" #include "core/error/error_macros.h" #include "core/io/file_access.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/object/worker_thread_pool.h" #include "core/os/os.h" #include "core/string/translation_server.h" diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index e4c9c819ff..968ed0a4f8 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #define OT_TAG(m_c1, m_c2, m_c3, m_c4) ((int32_t)((((uint32_t)(m_c1) & 0xff) << 24) | (((uint32_t)(m_c2) & 0xff) << 16) | (((uint32_t)(m_c3) & 0xff) << 8) | ((uint32_t)(m_c4) & 0xff))) @@ -52,7 +51,7 @@ using namespace godot; #include "core/config/project_settings.h" #include "core/error/error_macros.h" #include "core/io/file_access.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/string/print_string.h" #include "core/string/translation_server.h" diff --git a/platform/android/export/android_editor_gradle_runner.cpp b/platform/android/export/android_editor_gradle_runner.cpp index fbca188387..4f07f4c472 100644 --- a/platform/android/export/android_editor_gradle_runner.cpp +++ b/platform/android/export/android_editor_gradle_runner.cpp @@ -31,7 +31,7 @@ #ifdef ANDROID_ENABLED #include "android_editor_gradle_runner.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/settings/editor_settings.h" #include "scene/gui/dialogs.h" diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index fccf4e3007..0c1182f2cd 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -40,6 +40,7 @@ #include "core/io/json.h" #include "core/io/marshalls.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/string/translation_server.h" #include "core/version.h" @@ -68,7 +69,6 @@ #endif #ifndef ANDROID_ENABLED -#include "core/object/callable_method_pointer.h" #endif static const char *ANDROID_PERMS[] = { diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 92af046265..22286be714 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -43,13 +43,13 @@ #include "core/extension/gdextension_manager.h" #include "core/input/input.h" #include "core/io/xml_parser.h" +#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/profiling/profiling.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #ifdef TOOLS_ENABLED -#include "core/object/callable_method_pointer.h" #include "editor/editor_node.h" #include "editor/run/game_view_plugin.h" #endif diff --git a/platform/linuxbsd/freedesktop_portal_desktop.cpp b/platform/linuxbsd/freedesktop_portal_desktop.cpp index 5f43167a5a..ff248b4fda 100644 --- a/platform/linuxbsd/freedesktop_portal_desktop.cpp +++ b/platform/linuxbsd/freedesktop_portal_desktop.cpp @@ -34,7 +34,7 @@ #include "core/crypto/crypto_core.h" #include "core/error/error_macros.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/string/ustring.h" #include "core/variant/typed_array.h" diff --git a/platform/linuxbsd/tts_linux.cpp b/platform/linuxbsd/tts_linux.cpp index 11b67bfee5..974d9008b9 100644 --- a/platform/linuxbsd/tts_linux.cpp +++ b/platform/linuxbsd/tts_linux.cpp @@ -31,7 +31,7 @@ #include "tts_linux.h" #include "core/config/project_settings.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "servers/display/display_server.h" #include "servers/text/text_server.h" diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 9abd69634e..3c545397aa 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -38,7 +38,7 @@ #include "core/input/input.h" #include "core/io/file_access.h" #include "core/math/math_funcs.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/string/print_string.h" diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 7f071a3704..134e006f69 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -55,7 +55,7 @@ #include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/keyboard.h" #include "core/os/main_loop.h" #include "core/os/os.h" diff --git a/platform/macos/native_menu_macos.mm b/platform/macos/native_menu_macos.mm index d15139e3e9..74d94b9737 100644 --- a/platform/macos/native_menu_macos.mm +++ b/platform/macos/native_menu_macos.mm @@ -34,7 +34,7 @@ #import "godot_menu_item.h" #import "key_mapping_macos.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "scene/resources/image_texture.h" void NativeMenuMacOS::_register_system_menus(NSMenu *p_main_menu, NSMenu *p_application_menu, NSMenu *p_window_menu, NSMenu *p_help_menu, NSMenu *p_dock_menu) { diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp index 04a2776f0e..afbd22bc7c 100644 --- a/platform/web/display_server_web.cpp +++ b/platform/web/display_server_web.cpp @@ -37,14 +37,13 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/input/input_event.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "servers/display/native_menu.h" #include "servers/rendering/dummy/rasterizer_dummy.h" #ifdef PROXY_TO_PTHREAD_ENABLED -#include "core/object/callable_method_pointer.h" #endif #ifdef GLES3_ENABLED diff --git a/platform/web/editor/web_tools_editor_plugin.cpp b/platform/web/editor/web_tools_editor_plugin.cpp index f7eeedd864..812106c52a 100644 --- a/platform/web/editor/web_tools_editor_plugin.cpp +++ b/platform/web/editor/web_tools_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/time.h" #include "editor/editor_node.h" #include "editor/export/project_zip_packer.h" diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp index 1d59ea025c..d3a6203879 100644 --- a/platform/web/javascript_bridge_singleton.cpp +++ b/platform/web/javascript_bridge_singleton.cpp @@ -35,7 +35,7 @@ #include #ifdef PROXY_TO_PTHREAD_ENABLED -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #endif extern "C" { diff --git a/platform/web/webmidi_driver.cpp b/platform/web/webmidi_driver.cpp index 51c5834441..6925f82e95 100644 --- a/platform/web/webmidi_driver.cpp +++ b/platform/web/webmidi_driver.cpp @@ -31,7 +31,7 @@ #include "webmidi_driver.h" #ifdef PROXY_TO_PTHREAD_ENABLED -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #endif MIDIDriverWebMidi *MIDIDriverWebMidi::get_singleton() { diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 0634a2bca6..a38742bdff 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -41,7 +41,7 @@ #include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/io/xml_parser.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/version.h" diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp index 7d5521dee0..27d17fa0b6 100644 --- a/scene/2d/animated_sprite_2d.cpp +++ b/scene/2d/animated_sprite_2d.cpp @@ -31,6 +31,7 @@ #include "animated_sprite_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/display/accessibility_server.h" diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 84db948d84..429805f277 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -32,6 +32,7 @@ #include "audio_stream_player_2d.compat.inc" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/audio_listener_2d.h" #include "scene/audio/audio_stream_player_internal.h" diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index bf3fc5e427..013f2cbd23 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index ac930e91fa..f108868003 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -34,6 +34,7 @@ #include "core/config/engine.h" #include "core/math/random_number_generator.h" #include "core/math/transform_interpolator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/gpu_particles_2d.h" #include "scene/resources/atlas_texture.h" diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp index 3236abbfb3..91c0f3d076 100644 --- a/scene/2d/gpu_particles_2d.cpp +++ b/scene/2d/gpu_particles_2d.cpp @@ -32,6 +32,7 @@ #include "gpu_particles_2d.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/2d/cpu_particles_2d.h" diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 965c54d669..a629ccc688 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index 82b459a152..da6de18a8a 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -31,6 +31,7 @@ #include "line_2d.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "line_builder.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/2d/mesh_instance_2d.cpp b/scene/2d/mesh_instance_2d.cpp index bc0b096c80..b063b97cbe 100644 --- a/scene/2d/mesh_instance_2d.cpp +++ b/scene/2d/mesh_instance_2d.cpp @@ -30,6 +30,7 @@ #include "mesh_instance_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_2D_DISABLED diff --git a/scene/2d/multimesh_instance_2d.cpp b/scene/2d/multimesh_instance_2d.cpp index 1c864b5414..1526a62c1f 100644 --- a/scene/2d/multimesh_instance_2d.cpp +++ b/scene/2d/multimesh_instance_2d.cpp @@ -30,6 +30,7 @@ #include "multimesh_instance_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_2D_DISABLED diff --git a/scene/2d/navigation/navigation_agent_2d.cpp b/scene/2d/navigation/navigation_agent_2d.cpp index 56b38b50a3..21fcbeb8c9 100644 --- a/scene/2d/navigation/navigation_agent_2d.cpp +++ b/scene/2d/navigation/navigation_agent_2d.cpp @@ -31,6 +31,7 @@ #include "navigation_agent_2d.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/navigation/navigation_link_2d.h" #include "scene/resources/world_2d.h" diff --git a/scene/2d/navigation/navigation_obstacle_2d.cpp b/scene/2d/navigation/navigation_obstacle_2d.cpp index 4f3df8cf2f..7de62154ab 100644 --- a/scene/2d/navigation/navigation_obstacle_2d.cpp +++ b/scene/2d/navigation/navigation_obstacle_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/2d/navigation_polygon.h" diff --git a/scene/2d/navigation/navigation_region_2d.cpp b/scene/2d/navigation/navigation_region_2d.cpp index 5a42df679d..f05e287874 100644 --- a/scene/2d/navigation/navigation_region_2d.cpp +++ b/scene/2d/navigation/navigation_region_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/world_2d.h" #include "servers/navigation_2d/navigation_server_2d.h" diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 56c4f73fe7..6f32cb6e92 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -30,6 +30,7 @@ #include "node_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/display/accessibility_server.h" diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 61494a2da0..446f6e2e29 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/timer.h" #include "scene/resources/mesh.h" diff --git a/scene/2d/physics/animatable_body_2d.cpp b/scene/2d/physics/animatable_body_2d.cpp index 84d633e42e..ecbc5528e2 100644 --- a/scene/2d/physics/animatable_body_2d.cpp +++ b/scene/2d/physics/animatable_body_2d.cpp @@ -31,6 +31,7 @@ #include "animatable_body_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void AnimatableBody2D::set_sync_to_physics(bool p_enable) { diff --git a/scene/2d/physics/area_2d.cpp b/scene/2d/physics/area_2d.cpp index ae0fcec8a7..9b51441373 100644 --- a/scene/2d/physics/area_2d.cpp +++ b/scene/2d/physics/area_2d.cpp @@ -31,6 +31,7 @@ #include "area_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/audio/audio_server.h" diff --git a/scene/2d/physics/collision_shape_2d.cpp b/scene/2d/physics/collision_shape_2d.cpp index fb8e3fe5bc..9e095317d9 100644 --- a/scene/2d/physics/collision_shape_2d.cpp +++ b/scene/2d/physics/collision_shape_2d.cpp @@ -31,6 +31,7 @@ #include "collision_shape_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/physics/area_2d.h" #include "scene/2d/physics/collision_object_2d.h" diff --git a/scene/2d/physics/joints/joint_2d.cpp b/scene/2d/physics/joints/joint_2d.cpp index 5550111087..46eaedded1 100644 --- a/scene/2d/physics/joints/joint_2d.cpp +++ b/scene/2d/physics/joints/joint_2d.cpp @@ -31,6 +31,7 @@ #include "joint_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/physics/physics_body_2d.h" diff --git a/scene/2d/physics/rigid_body_2d.cpp b/scene/2d/physics/rigid_body_2d.cpp index 7429a6368f..90d4f165b1 100644 --- a/scene/2d/physics/rigid_body_2d.cpp +++ b/scene/2d/physics/rigid_body_2d.cpp @@ -31,6 +31,7 @@ #include "rigid_body_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void RigidBody2D::_body_enter_tree(ObjectID p_id) { diff --git a/scene/2d/physics/shape_cast_2d.cpp b/scene/2d/physics/shape_cast_2d.cpp index 72a6828c2d..b81df9c5c5 100644 --- a/scene/2d/physics/shape_cast_2d.cpp +++ b/scene/2d/physics/shape_cast_2d.cpp @@ -31,6 +31,7 @@ #include "shape_cast_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/physics/collision_object_2d.h" #include "scene/resources/world_2d.h" diff --git a/scene/2d/physics/static_body_2d.cpp b/scene/2d/physics/static_body_2d.cpp index ec3735f3c9..410e721ce3 100644 --- a/scene/2d/physics/static_body_2d.cpp +++ b/scene/2d/physics/static_body_2d.cpp @@ -30,6 +30,7 @@ #include "static_body_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_2D_DISABLED diff --git a/scene/2d/physics/touch_screen_button.cpp b/scene/2d/physics/touch_screen_button.cpp index 6aad3fc71e..3bf6b2e81f 100644 --- a/scene/2d/physics/touch_screen_button.cpp +++ b/scene/2d/physics/touch_screen_button.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/display/accessibility_server.h" diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index 00cec5d843..8cbc356ac6 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/skeleton_2d.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp index c7bb34d0cc..57bf619378 100644 --- a/scene/2d/skeleton_2d.cpp +++ b/scene/2d/skeleton_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/transform_interpolator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp index f825228ce3..9a7aca710f 100644 --- a/scene/2d/sprite_2d.cpp +++ b/scene/2d/sprite_2d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/display/accessibility_server.h" diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 34b9dc066f..4b541292a1 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/io/marshalls.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_2D_DISABLED diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp index 843eb5d691..9e28d86a26 100644 --- a/scene/2d/tile_map_layer.cpp +++ b/scene/2d/tile_map_layer.cpp @@ -34,6 +34,7 @@ #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/a_hash_map.h" #include "scene/2d/tile_map.h" diff --git a/scene/2d/visible_on_screen_notifier_2d.cpp b/scene/2d/visible_on_screen_notifier_2d.cpp index 2b95805909..685bb14da8 100644 --- a/scene/2d/visible_on_screen_notifier_2d.cpp +++ b/scene/2d/visible_on_screen_notifier_2d.cpp @@ -31,6 +31,7 @@ #include "visible_on_screen_notifier_2d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 3706ac7412..2b53885b80 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -32,6 +32,7 @@ #include "audio_stream_player_3d.compat.inc" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/audio_listener_3d.h" #include "scene/3d/camera_3d.h" diff --git a/scene/3d/bone_attachment_3d.cpp b/scene/3d/bone_attachment_3d.cpp index e40af113a7..c7b16969df 100644 --- a/scene/3d/bone_attachment_3d.cpp +++ b/scene/3d/bone_attachment_3d.cpp @@ -32,6 +32,7 @@ #include "bone_attachment_3d.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const { diff --git a/scene/3d/bone_twist_disperser_3d.cpp b/scene/3d/bone_twist_disperser_3d.cpp index e268f8ff8b..3cca144894 100644 --- a/scene/3d/bone_twist_disperser_3d.cpp +++ b/scene/3d/bone_twist_disperser_3d.cpp @@ -30,6 +30,7 @@ #include "bone_twist_disperser_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" bool BoneTwistDisperser3D::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp index 3eb24c7f3f..a42abf59fb 100644 --- a/scene/3d/camera_3d.cpp +++ b/scene/3d/camera_3d.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/math/projection.h" #include "core/math/transform_interpolator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp index 97f773f418..4f344276ce 100644 --- a/scene/3d/cpu_particles_3d.cpp +++ b/scene/3d/cpu_particles_3d.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/math/random_number_generator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/camera_3d.h" #include "scene/3d/gpu_particles_3d.h" diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp index 55d5d972c0..15564fd818 100644 --- a/scene/3d/gpu_particles_3d.cpp +++ b/scene/3d/gpu_particles_3d.cpp @@ -32,6 +32,7 @@ #include "gpu_particles_3d.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/3d/cpu_particles_3d.h" diff --git a/scene/3d/ik_modifier_3d.cpp b/scene/3d/ik_modifier_3d.cpp index 4e768ef649..17bc312637 100644 --- a/scene/3d/ik_modifier_3d.cpp +++ b/scene/3d/ik_modifier_3d.cpp @@ -31,6 +31,7 @@ #include "ik_modifier_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void IKModifier3D::_notification(int p_what) { diff --git a/scene/3d/iterate_ik_3d.cpp b/scene/3d/iterate_ik_3d.cpp index f8da9a57e6..8e57a9a224 100644 --- a/scene/3d/iterate_ik_3d.cpp +++ b/scene/3d/iterate_ik_3d.cpp @@ -30,6 +30,7 @@ #include "iterate_ik_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" bool IterateIK3D::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/3d/label_3d.cpp b/scene/3d/label_3d.cpp index b6f921b240..4d182e8e85 100644 --- a/scene/3d/label_3d.cpp +++ b/scene/3d/label_3d.cpp @@ -31,6 +31,7 @@ #include "label_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/window.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/limit_angular_velocity_modifier_3d.cpp b/scene/3d/limit_angular_velocity_modifier_3d.cpp index b4b414ea8c..3ed2aa1d75 100644 --- a/scene/3d/limit_angular_velocity_modifier_3d.cpp +++ b/scene/3d/limit_angular_velocity_modifier_3d.cpp @@ -30,6 +30,7 @@ #include "limit_angular_velocity_modifier_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" bool LimitAngularVelocityModifier3D::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp index e7df431475..36c3e1d0d3 100644 --- a/scene/3d/mesh_instance_3d.cpp +++ b/scene/3d/mesh_instance_3d.cpp @@ -30,6 +30,7 @@ #include "mesh_instance_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/skeleton_3d.h" diff --git a/scene/3d/multimesh_instance_3d.cpp b/scene/3d/multimesh_instance_3d.cpp index 52efeb1e26..e257576c8e 100644 --- a/scene/3d/multimesh_instance_3d.cpp +++ b/scene/3d/multimesh_instance_3d.cpp @@ -30,6 +30,7 @@ #include "multimesh_instance_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_3D_DISABLED diff --git a/scene/3d/navigation/navigation_agent_3d.cpp b/scene/3d/navigation/navigation_agent_3d.cpp index 172afce60c..9603a254e2 100644 --- a/scene/3d/navigation/navigation_agent_3d.cpp +++ b/scene/3d/navigation/navigation_agent_3d.cpp @@ -31,6 +31,7 @@ #include "navigation_agent_3d.h" #include "core/math/geometry_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/navigation/navigation_link_3d.h" #include "servers/navigation_3d/navigation_server_3d.h" diff --git a/scene/3d/navigation/navigation_obstacle_3d.cpp b/scene/3d/navigation/navigation_obstacle_3d.cpp index 54d4eb80f8..94bd5f7d6a 100644 --- a/scene/3d/navigation/navigation_obstacle_3d.cpp +++ b/scene/3d/navigation/navigation_obstacle_3d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation_mesh.h" diff --git a/scene/3d/navigation/navigation_region_3d.cpp b/scene/3d/navigation/navigation_region_3d.cpp index 778707b83a..50b13ffb9e 100644 --- a/scene/3d/navigation/navigation_region_3d.cpp +++ b/scene/3d/navigation/navigation_region_3d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/random_pcg.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h" #include "servers/navigation_3d/navigation_server_3d.h" diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index ca1f027afc..10596f4c89 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/math/transform_interpolator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/visual_instance_3d.h" #include "scene/main/viewport.h" diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp index 38a9ed66fe..8d1374be2f 100644 --- a/scene/3d/occluder_instance_3d.cpp +++ b/scene/3d/occluder_instance_3d.cpp @@ -35,6 +35,7 @@ #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" #include "core/math/triangulate.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h" diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp index cac320d17e..9a2ef4d117 100644 --- a/scene/3d/path_3d.cpp +++ b/scene/3d/path_3d.cpp @@ -31,6 +31,7 @@ #include "path_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/mesh.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/3d/physics/animatable_body_3d.cpp b/scene/3d/physics/animatable_body_3d.cpp index e09092470f..b8fc4e47b5 100644 --- a/scene/3d/physics/animatable_body_3d.cpp +++ b/scene/3d/physics/animatable_body_3d.cpp @@ -31,6 +31,7 @@ #include "animatable_body_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" Vector3 AnimatableBody3D::get_linear_velocity() const { diff --git a/scene/3d/physics/area_3d.cpp b/scene/3d/physics/area_3d.cpp index bba7a47f48..e904ee2663 100644 --- a/scene/3d/physics/area_3d.cpp +++ b/scene/3d/physics/area_3d.cpp @@ -31,6 +31,7 @@ #include "area_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/audio/audio_server.h" diff --git a/scene/3d/physics/collision_object_3d.cpp b/scene/3d/physics/collision_object_3d.cpp index f9ab768592..90559334ab 100644 --- a/scene/3d/physics/collision_object_3d.cpp +++ b/scene/3d/physics/collision_object_3d.cpp @@ -31,6 +31,7 @@ #include "collision_object_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/3d/shape_3d.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/physics/collision_shape_3d.cpp b/scene/3d/physics/collision_shape_3d.cpp index c0485cbe11..1744195d11 100644 --- a/scene/3d/physics/collision_shape_3d.cpp +++ b/scene/3d/physics/collision_shape_3d.cpp @@ -30,6 +30,7 @@ #include "collision_shape_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics/character_body_3d.h" diff --git a/scene/3d/physics/joints/joint_3d.cpp b/scene/3d/physics/joints/joint_3d.cpp index e5ebf5f1d1..0f09afa1ef 100644 --- a/scene/3d/physics/joints/joint_3d.cpp +++ b/scene/3d/physics/joints/joint_3d.cpp @@ -30,6 +30,7 @@ #include "joint_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void Joint3D::_disconnect_signals() { diff --git a/scene/3d/physics/physical_bone_3d.cpp b/scene/3d/physics/physical_bone_3d.cpp index cea0441094..4912cec46b 100644 --- a/scene/3d/physics/physical_bone_3d.cpp +++ b/scene/3d/physics/physical_bone_3d.cpp @@ -31,6 +31,7 @@ #include "physical_bone_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/physics/physical_bone_simulator_3d.h" diff --git a/scene/3d/physics/physical_bone_simulator_3d.cpp b/scene/3d/physics/physical_bone_simulator_3d.cpp index 97e1c6b37b..7d6ce68cad 100644 --- a/scene/3d/physics/physical_bone_simulator_3d.cpp +++ b/scene/3d/physics/physical_bone_simulator_3d.cpp @@ -31,6 +31,7 @@ #include "physical_bone_simulator_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/physics/physical_bone_3d.h" diff --git a/scene/3d/physics/rigid_body_3d.cpp b/scene/3d/physics/rigid_body_3d.cpp index 745f16bf5a..9ac2db9705 100644 --- a/scene/3d/physics/rigid_body_3d.cpp +++ b/scene/3d/physics/rigid_body_3d.cpp @@ -31,6 +31,7 @@ #include "rigid_body_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void RigidBody3D::_body_enter_tree(ObjectID p_id) { diff --git a/scene/3d/physics/shape_cast_3d.cpp b/scene/3d/physics/shape_cast_3d.cpp index e32628678e..a75c9d0cea 100644 --- a/scene/3d/physics/shape_cast_3d.cpp +++ b/scene/3d/physics/shape_cast_3d.cpp @@ -31,6 +31,7 @@ #include "shape_cast_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/physics/collision_object_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h" diff --git a/scene/3d/physics/soft_body_3d.cpp b/scene/3d/physics/soft_body_3d.cpp index dc41c863b3..2e7d2c25b3 100644 --- a/scene/3d/physics/soft_body_3d.cpp +++ b/scene/3d/physics/soft_body_3d.cpp @@ -32,6 +32,7 @@ #include "soft_body_3d.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/physics/physics_body_3d.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/3d/physics/static_body_3d.cpp b/scene/3d/physics/static_body_3d.cpp index f34235bb6c..3fc269cb7f 100644 --- a/scene/3d/physics/static_body_3d.cpp +++ b/scene/3d/physics/static_body_3d.cpp @@ -30,6 +30,7 @@ #include "static_body_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #ifndef NAVIGATION_3D_DISABLED diff --git a/scene/3d/retarget_modifier_3d.cpp b/scene/3d/retarget_modifier_3d.cpp index abafe17533..80cb8816c2 100644 --- a/scene/3d/retarget_modifier_3d.cpp +++ b/scene/3d/retarget_modifier_3d.cpp @@ -30,6 +30,7 @@ #include "retarget_modifier_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" PackedStringArray RetargetModifier3D::get_configuration_warnings() const { diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp index 668f13d849..0dcb1238d4 100644 --- a/scene/3d/skeleton_3d.cpp +++ b/scene/3d/skeleton_3d.cpp @@ -31,6 +31,7 @@ #include "skeleton_3d.h" #include "skeleton_3d.compat.inc" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/skeleton_modifier_3d.h" #if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED) diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h index 66ae8bd7c6..cbeac91ded 100644 --- a/scene/3d/skeleton_3d.h +++ b/scene/3d/skeleton_3d.h @@ -54,7 +54,7 @@ protected: static void _bind_methods(); public: - // Public for use with callable_mp. + // Public for use as signal callback. void _skin_changed(); RID get_skeleton() const; diff --git a/scene/3d/spring_bone_simulator_3d.cpp b/scene/3d/spring_bone_simulator_3d.cpp index 3c87e6e872..0c722d0b65 100644 --- a/scene/3d/spring_bone_simulator_3d.cpp +++ b/scene/3d/spring_bone_simulator_3d.cpp @@ -32,6 +32,7 @@ #include "spring_bone_simulator_3d.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/spring_bone_collision_3d.h" diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 1a74f971dc..34a79f0bf3 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -31,6 +31,7 @@ #include "sprite_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/atlas_texture.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/visible_on_screen_notifier_3d.cpp b/scene/3d/visible_on_screen_notifier_3d.cpp index efd9ead4ae..2c9259e483 100644 --- a/scene/3d/visible_on_screen_notifier_3d.cpp +++ b/scene/3d/visible_on_screen_notifier_3d.cpp @@ -31,6 +31,7 @@ #include "visible_on_screen_notifier_3d.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp index eac4fa4ec9..505d5aaffa 100644 --- a/scene/3d/visual_instance_3d.cpp +++ b/scene/3d/visual_instance_3d.cpp @@ -33,6 +33,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/resources/material.h" diff --git a/scene/3d/xr/xr_body_modifier_3d.cpp b/scene/3d/xr/xr_body_modifier_3d.cpp index fb79ceb712..0f6e294c5f 100644 --- a/scene/3d/xr/xr_body_modifier_3d.cpp +++ b/scene/3d/xr/xr_body_modifier_3d.cpp @@ -30,6 +30,7 @@ #include "xr_body_modifier_3d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/3d/skeleton_3d.h" #include "servers/xr/xr_server.h" diff --git a/scene/3d/xr/xr_hand_modifier_3d.cpp b/scene/3d/xr/xr_hand_modifier_3d.cpp index 545602b1c2..1ba3185781 100644 --- a/scene/3d/xr/xr_hand_modifier_3d.cpp +++ b/scene/3d/xr/xr_hand_modifier_3d.cpp @@ -31,6 +31,7 @@ #include "xr_hand_modifier_3d.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/xr/xr_server.h" diff --git a/scene/3d/xr/xr_nodes.cpp b/scene/3d/xr/xr_nodes.cpp index 9385aa7e2b..ee7b8578b7 100644 --- a/scene/3d/xr/xr_nodes.cpp +++ b/scene/3d/xr/xr_nodes.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/viewport.h" #include "servers/xr/xr_interface.h" diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp index 691e6a1b31..e98eeec12d 100644 --- a/scene/animation/animation_blend_space_1d.cpp +++ b/scene/animation/animation_blend_space_1d.cpp @@ -32,6 +32,7 @@ #include "animation_blend_tree.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void AnimationNodeBlendSpace1D::get_parameter_list(List *r_list) const { diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp index d3a23f8fcc..323fac5d00 100644 --- a/scene/animation/animation_blend_space_2d.cpp +++ b/scene/animation/animation_blend_space_2d.cpp @@ -33,6 +33,7 @@ #include "animation_blend_tree.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/material.h" diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 95417808d0..86fec0d878 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -31,6 +31,7 @@ #include "animation_blend_tree.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/animation.h" diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp index aad583a060..fe103534f8 100644 --- a/scene/animation/animation_mixer.cpp +++ b/scene/animation/animation_mixer.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/string_name.h" #include "scene/2d/audio_stream_player_2d.h" diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index b3fc7aa23c..6a3e2f6bba 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -31,6 +31,7 @@ #include "animation_node_state_machine.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" ///////////////////////////////////////////////// diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 9a6812ab9a..5d1400573d 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -32,6 +32,7 @@ #include "animation_player.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 48983c2485..9de9abfe0b 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -32,6 +32,7 @@ #include "animation_tree.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 33f57e820e..1eaa80718e 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -31,6 +31,7 @@ #include "audio_stream_player.h" #include "audio_stream_player.compat.inc" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/audio/audio_stream_player_internal.h" #include "servers/audio/audio_stream.h" diff --git a/scene/audio/audio_stream_player_internal.cpp b/scene/audio/audio_stream_player_internal.cpp index 72c58602b3..adac5c96a8 100644 --- a/scene/audio/audio_stream_player_internal.cpp +++ b/scene/audio/audio_stream_player_internal.cpp @@ -31,6 +31,7 @@ #include "audio_stream_player_internal.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "scene/main/node.h" #include "servers/audio/audio_stream.h" diff --git a/scene/debugger/runtime_node_select.cpp b/scene/debugger/runtime_node_select.cpp index 38293e1c0a..03d004730d 100644 --- a/scene/debugger/runtime_node_select.cpp +++ b/scene/debugger/runtime_node_select.cpp @@ -39,6 +39,7 @@ #include "core/input/input.h" #include "core/input/input_event.h" #include "core/math/geometry_3d.h" +#include "core/object/callable_mp.h" #include "scene/2d/camera_2d.h" #include "scene/debugger/scene_debugger_object.h" #include "scene/gui/popup_menu.h" diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp index 54606cc76a..32f9cbae67 100644 --- a/scene/debugger/scene_debugger.cpp +++ b/scene/debugger/scene_debugger.cpp @@ -38,6 +38,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/math/math_fieldwise.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/os/time.h" #include "core/templates/local_vector.h" diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 1887153a4a..598670b58f 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -31,6 +31,7 @@ #include "base_button.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/label.h" #include "scene/main/timer.h" diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 0caedc0552..6f805b319c 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -30,6 +30,7 @@ #include "button.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/dialogs.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp index 7955185528..a088ebf7f8 100644 --- a/scene/gui/code_edit.cpp +++ b/scene/gui/code_edit.cpp @@ -34,6 +34,7 @@ #include "core/config/engine.h" #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" diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 4b44feadde..a3329ed2ca 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -34,6 +34,7 @@ #include "core/input/input.h" #include "core/io/image.h" #include "core/math/expression.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/gui/color_mode.h" diff --git a/scene/gui/color_picker_shape.cpp b/scene/gui/color_picker_shape.cpp index 12878da058..4048d02907 100644 --- a/scene/gui/color_picker_shape.cpp +++ b/scene/gui/color_picker_shape.cpp @@ -31,7 +31,7 @@ #include "color_picker_shape.h" #include "core/input/input.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "scene/gui/margin_container.h" #include "scene/resources/material.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index f31bec5462..27ca14eb68 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -30,6 +30,7 @@ #include "container.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/display/accessibility_server.h" diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index a7bd6fc226..2c42bc3074 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -36,6 +36,8 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/input/input_map.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/string/string_builder.h" diff --git a/scene/gui/control.h b/scene/gui/control.h index 47ab39f44f..b00903f67b 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -30,17 +30,17 @@ #pragma once -#include "core/math/transform_2d.h" #include "core/object/gdvirtual.gen.h" #include "scene/main/canvas_item.h" #include "scene/resources/theme.h" #include "servers/display/accessibility_server_enums.h" -class Viewport; class Label; class Panel; -class ThemeOwner; class ThemeContext; +class ThemeOwner; +class Viewport; +struct Transform2D; class Control : public CanvasItem { GDCLASS(Control, CanvasItem); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 13c19c6e72..ce93ac3e89 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -32,6 +32,7 @@ #include "dialogs.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/line_edit.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index bce26e1718..d7326e9368 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -34,6 +34,7 @@ #include "core/config/project_settings.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/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 6fe4cb9b32..0c431c016a 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -35,6 +35,7 @@ #include "core/input/input.h" #include "core/math/geometry_2d.h" #include "core/math/math_funcs.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "scene/2d/line_2d.h" diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index f2ccaffacd..599d7ae3e8 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -30,6 +30,7 @@ #include "graph_node.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/box_container.h" #include "scene/gui/graph_edit.h" diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index 024a3b9a7a..964afb43cd 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -31,6 +31,7 @@ #include "item_list.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 "scene/theme/theme_db.h" diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 8d7cfe9c81..1f4f09af75 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -30,6 +30,7 @@ #include "label.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/container.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 1cf4cdaba2..f3db9b7691 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -35,6 +35,7 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp index 33d00df73a..f524e1a007 100644 --- a/scene/gui/menu_bar.cpp +++ b/scene/gui/menu_bar.cpp @@ -30,6 +30,7 @@ #include "menu_bar.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 11958beff3..71ef40fb89 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -30,6 +30,7 @@ #include "menu_button.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/window.h" #include "servers/display/accessibility_server.h" diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index 2c3cb64a61..26a5a11664 100644 --- a/scene/gui/nine_patch_rect.cpp +++ b/scene/gui/nine_patch_rect.cpp @@ -30,6 +30,7 @@ #include "nine_patch_rect.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 0eaad845b0..2cbc6e3666 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -30,6 +30,7 @@ #include "option_button.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/theme/theme_db.h" #include "servers/display/accessibility_server.h" diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 95a03f4ca8..becf8d1f93 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -31,6 +31,7 @@ #include "popup.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/panel.h" #include "scene/resources/style_box_flat.h" diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 215291426c..a1fde995d2 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -33,6 +33,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" diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index b43f026022..f84498a945 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -30,6 +30,7 @@ #include "range.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/display/accessibility_server.h" #include "thirdparty/misc/r128.h" diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 70b325841b..1689831770 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -34,14 +34,19 @@ #include "core/input/input_map.h" #include "core/io/resource_loader.h" #include "core/math/math_defs.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/translation_server.h" #include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/rich_text_effect.h" +#include "scene/gui/scroll_bar.h" #include "scene/main/timer.h" #include "scene/resources/atlas_texture.h" +#include "scene/resources/text_paragraph.h" +#include "scene/resources/texture.h" #include "scene/theme/theme_db.h" #include "servers/display/accessibility_server.h" #include "servers/display/display_server.h" @@ -52,6 +57,36 @@ #include "modules/regex/regex.h" #endif +RichTextLabel::ItemDropcap::~ItemDropcap() { + if (font.is_valid()) { + RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); + if (owner_rtl) { + font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts)); + } + } +} + +RichTextLabel::ItemImage::~ItemImage() { + if (image.is_valid()) { + RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); + if (owner_rtl) { + if (owner_rtl->hr_list.has(rid)) { + owner_rtl->hr_list.erase((rid)); + } + image->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_texture_changed)); + } + } +} + +RichTextLabel::ItemFont::~ItemFont() { + if (font.is_valid()) { + RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); + if (owner_rtl) { + font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts)); + } + } +} + RichTextLabel::ItemCustomFX::ItemCustomFX() { type = ITEM_CUSTOMFX; char_fx_transform.instantiate(); diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index e8bbf42b5c..3c154eb7ea 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -32,15 +32,18 @@ #include "core/object/worker_thread_pool.h" #include "core/templates/rid_owner.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/scroll_bar.h" -#include "scene/resources/image_texture.h" +#include "scene/gui/control.h" #include "scene/resources/text_paragraph.h" #ifdef TOOLS_ENABLED #include "editor/themes/editor_scale.h" #endif +class PopupMenu; +class Texture2D; +class Timer; +class VScrollBar; + class CharFXTransform; class RichTextEffect; @@ -259,14 +262,7 @@ private: Color ol_color; Rect2 dropcap_margins; ItemDropcap() { type = ITEM_DROPCAP; } - ~ItemDropcap() { - if (font.is_valid()) { - RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); - if (owner_rtl) { - font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts)); - } - } - } + ~ItemDropcap(); }; struct ItemImage : public Item { @@ -283,17 +279,7 @@ private: Variant key; String tooltip; ItemImage() { type = ITEM_IMAGE; } - ~ItemImage() { - if (image.is_valid()) { - RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); - if (owner_rtl) { - if (owner_rtl->hr_list.has(rid)) { - owner_rtl->hr_list.erase((rid)); - } - image->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_texture_changed)); - } - } - } + ~ItemImage(); }; struct ItemFont : public Item { @@ -303,14 +289,7 @@ private: bool def_size = false; int font_size = 0; ItemFont() { type = ITEM_FONT; } - ~ItemFont() { - if (font.is_valid()) { - RichTextLabel *owner_rtl = ObjectDB::get_instance(owner); - if (owner_rtl) { - font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts)); - } - } - } + ~ItemFont(); }; struct ItemFontSize : public Item { diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 90631986da..99ac1a4c9e 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -30,6 +30,7 @@ #include "scroll_bar.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 41eaf65cdd..661e2d1295 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -31,6 +31,7 @@ #include "scroll_container.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/panel_container.h" #include "scene/gui/texture_rect.h" diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 95e8defac6..56d0a95844 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -32,6 +32,7 @@ #include "core/input/input.h" #include "core/math/expression.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/string/translation_server.h" #include "scene/theme/theme_db.h" diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index 87303d567d..98da7f03fe 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -32,6 +32,7 @@ #include "split_container.compat.inc" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/texture_rect.h" #include "scene/main/viewport.h" diff --git a/scene/gui/tab_bar.cpp b/scene/gui/tab_bar.cpp index 11c516ba62..e668452151 100644 --- a/scene/gui/tab_bar.cpp +++ b/scene/gui/tab_bar.cpp @@ -31,6 +31,7 @@ #include "tab_bar.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 0e203e9834..e682166ff8 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -30,6 +30,7 @@ #include "tab_container.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 2db5356da0..046feb85a2 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -35,6 +35,7 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/input/input_map.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/script_language.h" #include "core/os/keyboard.h" diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index 14a35a8b3f..5e2ef5e21f 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -30,6 +30,7 @@ #include "texture_button.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/typedefs.h" diff --git a/scene/gui/texture_progress_bar.cpp b/scene/gui/texture_progress_bar.cpp index b345f0bab5..eac9f98a1c 100644 --- a/scene/gui/texture_progress_bar.cpp +++ b/scene/gui/texture_progress_bar.cpp @@ -31,6 +31,7 @@ #include "texture_progress_bar.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/display/accessibility_server.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index 714e5b0446..15f77ee9f7 100644 --- a/scene/gui/texture_rect.cpp +++ b/scene/gui/texture_rect.cpp @@ -30,6 +30,7 @@ #include "texture_rect.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/atlas_texture.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index cd8ca7c534..6282ecc8a7 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -34,6 +34,7 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/math/math_funcs.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp index 2833472c38..39bda2d3c5 100644 --- a/scene/gui/video_stream_player.cpp +++ b/scene/gui/video_stream_player.cpp @@ -31,6 +31,7 @@ #include "video_stream_player.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/audio/audio_server.h" #include "servers/display/accessibility_server.h" diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 3d3c76dc1a..a7008f5cf8 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -33,6 +33,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/2d/canvas_group.h" #include "scene/main/canvas_layer.h" diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index c2624bb6f1..9813220519 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -30,6 +30,7 @@ #include "canvas_layer.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/canvas_item.h" #include "scene/main/viewport.h" diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index 68b7b3b70f..e30d938570 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -32,6 +32,7 @@ #include "core/io/file_access.h" #include "core/io/stream_peer_gzip.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/os/thread.h" diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index d4ccd16085..ec25b46ad9 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -37,6 +37,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); #include "core/input/input.h" #include "core/io/image_loader.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/message_queue.h" #include "core/object/worker_thread_pool.h" diff --git a/scene/main/status_indicator.cpp b/scene/main/status_indicator.cpp index 7c13e71eca..6defcbe030 100644 --- a/scene/main/status_indicator.cpp +++ b/scene/main/status_indicator.cpp @@ -30,6 +30,7 @@ #include "status_indicator.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/popup_menu.h" #include "servers/display/display_server.h" diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 494eb8f15e..4b1e184586 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -37,6 +37,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); #include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/pair.h" #include "core/templates/sort_array.h" diff --git a/scene/main/window.cpp b/scene/main/window.cpp index b2fc686c19..80d39f7e2f 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer); #include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" #include "core/input/input.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "scene/gui/control.h" diff --git a/scene/resources/2d/tile_set.cpp b/scene/resources/2d/tile_set.cpp index 439058a537..b69e9f2d2a 100644 --- a/scene/resources/2d/tile_set.cpp +++ b/scene/resources/2d/tile_set.cpp @@ -34,6 +34,7 @@ #include "core/config/engine.h" #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/local_vector.h" #include "core/templates/rb_set.h" diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp index 8a640da898..eaf8a56d3e 100644 --- a/scene/resources/3d/primitive_meshes.cpp +++ b/scene/resources/3d/primitive_meshes.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/math/math_funcs.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/main_loop.h" #include "scene/resources/theme.h" diff --git a/scene/resources/animated_texture.cpp b/scene/resources/animated_texture.cpp index a8127eae06..1c4e901313 100644 --- a/scene/resources/animated_texture.cpp +++ b/scene/resources/animated_texture.cpp @@ -30,6 +30,7 @@ #include "animated_texture.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/message_queue.h" #include "core/os/os.h" diff --git a/scene/resources/animation_library.cpp b/scene/resources/animation_library.cpp index e5ebed82b3..b2370f77e6 100644 --- a/scene/resources/animation_library.cpp +++ b/scene/resources/animation_library.cpp @@ -30,6 +30,7 @@ #include "animation_library.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/scene_string_names.h" diff --git a/scene/resources/atlas_texture.cpp b/scene/resources/atlas_texture.cpp index cfce3a1a66..a5b48db0f9 100644 --- a/scene/resources/atlas_texture.cpp +++ b/scene/resources/atlas_texture.cpp @@ -30,6 +30,7 @@ #include "atlas_texture.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" int AtlasTexture::get_width() const { diff --git a/scene/resources/bone_map.cpp b/scene/resources/bone_map.cpp index 5d6a3ae044..6c568a3552 100644 --- a/scene/resources/bone_map.cpp +++ b/scene/resources/bone_map.cpp @@ -31,6 +31,7 @@ #include "bone_map.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" bool BoneMap::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/resources/camera_texture.cpp b/scene/resources/camera_texture.cpp index 9685cc9476..7c8d66d52f 100644 --- a/scene/resources/camera_texture.cpp +++ b/scene/resources/camera_texture.cpp @@ -30,6 +30,7 @@ #include "camera_texture.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/camera/camera_feed.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/canvas_item_material.cpp b/scene/resources/canvas_item_material.cpp index 92977f6428..004950549e 100644 --- a/scene/resources/canvas_item_material.cpp +++ b/scene/resources/canvas_item_material.cpp @@ -30,6 +30,7 @@ #include "canvas_item_material.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/version.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/compositor.cpp b/scene/resources/compositor.cpp index 1df1c632d3..c189064aa1 100644 --- a/scene/resources/compositor.cpp +++ b/scene/resources/compositor.cpp @@ -30,6 +30,7 @@ #include "compositor.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/curve_texture.cpp b/scene/resources/curve_texture.cpp index 455c3f6bba..3cad726d38 100644 --- a/scene/resources/curve_texture.cpp +++ b/scene/resources/curve_texture.cpp @@ -30,6 +30,7 @@ #include "curve_texture.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index b54efaedb0..43bf828c43 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.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 "scene/resources/gradient_texture.h" diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index 21f050deb6..38bf7a71c1 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/io/image_loader.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/templates/hash_map.h" diff --git a/scene/resources/gradient_texture.cpp b/scene/resources/gradient_texture.cpp index cf7669a966..559849e131 100644 --- a/scene/resources/gradient_texture.cpp +++ b/scene/resources/gradient_texture.cpp @@ -31,6 +31,7 @@ #include "gradient_texture.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/label_settings.cpp b/scene/resources/label_settings.cpp index 4dc5587f1e..e60cb1e9f1 100644 --- a/scene/resources/label_settings.cpp +++ b/scene/resources/label_settings.cpp @@ -30,6 +30,7 @@ #include "label_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void LabelSettings::_font_changed() { diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index f15713ee02..8141491d3e 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/error/error_macros.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/version.h" diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 14f829843c..49a7248817 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -34,6 +34,7 @@ #include "core/io/file_access.h" #include "core/io/missing_resource.h" #include "core/io/resource_loader.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/script_language.h" #include "core/templates/local_vector.h" diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index d661c5e86d..fddc1311af 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/io/file_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/scene_tree.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp index 123421af80..d30c668e0e 100644 --- a/scene/resources/shader_include.cpp +++ b/scene/resources/shader_include.cpp @@ -31,6 +31,7 @@ #include "shader_include.h" #include "core/io/file_access.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/shader_preprocessor.h" diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp index f598cfa98b..1e8ef6014e 100644 --- a/scene/resources/syntax_highlighter.cpp +++ b/scene/resources/syntax_highlighter.cpp @@ -30,6 +30,7 @@ #include "syntax_highlighter.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/gui/text_edit.h" diff --git a/scene/resources/texture_rd.cpp b/scene/resources/texture_rd.cpp index 0e9ff0023d..6fb37374b8 100644 --- a/scene/resources/texture_rd.cpp +++ b/scene/resources/texture_rd.cpp @@ -30,6 +30,7 @@ #include "texture_rd.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_device.h" #include "servers/rendering/rendering_server.h" diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 71dbc8095c..c237c0c45f 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -30,6 +30,7 @@ #include "theme.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/theme/theme_db.h" diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index e3dc4c9676..8a939fad86 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -31,6 +31,7 @@ #include "visual_shader.h" #include "core/config/engine.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/rb_map.h" #include "core/variant/variant_utility.h" diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/scene/resources/visual_shader_particle_nodes.cpp index 64ec785dc2..db430e8eb1 100644 --- a/scene/resources/visual_shader_particle_nodes.cpp +++ b/scene/resources/visual_shader_particle_nodes.cpp @@ -30,6 +30,7 @@ #include "visual_shader_particle_nodes.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/image_texture.h" #include "scene/resources/mesh.h" diff --git a/scene/theme/theme_db.cpp b/scene/theme/theme_db.cpp index 9c7b037292..792acfd57a 100644 --- a/scene/theme/theme_db.cpp +++ b/scene/theme/theme_db.cpp @@ -33,6 +33,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 "scene/gui/control.h" #include "scene/main/node.h" diff --git a/scene/theme/theme_owner.cpp b/scene/theme/theme_owner.cpp index febe95fe2a..4243926eeb 100644 --- a/scene/theme/theme_owner.cpp +++ b/scene/theme/theme_owner.cpp @@ -30,7 +30,7 @@ #include "theme_owner.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "scene/gui/control.h" #include "scene/main/window.h" #include "scene/theme/theme_db.h" diff --git a/servers/navigation_2d/navigation_server_2d.cpp b/servers/navigation_2d/navigation_server_2d.cpp index e5086d645c..780a233e1a 100644 --- a/servers/navigation_2d/navigation_server_2d.cpp +++ b/servers/navigation_2d/navigation_server_2d.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/node.h" #include "servers/navigation_2d/navigation_server_2d_dummy.h" diff --git a/servers/navigation_3d/navigation_server_3d.cpp b/servers/navigation_3d/navigation_server_3d.cpp index b90b0bc2f2..176733fabd 100644 --- a/servers/navigation_3d/navigation_server_3d.cpp +++ b/servers/navigation_3d/navigation_server_3d.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/node.h" #include "servers/navigation_3d/navigation_server_3d_dummy.h" diff --git a/servers/physics_2d/physics_server_2d_wrap_mt.cpp b/servers/physics_2d/physics_server_2d_wrap_mt.cpp index b6f0968420..33cbbc64bb 100644 --- a/servers/physics_2d/physics_server_2d_wrap_mt.cpp +++ b/servers/physics_2d/physics_server_2d_wrap_mt.cpp @@ -30,6 +30,8 @@ #include "physics_server_2d_wrap_mt.h" +#include "core/object/callable_mp.h" + void PhysicsServer2DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) { server_thread = Thread::get_caller_id(); server_task_id = p_pump_task_id; diff --git a/servers/physics_3d/physics_server_3d_wrap_mt.cpp b/servers/physics_3d/physics_server_3d_wrap_mt.cpp index c5e6896ec0..376ab69ec9 100644 --- a/servers/physics_3d/physics_server_3d_wrap_mt.cpp +++ b/servers/physics_3d/physics_server_3d_wrap_mt.cpp @@ -30,7 +30,7 @@ #include "physics_server_3d_wrap_mt.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" void PhysicsServer3DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) { server_thread = Thread::get_caller_id(); diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 1e618c8f1b..d9073fe7b6 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -32,6 +32,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "audio/audio_effect.h" diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp index 2204433573..999c301de7 100644 --- a/servers/rendering/renderer_scene_cull.cpp +++ b/servers/rendering/renderer_scene_cull.cpp @@ -33,7 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/math/geometry_3d.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/object/worker_thread_pool.h" #include "core/os/os.h" #include "servers/rendering/rendering_light_culler.h" diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp index 3efa103a88..49b80b10b6 100644 --- a/servers/rendering/rendering_server_default.cpp +++ b/servers/rendering/rendering_server_default.cpp @@ -30,7 +30,7 @@ #include "rendering_server_default.h" -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/os/os.h" #include "core/profiling/profiling.h" #include "servers/display/display_server.h" diff --git a/servers/xr/xr_server.cpp b/servers/xr/xr_server.cpp index ad8846cb40..f245509a34 100644 --- a/servers/xr/xr_server.cpp +++ b/servers/xr/xr_server.cpp @@ -32,6 +32,7 @@ #include "xr_server.compat.inc" #include "core/config/project_settings.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/rendering/rendering_server.h" #include "servers/xr/xr_interface.h" diff --git a/tests/core/object/test_object.cpp b/tests/core/object/test_object.cpp index 55b149efaa..d241b6162a 100644 --- a/tests/core/object/test_object.cpp +++ b/tests/core/object/test_object.cpp @@ -32,6 +32,7 @@ TEST_FORCE_LINK(test_object) +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/object.h" #include "core/object/script_language.h" diff --git a/tests/core/object/test_undo_redo.cpp b/tests/core/object/test_undo_redo.cpp index 941074fd52..21824daeef 100644 --- a/tests/core/object/test_undo_redo.cpp +++ b/tests/core/object/test_undo_redo.cpp @@ -32,6 +32,7 @@ TEST_FORCE_LINK(test_undo_redo) +#include "core/object/callable_mp.h" #include "core/object/undo_redo.h" namespace TestUndoRedo { diff --git a/tests/core/threads/test_worker_thread_pool.cpp b/tests/core/threads/test_worker_thread_pool.cpp index f698ed526c..5b43865e59 100644 --- a/tests/core/threads/test_worker_thread_pool.cpp +++ b/tests/core/threads/test_worker_thread_pool.cpp @@ -32,7 +32,7 @@ TEST_FORCE_LINK(test_worker_thread_pool) -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/object/worker_thread_pool.h" #include "core/os/os.h" diff --git a/tests/core/variant/test_array.cpp b/tests/core/variant/test_array.cpp index 801a89277f..fd78e8cc10 100644 --- a/tests/core/variant/test_array.cpp +++ b/tests/core/variant/test_array.cpp @@ -32,7 +32,7 @@ TEST_FORCE_LINK(test_array) -#include "core/object/callable_method_pointer.h" +#include "core/object/callable_mp.h" #include "core/variant/array.h" #include "core/variant/typed_array.h" #include "tests/test_tools.h" diff --git a/tests/core/variant/test_callable.cpp b/tests/core/variant/test_callable.cpp index fca557b25c..03fcbf0ffa 100644 --- a/tests/core/variant/test_callable.cpp +++ b/tests/core/variant/test_callable.cpp @@ -32,6 +32,7 @@ TEST_FORCE_LINK(test_callable) +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/object.h" diff --git a/tests/scene/test_packed_scene.cpp b/tests/scene/test_packed_scene.cpp index fff34cb828..bdec46d0b6 100644 --- a/tests/scene/test_packed_scene.cpp +++ b/tests/scene/test_packed_scene.cpp @@ -32,6 +32,7 @@ TEST_FORCE_LINK(test_packed_scene) +#include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/resources/packed_scene.h" diff --git a/tests/scene/test_viewport.cpp b/tests/scene/test_viewport.cpp index 8bc6741808..1d4d8579e0 100644 --- a/tests/scene/test_viewport.cpp +++ b/tests/scene/test_viewport.cpp @@ -32,6 +32,7 @@ TEST_FORCE_LINK(test_viewport) +#include "core/object/callable_mp.h" #include "scene/2d/node_2d.h" #include "scene/gui/control.h" #include "scene/gui/subviewport_container.h" diff --git a/tests/servers/test_navigation_server_2d.cpp b/tests/servers/test_navigation_server_2d.cpp index bb03890160..4a3956971c 100644 --- a/tests/servers/test_navigation_server_2d.cpp +++ b/tests/servers/test_navigation_server_2d.cpp @@ -36,6 +36,7 @@ TEST_FORCE_LINK(test_navigation_server_2d) #ifdef MODULE_NAVIGATION_2D_ENABLED +#include "core/object/callable_mp.h" #include "scene/2d/polygon_2d.h" #include "scene/main/window.h" #include "servers/navigation_2d/navigation_server_2d.h" diff --git a/tests/servers/test_navigation_server_3d.cpp b/tests/servers/test_navigation_server_3d.cpp index 6f2b9f1704..d90605f044 100644 --- a/tests/servers/test_navigation_server_3d.cpp +++ b/tests/servers/test_navigation_server_3d.cpp @@ -36,6 +36,7 @@ TEST_FORCE_LINK(test_navigation_server_3d) #ifdef MODULE_NAVIGATION_3D_ENABLED +#include "core/object/callable_mp.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/main/window.h" #include "scene/resources/3d/primitive_meshes.h" diff --git a/tests/signal_watcher.cpp b/tests/signal_watcher.cpp index fe04266b9d..802b9f5e67 100644 --- a/tests/signal_watcher.cpp +++ b/tests/signal_watcher.cpp @@ -30,6 +30,7 @@ #include "signal_watcher.h" +#include "core/object/callable_mp.h" #include "core/object/class_db.h" void SignalWatcher::_add_signal_entry(const Array &p_args, const String &p_name) {