diff options
| author | Rémi Verschelde | 2017-02-13 15:46:17 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-13 15:46:17 +0100 |
| commit | ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378 (patch) | |
| tree | 65ed57ff55cadd49b881e248e2f87331ca5eee28 /tools | |
| parent | f6859fd31b5c3cc1a112b7f77b3c1783df8c8919 (diff) | |
| parent | 411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (diff) | |
| download | godot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.tar.gz godot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.tar.zst godot-ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378.zip | |
Merge pull request #7795 from hpvb/rename-md-macro
Rename the _MD macro to D_METHOD
Diffstat (limited to 'tools')
62 files changed, 616 insertions, 616 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index f256e351a..d675c6a6b 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3922,48 +3922,48 @@ void AnimationKeyEditor::cleanup() { void AnimationKeyEditor::_bind_methods() { - ClassDB::bind_method(_MD("_root_removed"),&AnimationKeyEditor::_root_removed); - ClassDB::bind_method(_MD("_scale"),&AnimationKeyEditor::_scale); - ClassDB::bind_method(_MD("set_root"),&AnimationKeyEditor::set_root); + ClassDB::bind_method(D_METHOD("_root_removed"),&AnimationKeyEditor::_root_removed); + ClassDB::bind_method(D_METHOD("_scale"),&AnimationKeyEditor::_scale); + ClassDB::bind_method(D_METHOD("set_root"),&AnimationKeyEditor::set_root); - //ClassDB::bind_method(_MD("_confirm_insert"),&AnimationKeyEditor::_confirm_insert); - ClassDB::bind_method(_MD("_confirm_insert_list"),&AnimationKeyEditor::_confirm_insert_list); + //ClassDB::bind_method(D_METHOD("_confirm_insert"),&AnimationKeyEditor::_confirm_insert); + ClassDB::bind_method(D_METHOD("_confirm_insert_list"),&AnimationKeyEditor::_confirm_insert_list); - ClassDB::bind_method(_MD("_update_paths"),&AnimationKeyEditor::_update_paths); - ClassDB::bind_method(_MD("_track_editor_draw"),&AnimationKeyEditor::_track_editor_draw); + ClassDB::bind_method(D_METHOD("_update_paths"),&AnimationKeyEditor::_update_paths); + ClassDB::bind_method(D_METHOD("_track_editor_draw"),&AnimationKeyEditor::_track_editor_draw); - ClassDB::bind_method(_MD("_animation_changed"),&AnimationKeyEditor::_animation_changed); - ClassDB::bind_method(_MD("_scroll_changed"),&AnimationKeyEditor::_scroll_changed); - ClassDB::bind_method(_MD("_track_editor_gui_input"),&AnimationKeyEditor::_track_editor_gui_input); - ClassDB::bind_method(_MD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed); - ClassDB::bind_method(_MD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected); - ClassDB::bind_method(_MD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track); - ClassDB::bind_method(_MD("_menu_track"),&AnimationKeyEditor::_menu_track); - ClassDB::bind_method(_MD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim); - ClassDB::bind_method(_MD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim); - ClassDB::bind_method(_MD("_track_pos_draw"),&AnimationKeyEditor::_track_pos_draw); - ClassDB::bind_method(_MD("_insert_delay"),&AnimationKeyEditor::_insert_delay); - ClassDB::bind_method(_MD("_step_changed"),&AnimationKeyEditor::_step_changed); + ClassDB::bind_method(D_METHOD("_animation_changed"),&AnimationKeyEditor::_animation_changed); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&AnimationKeyEditor::_scroll_changed); + ClassDB::bind_method(D_METHOD("_track_editor_gui_input"),&AnimationKeyEditor::_track_editor_gui_input); + ClassDB::bind_method(D_METHOD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed); + ClassDB::bind_method(D_METHOD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected); + ClassDB::bind_method(D_METHOD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track); + ClassDB::bind_method(D_METHOD("_menu_track"),&AnimationKeyEditor::_menu_track); + ClassDB::bind_method(D_METHOD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim); + ClassDB::bind_method(D_METHOD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim); + ClassDB::bind_method(D_METHOD("_track_pos_draw"),&AnimationKeyEditor::_track_pos_draw); + ClassDB::bind_method(D_METHOD("_insert_delay"),&AnimationKeyEditor::_insert_delay); + ClassDB::bind_method(D_METHOD("_step_changed"),&AnimationKeyEditor::_step_changed); - ClassDB::bind_method(_MD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed); - ClassDB::bind_method(_MD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed); - ClassDB::bind_method(_MD("_create_value_item"),&AnimationKeyEditor::_create_value_item); - ClassDB::bind_method(_MD("_pane_drag"),&AnimationKeyEditor::_pane_drag); + ClassDB::bind_method(D_METHOD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed); + ClassDB::bind_method(D_METHOD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed); + ClassDB::bind_method(D_METHOD("_create_value_item"),&AnimationKeyEditor::_create_value_item); + ClassDB::bind_method(D_METHOD("_pane_drag"),&AnimationKeyEditor::_pane_drag); - ClassDB::bind_method(_MD("_animation_len_update"),&AnimationKeyEditor::_animation_len_update); + ClassDB::bind_method(D_METHOD("_animation_len_update"),&AnimationKeyEditor::_animation_len_update); - ClassDB::bind_method(_MD("set_animation"),&AnimationKeyEditor::set_animation); - ClassDB::bind_method(_MD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize); - ClassDB::bind_method(_MD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed); - ClassDB::bind_method(_MD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves); - ClassDB::bind_method(_MD("_add_call_track"),&AnimationKeyEditor::_add_call_track); + ClassDB::bind_method(D_METHOD("set_animation"),&AnimationKeyEditor::set_animation); + ClassDB::bind_method(D_METHOD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize); + ClassDB::bind_method(D_METHOD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed); + ClassDB::bind_method(D_METHOD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves); + ClassDB::bind_method(D_METHOD("_add_call_track"),&AnimationKeyEditor::_add_call_track); ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) ); diff --git a/tools/editor/array_property_edit.cpp b/tools/editor/array_property_edit.cpp index b587c4f83..7304d8ddd 100644 --- a/tools/editor/array_property_edit.cpp +++ b/tools/editor/array_property_edit.cpp @@ -288,10 +288,10 @@ Node *ArrayPropertyEdit::get_node() { void ArrayPropertyEdit::_bind_methods() { - ClassDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size); - ClassDB::bind_method(_MD("_set_value"),&ArrayPropertyEdit::_set_value); - ClassDB::bind_method(_MD("_notif_change"),&ArrayPropertyEdit::_notif_change); - ClassDB::bind_method(_MD("_notif_changev"),&ArrayPropertyEdit::_notif_changev); + ClassDB::bind_method(D_METHOD("_set_size"),&ArrayPropertyEdit::_set_size); + ClassDB::bind_method(D_METHOD("_set_value"),&ArrayPropertyEdit::_set_value); + ClassDB::bind_method(D_METHOD("_notif_change"),&ArrayPropertyEdit::_notif_change); + ClassDB::bind_method(D_METHOD("_notif_changev"),&ArrayPropertyEdit::_notif_changev); } ArrayPropertyEdit::ArrayPropertyEdit() diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp index 6ba7a7e79..1c1b6c91e 100644 --- a/tools/editor/asset_library_editor_plugin.cpp +++ b/tools/editor/asset_library_editor_plugin.cpp @@ -199,9 +199,9 @@ void EditorAssetLibraryItemDescription::set_image(int p_type,int p_index,const R } void EditorAssetLibraryItemDescription::_bind_methods() { - ClassDB::bind_method(_MD("set_image"),&EditorAssetLibraryItemDescription::set_image); - ClassDB::bind_method(_MD("_link_click"),&EditorAssetLibraryItemDescription::_link_click); - ClassDB::bind_method(_MD("_preview_click"),&EditorAssetLibraryItemDescription::_preview_click); + ClassDB::bind_method(D_METHOD("set_image"),&EditorAssetLibraryItemDescription::set_image); + ClassDB::bind_method(D_METHOD("_link_click"),&EditorAssetLibraryItemDescription::_link_click); + ClassDB::bind_method(D_METHOD("_preview_click"),&EditorAssetLibraryItemDescription::_preview_click); } diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index 53e968f38..58bb148ce 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -624,15 +624,15 @@ void CreateDialog::drop_data_fw(const Point2& p_point,const Variant& p_data,Cont void CreateDialog::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&CreateDialog::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&CreateDialog::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&CreateDialog::_sbox_input); - ClassDB::bind_method(_MD("_item_selected"),&CreateDialog::_item_selected); - ClassDB::bind_method(_MD("_favorite_toggled"),&CreateDialog::_favorite_toggled); - ClassDB::bind_method(_MD("_history_selected"),&CreateDialog::_history_selected); - ClassDB::bind_method(_MD("_favorite_selected"),&CreateDialog::_favorite_selected); - ClassDB::bind_method(_MD("_history_activated"),&CreateDialog::_history_activated); - ClassDB::bind_method(_MD("_favorite_activated"),&CreateDialog::_favorite_activated); + ClassDB::bind_method(D_METHOD("_text_changed"),&CreateDialog::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&CreateDialog::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&CreateDialog::_sbox_input); + ClassDB::bind_method(D_METHOD("_item_selected"),&CreateDialog::_item_selected); + ClassDB::bind_method(D_METHOD("_favorite_toggled"),&CreateDialog::_favorite_toggled); + ClassDB::bind_method(D_METHOD("_history_selected"),&CreateDialog::_history_selected); + ClassDB::bind_method(D_METHOD("_favorite_selected"),&CreateDialog::_favorite_selected); + ClassDB::bind_method(D_METHOD("_history_activated"),&CreateDialog::_history_activated); + ClassDB::bind_method(D_METHOD("_favorite_activated"),&CreateDialog::_favorite_activated); ClassDB::bind_method("get_drag_data_fw",&CreateDialog::get_drag_data_fw); diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp index a01383a86..d7e04db86 100644 --- a/tools/editor/dependency_editor.cpp +++ b/tools/editor/dependency_editor.cpp @@ -251,9 +251,9 @@ void DependencyEditor::edit(const String& p_path) { void DependencyEditor::_bind_methods() { - ClassDB::bind_method(_MD("_searched"),&DependencyEditor::_searched); - ClassDB::bind_method(_MD("_load_pressed"),&DependencyEditor::_load_pressed); - ClassDB::bind_method(_MD("_fix_all"),&DependencyEditor::_fix_all); + ClassDB::bind_method(D_METHOD("_searched"),&DependencyEditor::_searched); + ClassDB::bind_method(D_METHOD("_load_pressed"),&DependencyEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_fix_all"),&DependencyEditor::_fix_all); } @@ -691,8 +691,8 @@ void OrphanResourcesDialog::_button_pressed(Object *p_item,int p_column, int p_i void OrphanResourcesDialog::_bind_methods() { - ClassDB::bind_method(_MD("_delete_confirm"),&OrphanResourcesDialog::_delete_confirm); - ClassDB::bind_method(_MD("_button_pressed"),&OrphanResourcesDialog::_button_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm"),&OrphanResourcesDialog::_delete_confirm); + ClassDB::bind_method(D_METHOD("_button_pressed"),&OrphanResourcesDialog::_button_pressed); } diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp index ef839d7e7..2a3c55229 100644 --- a/tools/editor/editor_data.cpp +++ b/tools/editor/editor_data.cpp @@ -886,12 +886,12 @@ Array EditorSelection::_get_selected_nodes() { void EditorSelection::_bind_methods() { - ClassDB::bind_method(_MD("_node_removed"),&EditorSelection::_node_removed); - ClassDB::bind_method(_MD("clear"),&EditorSelection::clear); - ClassDB::bind_method(_MD("add_node","node:Node"),&EditorSelection::add_node); - ClassDB::bind_method(_MD("remove_node","node:Node"),&EditorSelection::remove_node); - ClassDB::bind_method(_MD("get_selected_nodes"),&EditorSelection::_get_selected_nodes); - ClassDB::bind_method(_MD("get_transformable_selected_nodes"),&EditorSelection::_get_transformable_selected_nodes); + ClassDB::bind_method(D_METHOD("_node_removed"),&EditorSelection::_node_removed); + ClassDB::bind_method(D_METHOD("clear"),&EditorSelection::clear); + ClassDB::bind_method(D_METHOD("add_node","node:Node"),&EditorSelection::add_node); + ClassDB::bind_method(D_METHOD("remove_node","node:Node"),&EditorSelection::remove_node); + ClassDB::bind_method(D_METHOD("get_selected_nodes"),&EditorSelection::_get_selected_nodes); + ClassDB::bind_method(D_METHOD("get_transformable_selected_nodes"),&EditorSelection::_get_transformable_selected_nodes); ADD_SIGNAL( MethodInfo("selection_changed") ); } diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp index bb9ddc2ae..c353e4307 100644 --- a/tools/editor/editor_dir_dialog.cpp +++ b/tools/editor/editor_dir_dialog.cpp @@ -225,10 +225,10 @@ void EditorDirDialog::_make_dir_confirm() { void EditorDirDialog::_bind_methods() { - ClassDB::bind_method(_MD("_item_collapsed"),&EditorDirDialog::_item_collapsed); - ClassDB::bind_method(_MD("_make_dir"),&EditorDirDialog::_make_dir); - ClassDB::bind_method(_MD("_make_dir_confirm"),&EditorDirDialog::_make_dir_confirm); - ClassDB::bind_method(_MD("reload"),&EditorDirDialog::reload); + ClassDB::bind_method(D_METHOD("_item_collapsed"),&EditorDirDialog::_item_collapsed); + ClassDB::bind_method(D_METHOD("_make_dir"),&EditorDirDialog::_make_dir); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"),&EditorDirDialog::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("reload"),&EditorDirDialog::reload); ADD_SIGNAL(MethodInfo("dir_selected",PropertyInfo(Variant::STRING,"dir"))); } diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index e23e2419d..bfaf1906d 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -1164,55 +1164,55 @@ EditorFileDialog::DisplayMode EditorFileDialog::get_display_mode() const{ void EditorFileDialog::_bind_methods() { - ClassDB::bind_method(_MD("_unhandled_input"),&EditorFileDialog::_unhandled_input); + ClassDB::bind_method(D_METHOD("_unhandled_input"),&EditorFileDialog::_unhandled_input); - ClassDB::bind_method(_MD("_item_selected"),&EditorFileDialog::_item_selected); - ClassDB::bind_method(_MD("_item_db_selected"),&EditorFileDialog::_item_dc_selected); - ClassDB::bind_method(_MD("_dir_entered"),&EditorFileDialog::_dir_entered); - ClassDB::bind_method(_MD("_file_entered"),&EditorFileDialog::_file_entered); - ClassDB::bind_method(_MD("_action_pressed"),&EditorFileDialog::_action_pressed); - ClassDB::bind_method(_MD("_cancel_pressed"),&EditorFileDialog::_cancel_pressed); - ClassDB::bind_method(_MD("_filter_selected"),&EditorFileDialog::_filter_selected); - ClassDB::bind_method(_MD("_save_confirm_pressed"),&EditorFileDialog::_save_confirm_pressed); + ClassDB::bind_method(D_METHOD("_item_selected"),&EditorFileDialog::_item_selected); + ClassDB::bind_method(D_METHOD("_item_db_selected"),&EditorFileDialog::_item_dc_selected); + ClassDB::bind_method(D_METHOD("_dir_entered"),&EditorFileDialog::_dir_entered); + ClassDB::bind_method(D_METHOD("_file_entered"),&EditorFileDialog::_file_entered); + ClassDB::bind_method(D_METHOD("_action_pressed"),&EditorFileDialog::_action_pressed); + ClassDB::bind_method(D_METHOD("_cancel_pressed"),&EditorFileDialog::_cancel_pressed); + ClassDB::bind_method(D_METHOD("_filter_selected"),&EditorFileDialog::_filter_selected); + ClassDB::bind_method(D_METHOD("_save_confirm_pressed"),&EditorFileDialog::_save_confirm_pressed); - ClassDB::bind_method(_MD("clear_filters"),&EditorFileDialog::clear_filters); - ClassDB::bind_method(_MD("add_filter","filter"),&EditorFileDialog::add_filter); - ClassDB::bind_method(_MD("get_current_dir"),&EditorFileDialog::get_current_dir); - ClassDB::bind_method(_MD("get_current_file"),&EditorFileDialog::get_current_file); - ClassDB::bind_method(_MD("get_current_path"),&EditorFileDialog::get_current_path); - ClassDB::bind_method(_MD("set_current_dir","dir"),&EditorFileDialog::set_current_dir); - ClassDB::bind_method(_MD("set_current_file","file"),&EditorFileDialog::set_current_file); - ClassDB::bind_method(_MD("set_current_path","path"),&EditorFileDialog::set_current_path); - ClassDB::bind_method(_MD("set_mode","mode"),&EditorFileDialog::set_mode); - ClassDB::bind_method(_MD("get_mode"),&EditorFileDialog::get_mode); - ClassDB::bind_method(_MD("get_vbox:VBoxContainer"),&EditorFileDialog::get_vbox); - ClassDB::bind_method(_MD("set_access","access"),&EditorFileDialog::set_access); - ClassDB::bind_method(_MD("get_access"),&EditorFileDialog::get_access); - ClassDB::bind_method(_MD("set_show_hidden_files","show"),&EditorFileDialog::set_show_hidden_files); - ClassDB::bind_method(_MD("is_showing_hidden_files"),&EditorFileDialog::is_showing_hidden_files); - ClassDB::bind_method(_MD("_select_drive"),&EditorFileDialog::_select_drive); - ClassDB::bind_method(_MD("_make_dir"),&EditorFileDialog::_make_dir); - ClassDB::bind_method(_MD("_make_dir_confirm"),&EditorFileDialog::_make_dir_confirm); - ClassDB::bind_method(_MD("_update_file_list"),&EditorFileDialog::update_file_list); - ClassDB::bind_method(_MD("_update_dir"),&EditorFileDialog::update_dir); - ClassDB::bind_method(_MD("_thumbnail_done"),&EditorFileDialog::_thumbnail_done); - ClassDB::bind_method(_MD("set_display_mode","mode"),&EditorFileDialog::set_display_mode); - ClassDB::bind_method(_MD("get_display_mode"),&EditorFileDialog::get_display_mode); - ClassDB::bind_method(_MD("_thumbnail_result"),&EditorFileDialog::_thumbnail_result); - ClassDB::bind_method(_MD("set_disable_overwrite_warning","disable"),&EditorFileDialog::set_disable_overwrite_warning); - ClassDB::bind_method(_MD("is_overwrite_warning_disabled"),&EditorFileDialog::is_overwrite_warning_disabled); + ClassDB::bind_method(D_METHOD("clear_filters"),&EditorFileDialog::clear_filters); + ClassDB::bind_method(D_METHOD("add_filter","filter"),&EditorFileDialog::add_filter); + ClassDB::bind_method(D_METHOD("get_current_dir"),&EditorFileDialog::get_current_dir); + ClassDB::bind_method(D_METHOD("get_current_file"),&EditorFileDialog::get_current_file); + ClassDB::bind_method(D_METHOD("get_current_path"),&EditorFileDialog::get_current_path); + ClassDB::bind_method(D_METHOD("set_current_dir","dir"),&EditorFileDialog::set_current_dir); + ClassDB::bind_method(D_METHOD("set_current_file","file"),&EditorFileDialog::set_current_file); + ClassDB::bind_method(D_METHOD("set_current_path","path"),&EditorFileDialog::set_current_path); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&EditorFileDialog::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&EditorFileDialog::get_mode); + ClassDB::bind_method(D_METHOD("get_vbox:VBoxContainer"),&EditorFileDialog::get_vbox); + ClassDB::bind_method(D_METHOD("set_access","access"),&EditorFileDialog::set_access); + ClassDB::bind_method(D_METHOD("get_access"),&EditorFileDialog::get_access); + ClassDB::bind_method(D_METHOD("set_show_hidden_files","show"),&EditorFileDialog::set_show_hidden_files); + ClassDB::bind_method(D_METHOD("is_showing_hidden_files"),&EditorFileDialog::is_showing_hidden_files); + ClassDB::bind_method(D_METHOD("_select_drive"),&EditorFileDialog::_select_drive); + ClassDB::bind_method(D_METHOD("_make_dir"),&EditorFileDialog::_make_dir); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"),&EditorFileDialog::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("_update_file_list"),&EditorFileDialog::update_file_list); + ClassDB::bind_method(D_METHOD("_update_dir"),&EditorFileDialog::update_dir); + ClassDB::bind_method(D_METHOD("_thumbnail_done"),&EditorFileDialog::_thumbnail_done); + ClassDB::bind_method(D_METHOD("set_display_mode","mode"),&EditorFileDialog::set_display_mode); + ClassDB::bind_method(D_METHOD("get_display_mode"),&EditorFileDialog::get_display_mode); + ClassDB::bind_method(D_METHOD("_thumbnail_result"),&EditorFileDialog::_thumbnail_result); + ClassDB::bind_method(D_METHOD("set_disable_overwrite_warning","disable"),&EditorFileDialog::set_disable_overwrite_warning); + ClassDB::bind_method(D_METHOD("is_overwrite_warning_disabled"),&EditorFileDialog::is_overwrite_warning_disabled); - ClassDB::bind_method(_MD("_recent_selected"),&EditorFileDialog::_recent_selected); - ClassDB::bind_method(_MD("_go_back"),&EditorFileDialog::_go_back); - ClassDB::bind_method(_MD("_go_forward"),&EditorFileDialog::_go_forward); - ClassDB::bind_method(_MD("_go_up"),&EditorFileDialog::_go_up); + ClassDB::bind_method(D_METHOD("_recent_selected"),&EditorFileDialog::_recent_selected); + ClassDB::bind_method(D_METHOD("_go_back"),&EditorFileDialog::_go_back); + ClassDB::bind_method(D_METHOD("_go_forward"),&EditorFileDialog::_go_forward); + ClassDB::bind_method(D_METHOD("_go_up"),&EditorFileDialog::_go_up); - ClassDB::bind_method(_MD("_favorite_toggled"),&EditorFileDialog::_favorite_toggled); - ClassDB::bind_method(_MD("_favorite_selected"),&EditorFileDialog::_favorite_selected); - ClassDB::bind_method(_MD("_favorite_move_up"),&EditorFileDialog::_favorite_move_up); - ClassDB::bind_method(_MD("_favorite_move_down"),&EditorFileDialog::_favorite_move_down); + ClassDB::bind_method(D_METHOD("_favorite_toggled"),&EditorFileDialog::_favorite_toggled); + ClassDB::bind_method(D_METHOD("_favorite_selected"),&EditorFileDialog::_favorite_selected); + ClassDB::bind_method(D_METHOD("_favorite_move_up"),&EditorFileDialog::_favorite_move_up); + ClassDB::bind_method(D_METHOD("_favorite_move_down"),&EditorFileDialog::_favorite_move_down); - ClassDB::bind_method(_MD("invalidate"),&EditorFileDialog::invalidate); + ClassDB::bind_method(D_METHOD("invalidate"),&EditorFileDialog::invalidate); ADD_SIGNAL(MethodInfo("file_selected",PropertyInfo( Variant::STRING,"path"))); ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::POOL_STRING_ARRAY,"paths"))); @@ -1493,11 +1493,11 @@ EditorFileDialog::~EditorFileDialog() { void EditorLineEditFileChooser::_bind_methods() { - ClassDB::bind_method(_MD("_browse"),&EditorLineEditFileChooser::_browse); - ClassDB::bind_method(_MD("_chosen"),&EditorLineEditFileChooser::_chosen); - ClassDB::bind_method(_MD("get_button:Button"),&EditorLineEditFileChooser::get_button); - ClassDB::bind_method(_MD("get_line_edit:LineEdit"),&EditorLineEditFileChooser::get_line_edit); - ClassDB::bind_method(_MD("get_file_dialog:EditorFileDialog"),&EditorLineEditFileChooser::get_file_dialog); + ClassDB::bind_method(D_METHOD("_browse"),&EditorLineEditFileChooser::_browse); + ClassDB::bind_method(D_METHOD("_chosen"),&EditorLineEditFileChooser::_chosen); + ClassDB::bind_method(D_METHOD("get_button:Button"),&EditorLineEditFileChooser::get_button); + ClassDB::bind_method(D_METHOD("get_line_edit:LineEdit"),&EditorLineEditFileChooser::get_line_edit); + ClassDB::bind_method(D_METHOD("get_file_dialog:EditorFileDialog"),&EditorLineEditFileChooser::get_file_dialog); } diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index c7b50a3c0..b9b834528 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -144,17 +144,17 @@ EditorFileSystemDirectory *EditorFileSystemDirectory::get_parent() { void EditorFileSystemDirectory::_bind_methods() { - ClassDB::bind_method(_MD("get_subdir_count"),&EditorFileSystemDirectory::get_subdir_count); - ClassDB::bind_method(_MD("get_subdir","idx"),&EditorFileSystemDirectory::get_subdir); - ClassDB::bind_method(_MD("get_file_count"),&EditorFileSystemDirectory::get_file_count); - ClassDB::bind_method(_MD("get_file","idx"),&EditorFileSystemDirectory::get_file); - ClassDB::bind_method(_MD("get_file_path","idx"),&EditorFileSystemDirectory::get_file_path); - ClassDB::bind_method(_MD("get_file_type","idx"),&EditorFileSystemDirectory::get_file_type); - ClassDB::bind_method(_MD("get_name"),&EditorFileSystemDirectory::get_name); - ClassDB::bind_method(_MD("get_path"),&EditorFileSystemDirectory::get_path); - ClassDB::bind_method(_MD("get_parent:EditorFileSystemDirectory"),&EditorFileSystemDirectory::get_parent); - ClassDB::bind_method(_MD("find_file_index","name"),&EditorFileSystemDirectory::find_file_index); - ClassDB::bind_method(_MD("find_dir_index","name"),&EditorFileSystemDirectory::find_dir_index); + ClassDB::bind_method(D_METHOD("get_subdir_count"),&EditorFileSystemDirectory::get_subdir_count); + ClassDB::bind_method(D_METHOD("get_subdir","idx"),&EditorFileSystemDirectory::get_subdir); + ClassDB::bind_method(D_METHOD("get_file_count"),&EditorFileSystemDirectory::get_file_count); + ClassDB::bind_method(D_METHOD("get_file","idx"),&EditorFileSystemDirectory::get_file); + ClassDB::bind_method(D_METHOD("get_file_path","idx"),&EditorFileSystemDirectory::get_file_path); + ClassDB::bind_method(D_METHOD("get_file_type","idx"),&EditorFileSystemDirectory::get_file_type); + ClassDB::bind_method(D_METHOD("get_name"),&EditorFileSystemDirectory::get_name); + ClassDB::bind_method(D_METHOD("get_path"),&EditorFileSystemDirectory::get_path); + ClassDB::bind_method(D_METHOD("get_parent:EditorFileSystemDirectory"),&EditorFileSystemDirectory::get_parent); + ClassDB::bind_method(D_METHOD("find_file_index","name"),&EditorFileSystemDirectory::find_file_index); + ClassDB::bind_method(D_METHOD("find_dir_index","name"),&EditorFileSystemDirectory::find_dir_index); } @@ -1484,14 +1484,14 @@ void EditorFileSystem::reimport_files(const Vector<String>& p_files) { void EditorFileSystem::_bind_methods() { - ClassDB::bind_method(_MD("get_filesystem:EditorFileSystemDirectory"),&EditorFileSystem::get_filesystem); - ClassDB::bind_method(_MD("is_scanning"),&EditorFileSystem::is_scanning); - ClassDB::bind_method(_MD("get_scanning_progress"),&EditorFileSystem::get_scanning_progress); - ClassDB::bind_method(_MD("scan"),&EditorFileSystem::scan); - ClassDB::bind_method(_MD("scan_sources"),&EditorFileSystem::scan_changes); - ClassDB::bind_method(_MD("update_file","path"),&EditorFileSystem::update_file); - ClassDB::bind_method(_MD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); - ClassDB::bind_method(_MD("get_file_type","path"),&EditorFileSystem::get_file_type); + ClassDB::bind_method(D_METHOD("get_filesystem:EditorFileSystemDirectory"),&EditorFileSystem::get_filesystem); + ClassDB::bind_method(D_METHOD("is_scanning"),&EditorFileSystem::is_scanning); + ClassDB::bind_method(D_METHOD("get_scanning_progress"),&EditorFileSystem::get_scanning_progress); + ClassDB::bind_method(D_METHOD("scan"),&EditorFileSystem::scan); + ClassDB::bind_method(D_METHOD("scan_sources"),&EditorFileSystem::scan_changes); + ClassDB::bind_method(D_METHOD("update_file","path"),&EditorFileSystem::update_file); + ClassDB::bind_method(D_METHOD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); + ClassDB::bind_method(D_METHOD("get_file_type","path"),&EditorFileSystem::get_file_type); ADD_SIGNAL( MethodInfo("filesystem_changed") ); ADD_SIGNAL( MethodInfo("sources_changed",PropertyInfo(Variant::BOOL,"exist")) ); diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp index 03e631cbc..5b629b259 100644 --- a/tools/editor/editor_help.cpp +++ b/tools/editor/editor_help.cpp @@ -297,10 +297,10 @@ void EditorHelpSearch::_notification(int p_what) { void EditorHelpSearch::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&EditorHelpSearch::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&EditorHelpSearch::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&EditorHelpSearch::_sbox_input); - ClassDB::bind_method(_MD("_update_search"),&EditorHelpSearch::_update_search); + ClassDB::bind_method(D_METHOD("_text_changed"),&EditorHelpSearch::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&EditorHelpSearch::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&EditorHelpSearch::_sbox_input); + ClassDB::bind_method(D_METHOD("_update_search"),&EditorHelpSearch::_update_search); ADD_SIGNAL(MethodInfo("go_to_help")); diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 69a004fc0..320c45776 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -79,8 +79,8 @@ String EditorImportPlugin::_expand_source_path(const String& p_path) { void EditorImportPlugin::_bind_methods() { - ClassDB::bind_method(_MD("validate_source_path","path"),&EditorImportPlugin::_validate_source_path); - ClassDB::bind_method(_MD("expand_source_path","path"),&EditorImportPlugin::_expand_source_path); + ClassDB::bind_method(D_METHOD("validate_source_path","path"),&EditorImportPlugin::_validate_source_path); + ClassDB::bind_method(D_METHOD("expand_source_path","path"),&EditorImportPlugin::_expand_source_path); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_name")); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_visible_name")); @@ -745,7 +745,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func } break; //use default } - String image_list_md5; + String image_listD_METHOD5; { MD5_CTX ctx; @@ -758,7 +758,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func } MD5Final(&ctx); - image_list_md5=String::md5(ctx.digest); + image_listD_METHOD5=String::md5(ctx.digest); } //ok see if cached String md5; @@ -803,7 +803,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (atlas_valid) { //check md5 of list of image /names/ - if (f->get_line().strip_edges()!=image_list_md5) { + if (f->get_line().strip_edges()!=image_listD_METHOD5) { atlas_valid=false; print_line("IMAGE MD5 INVALID!"); } @@ -829,10 +829,10 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func uint64_t file_mod_time = FileAccess::get_modified_time(F->get()); if (mod_time!=file_mod_time) { - String image_md5 = slices[1]; - String file_md5 = FileAccess::get_md5(F->get()); + String imageD_METHOD5 = slices[1]; + String fileD_METHOD5 = FileAccess::getD_METHOD5(F->get()); - if (image_md5!=file_md5) { + if (imageD_METHOD5!=fileD_METHOD5) { atlas_valid=false; print_line("IMAGE INVALID "+slices[0]); break; @@ -867,7 +867,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) { - imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::get_md5(F->get())); + imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::getD_METHOD5(F->get())); } @@ -925,7 +925,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func options["shrink"]=EditorImportExport::get_singleton()->image_export_group_get_shrink(E->get()); options["image_format"]=group_format; //f->store_line(options.to_json()); - f->store_line(image_list_md5); + f->store_line(image_listD_METHOD5); } //go through all ATEX files @@ -961,8 +961,8 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (f) { //recreating deps.. String depline; - //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get()); name unneccesary by top md5 - depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get()); + //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unneccesary by top md5 + depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); depline+="::"+itos(region.pos.x)+"::"+itos(region.pos.y)+"::"+itos(region.size.x)+"::"+itos(region.size.y); depline+="::"+itos(margin.pos.x)+"::"+itos(margin.pos.y)+"::"+itos(margin.size.x)+"::"+itos(margin.size.y); f->store_line(depline); @@ -2210,49 +2210,49 @@ PoolVector<String> EditorImportExport::_get_export_platforms() { void EditorImportExport::_bind_methods() { - ClassDB::bind_method(_MD("add_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::add_import_plugin); - ClassDB::bind_method(_MD("remove_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::remove_import_plugin); - ClassDB::bind_method(_MD("get_import_plugin_count"),&EditorImportExport::get_import_plugin_count); - ClassDB::bind_method(_MD("get_import_plugin:EditorImportPlugin","idx"),&EditorImportExport::get_import_plugin); - ClassDB::bind_method(_MD("get_import_plugin_by_name:EditorImportPlugin","name"),&EditorImportExport::get_import_plugin_by_name); + ClassDB::bind_method(D_METHOD("add_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::add_import_plugin); + ClassDB::bind_method(D_METHOD("remove_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::remove_import_plugin); + ClassDB::bind_method(D_METHOD("get_import_plugin_count"),&EditorImportExport::get_import_plugin_count); + ClassDB::bind_method(D_METHOD("get_import_plugin:EditorImportPlugin","idx"),&EditorImportExport::get_import_plugin); + ClassDB::bind_method(D_METHOD("get_import_plugin_by_name:EditorImportPlugin","name"),&EditorImportExport::get_import_plugin_by_name); - ClassDB::bind_method(_MD("add_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::add_export_plugin); - ClassDB::bind_method(_MD("remove_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::remove_export_plugin); - ClassDB::bind_method(_MD("get_export_plugin_count"),&EditorImportExport::get_export_plugin_count); - ClassDB::bind_method(_MD("get_export_plugin:EditorExportPlugin","idx"),&EditorImportExport::get_export_plugin); + ClassDB::bind_method(D_METHOD("add_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::add_export_plugin); + ClassDB::bind_method(D_METHOD("remove_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::remove_export_plugin); + ClassDB::bind_method(D_METHOD("get_export_plugin_count"),&EditorImportExport::get_export_plugin_count); + ClassDB::bind_method(D_METHOD("get_export_plugin:EditorExportPlugin","idx"),&EditorImportExport::get_export_plugin); - ClassDB::bind_method(_MD("set_export_file_action","file","action"),&EditorImportExport::set_export_file_action); - ClassDB::bind_method(_MD("get_export_file_action","file"),&EditorImportExport::get_export_file_action); - ClassDB::bind_method(_MD("get_export_file_list"),&EditorImportExport::_get_export_file_list); + ClassDB::bind_method(D_METHOD("set_export_file_action","file","action"),&EditorImportExport::set_export_file_action); + ClassDB::bind_method(D_METHOD("get_export_file_action","file"),&EditorImportExport::get_export_file_action); + ClassDB::bind_method(D_METHOD("get_export_file_list"),&EditorImportExport::_get_export_file_list); - ClassDB::bind_method(_MD("add_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); - //ClassDB::bind_method(_MD("remove_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); - ClassDB::bind_method(_MD("get_export_platform:EditorExportPlatform","name"),&EditorImportExport::get_export_platform); - ClassDB::bind_method(_MD("get_export_platforms"),&EditorImportExport::_get_export_platforms); + ClassDB::bind_method(D_METHOD("add_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); + //ClassDB::bind_method(D_METHOD("remove_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); + ClassDB::bind_method(D_METHOD("get_export_platform:EditorExportPlatform","name"),&EditorImportExport::get_export_platform); + ClassDB::bind_method(D_METHOD("get_export_platforms"),&EditorImportExport::_get_export_platforms); - ClassDB::bind_method(_MD("set_export_filter","filter"),&EditorImportExport::set_export_filter); - ClassDB::bind_method(_MD("get_export_filter"),&EditorImportExport::get_export_filter); + ClassDB::bind_method(D_METHOD("set_export_filter","filter"),&EditorImportExport::set_export_filter); + ClassDB::bind_method(D_METHOD("get_export_filter"),&EditorImportExport::get_export_filter); - ClassDB::bind_method(_MD("set_export_custom_filter","filter"),&EditorImportExport::set_export_custom_filter); - ClassDB::bind_method(_MD("get_export_custom_filter"),&EditorImportExport::get_export_custom_filter); + ClassDB::bind_method(D_METHOD("set_export_custom_filter","filter"),&EditorImportExport::set_export_custom_filter); + ClassDB::bind_method(D_METHOD("get_export_custom_filter"),&EditorImportExport::get_export_custom_filter); - ClassDB::bind_method(_MD("set_export_custom_filter_exclude","filter_exclude"),&EditorImportExport::set_export_custom_filter_exclude); - ClassDB::bind_method(_MD("get_export_custom_filter_exclude"),&EditorImportExport::get_export_custom_filter_exclude); + ClassDB::bind_method(D_METHOD("set_export_custom_filter_exclude","filter_exclude"),&EditorImportExport::set_export_custom_filter_exclude); + ClassDB::bind_method(D_METHOD("get_export_custom_filter_exclude"),&EditorImportExport::get_export_custom_filter_exclude); - ClassDB::bind_method(_MD("image_export_group_create"),&EditorImportExport::image_export_group_create); - ClassDB::bind_method(_MD("image_export_group_remove"),&EditorImportExport::image_export_group_remove); - ClassDB::bind_method(_MD("image_export_group_set_image_action"),&EditorImportExport::image_export_group_set_image_action); - ClassDB::bind_method(_MD("image_export_group_set_make_atlas"),&EditorImportExport::image_export_group_set_make_atlas); - ClassDB::bind_method(_MD("image_export_group_set_shrink"),&EditorImportExport::image_export_group_set_shrink); - ClassDB::bind_method(_MD("image_export_group_get_image_action"),&EditorImportExport::image_export_group_get_image_action); - ClassDB::bind_method(_MD("image_export_group_get_make_atlas"),&EditorImportExport::image_export_group_get_make_atlas); - ClassDB::bind_method(_MD("image_export_group_get_shrink"),&EditorImportExport::image_export_group_get_shrink); - ClassDB::bind_method(_MD("image_add_to_export_group"),&EditorImportExport::image_add_to_export_group); - ClassDB::bind_method(_MD("script_set_action"),&EditorImportExport::script_set_action); - ClassDB::bind_method(_MD("script_set_encryption_key"),&EditorImportExport::script_set_encryption_key); - ClassDB::bind_method(_MD("script_get_action"),&EditorImportExport::script_get_action); - ClassDB::bind_method(_MD("script_get_encryption_key"),&EditorImportExport::script_get_encryption_key); + ClassDB::bind_method(D_METHOD("image_export_group_create"),&EditorImportExport::image_export_group_create); + ClassDB::bind_method(D_METHOD("image_export_group_remove"),&EditorImportExport::image_export_group_remove); + ClassDB::bind_method(D_METHOD("image_export_group_set_image_action"),&EditorImportExport::image_export_group_set_image_action); + ClassDB::bind_method(D_METHOD("image_export_group_set_make_atlas"),&EditorImportExport::image_export_group_set_make_atlas); + ClassDB::bind_method(D_METHOD("image_export_group_set_shrink"),&EditorImportExport::image_export_group_set_shrink); + ClassDB::bind_method(D_METHOD("image_export_group_get_image_action"),&EditorImportExport::image_export_group_get_image_action); + ClassDB::bind_method(D_METHOD("image_export_group_get_make_atlas"),&EditorImportExport::image_export_group_get_make_atlas); + ClassDB::bind_method(D_METHOD("image_export_group_get_shrink"),&EditorImportExport::image_export_group_get_shrink); + ClassDB::bind_method(D_METHOD("image_add_to_export_group"),&EditorImportExport::image_add_to_export_group); + ClassDB::bind_method(D_METHOD("script_set_action"),&EditorImportExport::script_set_action); + ClassDB::bind_method(D_METHOD("script_set_encryption_key"),&EditorImportExport::script_set_encryption_key); + ClassDB::bind_method(D_METHOD("script_get_action"),&EditorImportExport::script_get_action); + ClassDB::bind_method(D_METHOD("script_get_encryption_key"),&EditorImportExport::script_get_encryption_key); diff --git a/tools/editor/editor_log.cpp b/tools/editor/editor_log.cpp index 6b6a1b998..850d9273f 100644 --- a/tools/editor/editor_log.cpp +++ b/tools/editor/editor_log.cpp @@ -167,9 +167,9 @@ void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) { void EditorLog::_bind_methods() { - ClassDB::bind_method(_MD("_clear_request"),&EditorLog::_clear_request ); + ClassDB::bind_method(D_METHOD("_clear_request"),&EditorLog::_clear_request ); ClassDB::bind_method("_override_logger_styles",&EditorLog::_override_logger_styles ); - //ClassDB::bind_method(_MD("_dragged"),&EditorLog::_dragged ); + //ClassDB::bind_method(D_METHOD("_dragged"),&EditorLog::_dragged ); ADD_SIGNAL( MethodInfo("clear_request")); } diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 9fac8dfbe..da9138e5d 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5098,13 +5098,13 @@ void EditorNode::_bind_methods() { -// ClassDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin); - //ClassDB::bind_method(_MD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin); - ClassDB::bind_method(_MD("get_gui_base"), &EditorNode::get_gui_base); - ClassDB::bind_method(_MD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch); +// ClassDB::bind_method(D_METHOD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin); + //ClassDB::bind_method(D_METHOD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin); + ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base); + ClassDB::bind_method(D_METHOD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch); - ClassDB::bind_method(_MD("_open_imported"), &EditorNode::_open_imported); - ClassDB::bind_method(_MD("_inherit_imported"), &EditorNode::_inherit_imported); + ClassDB::bind_method(D_METHOD("_open_imported"), &EditorNode::_open_imported); + ClassDB::bind_method(D_METHOD("_inherit_imported"), &EditorNode::_inherit_imported); ADD_SIGNAL( MethodInfo("play_pressed") ); ADD_SIGNAL( MethodInfo("pause_pressed") ); diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp index 2f44b5558..2a0efa5be 100644 --- a/tools/editor/editor_plugin.cpp +++ b/tools/editor/editor_plugin.cpp @@ -345,33 +345,33 @@ EditorFileSystem *EditorPlugin::get_resource_file_system() { void EditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("add_control_to_container","container","control:Control"),&EditorPlugin::add_control_to_container); - ClassDB::bind_method(_MD("add_control_to_bottom_panel:ToolButton","control:Control","title"),&EditorPlugin::add_control_to_bottom_panel); - ClassDB::bind_method(_MD("add_control_to_dock","slot","control:Control"),&EditorPlugin::add_control_to_dock); - ClassDB::bind_method(_MD("remove_control_from_docks","control:Control"),&EditorPlugin::remove_control_from_docks); - ClassDB::bind_method(_MD("remove_control_from_bottom_panel","control:Control"),&EditorPlugin::remove_control_from_bottom_panel); - //ClassDB::bind_method(_MD("add_tool_menu_item", "name", "handler", "callback", "ud"),&EditorPlugin::add_tool_menu_item,DEFVAL(Variant())); - ClassDB::bind_method(_MD("add_tool_submenu_item", "name", "submenu:PopupMenu"),&EditorPlugin::add_tool_submenu_item); - //ClassDB::bind_method(_MD("remove_tool_menu_item", "name"),&EditorPlugin::remove_tool_menu_item); - ClassDB::bind_method(_MD("add_custom_type","type","base","script:Script","icon:Texture"),&EditorPlugin::add_custom_type); - ClassDB::bind_method(_MD("remove_custom_type","type"),&EditorPlugin::remove_custom_type); - ClassDB::bind_method(_MD("get_editor_viewport:Control"), &EditorPlugin::get_editor_viewport); + ClassDB::bind_method(D_METHOD("add_control_to_container","container","control:Control"),&EditorPlugin::add_control_to_container); + ClassDB::bind_method(D_METHOD("add_control_to_bottom_panel:ToolButton","control:Control","title"),&EditorPlugin::add_control_to_bottom_panel); + ClassDB::bind_method(D_METHOD("add_control_to_dock","slot","control:Control"),&EditorPlugin::add_control_to_dock); + ClassDB::bind_method(D_METHOD("remove_control_from_docks","control:Control"),&EditorPlugin::remove_control_from_docks); + ClassDB::bind_method(D_METHOD("remove_control_from_bottom_panel","control:Control"),&EditorPlugin::remove_control_from_bottom_panel); + //ClassDB::bind_method(D_METHOD("add_tool_menu_item", "name", "handler", "callback", "ud"),&EditorPlugin::add_tool_menu_item,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("add_tool_submenu_item", "name", "submenu:PopupMenu"),&EditorPlugin::add_tool_submenu_item); + //ClassDB::bind_method(D_METHOD("remove_tool_menu_item", "name"),&EditorPlugin::remove_tool_menu_item); + ClassDB::bind_method(D_METHOD("add_custom_type","type","base","script:Script","icon:Texture"),&EditorPlugin::add_custom_type); + ClassDB::bind_method(D_METHOD("remove_custom_type","type"),&EditorPlugin::remove_custom_type); + ClassDB::bind_method(D_METHOD("get_editor_viewport:Control"), &EditorPlugin::get_editor_viewport); - ClassDB::bind_method(_MD("get_resource_previewer:EditorResourcePreview"),&EditorPlugin::get_resource_previewer); - ClassDB::bind_method(_MD("get_resource_filesystem:EditorFileSystem"),&EditorPlugin::get_resource_file_system); + ClassDB::bind_method(D_METHOD("get_resource_previewer:EditorResourcePreview"),&EditorPlugin::get_resource_previewer); + ClassDB::bind_method(D_METHOD("get_resource_filesystem:EditorFileSystem"),&EditorPlugin::get_resource_file_system); - ClassDB::bind_method(_MD("inspect_object","object","for_property"),&EditorPlugin::inspect_object,DEFVAL(String())); - ClassDB::bind_method(_MD("update_canvas"),&EditorPlugin::update_canvas); + ClassDB::bind_method(D_METHOD("inspect_object","object","for_property"),&EditorPlugin::inspect_object,DEFVAL(String())); + ClassDB::bind_method(D_METHOD("update_canvas"),&EditorPlugin::update_canvas); - ClassDB::bind_method(_MD("make_bottom_panel_item_visible","item:Control"), &EditorPlugin::make_bottom_panel_item_visible); - ClassDB::bind_method(_MD("hide_bottom_panel"), &EditorPlugin::hide_bottom_panel); + ClassDB::bind_method(D_METHOD("make_bottom_panel_item_visible","item:Control"), &EditorPlugin::make_bottom_panel_item_visible); + ClassDB::bind_method(D_METHOD("hide_bottom_panel"), &EditorPlugin::hide_bottom_panel); - ClassDB::bind_method(_MD("get_base_control:Control"),&EditorPlugin::get_base_control); - ClassDB::bind_method(_MD("get_undo_redo:UndoRedo"),&EditorPlugin::_get_undo_redo); - ClassDB::bind_method(_MD("get_selection:EditorSelection"),&EditorPlugin::get_selection); - ClassDB::bind_method(_MD("get_editor_settings:EditorSettings"),&EditorPlugin::get_editor_settings); - ClassDB::bind_method(_MD("queue_save_layout"),&EditorPlugin::queue_save_layout); - ClassDB::bind_method(_MD("edit_resource"),&EditorPlugin::edit_resource); + ClassDB::bind_method(D_METHOD("get_base_control:Control"),&EditorPlugin::get_base_control); + ClassDB::bind_method(D_METHOD("get_undo_redo:UndoRedo"),&EditorPlugin::_get_undo_redo); + ClassDB::bind_method(D_METHOD("get_selection:EditorSelection"),&EditorPlugin::get_selection); + ClassDB::bind_method(D_METHOD("get_editor_settings:EditorSettings"),&EditorPlugin::get_editor_settings); + ClassDB::bind_method(D_METHOD("queue_save_layout"),&EditorPlugin::queue_save_layout); + ClassDB::bind_method(D_METHOD("edit_resource"),&EditorPlugin::edit_resource); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"forward_canvas_gui_input",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::INPUT_EVENT,"event"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo("forward_draw_over_canvas",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::OBJECT,"canvas:Control"))); diff --git a/tools/editor/editor_profiler.cpp b/tools/editor/editor_profiler.cpp index 94ec059ea..d9a417424 100644 --- a/tools/editor/editor_profiler.cpp +++ b/tools/editor/editor_profiler.cpp @@ -646,16 +646,16 @@ void EditorProfiler::_combo_changed(int) { void EditorProfiler::_bind_methods() { - ClassDB::bind_method(_MD("_update_frame"),&EditorProfiler::_update_frame); - ClassDB::bind_method(_MD("_update_plot"),&EditorProfiler::_update_plot); - ClassDB::bind_method(_MD("_activate_pressed"),&EditorProfiler::_activate_pressed); - ClassDB::bind_method(_MD("_graph_tex_draw"),&EditorProfiler::_graph_tex_draw); - ClassDB::bind_method(_MD("_graph_tex_input"),&EditorProfiler::_graph_tex_input); - ClassDB::bind_method(_MD("_graph_tex_mouse_exit"),&EditorProfiler::_graph_tex_mouse_exit); - ClassDB::bind_method(_MD("_cursor_metric_changed"),&EditorProfiler::_cursor_metric_changed); - ClassDB::bind_method(_MD("_combo_changed"),&EditorProfiler::_combo_changed); + ClassDB::bind_method(D_METHOD("_update_frame"),&EditorProfiler::_update_frame); + ClassDB::bind_method(D_METHOD("_update_plot"),&EditorProfiler::_update_plot); + ClassDB::bind_method(D_METHOD("_activate_pressed"),&EditorProfiler::_activate_pressed); + ClassDB::bind_method(D_METHOD("_graph_tex_draw"),&EditorProfiler::_graph_tex_draw); + ClassDB::bind_method(D_METHOD("_graph_tex_input"),&EditorProfiler::_graph_tex_input); + ClassDB::bind_method(D_METHOD("_graph_tex_mouse_exit"),&EditorProfiler::_graph_tex_mouse_exit); + ClassDB::bind_method(D_METHOD("_cursor_metric_changed"),&EditorProfiler::_cursor_metric_changed); + ClassDB::bind_method(D_METHOD("_combo_changed"),&EditorProfiler::_combo_changed); - ClassDB::bind_method(_MD("_item_edited"),&EditorProfiler::_item_edited); + ClassDB::bind_method(D_METHOD("_item_edited"),&EditorProfiler::_item_edited); ADD_SIGNAL( MethodInfo("enable_profiling",PropertyInfo(Variant::BOOL,"enable"))); ADD_SIGNAL( MethodInfo("break_request")); diff --git a/tools/editor/editor_resource_preview.cpp b/tools/editor/editor_resource_preview.cpp index b4c459a49..b6cf24e52 100644 --- a/tools/editor/editor_resource_preview.cpp +++ b/tools/editor/editor_resource_preview.cpp @@ -379,11 +379,11 @@ void EditorResourcePreview::_bind_methods() { ClassDB::bind_method("_preview_ready",&EditorResourcePreview::_preview_ready); - ClassDB::bind_method(_MD("queue_resource_preview","path","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_resource_preview); - ClassDB::bind_method(_MD("queue_edited_resource_preview","resource:Resource","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_edited_resource_preview); - ClassDB::bind_method(_MD("add_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::add_preview_generator); - ClassDB::bind_method(_MD("remove_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::remove_preview_generator); - ClassDB::bind_method(_MD("check_for_invalidation","path"),&EditorResourcePreview::check_for_invalidation); + ClassDB::bind_method(D_METHOD("queue_resource_preview","path","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_resource_preview); + ClassDB::bind_method(D_METHOD("queue_edited_resource_preview","resource:Resource","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_edited_resource_preview); + ClassDB::bind_method(D_METHOD("add_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::add_preview_generator); + ClassDB::bind_method(D_METHOD("remove_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::remove_preview_generator); + ClassDB::bind_method(D_METHOD("check_for_invalidation","path"),&EditorResourcePreview::check_for_invalidation); ADD_SIGNAL(MethodInfo("preview_invalidated",PropertyInfo(Variant::STRING,"path"))); diff --git a/tools/editor/editor_run_script.cpp b/tools/editor/editor_run_script.cpp index 6a980019e..77dc7bd4b 100644 --- a/tools/editor/editor_run_script.cpp +++ b/tools/editor/editor_run_script.cpp @@ -83,8 +83,8 @@ void EditorScript::set_editor(EditorNode *p_editor) { void EditorScript::_bind_methods() { - ClassDB::bind_method(_MD("add_root_node","node"),&EditorScript::add_root_node); - ClassDB::bind_method(_MD("get_scene"),&EditorScript::get_scene); + ClassDB::bind_method(D_METHOD("add_root_node","node"),&EditorScript::add_root_node); + ClassDB::bind_method(D_METHOD("get_scene"),&EditorScript::get_scene); BIND_VMETHOD( MethodInfo("_run") ); diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 6d9f1bd97..2e32cfe38 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -1058,17 +1058,17 @@ void EditorSettings::set_project_metadata(const String& p_section, const String& void EditorSettings::_bind_methods() { - ClassDB::bind_method(_MD("erase","property"),&EditorSettings::erase); - ClassDB::bind_method(_MD("get_settings_path"),&EditorSettings::get_settings_path); - ClassDB::bind_method(_MD("get_project_settings_path"),&EditorSettings::get_project_settings_path); + ClassDB::bind_method(D_METHOD("erase","property"),&EditorSettings::erase); + ClassDB::bind_method(D_METHOD("get_settings_path"),&EditorSettings::get_settings_path); + ClassDB::bind_method(D_METHOD("get_project_settings_path"),&EditorSettings::get_project_settings_path); - ClassDB::bind_method(_MD("add_property_info", "info"),&EditorSettings::_add_property_info_bind); + ClassDB::bind_method(D_METHOD("add_property_info", "info"),&EditorSettings::_add_property_info_bind); - ClassDB::bind_method(_MD("set_favorite_dirs","dirs"),&EditorSettings::set_favorite_dirs); - ClassDB::bind_method(_MD("get_favorite_dirs"),&EditorSettings::get_favorite_dirs); + ClassDB::bind_method(D_METHOD("set_favorite_dirs","dirs"),&EditorSettings::set_favorite_dirs); + ClassDB::bind_method(D_METHOD("get_favorite_dirs"),&EditorSettings::get_favorite_dirs); - ClassDB::bind_method(_MD("set_recent_dirs","dirs"),&EditorSettings::set_recent_dirs); - ClassDB::bind_method(_MD("get_recent_dirs"),&EditorSettings::get_recent_dirs); + ClassDB::bind_method(D_METHOD("set_recent_dirs","dirs"),&EditorSettings::set_recent_dirs); + ClassDB::bind_method(D_METHOD("get_recent_dirs"),&EditorSettings::get_recent_dirs); ADD_SIGNAL(MethodInfo("settings_changed")); diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp index 094cf049b..917560b54 100644 --- a/tools/editor/editor_sub_scene.cpp +++ b/tools/editor/editor_sub_scene.cpp @@ -187,9 +187,9 @@ void EditorSubScene::clear() { void EditorSubScene::_bind_methods() { - ClassDB::bind_method(_MD("_path_selected"),&EditorSubScene::_path_selected); - ClassDB::bind_method(_MD("_path_changed"),&EditorSubScene::_path_changed); - ClassDB::bind_method(_MD("_path_browse"),&EditorSubScene::_path_browse); + ClassDB::bind_method(D_METHOD("_path_selected"),&EditorSubScene::_path_selected); + ClassDB::bind_method(D_METHOD("_path_changed"),&EditorSubScene::_path_changed); + ClassDB::bind_method(D_METHOD("_path_browse"),&EditorSubScene::_path_browse); ADD_SIGNAL( MethodInfo("subscene_selected")); } diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp index 08b8307eb..c6c1a02f3 100644 --- a/tools/editor/filesystem_dock.cpp +++ b/tools/editor/filesystem_dock.cpp @@ -1641,37 +1641,37 @@ void FileSystemDock::_file_selected() { void FileSystemDock::_bind_methods() { - ClassDB::bind_method(_MD("_update_tree"),&FileSystemDock::_update_tree); - ClassDB::bind_method(_MD("_rescan"),&FileSystemDock::_rescan); - ClassDB::bind_method(_MD("_favorites_pressed"),&FileSystemDock::_favorites_pressed); - //ClassDB::bind_method(_MD("_instance_pressed"),&ScenesDock::_instance_pressed); - ClassDB::bind_method(_MD("_open_pressed"),&FileSystemDock::_open_pressed); - ClassDB::bind_method(_MD("_dir_rmb_pressed"),&FileSystemDock::_dir_rmb_pressed); + ClassDB::bind_method(D_METHOD("_update_tree"),&FileSystemDock::_update_tree); + ClassDB::bind_method(D_METHOD("_rescan"),&FileSystemDock::_rescan); + ClassDB::bind_method(D_METHOD("_favorites_pressed"),&FileSystemDock::_favorites_pressed); + //ClassDB::bind_method(D_METHOD("_instance_pressed"),&ScenesDock::_instance_pressed); + ClassDB::bind_method(D_METHOD("_open_pressed"),&FileSystemDock::_open_pressed); + ClassDB::bind_method(D_METHOD("_dir_rmb_pressed"),&FileSystemDock::_dir_rmb_pressed); - ClassDB::bind_method(_MD("_thumbnail_done"),&FileSystemDock::_thumbnail_done); - ClassDB::bind_method(_MD("_select_file"), &FileSystemDock::_select_file); - ClassDB::bind_method(_MD("_go_to_tree"), &FileSystemDock::_go_to_tree); - ClassDB::bind_method(_MD("_go_to_dir"), &FileSystemDock::_go_to_dir); - ClassDB::bind_method(_MD("_change_file_display"), &FileSystemDock::_change_file_display); - ClassDB::bind_method(_MD("_fw_history"), &FileSystemDock::_fw_history); - ClassDB::bind_method(_MD("_bw_history"), &FileSystemDock::_bw_history); - ClassDB::bind_method(_MD("_fs_changed"), &FileSystemDock::_fs_changed); - ClassDB::bind_method(_MD("_dir_selected"), &FileSystemDock::_dir_selected); - ClassDB::bind_method(_MD("_file_option"), &FileSystemDock::_file_option); - ClassDB::bind_method(_MD("_folder_option"), &FileSystemDock::_folder_option); - ClassDB::bind_method(_MD("_move_operation"), &FileSystemDock::_move_operation); - ClassDB::bind_method(_MD("_rename_operation"), &FileSystemDock::_rename_operation); + ClassDB::bind_method(D_METHOD("_thumbnail_done"),&FileSystemDock::_thumbnail_done); + ClassDB::bind_method(D_METHOD("_select_file"), &FileSystemDock::_select_file); + ClassDB::bind_method(D_METHOD("_go_to_tree"), &FileSystemDock::_go_to_tree); + ClassDB::bind_method(D_METHOD("_go_to_dir"), &FileSystemDock::_go_to_dir); + ClassDB::bind_method(D_METHOD("_change_file_display"), &FileSystemDock::_change_file_display); + ClassDB::bind_method(D_METHOD("_fw_history"), &FileSystemDock::_fw_history); + ClassDB::bind_method(D_METHOD("_bw_history"), &FileSystemDock::_bw_history); + ClassDB::bind_method(D_METHOD("_fs_changed"), &FileSystemDock::_fs_changed); + ClassDB::bind_method(D_METHOD("_dir_selected"), &FileSystemDock::_dir_selected); + ClassDB::bind_method(D_METHOD("_file_option"), &FileSystemDock::_file_option); + ClassDB::bind_method(D_METHOD("_folder_option"), &FileSystemDock::_folder_option); + ClassDB::bind_method(D_METHOD("_move_operation"), &FileSystemDock::_move_operation); + ClassDB::bind_method(D_METHOD("_rename_operation"), &FileSystemDock::_rename_operation); - ClassDB::bind_method(_MD("_search_changed"), &FileSystemDock::_search_changed); + ClassDB::bind_method(D_METHOD("_search_changed"), &FileSystemDock::_search_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &FileSystemDock::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &FileSystemDock::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &FileSystemDock::drop_data_fw); - ClassDB::bind_method(_MD("_files_list_rmb_select"),&FileSystemDock::_files_list_rmb_select); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &FileSystemDock::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &FileSystemDock::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &FileSystemDock::drop_data_fw); + ClassDB::bind_method(D_METHOD("_files_list_rmb_select"),&FileSystemDock::_files_list_rmb_select); - ClassDB::bind_method(_MD("_preview_invalidated"),&FileSystemDock::_preview_invalidated); - ClassDB::bind_method(_MD("_file_selected"),&FileSystemDock::_file_selected); - ClassDB::bind_method(_MD("_file_multi_selected"),&FileSystemDock::_file_multi_selected); + ClassDB::bind_method(D_METHOD("_preview_invalidated"),&FileSystemDock::_preview_invalidated); + ClassDB::bind_method(D_METHOD("_file_selected"),&FileSystemDock::_file_selected); + ClassDB::bind_method(D_METHOD("_file_multi_selected"),&FileSystemDock::_file_multi_selected); ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::POOL_STRING_ARRAY, "files"))); diff --git a/tools/editor/import_dock.cpp b/tools/editor/import_dock.cpp index b1bd69823..bf61ca4df 100644 --- a/tools/editor/import_dock.cpp +++ b/tools/editor/import_dock.cpp @@ -285,8 +285,8 @@ void ImportDock::_reimport() { void ImportDock::_bind_methods() { - ClassDB::bind_method(_MD("_reimport"),&ImportDock::_reimport); - ClassDB::bind_method(_MD("_preset_selected"),&ImportDock::_preset_selected); + ClassDB::bind_method(D_METHOD("_reimport"),&ImportDock::_reimport); + ClassDB::bind_method(D_METHOD("_preset_selected"),&ImportDock::_preset_selected); } ImportDock::ImportDock() { diff --git a/tools/editor/node_dock.cpp b/tools/editor/node_dock.cpp index 3d906cf96..fed3d2efb 100644 --- a/tools/editor/node_dock.cpp +++ b/tools/editor/node_dock.cpp @@ -49,8 +49,8 @@ void NodeDock::show_connections(){ void NodeDock::_bind_methods() { - ClassDB::bind_method(_MD("show_groups"),&NodeDock::show_groups); - ClassDB::bind_method(_MD("show_connections"),&NodeDock::show_connections); + ClassDB::bind_method(D_METHOD("show_groups"),&NodeDock::show_groups); + ClassDB::bind_method(D_METHOD("show_connections"),&NodeDock::show_connections); } void NodeDock::_notification(int p_what) { diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index f10526fb7..7d6598bd4 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -1258,43 +1258,43 @@ void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) { void AnimationPlayerEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&AnimationPlayerEditor::_gui_input); - ClassDB::bind_method(_MD("_node_removed"),&AnimationPlayerEditor::_node_removed); - ClassDB::bind_method(_MD("_play_pressed"),&AnimationPlayerEditor::_play_pressed); - ClassDB::bind_method(_MD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed); - ClassDB::bind_method(_MD("_play_bw_pressed"),&AnimationPlayerEditor::_play_bw_pressed); - ClassDB::bind_method(_MD("_play_bw_from_pressed"),&AnimationPlayerEditor::_play_bw_from_pressed); - ClassDB::bind_method(_MD("_stop_pressed"),&AnimationPlayerEditor::_stop_pressed); - ClassDB::bind_method(_MD("_autoplay_pressed"),&AnimationPlayerEditor::_autoplay_pressed); - ClassDB::bind_method(_MD("_pause_pressed"),&AnimationPlayerEditor::_pause_pressed); - ClassDB::bind_method(_MD("_animation_selected"),&AnimationPlayerEditor::_animation_selected); - ClassDB::bind_method(_MD("_animation_name_edited"),&AnimationPlayerEditor::_animation_name_edited); - ClassDB::bind_method(_MD("_animation_new"),&AnimationPlayerEditor::_animation_new); - ClassDB::bind_method(_MD("_animation_rename"),&AnimationPlayerEditor::_animation_rename); - ClassDB::bind_method(_MD("_animation_load"),&AnimationPlayerEditor::_animation_load); - ClassDB::bind_method(_MD("_animation_remove"),&AnimationPlayerEditor::_animation_remove); - ClassDB::bind_method(_MD("_animation_remove_confirmed"),&AnimationPlayerEditor::_animation_remove_confirmed); - ClassDB::bind_method(_MD("_animation_blend"),&AnimationPlayerEditor::_animation_blend); - ClassDB::bind_method(_MD("_animation_edit"),&AnimationPlayerEditor::_animation_edit); - ClassDB::bind_method(_MD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit); - ClassDB::bind_method(_MD("_dialog_action"),&AnimationPlayerEditor::_dialog_action); - ClassDB::bind_method(_MD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed,DEFVAL(true)); - ClassDB::bind_method(_MD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed); - ClassDB::bind_method(_MD("_blend_edited"),&AnimationPlayerEditor::_blend_edited); - //ClassDB::bind_method(_MD("_seek_frame_changed"),&AnimationPlayerEditor::_seek_frame_changed); - ClassDB::bind_method(_MD("_scale_changed"),&AnimationPlayerEditor::_scale_changed); - //ClassDB::bind_method(_MD("_editor_store_all"),&AnimationPlayerEditor::_editor_store_all); - ///jectTypeDB::bind_method(_MD("_editor_load_all"),&AnimationPlayerEditor::_editor_load_all); - ClassDB::bind_method(_MD("_list_changed"),&AnimationPlayerEditor::_list_changed); - ClassDB::bind_method(_MD("_animation_key_editor_seek"),&AnimationPlayerEditor::_animation_key_editor_seek); - ClassDB::bind_method(_MD("_animation_key_editor_anim_len_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_len_changed); - ClassDB::bind_method(_MD("_animation_key_editor_anim_step_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_step_changed); - ClassDB::bind_method(_MD("_hide_anim_editors"),&AnimationPlayerEditor::_hide_anim_editors); - ClassDB::bind_method(_MD("_animation_duplicate"),&AnimationPlayerEditor::_animation_duplicate); - ClassDB::bind_method(_MD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed); - ClassDB::bind_method(_MD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input); - ClassDB::bind_method(_MD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu); - ClassDB::bind_method(_MD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu); + ClassDB::bind_method(D_METHOD("_gui_input"),&AnimationPlayerEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_node_removed"),&AnimationPlayerEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_play_pressed"),&AnimationPlayerEditor::_play_pressed); + ClassDB::bind_method(D_METHOD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_pressed"),&AnimationPlayerEditor::_play_bw_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_from_pressed"),&AnimationPlayerEditor::_play_bw_from_pressed); + ClassDB::bind_method(D_METHOD("_stop_pressed"),&AnimationPlayerEditor::_stop_pressed); + ClassDB::bind_method(D_METHOD("_autoplay_pressed"),&AnimationPlayerEditor::_autoplay_pressed); + ClassDB::bind_method(D_METHOD("_pause_pressed"),&AnimationPlayerEditor::_pause_pressed); + ClassDB::bind_method(D_METHOD("_animation_selected"),&AnimationPlayerEditor::_animation_selected); + ClassDB::bind_method(D_METHOD("_animation_name_edited"),&AnimationPlayerEditor::_animation_name_edited); + ClassDB::bind_method(D_METHOD("_animation_new"),&AnimationPlayerEditor::_animation_new); + ClassDB::bind_method(D_METHOD("_animation_rename"),&AnimationPlayerEditor::_animation_rename); + ClassDB::bind_method(D_METHOD("_animation_load"),&AnimationPlayerEditor::_animation_load); + ClassDB::bind_method(D_METHOD("_animation_remove"),&AnimationPlayerEditor::_animation_remove); + ClassDB::bind_method(D_METHOD("_animation_remove_confirmed"),&AnimationPlayerEditor::_animation_remove_confirmed); + ClassDB::bind_method(D_METHOD("_animation_blend"),&AnimationPlayerEditor::_animation_blend); + ClassDB::bind_method(D_METHOD("_animation_edit"),&AnimationPlayerEditor::_animation_edit); + ClassDB::bind_method(D_METHOD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit); + ClassDB::bind_method(D_METHOD("_dialog_action"),&AnimationPlayerEditor::_dialog_action); + ClassDB::bind_method(D_METHOD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed); + ClassDB::bind_method(D_METHOD("_blend_edited"),&AnimationPlayerEditor::_blend_edited); + //ClassDB::bind_method(D_METHOD("_seek_frame_changed"),&AnimationPlayerEditor::_seek_frame_changed); + ClassDB::bind_method(D_METHOD("_scale_changed"),&AnimationPlayerEditor::_scale_changed); + //ClassDB::bind_method(D_METHOD("_editor_store_all"),&AnimationPlayerEditor::_editor_store_all); + //ClassDB::bind_method(D_METHOD("_editor_load_all"),&AnimationPlayerEditor::_editor_load_all); + ClassDB::bind_method(D_METHOD("_list_changed"),&AnimationPlayerEditor::_list_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_seek"),&AnimationPlayerEditor::_animation_key_editor_seek); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_len_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_len_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_step_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_step_changed); + ClassDB::bind_method(D_METHOD("_hide_anim_editors"),&AnimationPlayerEditor::_hide_anim_editors); + ClassDB::bind_method(D_METHOD("_animation_duplicate"),&AnimationPlayerEditor::_animation_duplicate); + ClassDB::bind_method(D_METHOD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu); + ClassDB::bind_method(D_METHOD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu); diff --git a/tools/editor/plugins/camera_editor_plugin.cpp b/tools/editor/plugins/camera_editor_plugin.cpp index 1e0ec2b4a..7073acd2c 100644 --- a/tools/editor/plugins/camera_editor_plugin.cpp +++ b/tools/editor/plugins/camera_editor_plugin.cpp @@ -62,7 +62,7 @@ void CameraEditor::_pressed() { void CameraEditor::_bind_methods() { - ClassDB::bind_method(_MD("_pressed"),&CameraEditor::_pressed); + ClassDB::bind_method(D_METHOD("_pressed"),&CameraEditor::_pressed); } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index bec7956b8..0830556ac 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -3212,8 +3212,8 @@ void CanvasItemEditor::_bind_methods() { ClassDB::bind_method("_viewport_draw",&CanvasItemEditor::_viewport_draw); ClassDB::bind_method("_viewport_gui_input",&CanvasItemEditor::_viewport_gui_input); ClassDB::bind_method("_snap_changed",&CanvasItemEditor::_snap_changed); - ClassDB::bind_method(_MD("_selection_result_pressed"),&CanvasItemEditor::_selection_result_pressed); - ClassDB::bind_method(_MD("_selection_menu_hide"),&CanvasItemEditor::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("_selection_result_pressed"),&CanvasItemEditor::_selection_result_pressed); + ClassDB::bind_method(D_METHOD("_selection_menu_hide"),&CanvasItemEditor::_selection_menu_hide); ADD_SIGNAL( MethodInfo("item_lock_status_changed") ); ADD_SIGNAL( MethodInfo("item_group_status_changed") ); @@ -3984,9 +3984,9 @@ void CanvasItemEditorViewport::_notification(int p_what) { } void CanvasItemEditorViewport::_bind_methods() { - ClassDB::bind_method(_MD("_on_select_type"),&CanvasItemEditorViewport::_on_select_type); - ClassDB::bind_method(_MD("_on_change_type"),&CanvasItemEditorViewport::_on_change_type); - ClassDB::bind_method(_MD("_on_mouse_exit"),&CanvasItemEditorViewport::_on_mouse_exit); + ClassDB::bind_method(D_METHOD("_on_select_type"),&CanvasItemEditorViewport::_on_select_type); + ClassDB::bind_method(D_METHOD("_on_change_type"),&CanvasItemEditorViewport::_on_change_type); + ClassDB::bind_method(D_METHOD("_on_mouse_exit"),&CanvasItemEditorViewport::_on_mouse_exit); } CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor* p_canvas) { diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 263d96ecd..43d3ad577 100644 --- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -398,9 +398,9 @@ void CollisionPolygon2DEditor::edit(Node *p_collision_polygon) { void CollisionPolygon2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&CollisionPolygon2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&CollisionPolygon2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&CollisionPolygon2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_menu_option"),&CollisionPolygon2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&CollisionPolygon2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&CollisionPolygon2DEditor::_node_removed); } diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_editor_plugin.cpp index c5cd15cf7..406c12b00 100644 --- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_editor_plugin.cpp @@ -530,9 +530,9 @@ void CollisionPolygonEditor::edit(Node *p_collision_polygon) { void CollisionPolygonEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&CollisionPolygonEditor::_menu_option); - ClassDB::bind_method(_MD("_polygon_draw"),&CollisionPolygonEditor::_polygon_draw); - ClassDB::bind_method(_MD("_node_removed"),&CollisionPolygonEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_menu_option"),&CollisionPolygonEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_polygon_draw"),&CollisionPolygonEditor::_polygon_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&CollisionPolygonEditor::_node_removed); } diff --git a/tools/editor/plugins/color_ramp_editor_plugin.cpp b/tools/editor/plugins/color_ramp_editor_plugin.cpp index 9509eb1b0..82674fabb 100644 --- a/tools/editor/plugins/color_ramp_editor_plugin.cpp +++ b/tools/editor/plugins/color_ramp_editor_plugin.cpp @@ -107,6 +107,6 @@ ColorRampEditorPlugin::~ColorRampEditorPlugin(){ } void ColorRampEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("ramp_changed"),&ColorRampEditorPlugin::_ramp_changed); - ClassDB::bind_method(_MD("undo_redo_color_ramp","offsets","colors"),&ColorRampEditorPlugin::_undo_redo_color_ramp); + ClassDB::bind_method(D_METHOD("ramp_changed"),&ColorRampEditorPlugin::_ramp_changed); + ClassDB::bind_method(D_METHOD("undo_redo_color_ramp","offsets","colors"),&ColorRampEditorPlugin::_undo_redo_color_ramp); } diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp index f6a51632a..e3b02e851 100644 --- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -427,10 +427,10 @@ void LightOccluder2DEditor::_create_poly() { void LightOccluder2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&LightOccluder2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&LightOccluder2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&LightOccluder2DEditor::_node_removed); - ClassDB::bind_method(_MD("_create_poly"),&LightOccluder2DEditor::_create_poly); + ClassDB::bind_method(D_METHOD("_menu_option"),&LightOccluder2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&LightOccluder2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&LightOccluder2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_create_poly"),&LightOccluder2DEditor::_create_poly); } diff --git a/tools/editor/plugins/line_2d_editor_plugin.cpp b/tools/editor/plugins/line_2d_editor_plugin.cpp index 054a2c62e..5ecbcaac4 100644 --- a/tools/editor/plugins/line_2d_editor_plugin.cpp +++ b/tools/editor/plugins/line_2d_editor_plugin.cpp @@ -185,9 +185,9 @@ void Line2DEditor::edit(Node *p_line2d) { } void Line2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_canvas_draw"), &Line2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_visibility_changed"), &Line2DEditor::_node_visibility_changed); - ClassDB::bind_method(_MD("_mode_selected"), &Line2DEditor::_mode_selected); + ClassDB::bind_method(D_METHOD("_canvas_draw"), &Line2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_visibility_changed"), &Line2DEditor::_node_visibility_changed); + ClassDB::bind_method(D_METHOD("_mode_selected"), &Line2DEditor::_mode_selected); } void Line2DEditor::_mode_selected(int p_mode) { diff --git a/tools/editor/plugins/material_editor_plugin.cpp b/tools/editor/plugins/material_editor_plugin.cpp index 1aababa91..cdf7c70d3 100644 --- a/tools/editor/plugins/material_editor_plugin.cpp +++ b/tools/editor/plugins/material_editor_plugin.cpp @@ -122,8 +122,8 @@ void MaterialEditor::_button_pressed(Node* p_button) { void MaterialEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&MaterialEditor::_gui_input); - ClassDB::bind_method(_MD("_button_pressed"),&MaterialEditor::_button_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&MaterialEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_button_pressed"),&MaterialEditor::_button_pressed); } diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp index 49cb02c9d..93f417247 100644 --- a/tools/editor/plugins/mesh_editor_plugin.cpp +++ b/tools/editor/plugins/mesh_editor_plugin.cpp @@ -136,8 +136,8 @@ void MeshEditor::_button_pressed(Node* p_button) { void MeshEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&MeshEditor::_gui_input); - ClassDB::bind_method(_MD("_button_pressed"),&MeshEditor::_button_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&MeshEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_button_pressed"),&MeshEditor::_button_pressed); } diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp index e70f2be9f..93a35cf8b 100644 --- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -477,10 +477,10 @@ void NavigationPolygonEditor::edit(Node *p_collision_polygon) { void NavigationPolygonEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&NavigationPolygonEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&NavigationPolygonEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&NavigationPolygonEditor::_node_removed); - ClassDB::bind_method(_MD("_create_nav"),&NavigationPolygonEditor::_create_nav); + ClassDB::bind_method(D_METHOD("_menu_option"),&NavigationPolygonEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&NavigationPolygonEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&NavigationPolygonEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_create_nav"),&NavigationPolygonEditor::_create_nav); } diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp index 20b1b9d1c..1efdbe9e6 100644 --- a/tools/editor/plugins/particles_2d_editor_plugin.cpp +++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp @@ -152,8 +152,8 @@ void Particles2DEditorPlugin::_notification(int p_what) { void Particles2DEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("_menu_callback"),&Particles2DEditorPlugin::_menu_callback); - ClassDB::bind_method(_MD("_file_selected"),&Particles2DEditorPlugin::_file_selected); + ClassDB::bind_method(D_METHOD("_menu_callback"),&Particles2DEditorPlugin::_menu_callback); + ClassDB::bind_method(D_METHOD("_file_selected"),&Particles2DEditorPlugin::_file_selected); } diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp index 8e475e56f..88dded72a 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.cpp +++ b/tools/editor/plugins/path_2d_editor_plugin.cpp @@ -550,10 +550,10 @@ void Path2DEditor::edit(Node *p_path2d) { void Path2DEditor::_bind_methods() { - //ClassDB::bind_method(_MD("_menu_option"),&Path2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&Path2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_visibility_changed"),&Path2DEditor::_node_visibility_changed); - ClassDB::bind_method(_MD("_mode_selected"),&Path2DEditor::_mode_selected); + //ClassDB::bind_method(D_METHOD("_menu_option"),&Path2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&Path2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_visibility_changed"),&Path2DEditor::_node_visibility_changed); + ClassDB::bind_method(D_METHOD("_mode_selected"),&Path2DEditor::_mode_selected); } void Path2DEditor::_mode_selected(int p_mode) { diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp index 2e148d648..a3df39fda 100644 --- a/tools/editor/plugins/path_editor_plugin.cpp +++ b/tools/editor/plugins/path_editor_plugin.cpp @@ -517,8 +517,8 @@ void PathEditorPlugin::_notification(int p_what) { void PathEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("_mode_changed"),&PathEditorPlugin::_mode_changed); - ClassDB::bind_method(_MD("_close_curve"),&PathEditorPlugin::_close_curve); + ClassDB::bind_method(D_METHOD("_mode_changed"),&PathEditorPlugin::_mode_changed); + ClassDB::bind_method(D_METHOD("_close_curve"),&PathEditorPlugin::_close_curve); } PathEditorPlugin* PathEditorPlugin::singleton=NULL; diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index 7958dce75..3fdf9a4da 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -775,19 +775,19 @@ void Polygon2DEditor::edit(Node *p_collision_polygon) { void Polygon2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&Polygon2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&Polygon2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_uv_mode"),&Polygon2DEditor::_uv_mode); - ClassDB::bind_method(_MD("_uv_draw"),&Polygon2DEditor::_uv_draw); - ClassDB::bind_method(_MD("_uv_input"),&Polygon2DEditor::_uv_input); - ClassDB::bind_method(_MD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed); - ClassDB::bind_method(_MD("_node_removed"),&Polygon2DEditor::_node_removed); - ClassDB::bind_method(_MD("_set_use_snap"),&Polygon2DEditor::_set_use_snap); - ClassDB::bind_method(_MD("_set_show_grid"),&Polygon2DEditor::_set_show_grid); - ClassDB::bind_method(_MD("_set_snap_off_x"),&Polygon2DEditor::_set_snap_off_x); - ClassDB::bind_method(_MD("_set_snap_off_y"),&Polygon2DEditor::_set_snap_off_y); - ClassDB::bind_method(_MD("_set_snap_step_x"),&Polygon2DEditor::_set_snap_step_x); - ClassDB::bind_method(_MD("_set_snap_step_y"),&Polygon2DEditor::_set_snap_step_y); + ClassDB::bind_method(D_METHOD("_menu_option"),&Polygon2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&Polygon2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_uv_mode"),&Polygon2DEditor::_uv_mode); + ClassDB::bind_method(D_METHOD("_uv_draw"),&Polygon2DEditor::_uv_draw); + ClassDB::bind_method(D_METHOD("_uv_input"),&Polygon2DEditor::_uv_input); + ClassDB::bind_method(D_METHOD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed); + ClassDB::bind_method(D_METHOD("_node_removed"),&Polygon2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_set_use_snap"),&Polygon2DEditor::_set_use_snap); + ClassDB::bind_method(D_METHOD("_set_show_grid"),&Polygon2DEditor::_set_show_grid); + ClassDB::bind_method(D_METHOD("_set_snap_off_x"),&Polygon2DEditor::_set_snap_off_x); + ClassDB::bind_method(D_METHOD("_set_snap_off_y"),&Polygon2DEditor::_set_snap_off_y); + ClassDB::bind_method(D_METHOD("_set_snap_step_x"),&Polygon2DEditor::_set_snap_step_x); + ClassDB::bind_method(D_METHOD("_set_snap_step_y"),&Polygon2DEditor::_set_snap_step_y); } diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp index cb139cbe2..cfdfbdc1c 100644 --- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp @@ -380,19 +380,19 @@ void ResourcePreloaderEditor::drop_data_fw(const Point2& p_point,const Variant& void ResourcePreloaderEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&ResourcePreloaderEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&ResourcePreloaderEditor::_load_pressed); - ClassDB::bind_method(_MD("_item_edited"),&ResourcePreloaderEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&ResourcePreloaderEditor::_delete_pressed); - ClassDB::bind_method(_MD("_paste_pressed"),&ResourcePreloaderEditor::_paste_pressed); - ClassDB::bind_method(_MD("_delete_confirm_pressed"),&ResourcePreloaderEditor::_delete_confirm_pressed); - ClassDB::bind_method(_MD("_files_load_request"),&ResourcePreloaderEditor::_files_load_request); - ClassDB::bind_method(_MD("_update_library"),&ResourcePreloaderEditor::_update_library); + ClassDB::bind_method(D_METHOD("_gui_input"),&ResourcePreloaderEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&ResourcePreloaderEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&ResourcePreloaderEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&ResourcePreloaderEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_paste_pressed"),&ResourcePreloaderEditor::_paste_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm_pressed"),&ResourcePreloaderEditor::_delete_confirm_pressed); + ClassDB::bind_method(D_METHOD("_files_load_request"),&ResourcePreloaderEditor::_files_load_request); + ClassDB::bind_method(D_METHOD("_update_library"),&ResourcePreloaderEditor::_update_library); - ClassDB::bind_method(_MD("get_drag_data_fw"), &ResourcePreloaderEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &ResourcePreloaderEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &ResourcePreloaderEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &ResourcePreloaderEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &ResourcePreloaderEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &ResourcePreloaderEditor::drop_data_fw); } diff --git a/tools/editor/plugins/rich_text_editor_plugin.cpp b/tools/editor/plugins/rich_text_editor_plugin.cpp index 8629d6ec8..797ee8e8e 100644 --- a/tools/editor/plugins/rich_text_editor_plugin.cpp +++ b/tools/editor/plugins/rich_text_editor_plugin.cpp @@ -90,8 +90,8 @@ void RichTextEditor::_menu_option(int p_option) { void RichTextEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&RichTextEditor::_menu_option); - ClassDB::bind_method(_MD("_file_selected"),&RichTextEditor::_file_selected); + ClassDB::bind_method(D_METHOD("_menu_option"),&RichTextEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_file_selected"),&RichTextEditor::_file_selected); } diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp index c333ba017..cb60134c2 100644 --- a/tools/editor/plugins/sample_editor_plugin.cpp +++ b/tools/editor/plugins/sample_editor_plugin.cpp @@ -349,9 +349,9 @@ void SampleEditor::edit(Ref<Sample> p_sample) { void SampleEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SampleEditor::_gui_input); - ClassDB::bind_method(_MD("_play_pressed"),&SampleEditor::_play_pressed); - ClassDB::bind_method(_MD("_stop_pressed"),&SampleEditor::_stop_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&SampleEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_play_pressed"),&SampleEditor::_play_pressed); + ClassDB::bind_method(D_METHOD("_stop_pressed"),&SampleEditor::_stop_pressed); } diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp index 116c5d11b..d0ff33c88 100644 --- a/tools/editor/plugins/sample_library_editor_plugin.cpp +++ b/tools/editor/plugins/sample_library_editor_plugin.cpp @@ -413,17 +413,17 @@ void SampleLibraryEditor::drop_data_fw(const Point2& p_point,const Variant& p_da void SampleLibraryEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SampleLibraryEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&SampleLibraryEditor::_load_pressed); - ClassDB::bind_method(_MD("_item_edited"),&SampleLibraryEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&SampleLibraryEditor::_delete_pressed); - ClassDB::bind_method(_MD("_file_load_request"),&SampleLibraryEditor::_file_load_request); - ClassDB::bind_method(_MD("_update_library"),&SampleLibraryEditor::_update_library); - ClassDB::bind_method(_MD("_button_pressed"),&SampleLibraryEditor::_button_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&SampleLibraryEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&SampleLibraryEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&SampleLibraryEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&SampleLibraryEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_file_load_request"),&SampleLibraryEditor::_file_load_request); + ClassDB::bind_method(D_METHOD("_update_library"),&SampleLibraryEditor::_update_library); + ClassDB::bind_method(D_METHOD("_button_pressed"),&SampleLibraryEditor::_button_pressed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &SampleLibraryEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SampleLibraryEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SampleLibraryEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SampleLibraryEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SampleLibraryEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SampleLibraryEditor::drop_data_fw); } diff --git a/tools/editor/plugins/sample_player_editor_plugin.cpp b/tools/editor/plugins/sample_player_editor_plugin.cpp index dd6450bfe..7e2683ded 100644 --- a/tools/editor/plugins/sample_player_editor_plugin.cpp +++ b/tools/editor/plugins/sample_player_editor_plugin.cpp @@ -54,8 +54,8 @@ void SamplePlayerEditor::_node_removed(Node *p_node) { void SamplePlayerEditor::_bind_methods() { - ClassDB::bind_method(_MD("_play"),&SamplePlayerEditor::_play); - ClassDB::bind_method(_MD("_stop"),&SamplePlayerEditor::_stop); + ClassDB::bind_method(D_METHOD("_play"),&SamplePlayerEditor::_play); + ClassDB::bind_method(D_METHOD("_stop"),&SamplePlayerEditor::_stop); } diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 5f97fce4e..0a880de35 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -241,9 +241,9 @@ void ScriptEditorQuickOpen::_notification(int p_what) { void ScriptEditorQuickOpen::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&ScriptEditorQuickOpen::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&ScriptEditorQuickOpen::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input); + ClassDB::bind_method(D_METHOD("_text_changed"),&ScriptEditorQuickOpen::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&ScriptEditorQuickOpen::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input); ADD_SIGNAL(MethodInfo("goto_line",PropertyInfo(Variant::INT,"line"))); diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index d86fec11d..dac63b4a9 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -296,8 +296,8 @@ Vector<Color> GraphColorRampEdit::get_colors() const{ void GraphColorRampEdit::_bind_methods(){ - ClassDB::bind_method(_MD("_gui_input"),&GraphColorRampEdit::_gui_input); - ClassDB::bind_method(_MD("_color_changed"),&GraphColorRampEdit::_color_changed); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphColorRampEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_color_changed"),&GraphColorRampEdit::_color_changed); ADD_SIGNAL(MethodInfo("ramp_changed")); } @@ -657,7 +657,7 @@ Vector<Vector2> GraphCurveMapEdit::get_points() const { void GraphCurveMapEdit::_bind_methods(){ - ClassDB::bind_method(_MD("_gui_input"),&GraphCurveMapEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphCurveMapEdit::_gui_input); ADD_SIGNAL(MethodInfo("curve_changed")); } @@ -2732,9 +2732,9 @@ void ShaderGraphView::_bind_methods() { ClassDB::bind_method("_color_ramp_changed",&ShaderGraphView::_color_ramp_changed); ClassDB::bind_method("_curve_changed",&ShaderGraphView::_curve_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &ShaderGraphView::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &ShaderGraphView::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &ShaderGraphView::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &ShaderGraphView::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &ShaderGraphView::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &ShaderGraphView::drop_data_fw); ClassDB::bind_method("_sg_updated",&ShaderGraphView::_sg_updated); } diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 3ba1a2cbd..5e425ef3c 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2221,15 +2221,15 @@ Dictionary SpatialEditorViewport::get_state() const { void SpatialEditorViewport::_bind_methods(){ - ClassDB::bind_method(_MD("_draw"),&SpatialEditorViewport::_draw); - ClassDB::bind_method(_MD("_smouseenter"),&SpatialEditorViewport::_smouseenter); - ClassDB::bind_method(_MD("_sinput"),&SpatialEditorViewport::_sinput); - ClassDB::bind_method(_MD("_menu_option"),&SpatialEditorViewport::_menu_option); - ClassDB::bind_method(_MD("_toggle_camera_preview"),&SpatialEditorViewport::_toggle_camera_preview); - ClassDB::bind_method(_MD("_preview_exited_scene"),&SpatialEditorViewport::_preview_exited_scene); - ClassDB::bind_method(_MD("update_transform_gizmo_view"),&SpatialEditorViewport::update_transform_gizmo_view); - ClassDB::bind_method(_MD("_selection_result_pressed"),&SpatialEditorViewport::_selection_result_pressed); - ClassDB::bind_method(_MD("_selection_menu_hide"),&SpatialEditorViewport::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("_draw"),&SpatialEditorViewport::_draw); + ClassDB::bind_method(D_METHOD("_smouseenter"),&SpatialEditorViewport::_smouseenter); + ClassDB::bind_method(D_METHOD("_sinput"),&SpatialEditorViewport::_sinput); + ClassDB::bind_method(D_METHOD("_menu_option"),&SpatialEditorViewport::_menu_option); + ClassDB::bind_method(D_METHOD("_toggle_camera_preview"),&SpatialEditorViewport::_toggle_camera_preview); + ClassDB::bind_method(D_METHOD("_preview_exited_scene"),&SpatialEditorViewport::_preview_exited_scene); + ClassDB::bind_method(D_METHOD("update_transform_gizmo_view"),&SpatialEditorViewport::update_transform_gizmo_view); + ClassDB::bind_method(D_METHOD("_selection_result_pressed"),&SpatialEditorViewport::_selection_result_pressed); + ClassDB::bind_method(D_METHOD("_selection_menu_hide"),&SpatialEditorViewport::_selection_menu_hide); ADD_SIGNAL( MethodInfo("toggle_maximize_view", PropertyInfo(Variant::OBJECT, "viewport")) ); } diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp index 095b05983..48808d9e0 100644 --- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp @@ -754,27 +754,27 @@ void SpriteFramesEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat void SpriteFramesEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SpriteFramesEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&SpriteFramesEditor::_load_pressed); - ClassDB::bind_method(_MD("_empty_pressed"),&SpriteFramesEditor::_empty_pressed); - ClassDB::bind_method(_MD("_empty2_pressed"),&SpriteFramesEditor::_empty2_pressed); - ClassDB::bind_method(_MD("_item_edited"),&SpriteFramesEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&SpriteFramesEditor::_delete_pressed); - ClassDB::bind_method(_MD("_paste_pressed"),&SpriteFramesEditor::_paste_pressed); - ClassDB::bind_method(_MD("_delete_confirm_pressed"),&SpriteFramesEditor::_delete_confirm_pressed); - ClassDB::bind_method(_MD("_file_load_request","files","atpos"),&SpriteFramesEditor::_file_load_request,DEFVAL(-1)); - ClassDB::bind_method(_MD("_update_library","skipsel"),&SpriteFramesEditor::_update_library,DEFVAL(false)); - ClassDB::bind_method(_MD("_up_pressed"),&SpriteFramesEditor::_up_pressed); - ClassDB::bind_method(_MD("_down_pressed"),&SpriteFramesEditor::_down_pressed); - ClassDB::bind_method(_MD("_animation_select"),&SpriteFramesEditor::_animation_select); - ClassDB::bind_method(_MD("_animation_name_edited"),&SpriteFramesEditor::_animation_name_edited); - ClassDB::bind_method(_MD("_animation_add"),&SpriteFramesEditor::_animation_add); - ClassDB::bind_method(_MD("_animation_remove"),&SpriteFramesEditor::_animation_remove); - ClassDB::bind_method(_MD("_animation_loop_changed"),&SpriteFramesEditor::_animation_loop_changed); - ClassDB::bind_method(_MD("_animation_fps_changed"),&SpriteFramesEditor::_animation_fps_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &SpriteFramesEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SpriteFramesEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SpriteFramesEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("_gui_input"),&SpriteFramesEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&SpriteFramesEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_empty_pressed"),&SpriteFramesEditor::_empty_pressed); + ClassDB::bind_method(D_METHOD("_empty2_pressed"),&SpriteFramesEditor::_empty2_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&SpriteFramesEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&SpriteFramesEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_paste_pressed"),&SpriteFramesEditor::_paste_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm_pressed"),&SpriteFramesEditor::_delete_confirm_pressed); + ClassDB::bind_method(D_METHOD("_file_load_request","files","atpos"),&SpriteFramesEditor::_file_load_request,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("_update_library","skipsel"),&SpriteFramesEditor::_update_library,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("_up_pressed"),&SpriteFramesEditor::_up_pressed); + ClassDB::bind_method(D_METHOD("_down_pressed"),&SpriteFramesEditor::_down_pressed); + ClassDB::bind_method(D_METHOD("_animation_select"),&SpriteFramesEditor::_animation_select); + ClassDB::bind_method(D_METHOD("_animation_name_edited"),&SpriteFramesEditor::_animation_name_edited); + ClassDB::bind_method(D_METHOD("_animation_add"),&SpriteFramesEditor::_animation_add); + ClassDB::bind_method(D_METHOD("_animation_remove"),&SpriteFramesEditor::_animation_remove); + ClassDB::bind_method(D_METHOD("_animation_loop_changed"),&SpriteFramesEditor::_animation_loop_changed); + ClassDB::bind_method(D_METHOD("_animation_fps_changed"),&SpriteFramesEditor::_animation_fps_changed); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SpriteFramesEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SpriteFramesEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SpriteFramesEditor::drop_data_fw); } diff --git a/tools/editor/plugins/stream_editor_plugin.cpp b/tools/editor/plugins/stream_editor_plugin.cpp index 991c29b6d..449f6f610 100644 --- a/tools/editor/plugins/stream_editor_plugin.cpp +++ b/tools/editor/plugins/stream_editor_plugin.cpp @@ -59,8 +59,8 @@ void StreamEditor::_stop() { void StreamEditor::_bind_methods() { - ClassDB::bind_method(_MD("_play"),&StreamEditor::_play); - ClassDB::bind_method(_MD("_stop"),&StreamEditor::_stop); + ClassDB::bind_method(D_METHOD("_play"),&StreamEditor::_play); + ClassDB::bind_method(D_METHOD("_stop"),&StreamEditor::_stop); } diff --git a/tools/editor/plugins/texture_editor_plugin.cpp b/tools/editor/plugins/texture_editor_plugin.cpp index 82cba7ac0..1bfc05e2a 100644 --- a/tools/editor/plugins/texture_editor_plugin.cpp +++ b/tools/editor/plugins/texture_editor_plugin.cpp @@ -112,7 +112,7 @@ void TextureEditor::edit(Ref<Texture> p_texture) { void TextureEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&TextureEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_gui_input"),&TextureEditor::_gui_input); } diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index 9b0ca0a48..bffca6b81 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -614,21 +614,21 @@ void TextureRegionEditor::_node_removed(Object *p_obj) void TextureRegionEditor::_bind_methods() { - ClassDB::bind_method(_MD("_edit_region"),&TextureRegionEditor::_edit_region); - ClassDB::bind_method(_MD("_region_draw"),&TextureRegionEditor::_region_draw); - ClassDB::bind_method(_MD("_region_input"),&TextureRegionEditor::_region_input); - ClassDB::bind_method(_MD("_scroll_changed"),&TextureRegionEditor::_scroll_changed); - ClassDB::bind_method(_MD("_node_removed"),&TextureRegionEditor::_node_removed); - ClassDB::bind_method(_MD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode); - ClassDB::bind_method(_MD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x); - ClassDB::bind_method(_MD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y); - ClassDB::bind_method(_MD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x); - ClassDB::bind_method(_MD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y); - ClassDB::bind_method(_MD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x); - ClassDB::bind_method(_MD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y); - ClassDB::bind_method(_MD("_zoom_in"),&TextureRegionEditor::_zoom_in); - ClassDB::bind_method(_MD("_zoom_reset"),&TextureRegionEditor::_zoom_reset); - ClassDB::bind_method(_MD("_zoom_out"),&TextureRegionEditor::_zoom_out); + ClassDB::bind_method(D_METHOD("_edit_region"),&TextureRegionEditor::_edit_region); + ClassDB::bind_method(D_METHOD("_region_draw"),&TextureRegionEditor::_region_draw); + ClassDB::bind_method(D_METHOD("_region_input"),&TextureRegionEditor::_region_input); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&TextureRegionEditor::_scroll_changed); + ClassDB::bind_method(D_METHOD("_node_removed"),&TextureRegionEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode); + ClassDB::bind_method(D_METHOD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x); + ClassDB::bind_method(D_METHOD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y); + ClassDB::bind_method(D_METHOD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x); + ClassDB::bind_method(D_METHOD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y); + ClassDB::bind_method(D_METHOD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x); + ClassDB::bind_method(D_METHOD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y); + ClassDB::bind_method(D_METHOD("_zoom_in"),&TextureRegionEditor::_zoom_in); + ClassDB::bind_method(D_METHOD("_zoom_reset"),&TextureRegionEditor::_zoom_reset); + ClassDB::bind_method(D_METHOD("_zoom_out"),&TextureRegionEditor::_zoom_out); } void TextureRegionEditor::edit(Object *p_obj) diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 7c232f0c3..16b354c8b 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -1344,20 +1344,20 @@ void TileMapEditor::_icon_size_changed(float p_value) { void TileMapEditor::_bind_methods() { - ClassDB::bind_method(_MD("_text_entered"),&TileMapEditor::_text_entered); - ClassDB::bind_method(_MD("_text_changed"),&TileMapEditor::_text_changed); - ClassDB::bind_method(_MD("_sbox_input"),&TileMapEditor::_sbox_input); - ClassDB::bind_method(_MD("_menu_option"),&TileMapEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&TileMapEditor::_canvas_draw); - ClassDB::bind_method(_MD("_canvas_mouse_enter"),&TileMapEditor::_canvas_mouse_enter); - ClassDB::bind_method(_MD("_canvas_mouse_exit"),&TileMapEditor::_canvas_mouse_exit); - ClassDB::bind_method(_MD("_tileset_settings_changed"),&TileMapEditor::_tileset_settings_changed); - ClassDB::bind_method(_MD("_update_transform_buttons"),&TileMapEditor::_update_transform_buttons); + ClassDB::bind_method(D_METHOD("_text_entered"),&TileMapEditor::_text_entered); + ClassDB::bind_method(D_METHOD("_text_changed"),&TileMapEditor::_text_changed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&TileMapEditor::_sbox_input); + ClassDB::bind_method(D_METHOD("_menu_option"),&TileMapEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&TileMapEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_canvas_mouse_enter"),&TileMapEditor::_canvas_mouse_enter); + ClassDB::bind_method(D_METHOD("_canvas_mouse_exit"),&TileMapEditor::_canvas_mouse_exit); + ClassDB::bind_method(D_METHOD("_tileset_settings_changed"),&TileMapEditor::_tileset_settings_changed); + ClassDB::bind_method(D_METHOD("_update_transform_buttons"),&TileMapEditor::_update_transform_buttons); - ClassDB::bind_method(_MD("_fill_points"),&TileMapEditor::_fill_points); - ClassDB::bind_method(_MD("_erase_points"),&TileMapEditor::_erase_points); + ClassDB::bind_method(D_METHOD("_fill_points"),&TileMapEditor::_fill_points); + ClassDB::bind_method(D_METHOD("_erase_points"),&TileMapEditor::_erase_points); - ClassDB::bind_method(_MD("_icon_size_changed"), &TileMapEditor::_icon_size_changed); + ClassDB::bind_method(D_METHOD("_icon_size_changed"), &TileMapEditor::_icon_size_changed); } TileMapEditor::CellOp TileMapEditor::_get_op_from_cell(const Point2i& p_pos) diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 2fa62df5b..c760e4502 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -1290,44 +1290,44 @@ void ProjectExportDialog::_image_filter_changed(String) { void ProjectExportDialog::_bind_methods() { - ClassDB::bind_method(_MD("_rescan"),&ProjectExportDialog::_rescan); - ClassDB::bind_method(_MD("_tree_changed"),&ProjectExportDialog::_tree_changed); - ClassDB::bind_method(_MD("_scan_finished"),&ProjectExportDialog::_scan_finished); - ClassDB::bind_method(_MD("_platform_selected"),&ProjectExportDialog::_platform_selected); - ClassDB::bind_method(_MD("_prop_edited"),&ProjectExportDialog::_prop_edited); - ClassDB::bind_method(_MD("_export_mode_changed"),&ProjectExportDialog::_export_mode_changed); - ClassDB::bind_method(_MD("_filters_edited"),&ProjectExportDialog::_filters_edited); - ClassDB::bind_method(_MD("_filters_exclude_edited"),&ProjectExportDialog::_filters_exclude_edited); - ClassDB::bind_method(_MD("_export_action"),&ProjectExportDialog::_export_action); - ClassDB::bind_method(_MD("_export_action_pck"),&ProjectExportDialog::_export_action_pck); - ClassDB::bind_method(_MD("_quality_edited"),&ProjectExportDialog::_quality_edited); - ClassDB::bind_method(_MD("_shrink_edited"),&ProjectExportDialog::_shrink_edited); - ClassDB::bind_method(_MD("_image_export_edited"),&ProjectExportDialog::_image_export_edited); - ClassDB::bind_method(_MD("_format_toggled"),&ProjectExportDialog::_format_toggled); - ClassDB::bind_method(_MD("_group_changed"),&ProjectExportDialog::_group_changed); - ClassDB::bind_method(_MD("_group_add"),&ProjectExportDialog::_group_add); - ClassDB::bind_method(_MD("_group_del"),&ProjectExportDialog::_group_del); - ClassDB::bind_method(_MD("_group_selected"),&ProjectExportDialog::_group_selected); - ClassDB::bind_method(_MD("_update_group"),&ProjectExportDialog::_update_group); - ClassDB::bind_method(_MD("_update_group_list"),&ProjectExportDialog::_update_group_list); - ClassDB::bind_method(_MD("_select_group"),&ProjectExportDialog::_select_group); - ClassDB::bind_method(_MD("_update_group_tree"),&ProjectExportDialog::_update_group_tree); - ClassDB::bind_method(_MD("_group_item_edited"),&ProjectExportDialog::_group_item_edited); - ClassDB::bind_method(_MD("_save_export_cfg"),&ProjectExportDialog::_save_export_cfg); - ClassDB::bind_method(_MD("_image_filter_changed"),&ProjectExportDialog::_image_filter_changed); - ClassDB::bind_method(_MD("_group_atlas_preview"),&ProjectExportDialog::_group_atlas_preview); - ClassDB::bind_method(_MD("_group_select_all"),&ProjectExportDialog::_group_select_all); - ClassDB::bind_method(_MD("_group_select_none"),&ProjectExportDialog::_group_select_none); - ClassDB::bind_method(_MD("_script_edited"),&ProjectExportDialog::_script_edited); - ClassDB::bind_method(_MD("_update_script"),&ProjectExportDialog::_update_script); - ClassDB::bind_method(_MD("_sample_convert_edited"),&ProjectExportDialog::_sample_convert_edited); + ClassDB::bind_method(D_METHOD("_rescan"),&ProjectExportDialog::_rescan); + ClassDB::bind_method(D_METHOD("_tree_changed"),&ProjectExportDialog::_tree_changed); + ClassDB::bind_method(D_METHOD("_scan_finished"),&ProjectExportDialog::_scan_finished); + ClassDB::bind_method(D_METHOD("_platform_selected"),&ProjectExportDialog::_platform_selected); + ClassDB::bind_method(D_METHOD("_prop_edited"),&ProjectExportDialog::_prop_edited); + ClassDB::bind_method(D_METHOD("_export_mode_changed"),&ProjectExportDialog::_export_mode_changed); + ClassDB::bind_method(D_METHOD("_filters_edited"),&ProjectExportDialog::_filters_edited); + ClassDB::bind_method(D_METHOD("_filters_exclude_edited"),&ProjectExportDialog::_filters_exclude_edited); + ClassDB::bind_method(D_METHOD("_export_action"),&ProjectExportDialog::_export_action); + ClassDB::bind_method(D_METHOD("_export_action_pck"),&ProjectExportDialog::_export_action_pck); + ClassDB::bind_method(D_METHOD("_quality_edited"),&ProjectExportDialog::_quality_edited); + ClassDB::bind_method(D_METHOD("_shrink_edited"),&ProjectExportDialog::_shrink_edited); + ClassDB::bind_method(D_METHOD("_image_export_edited"),&ProjectExportDialog::_image_export_edited); + ClassDB::bind_method(D_METHOD("_format_toggled"),&ProjectExportDialog::_format_toggled); + ClassDB::bind_method(D_METHOD("_group_changed"),&ProjectExportDialog::_group_changed); + ClassDB::bind_method(D_METHOD("_group_add"),&ProjectExportDialog::_group_add); + ClassDB::bind_method(D_METHOD("_group_del"),&ProjectExportDialog::_group_del); + ClassDB::bind_method(D_METHOD("_group_selected"),&ProjectExportDialog::_group_selected); + ClassDB::bind_method(D_METHOD("_update_group"),&ProjectExportDialog::_update_group); + ClassDB::bind_method(D_METHOD("_update_group_list"),&ProjectExportDialog::_update_group_list); + ClassDB::bind_method(D_METHOD("_select_group"),&ProjectExportDialog::_select_group); + ClassDB::bind_method(D_METHOD("_update_group_tree"),&ProjectExportDialog::_update_group_tree); + ClassDB::bind_method(D_METHOD("_group_item_edited"),&ProjectExportDialog::_group_item_edited); + ClassDB::bind_method(D_METHOD("_save_export_cfg"),&ProjectExportDialog::_save_export_cfg); + ClassDB::bind_method(D_METHOD("_image_filter_changed"),&ProjectExportDialog::_image_filter_changed); + ClassDB::bind_method(D_METHOD("_group_atlas_preview"),&ProjectExportDialog::_group_atlas_preview); + ClassDB::bind_method(D_METHOD("_group_select_all"),&ProjectExportDialog::_group_select_all); + ClassDB::bind_method(D_METHOD("_group_select_none"),&ProjectExportDialog::_group_select_none); + ClassDB::bind_method(D_METHOD("_script_edited"),&ProjectExportDialog::_script_edited); + ClassDB::bind_method(D_METHOD("_update_script"),&ProjectExportDialog::_update_script); + ClassDB::bind_method(D_METHOD("_sample_convert_edited"),&ProjectExportDialog::_sample_convert_edited); - ClassDB::bind_method(_MD("export_platform"),&ProjectExportDialog::export_platform); - ClassDB::bind_method(_MD("_create_android_keystore"),&ProjectExportDialog::_create_android_keystore); - ClassDB::bind_method(_MD("_check_keystore_path"),&ProjectExportDialog::_check_keystore_path); - ClassDB::bind_method(_MD("_keystore_dir_selected"),&ProjectExportDialog::_keystore_dir_selected); - ClassDB::bind_method(_MD("_keystore_created"),&ProjectExportDialog::_keystore_created); + ClassDB::bind_method(D_METHOD("export_platform"),&ProjectExportDialog::export_platform); + ClassDB::bind_method(D_METHOD("_create_android_keystore"),&ProjectExportDialog::_create_android_keystore); + ClassDB::bind_method(D_METHOD("_check_keystore_path"),&ProjectExportDialog::_check_keystore_path); + ClassDB::bind_method(D_METHOD("_keystore_dir_selected"),&ProjectExportDialog::_keystore_dir_selected); + ClassDB::bind_method(D_METHOD("_keystore_created"),&ProjectExportDialog::_keystore_created); //ADD_SIGNAL(MethodInfo("instance")); diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index af73414ab..34b2d3e82 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -1200,7 +1200,7 @@ void ProjectManager::_bind_methods() { ClassDB::bind_method("_favorite_pressed",&ProjectManager::_favorite_pressed); ClassDB::bind_method("_install_project",&ProjectManager::_install_project); ClassDB::bind_method("_files_dropped",&ProjectManager::_files_dropped); - ClassDB::bind_method(_MD("_scan_multiple_folders", "files"),&ProjectManager::_scan_multiple_folders); + ClassDB::bind_method(D_METHOD("_scan_multiple_folders", "files"),&ProjectManager::_scan_multiple_folders); } @@ -1483,9 +1483,9 @@ void ProjectListFilter::_notification(int p_what) { void ProjectListFilter::_bind_methods() { - ClassDB::bind_method(_MD("_command"),&ProjectListFilter::_command); - ClassDB::bind_method(_MD("_search_text_changed"), &ProjectListFilter::_search_text_changed); - ClassDB::bind_method(_MD("_filter_option_selected"), &ProjectListFilter::_filter_option_selected); + ClassDB::bind_method(D_METHOD("_command"),&ProjectListFilter::_command); + ClassDB::bind_method(D_METHOD("_search_text_changed"), &ProjectListFilter::_search_text_changed); + ClassDB::bind_method(D_METHOD("_filter_option_selected"), &ProjectListFilter::_filter_option_selected); ADD_SIGNAL( MethodInfo("filter_changed") ); } diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index e725786f9..99afe9f3a 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -1175,41 +1175,41 @@ void ProjectSettings::set_plugins_page() { void ProjectSettings::_bind_methods() { - ClassDB::bind_method(_MD("_item_selected"),&ProjectSettings::_item_selected); - ClassDB::bind_method(_MD("_item_add"),&ProjectSettings::_item_add); - ClassDB::bind_method(_MD("_item_adds"),&ProjectSettings::_item_adds); - ClassDB::bind_method(_MD("_item_del"),&ProjectSettings::_item_del); - ClassDB::bind_method(_MD("_item_checked"),&ProjectSettings::_item_checked); - ClassDB::bind_method(_MD("_save"),&ProjectSettings::_save); - ClassDB::bind_method(_MD("_action_add"),&ProjectSettings::_action_add); - ClassDB::bind_method(_MD("_action_adds"),&ProjectSettings::_action_adds); - ClassDB::bind_method(_MD("_action_selected"),&ProjectSettings::_action_selected); - ClassDB::bind_method(_MD("_action_edited"),&ProjectSettings::_action_edited); - ClassDB::bind_method(_MD("_action_button_pressed"),&ProjectSettings::_action_button_pressed); - ClassDB::bind_method(_MD("_update_actions"),&ProjectSettings::_update_actions); - ClassDB::bind_method(_MD("_wait_for_key"),&ProjectSettings::_wait_for_key); - ClassDB::bind_method(_MD("_add_item"),&ProjectSettings::_add_item); - ClassDB::bind_method(_MD("_device_input_add"),&ProjectSettings::_device_input_add); - ClassDB::bind_method(_MD("_press_a_key_confirm"),&ProjectSettings::_press_a_key_confirm); - ClassDB::bind_method(_MD("_settings_prop_edited"),&ProjectSettings::_settings_prop_edited); - ClassDB::bind_method(_MD("_copy_to_platform"),&ProjectSettings::_copy_to_platform); - ClassDB::bind_method(_MD("_update_translations"),&ProjectSettings::_update_translations); - ClassDB::bind_method(_MD("_translation_delete"),&ProjectSettings::_translation_delete); - ClassDB::bind_method(_MD("_settings_changed"),&ProjectSettings::_settings_changed); - ClassDB::bind_method(_MD("_translation_add"),&ProjectSettings::_translation_add); - ClassDB::bind_method(_MD("_translation_file_open"),&ProjectSettings::_translation_file_open); + ClassDB::bind_method(D_METHOD("_item_selected"),&ProjectSettings::_item_selected); + ClassDB::bind_method(D_METHOD("_item_add"),&ProjectSettings::_item_add); + ClassDB::bind_method(D_METHOD("_item_adds"),&ProjectSettings::_item_adds); + ClassDB::bind_method(D_METHOD("_item_del"),&ProjectSettings::_item_del); + ClassDB::bind_method(D_METHOD("_item_checked"),&ProjectSettings::_item_checked); + ClassDB::bind_method(D_METHOD("_save"),&ProjectSettings::_save); + ClassDB::bind_method(D_METHOD("_action_add"),&ProjectSettings::_action_add); + ClassDB::bind_method(D_METHOD("_action_adds"),&ProjectSettings::_action_adds); + ClassDB::bind_method(D_METHOD("_action_selected"),&ProjectSettings::_action_selected); + ClassDB::bind_method(D_METHOD("_action_edited"),&ProjectSettings::_action_edited); + ClassDB::bind_method(D_METHOD("_action_button_pressed"),&ProjectSettings::_action_button_pressed); + ClassDB::bind_method(D_METHOD("_update_actions"),&ProjectSettings::_update_actions); + ClassDB::bind_method(D_METHOD("_wait_for_key"),&ProjectSettings::_wait_for_key); + ClassDB::bind_method(D_METHOD("_add_item"),&ProjectSettings::_add_item); + ClassDB::bind_method(D_METHOD("_device_input_add"),&ProjectSettings::_device_input_add); + ClassDB::bind_method(D_METHOD("_press_a_key_confirm"),&ProjectSettings::_press_a_key_confirm); + ClassDB::bind_method(D_METHOD("_settings_prop_edited"),&ProjectSettings::_settings_prop_edited); + ClassDB::bind_method(D_METHOD("_copy_to_platform"),&ProjectSettings::_copy_to_platform); + ClassDB::bind_method(D_METHOD("_update_translations"),&ProjectSettings::_update_translations); + ClassDB::bind_method(D_METHOD("_translation_delete"),&ProjectSettings::_translation_delete); + ClassDB::bind_method(D_METHOD("_settings_changed"),&ProjectSettings::_settings_changed); + ClassDB::bind_method(D_METHOD("_translation_add"),&ProjectSettings::_translation_add); + ClassDB::bind_method(D_METHOD("_translation_file_open"),&ProjectSettings::_translation_file_open); - ClassDB::bind_method(_MD("_translation_res_add"),&ProjectSettings::_translation_res_add); - ClassDB::bind_method(_MD("_translation_res_file_open"),&ProjectSettings::_translation_res_file_open); - ClassDB::bind_method(_MD("_translation_res_option_add"),&ProjectSettings::_translation_res_option_add); - ClassDB::bind_method(_MD("_translation_res_option_file_open"),&ProjectSettings::_translation_res_option_file_open); - ClassDB::bind_method(_MD("_translation_res_select"),&ProjectSettings::_translation_res_select); - ClassDB::bind_method(_MD("_translation_res_option_changed"),&ProjectSettings::_translation_res_option_changed); - ClassDB::bind_method(_MD("_translation_res_delete"),&ProjectSettings::_translation_res_delete); - ClassDB::bind_method(_MD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete); + ClassDB::bind_method(D_METHOD("_translation_res_add"),&ProjectSettings::_translation_res_add); + ClassDB::bind_method(D_METHOD("_translation_res_file_open"),&ProjectSettings::_translation_res_file_open); + ClassDB::bind_method(D_METHOD("_translation_res_option_add"),&ProjectSettings::_translation_res_option_add); + ClassDB::bind_method(D_METHOD("_translation_res_option_file_open"),&ProjectSettings::_translation_res_option_file_open); + ClassDB::bind_method(D_METHOD("_translation_res_select"),&ProjectSettings::_translation_res_select); + ClassDB::bind_method(D_METHOD("_translation_res_option_changed"),&ProjectSettings::_translation_res_option_changed); + ClassDB::bind_method(D_METHOD("_translation_res_delete"),&ProjectSettings::_translation_res_delete); + ClassDB::bind_method(D_METHOD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete); - ClassDB::bind_method(_MD("_clear_search_box"),&ProjectSettings::_clear_search_box); - ClassDB::bind_method(_MD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar); + ClassDB::bind_method(D_METHOD("_clear_search_box"),&ProjectSettings::_clear_search_box); + ClassDB::bind_method(D_METHOD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar); } diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 8e3791eb8..9a5fff3fb 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -4403,9 +4403,9 @@ void PropertyEditor::_bind_methods() { ClassDB::bind_method( "refresh",&PropertyEditor::refresh); ClassDB::bind_method( "_draw_transparency",&PropertyEditor::_draw_transparency); - ClassDB::bind_method(_MD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &PropertyEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &PropertyEditor::drop_data_fw); ADD_SIGNAL( MethodInfo("property_toggled",PropertyInfo( Variant::STRING, "property"),PropertyInfo( Variant::BOOL, "value"))); ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) ); diff --git a/tools/editor/property_selector.cpp b/tools/editor/property_selector.cpp index 3eeec1634..71ffae472 100644 --- a/tools/editor/property_selector.cpp +++ b/tools/editor/property_selector.cpp @@ -587,10 +587,10 @@ void PropertySelector::select_property_from_instance(Object* p_instance, const S void PropertySelector::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&PropertySelector::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&PropertySelector::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&PropertySelector::_sbox_input); - ClassDB::bind_method(_MD("_item_selected"),&PropertySelector::_item_selected); + ClassDB::bind_method(D_METHOD("_text_changed"),&PropertySelector::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&PropertySelector::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&PropertySelector::_sbox_input); + ClassDB::bind_method(D_METHOD("_item_selected"),&PropertySelector::_item_selected); ADD_SIGNAL(MethodInfo("selected",PropertyInfo(Variant::STRING,"name"))); diff --git a/tools/editor/quick_open.cpp b/tools/editor/quick_open.cpp index 615b42b41..f43189a7b 100644 --- a/tools/editor/quick_open.cpp +++ b/tools/editor/quick_open.cpp @@ -252,9 +252,9 @@ StringName EditorQuickOpen::get_base_type() const { void EditorQuickOpen::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&EditorQuickOpen::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&EditorQuickOpen::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&EditorQuickOpen::_sbox_input); + ClassDB::bind_method(D_METHOD("_text_changed"),&EditorQuickOpen::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&EditorQuickOpen::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&EditorQuickOpen::_sbox_input); ADD_SIGNAL(MethodInfo("quick_open")); diff --git a/tools/editor/resources_dock.cpp b/tools/editor/resources_dock.cpp index e89262db2..5348c8c12 100644 --- a/tools/editor/resources_dock.cpp +++ b/tools/editor/resources_dock.cpp @@ -322,12 +322,12 @@ void ResourcesDock::_create() { void ResourcesDock::_bind_methods() { - ClassDB::bind_method(_MD("_tool_selected"),&ResourcesDock::_tool_selected); - ClassDB::bind_method(_MD("_create"),&ResourcesDock::_create); - ClassDB::bind_method(_MD("_resource_selected"),&ResourcesDock::_resource_selected); - ClassDB::bind_method(_MD("_delete"),&ResourcesDock::_delete); - ClassDB::bind_method(_MD("remove_resource"),&ResourcesDock::remove_resource); - ClassDB::bind_method(_MD("_file_action"),&ResourcesDock::_file_action); + ClassDB::bind_method(D_METHOD("_tool_selected"),&ResourcesDock::_tool_selected); + ClassDB::bind_method(D_METHOD("_create"),&ResourcesDock::_create); + ClassDB::bind_method(D_METHOD("_resource_selected"),&ResourcesDock::_resource_selected); + ClassDB::bind_method(D_METHOD("_delete"),&ResourcesDock::_delete); + ClassDB::bind_method(D_METHOD("remove_resource"),&ResourcesDock::remove_resource); + ClassDB::bind_method(D_METHOD("_file_action"),&ResourcesDock::_file_action); diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index f3e5fd85d..eee4aefce 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1886,33 +1886,33 @@ void SceneTreeDock::open_script_dialog(Node* p_for_node) { void SceneTreeDock::_bind_methods() { - ClassDB::bind_method(_MD("_tool_selected"),&SceneTreeDock::_tool_selected,DEFVAL(false)); - ClassDB::bind_method(_MD("_create"),&SceneTreeDock::_create); - //ClassDB::bind_method(_MD("_script_created"),&SceneTreeDock::_script_created); - ClassDB::bind_method(_MD("_node_reparent"),&SceneTreeDock::_node_reparent); - ClassDB::bind_method(_MD("_set_owners"),&SceneTreeDock::_set_owners); - ClassDB::bind_method(_MD("_node_selected"),&SceneTreeDock::_node_selected); - ClassDB::bind_method(_MD("_node_renamed"),&SceneTreeDock::_node_renamed); - ClassDB::bind_method(_MD("_script_created"),&SceneTreeDock::_script_created); - ClassDB::bind_method(_MD("_load_request"),&SceneTreeDock::_load_request); - ClassDB::bind_method(_MD("_script_open_request"),&SceneTreeDock::_script_open_request); - ClassDB::bind_method(_MD("_unhandled_key_input"),&SceneTreeDock::_unhandled_key_input); - ClassDB::bind_method(_MD("_input"),&SceneTreeDock::_input); - ClassDB::bind_method(_MD("_nodes_drag_begin"),&SceneTreeDock::_nodes_drag_begin); - ClassDB::bind_method(_MD("_delete_confirm"),&SceneTreeDock::_delete_confirm); - ClassDB::bind_method(_MD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed); - ClassDB::bind_method(_MD("_import_subscene"),&SceneTreeDock::_import_subscene); - ClassDB::bind_method(_MD("_selection_changed"),&SceneTreeDock::_selection_changed); - ClassDB::bind_method(_MD("_new_scene_from"),&SceneTreeDock::_new_scene_from); - ClassDB::bind_method(_MD("_nodes_dragged"),&SceneTreeDock::_nodes_dragged); - ClassDB::bind_method(_MD("_files_dropped"),&SceneTreeDock::_files_dropped); - ClassDB::bind_method(_MD("_script_dropped"),&SceneTreeDock::_script_dropped); - ClassDB::bind_method(_MD("_tree_rmb"),&SceneTreeDock::_tree_rmb); - ClassDB::bind_method(_MD("_filter_changed"),&SceneTreeDock::_filter_changed); - ClassDB::bind_method(_MD("_focus_node"),&SceneTreeDock::_focus_node); + ClassDB::bind_method(D_METHOD("_tool_selected"),&SceneTreeDock::_tool_selected,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("_create"),&SceneTreeDock::_create); + //ClassDB::bind_method(D_METHOD("_script_created"),&SceneTreeDock::_script_created); + ClassDB::bind_method(D_METHOD("_node_reparent"),&SceneTreeDock::_node_reparent); + ClassDB::bind_method(D_METHOD("_set_owners"),&SceneTreeDock::_set_owners); + ClassDB::bind_method(D_METHOD("_node_selected"),&SceneTreeDock::_node_selected); + ClassDB::bind_method(D_METHOD("_node_renamed"),&SceneTreeDock::_node_renamed); + ClassDB::bind_method(D_METHOD("_script_created"),&SceneTreeDock::_script_created); + ClassDB::bind_method(D_METHOD("_load_request"),&SceneTreeDock::_load_request); + ClassDB::bind_method(D_METHOD("_script_open_request"),&SceneTreeDock::_script_open_request); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&SceneTreeDock::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_input"),&SceneTreeDock::_input); + ClassDB::bind_method(D_METHOD("_nodes_drag_begin"),&SceneTreeDock::_nodes_drag_begin); + ClassDB::bind_method(D_METHOD("_delete_confirm"),&SceneTreeDock::_delete_confirm); + ClassDB::bind_method(D_METHOD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed); + ClassDB::bind_method(D_METHOD("_import_subscene"),&SceneTreeDock::_import_subscene); + ClassDB::bind_method(D_METHOD("_selection_changed"),&SceneTreeDock::_selection_changed); + ClassDB::bind_method(D_METHOD("_new_scene_from"),&SceneTreeDock::_new_scene_from); + ClassDB::bind_method(D_METHOD("_nodes_dragged"),&SceneTreeDock::_nodes_dragged); + ClassDB::bind_method(D_METHOD("_files_dropped"),&SceneTreeDock::_files_dropped); + ClassDB::bind_method(D_METHOD("_script_dropped"),&SceneTreeDock::_script_dropped); + ClassDB::bind_method(D_METHOD("_tree_rmb"),&SceneTreeDock::_tree_rmb); + ClassDB::bind_method(D_METHOD("_filter_changed"),&SceneTreeDock::_filter_changed); + ClassDB::bind_method(D_METHOD("_focus_node"),&SceneTreeDock::_focus_node); - ClassDB::bind_method(_MD("instance"),&SceneTreeDock::instance); + ClassDB::bind_method(D_METHOD("instance"),&SceneTreeDock::instance); } diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index dd1fdeb40..0e15040a3 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -1124,11 +1124,11 @@ void SceneTreeEditor::_bind_methods() { ClassDB::bind_method("_editor_settings_changed", &SceneTreeEditor::_editor_settings_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &SceneTreeEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SceneTreeEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SceneTreeEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SceneTreeEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SceneTreeEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SceneTreeEditor::drop_data_fw); - ClassDB::bind_method(_MD("update_tree"), &SceneTreeEditor::update_tree); + ClassDB::bind_method(D_METHOD("update_tree"), &SceneTreeEditor::update_tree); ADD_SIGNAL( MethodInfo("node_selected") ); ADD_SIGNAL( MethodInfo("node_renamed") ); diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index d5cca0682..248eecc1c 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -1635,39 +1635,39 @@ void ScriptEditorDebugger::_paused() { void ScriptEditorDebugger::_bind_methods() { - ClassDB::bind_method(_MD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected); - ClassDB::bind_method(_MD("debug_next"),&ScriptEditorDebugger::debug_next); - ClassDB::bind_method(_MD("debug_step"),&ScriptEditorDebugger::debug_step); - ClassDB::bind_method(_MD("debug_break"),&ScriptEditorDebugger::debug_break); - ClassDB::bind_method(_MD("debug_continue"),&ScriptEditorDebugger::debug_continue); - ClassDB::bind_method(_MD("_output_clear"),&ScriptEditorDebugger::_output_clear); - ClassDB::bind_method(_MD("_performance_draw"),&ScriptEditorDebugger::_performance_draw); - ClassDB::bind_method(_MD("_performance_select"),&ScriptEditorDebugger::_performance_select); - ClassDB::bind_method(_MD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request); - ClassDB::bind_method(_MD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request); - ClassDB::bind_method(_MD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set); - ClassDB::bind_method(_MD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear); + ClassDB::bind_method(D_METHOD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected); + ClassDB::bind_method(D_METHOD("debug_next"),&ScriptEditorDebugger::debug_next); + ClassDB::bind_method(D_METHOD("debug_step"),&ScriptEditorDebugger::debug_step); + ClassDB::bind_method(D_METHOD("debug_break"),&ScriptEditorDebugger::debug_break); + ClassDB::bind_method(D_METHOD("debug_continue"),&ScriptEditorDebugger::debug_continue); + ClassDB::bind_method(D_METHOD("_output_clear"),&ScriptEditorDebugger::_output_clear); + ClassDB::bind_method(D_METHOD("_performance_draw"),&ScriptEditorDebugger::_performance_draw); + ClassDB::bind_method(D_METHOD("_performance_select"),&ScriptEditorDebugger::_performance_select); + ClassDB::bind_method(D_METHOD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request); + ClassDB::bind_method(D_METHOD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request); + ClassDB::bind_method(D_METHOD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set); + ClassDB::bind_method(D_METHOD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear); - ClassDB::bind_method(_MD("_error_selected"),&ScriptEditorDebugger::_error_selected); - ClassDB::bind_method(_MD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected); - ClassDB::bind_method(_MD("_profiler_activate"),&ScriptEditorDebugger::_profiler_activate); - ClassDB::bind_method(_MD("_profiler_seeked"),&ScriptEditorDebugger::_profiler_seeked); + ClassDB::bind_method(D_METHOD("_error_selected"),&ScriptEditorDebugger::_error_selected); + ClassDB::bind_method(D_METHOD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected); + ClassDB::bind_method(D_METHOD("_profiler_activate"),&ScriptEditorDebugger::_profiler_activate); + ClassDB::bind_method(D_METHOD("_profiler_seeked"),&ScriptEditorDebugger::_profiler_seeked); - ClassDB::bind_method(_MD("_paused"),&ScriptEditorDebugger::_paused); + ClassDB::bind_method(D_METHOD("_paused"),&ScriptEditorDebugger::_paused); - ClassDB::bind_method(_MD("_scene_tree_selected"),&ScriptEditorDebugger::_scene_tree_selected); - ClassDB::bind_method(_MD("_scene_tree_folded"),&ScriptEditorDebugger::_scene_tree_folded); + ClassDB::bind_method(D_METHOD("_scene_tree_selected"),&ScriptEditorDebugger::_scene_tree_selected); + ClassDB::bind_method(D_METHOD("_scene_tree_folded"),&ScriptEditorDebugger::_scene_tree_folded); - ClassDB::bind_method(_MD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node); - ClassDB::bind_method(_MD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node); - ClassDB::bind_method(_MD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node); - ClassDB::bind_method(_MD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node); - ClassDB::bind_method(_MD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node); - ClassDB::bind_method(_MD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node); - ClassDB::bind_method(_MD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node); - ClassDB::bind_method(_MD("_scene_tree_property_select_object"),&ScriptEditorDebugger::_scene_tree_property_select_object); - ClassDB::bind_method(_MD("_scene_tree_property_value_edited"),&ScriptEditorDebugger::_scene_tree_property_value_edited); + ClassDB::bind_method(D_METHOD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node); + ClassDB::bind_method(D_METHOD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node); + ClassDB::bind_method(D_METHOD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node); + ClassDB::bind_method(D_METHOD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node); + ClassDB::bind_method(D_METHOD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node); + ClassDB::bind_method(D_METHOD("_scene_tree_property_select_object"),&ScriptEditorDebugger::_scene_tree_property_select_object); + ClassDB::bind_method(D_METHOD("_scene_tree_property_value_edited"),&ScriptEditorDebugger::_scene_tree_property_value_edited); ADD_SIGNAL(MethodInfo("goto_script_line")); ADD_SIGNAL(MethodInfo("breaked",PropertyInfo(Variant::BOOL,"reallydid"),PropertyInfo(Variant::BOOL,"can_debug"))); diff --git a/tools/editor/settings_config_dialog.cpp b/tools/editor/settings_config_dialog.cpp index 31cbcee5a..cd8403b27 100644 --- a/tools/editor/settings_config_dialog.cpp +++ b/tools/editor/settings_config_dialog.cpp @@ -289,16 +289,16 @@ void EditorSettingsDialog::_press_a_key_confirm() { void EditorSettingsDialog::_bind_methods() { - ClassDB::bind_method(_MD("_settings_save"),&EditorSettingsDialog::_settings_save); - ClassDB::bind_method(_MD("_settings_changed"),&EditorSettingsDialog::_settings_changed); - ClassDB::bind_method(_MD("_settings_property_edited"),&EditorSettingsDialog::_settings_property_edited); - ClassDB::bind_method(_MD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box); - ClassDB::bind_method(_MD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box); - ClassDB::bind_method(_MD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed); - ClassDB::bind_method(_MD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts); - ClassDB::bind_method(_MD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts); - ClassDB::bind_method(_MD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm); - ClassDB::bind_method(_MD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key); + ClassDB::bind_method(D_METHOD("_settings_save"),&EditorSettingsDialog::_settings_save); + ClassDB::bind_method(D_METHOD("_settings_changed"),&EditorSettingsDialog::_settings_changed); + ClassDB::bind_method(D_METHOD("_settings_property_edited"),&EditorSettingsDialog::_settings_property_edited); + ClassDB::bind_method(D_METHOD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box); + ClassDB::bind_method(D_METHOD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box); + ClassDB::bind_method(D_METHOD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed); + ClassDB::bind_method(D_METHOD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts); + ClassDB::bind_method(D_METHOD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts); + ClassDB::bind_method(D_METHOD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm); + ClassDB::bind_method(D_METHOD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key); } diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp index 3ed101cdd..825db5356 100644 --- a/tools/editor/spatial_editor_gizmos.cpp +++ b/tools/editor/spatial_editor_gizmos.cpp @@ -618,14 +618,14 @@ void EditorSpatialGizmo::free(){ void EditorSpatialGizmo::_bind_methods() { - ClassDB::bind_method(_MD("add_lines","lines","material:Material","billboard"),&EditorSpatialGizmo::add_lines,DEFVAL(false)); - ClassDB::bind_method(_MD("add_mesh","mesh:Mesh","billboard","skeleton"),&EditorSpatialGizmo::add_mesh,DEFVAL(false),DEFVAL(RID())); - ClassDB::bind_method(_MD("add_collision_segments","segments"),&EditorSpatialGizmo::add_collision_segments); - ClassDB::bind_method(_MD("add_collision_triangles","triangles:TriangleMesh"),&EditorSpatialGizmo::add_collision_triangles); - ClassDB::bind_method(_MD("add_unscaled_billboard","material:Material","default_scale"),&EditorSpatialGizmo::add_unscaled_billboard,DEFVAL(1)); - ClassDB::bind_method(_MD("add_handles","handles","billboard","secondary"),&EditorSpatialGizmo::add_handles,DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("set_spatial_node","node:Spatial"),&EditorSpatialGizmo::_set_spatial_node); - ClassDB::bind_method(_MD("clear"),&EditorSpatialGizmo::clear); + ClassDB::bind_method(D_METHOD("add_lines","lines","material:Material","billboard"),&EditorSpatialGizmo::add_lines,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_mesh","mesh:Mesh","billboard","skeleton"),&EditorSpatialGizmo::add_mesh,DEFVAL(false),DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("add_collision_segments","segments"),&EditorSpatialGizmo::add_collision_segments); + ClassDB::bind_method(D_METHOD("add_collision_triangles","triangles:TriangleMesh"),&EditorSpatialGizmo::add_collision_triangles); + ClassDB::bind_method(D_METHOD("add_unscaled_billboard","material:Material","default_scale"),&EditorSpatialGizmo::add_unscaled_billboard,DEFVAL(1)); + ClassDB::bind_method(D_METHOD("add_handles","handles","billboard","secondary"),&EditorSpatialGizmo::add_handles,DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_spatial_node","node:Spatial"),&EditorSpatialGizmo::_set_spatial_node); + ClassDB::bind_method(D_METHOD("clear"),&EditorSpatialGizmo::clear); BIND_VMETHOD( MethodInfo("redraw")); BIND_VMETHOD( MethodInfo(Variant::STRING,"get_handle_name",PropertyInfo(Variant::INT,"index"))); |