From 0ab3dc273ee783eea8a5af6922d7960a8274597c Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sat, 12 Oct 2024 19:42:12 -0700 Subject: [PATCH] Rename internal EditorPlugin icon/name to match exposed methods --- editor/editor_audio_buses.h | 2 +- editor/editor_data.cpp | 6 +++--- editor/editor_main_screen.cpp | 20 +++++++++---------- editor/editor_node.cpp | 2 +- editor/plugins/abstract_polygon_2d_editor.h | 2 +- .../plugins/animation_player_editor_plugin.h | 6 +++--- editor/plugins/animation_tree_editor_plugin.h | 2 +- editor/plugins/asset_library_editor_plugin.h | 2 +- .../audio_stream_randomizer_editor_plugin.h | 2 +- editor/plugins/bone_map_editor_plugin.h | 2 +- editor/plugins/camera_3d_editor_plugin.h | 2 +- editor/plugins/canvas_item_editor_plugin.h | 2 +- editor/plugins/cast_2d_editor_plugin.h | 2 +- .../collision_shape_2d_editor_plugin.h | 2 +- editor/plugins/control_editor_plugin.h | 2 +- editor/plugins/curve_editor_plugin.h | 2 +- editor/plugins/debugger_editor_plugin.h | 2 +- editor/plugins/editor_plugin.cpp | 4 ++-- editor/plugins/editor_plugin.h | 4 ++-- editor/plugins/font_config_plugin.h | 2 +- editor/plugins/game_view_plugin.h | 2 +- ...pu_particles_collision_sdf_editor_plugin.h | 2 +- editor/plugins/gradient_editor_plugin.h | 2 +- editor/plugins/input_event_editor_plugin.h | 2 +- editor/plugins/lightmap_gi_editor_plugin.h | 2 +- editor/plugins/material_editor_plugin.h | 2 +- editor/plugins/mesh_editor_plugin.h | 2 +- .../plugins/mesh_instance_3d_editor_plugin.h | 2 +- editor/plugins/mesh_library_editor_plugin.h | 2 +- editor/plugins/multimesh_editor_plugin.h | 2 +- .../navigation_link_2d_editor_plugin.h | 2 +- .../navigation_obstacle_3d_editor_plugin.h | 2 +- editor/plugins/node_3d_editor_plugin.h | 2 +- .../occluder_instance_3d_editor_plugin.h | 2 +- .../parallax_background_editor_plugin.h | 2 +- editor/plugins/path_2d_editor_plugin.h | 2 +- editor/plugins/path_3d_editor_plugin.h | 2 +- .../plugins/physical_bone_3d_editor_plugin.h | 2 +- editor/plugins/polygon_3d_editor_plugin.h | 2 +- .../resource_preloader_editor_plugin.h | 2 +- editor/plugins/script_editor_plugin.cpp | 2 +- editor/plugins/script_editor_plugin.h | 2 +- editor/plugins/shader_editor_plugin.h | 2 +- editor/plugins/shader_file_editor_plugin.h | 2 +- editor/plugins/skeleton_2d_editor_plugin.h | 2 +- editor/plugins/skeleton_3d_editor_plugin.h | 2 +- editor/plugins/skeleton_ik_3d_editor_plugin.h | 2 +- editor/plugins/sprite_2d_editor_plugin.h | 2 +- editor/plugins/sprite_frames_editor_plugin.h | 2 +- editor/plugins/style_box_editor_plugin.h | 2 +- .../sub_viewport_preview_editor_plugin.h | 2 +- editor/plugins/texture_3d_editor_plugin.h | 2 +- editor/plugins/texture_editor_plugin.h | 2 +- .../plugins/texture_layered_editor_plugin.h | 2 +- editor/plugins/texture_region_editor_plugin.h | 2 +- editor/plugins/theme_editor_plugin.h | 2 +- editor/plugins/tool_button_editor_plugin.h | 2 +- editor/plugins/voxel_gi_editor_plugin.h | 2 +- modules/csg/editor/csg_gizmos.h | 2 +- .../editor_scene_exporter_gltf_plugin.cpp | 2 +- .../editor_scene_exporter_gltf_plugin.h | 2 +- .../gridmap/editor/grid_map_editor_plugin.h | 2 +- .../audio_stream_interactive_editor_plugin.h | 2 +- .../editor/navigation_mesh_editor_plugin.h | 2 +- modules/noise/editor/noise_editor_plugin.cpp | 2 +- modules/noise/editor/noise_editor_plugin.h | 2 +- modules/openxr/editor/openxr_editor_plugin.h | 2 +- 67 files changed, 82 insertions(+), 82 deletions(-) diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index b1f811fbf6c5..5a9cd0c692de 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -274,7 +274,7 @@ class AudioBusesEditorPlugin : public EditorPlugin { EditorAudioBuses *audio_bus_editor = nullptr; public: - virtual String get_name() const override { return "SampleLibrary"; } + virtual String get_plugin_name() const override { return "SampleLibrary"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_node) override; virtual bool handles(Object *p_node) const override; diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index bb02172b1a83..4767194e3d8e 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -281,7 +281,7 @@ Vector EditorData::get_handling_sub_editors(Object *p_object) { EditorPlugin *EditorData::get_editor_by_name(const String &p_name) { for (int i = editor_plugins.size() - 1; i > -1; i--) { - if (editor_plugins[i]->get_name() == p_name) { + if (editor_plugins[i]->get_plugin_name() == p_name) { return editor_plugins[i]; } } @@ -320,7 +320,7 @@ Dictionary EditorData::get_editor_plugin_states() const { if (state.is_empty()) { continue; } - metadata[editor_plugins[i]->get_name()] = state; + metadata[editor_plugins[i]->get_plugin_name()] = state; } return metadata; @@ -348,7 +348,7 @@ void EditorData::set_editor_plugin_states(const Dictionary &p_states) { String name = E->get(); int idx = -1; for (int i = 0; i < editor_plugins.size(); i++) { - if (editor_plugins[i]->get_name() == name) { + if (editor_plugins[i]->get_plugin_name() == name) { idx = i; break; } diff --git a/editor/editor_main_screen.cpp b/editor/editor_main_screen.cpp index 6da2bce60ea5..dfc1152d17ec 100644 --- a/editor/editor_main_screen.cpp +++ b/editor/editor_main_screen.cpp @@ -63,12 +63,12 @@ void EditorMainScreen::_notification(int p_what) { for (int i = 0; i < buttons.size(); i++) { Button *tb = buttons[i]; EditorPlugin *p_editor = editor_table[i]; - Ref icon = p_editor->get_icon(); + Ref icon = p_editor->get_plugin_icon(); if (icon.is_valid()) { tb->set_button_icon(icon); - } else if (has_theme_icon(p_editor->get_name(), EditorStringName(EditorIcons))) { - tb->set_button_icon(get_theme_icon(p_editor->get_name(), EditorStringName(EditorIcons))); + } else if (has_theme_icon(p_editor->get_plugin_name(), EditorStringName(EditorIcons))) { + tb->set_button_icon(get_theme_icon(p_editor->get_plugin_name(), EditorStringName(EditorIcons))); } } } break; @@ -198,7 +198,7 @@ void EditorMainScreen::select(int p_index) { EditorData &editor_data = EditorNode::get_editor_data(); int plugin_count = editor_data.get_editor_plugin_count(); for (int i = 0; i < plugin_count; i++) { - editor_data.get_editor_plugin(i)->notify_main_screen_changed(selected_plugin->get_name()); + editor_data.get_editor_plugin(i)->notify_main_screen_changed(selected_plugin->get_plugin_name()); } EditorNode::get_singleton()->update_distraction_free_mode(); @@ -236,12 +236,12 @@ void EditorMainScreen::add_main_plugin(EditorPlugin *p_editor) { Button *tb = memnew(Button); tb->set_toggle_mode(true); tb->set_theme_type_variation("MainScreenButton"); - tb->set_name(p_editor->get_name()); - tb->set_text(p_editor->get_name()); + tb->set_name(p_editor->get_plugin_name()); + tb->set_text(p_editor->get_plugin_name()); - Ref icon = p_editor->get_icon(); - if (icon.is_null() && has_theme_icon(p_editor->get_name(), EditorStringName(EditorIcons))) { - icon = get_editor_theme_icon(p_editor->get_name()); + Ref icon = p_editor->get_plugin_icon(); + if (icon.is_null() && has_theme_icon(p_editor->get_plugin_name(), EditorStringName(EditorIcons))) { + icon = get_editor_theme_icon(p_editor->get_plugin_name()); } if (icon.is_valid()) { tb->set_button_icon(icon); @@ -260,7 +260,7 @@ void EditorMainScreen::remove_main_plugin(EditorPlugin *p_editor) { // Remove the main editor button and update the bindings of // all buttons behind it to point to the correct main window. for (int i = buttons.size() - 1; i >= 0; i--) { - if (p_editor->get_name() == buttons[i]->get_text()) { + if (p_editor->get_plugin_name() == buttons[i]->get_text()) { if (buttons[i]->is_pressed()) { select(EDITOR_SCRIPT); } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 7591208aa02c..92d9ac04ee8a 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2629,7 +2629,7 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update if (main_plugin && !skip_main_plugin) { // Special case if use of external editor is true. Resource *current_res = Object::cast_to(current_obj); - if (main_plugin->get_name() == "Script" && current_res && !current_res->is_built_in() && (bool(EDITOR_GET("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { + if (main_plugin->get_plugin_name() == "Script" && current_res && !current_res->is_built_in() && (bool(EDITOR_GET("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { if (!changing_scene) { main_plugin->edit(current_obj); } diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 66d4e1b7ef04..6f13209a844c 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -157,7 +157,7 @@ class AbstractPolygon2DEditorPlugin : public EditorPlugin { virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { polygon_editor->forward_canvas_draw_over_viewport(p_overlay); } bool has_main_screen() const override { return false; } - virtual String get_name() const override { return klass; } + virtual String get_plugin_name() const override { return klass; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; virtual void make_visible(bool p_visible) override; diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index 349ed7b5cd4c..5295934dfcb7 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -299,7 +299,7 @@ class AnimationPlayerEditorPlugin : public EditorPlugin { virtual Dictionary get_state() const override { return anim_editor->get_state(); } virtual void set_state(const Dictionary &p_state) override { anim_editor->set_state(p_state); } - virtual String get_name() const override { return "Anim"; } + virtual String get_plugin_name() const override { return "Anim"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; @@ -333,7 +333,7 @@ class AnimationTrackKeyEditEditorPlugin : public EditorPlugin { bool has_main_screen() const override { return false; } virtual bool handles(Object *p_object) const override; - virtual String get_name() const override { return "AnimationTrackKeyEdit"; } + virtual String get_plugin_name() const override { return "AnimationTrackKeyEdit"; } AnimationTrackKeyEditEditorPlugin(); }; @@ -359,7 +359,7 @@ class AnimationMarkerKeyEditEditorPlugin : public EditorPlugin { bool has_main_screen() const override { return false; } virtual bool handles(Object *p_object) const override; - virtual String get_name() const override { return "AnimationMarkerKeyEdit"; } + virtual String get_plugin_name() const override { return "AnimationMarkerKeyEdit"; } AnimationMarkerKeyEditEditorPlugin(); }; diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index a234af68742d..3466ad602eb0 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -100,7 +100,7 @@ class AnimationTreeEditorPlugin : public EditorPlugin { Button *button = nullptr; public: - virtual String get_name() const override { return "AnimationTree"; } + virtual String get_plugin_name() const override { return "AnimationTree"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/plugins/asset_library_editor_plugin.h index a80e7c8f9683..616145b4140b 100644 --- a/editor/plugins/asset_library_editor_plugin.h +++ b/editor/plugins/asset_library_editor_plugin.h @@ -342,7 +342,7 @@ class AssetLibraryEditorPlugin : public EditorPlugin { public: static bool is_available(); - virtual String get_name() const override { return "AssetLib"; } + virtual String get_plugin_name() const override { return "AssetLib"; } bool has_main_screen() const override { return true; } virtual void edit(Object *p_object) override {} virtual bool handles(Object *p_object) const override { return false; } diff --git a/editor/plugins/audio_stream_randomizer_editor_plugin.h b/editor/plugins/audio_stream_randomizer_editor_plugin.h index 9d2fc76e9e90..edf5a4a95cc9 100644 --- a/editor/plugins/audio_stream_randomizer_editor_plugin.h +++ b/editor/plugins/audio_stream_randomizer_editor_plugin.h @@ -41,7 +41,7 @@ class AudioStreamRandomizerEditorPlugin : public EditorPlugin { void _move_stream_array_element(Object *p_undo_redo, Object *p_edited, const String &p_array_prefix, int p_from_index, int p_to_pos); public: - virtual String get_name() const override { return "AudioStreamRandomizer"; } + virtual String get_plugin_name() const override { return "AudioStreamRandomizer"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/bone_map_editor_plugin.h b/editor/plugins/bone_map_editor_plugin.h index 988ad40ec46a..eadea92b46fe 100644 --- a/editor/plugins/bone_map_editor_plugin.h +++ b/editor/plugins/bone_map_editor_plugin.h @@ -231,7 +231,7 @@ class BoneMapEditorPlugin : public EditorPlugin { GDCLASS(BoneMapEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "BoneMap"; } + virtual String get_plugin_name() const override { return "BoneMap"; } BoneMapEditorPlugin(); }; diff --git a/editor/plugins/camera_3d_editor_plugin.h b/editor/plugins/camera_3d_editor_plugin.h index 98d0bcc40c2f..4e5d3a8c332f 100644 --- a/editor/plugins/camera_3d_editor_plugin.h +++ b/editor/plugins/camera_3d_editor_plugin.h @@ -78,7 +78,7 @@ class Camera3DEditorPlugin : public EditorPlugin { GDCLASS(Camera3DEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Camera3D"; } + virtual String get_plugin_name() const override { return "Camera3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 2447dc63097f..14a1ac13fc55 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -604,7 +604,7 @@ class CanvasItemEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "2D"; } + virtual String get_plugin_name() const override { return "2D"; } bool has_main_screen() const override { return true; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/cast_2d_editor_plugin.h b/editor/plugins/cast_2d_editor_plugin.h index cbe7e0300869..a74307b3de9e 100644 --- a/editor/plugins/cast_2d_editor_plugin.h +++ b/editor/plugins/cast_2d_editor_plugin.h @@ -65,7 +65,7 @@ class Cast2DEditorPlugin : public EditorPlugin { virtual bool forward_canvas_gui_input(const Ref &p_event) override { return cast_2d_editor->forward_canvas_gui_input(p_event); } virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); } - virtual String get_name() const override { return "Cast2D"; } + virtual String get_plugin_name() const override { return "Cast2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index 672e1d9ce0ab..efd7c5e39fdc 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -105,7 +105,7 @@ class CollisionShape2DEditorPlugin : public EditorPlugin { virtual bool forward_canvas_gui_input(const Ref &p_event) override { return collision_shape_2d_editor->forward_canvas_gui_input(p_event); } virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { collision_shape_2d_editor->forward_canvas_draw_over_viewport(p_overlay); } - virtual String get_name() const override { return "CollisionShape2D"; } + virtual String get_plugin_name() const override { return "CollisionShape2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_obj) override; virtual bool handles(Object *p_obj) const override; diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h index 56e9f6ced492..b0a4de876edd 100644 --- a/editor/plugins/control_editor_plugin.h +++ b/editor/plugins/control_editor_plugin.h @@ -255,7 +255,7 @@ class ControlEditorPlugin : public EditorPlugin { ControlEditorToolbar *toolbar = nullptr; public: - virtual String get_name() const override { return "Control"; } + virtual String get_plugin_name() const override { return "Control"; } ControlEditorPlugin(); }; diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index 8fc87ee04e31..64abe977f14b 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -188,7 +188,7 @@ class CurveEditorPlugin : public EditorPlugin { public: CurveEditorPlugin(); - virtual String get_name() const override { return "Curve"; } + virtual String get_plugin_name() const override { return "Curve"; } }; class CurvePreviewGenerator : public EditorResourcePreviewGenerator { diff --git a/editor/plugins/debugger_editor_plugin.h b/editor/plugins/debugger_editor_plugin.h index c7ad31ebad5c..c94ff9b1a1d5 100644 --- a/editor/plugins/debugger_editor_plugin.h +++ b/editor/plugins/debugger_editor_plugin.h @@ -67,7 +67,7 @@ class DebuggerEditorPlugin : public EditorPlugin { void _menu_option(int p_option); public: - virtual String get_name() const override { return "Debugger"; } + virtual String get_plugin_name() const override { return "Debugger"; } bool has_main_screen() const override { return false; } DebuggerEditorPlugin(PopupMenu *p_menu); diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp index 29e4adb45a63..7fbd4dfc931f 100644 --- a/editor/plugins/editor_plugin.cpp +++ b/editor/plugins/editor_plugin.cpp @@ -307,13 +307,13 @@ void EditorPlugin::forward_3d_force_draw_over_viewport(Control *p_overlay) { GDVIRTUAL_CALL(_forward_3d_force_draw_over_viewport, p_overlay); } -String EditorPlugin::get_name() const { +String EditorPlugin::get_plugin_name() const { String name; GDVIRTUAL_CALL(_get_plugin_name, name); return name; } -const Ref EditorPlugin::get_icon() const { +const Ref EditorPlugin::get_plugin_icon() const { Ref icon; GDVIRTUAL_CALL(_get_plugin_icon, icon); return icon; diff --git a/editor/plugins/editor_plugin.h b/editor/plugins/editor_plugin.h index b43cbca66136..8b494b079be3 100644 --- a/editor/plugins/editor_plugin.h +++ b/editor/plugins/editor_plugin.h @@ -181,8 +181,8 @@ class EditorPlugin : public Node { virtual void forward_3d_draw_over_viewport(Control *p_overlay); virtual void forward_3d_force_draw_over_viewport(Control *p_overlay); - virtual String get_name() const; - virtual const Ref get_icon() const; + virtual String get_plugin_name() const; + virtual const Ref get_plugin_icon() const; virtual String get_plugin_version() const; virtual void set_plugin_version(const String &p_version); virtual bool has_main_screen() const; diff --git a/editor/plugins/font_config_plugin.h b/editor/plugins/font_config_plugin.h index 87fd3861dc93..d0e039cf8220 100644 --- a/editor/plugins/font_config_plugin.h +++ b/editor/plugins/font_config_plugin.h @@ -280,7 +280,7 @@ class FontEditorPlugin : public EditorPlugin { public: FontEditorPlugin(); - virtual String get_name() const override { return "Font"; } + virtual String get_plugin_name() const override { return "Font"; } }; #endif // FONT_CONFIG_PLUGIN_H diff --git a/editor/plugins/game_view_plugin.h b/editor/plugins/game_view_plugin.h index f8701c3e76fd..57251dc29551 100644 --- a/editor/plugins/game_view_plugin.h +++ b/editor/plugins/game_view_plugin.h @@ -136,7 +136,7 @@ class GameViewPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "Game"; } + virtual String get_plugin_name() const override { return "Game"; } bool has_main_screen() const override { return true; } virtual void edit(Object *p_object) override {} virtual bool handles(Object *p_object) const override { return false; } diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h index 3e1dae77ea59..499a1df6ec5b 100644 --- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h +++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h @@ -61,7 +61,7 @@ class GPUParticlesCollisionSDF3DEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "GPUParticlesCollisionSDF3D"; } + virtual String get_plugin_name() const override { return "GPUParticlesCollisionSDF3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index f211e4ef3053..516babf8da06 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -138,7 +138,7 @@ class GradientEditorPlugin : public EditorPlugin { GDCLASS(GradientEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Gradient"; } + virtual String get_plugin_name() const override { return "Gradient"; } GradientEditorPlugin(); }; diff --git a/editor/plugins/input_event_editor_plugin.h b/editor/plugins/input_event_editor_plugin.h index 276bb74f6be6..8d14c2e4243b 100644 --- a/editor/plugins/input_event_editor_plugin.h +++ b/editor/plugins/input_event_editor_plugin.h @@ -70,7 +70,7 @@ class InputEventEditorPlugin : public EditorPlugin { GDCLASS(InputEventEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "InputEvent"; } + virtual String get_plugin_name() const override { return "InputEvent"; } InputEventEditorPlugin(); }; diff --git a/editor/plugins/lightmap_gi_editor_plugin.h b/editor/plugins/lightmap_gi_editor_plugin.h index 3e739adf9e66..4df714591f42 100644 --- a/editor/plugins/lightmap_gi_editor_plugin.h +++ b/editor/plugins/lightmap_gi_editor_plugin.h @@ -57,7 +57,7 @@ class LightmapGIEditorPlugin : public EditorPlugin { static void _bind_methods(); public: - virtual String get_name() const override { return "LightmapGI"; } + virtual String get_plugin_name() const override { return "LightmapGI"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index c1b37a5831b0..f8b2eabb45f0 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -131,7 +131,7 @@ class MaterialEditorPlugin : public EditorPlugin { GDCLASS(MaterialEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Material"; } + virtual String get_plugin_name() const override { return "Material"; } MaterialEditorPlugin(); }; diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index 85d92e7800d1..aa97fe83d8e3 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -93,7 +93,7 @@ class MeshEditorPlugin : public EditorPlugin { GDCLASS(MeshEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Mesh"; } + virtual String get_plugin_name() const override { return "Mesh"; } MeshEditorPlugin(); }; diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h index 569ecd4fff17..2744c98a3209 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.h +++ b/editor/plugins/mesh_instance_3d_editor_plugin.h @@ -113,7 +113,7 @@ class MeshInstance3DEditorPlugin : public EditorPlugin { MeshInstance3DEditor *mesh_editor = nullptr; public: - virtual String get_name() const override { return "MeshInstance3D"; } + virtual String get_plugin_name() const override { return "MeshInstance3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/mesh_library_editor_plugin.h b/editor/plugins/mesh_library_editor_plugin.h index 5a9e32178d3b..eacfebc5bd03 100644 --- a/editor/plugins/mesh_library_editor_plugin.h +++ b/editor/plugins/mesh_library_editor_plugin.h @@ -83,7 +83,7 @@ class MeshLibraryEditorPlugin : public EditorPlugin { MeshLibraryEditor *mesh_library_editor = nullptr; public: - virtual String get_name() const override { return "MeshLibrary"; } + virtual String get_plugin_name() const override { return "MeshLibrary"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_node) override; virtual bool handles(Object *p_node) const override; diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index 3fe63bfa9214..af83d5fbc860 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -91,7 +91,7 @@ class MultiMeshEditorPlugin : public EditorPlugin { MultiMeshEditor *multimesh_editor = nullptr; public: - virtual String get_name() const override { return "MultiMesh"; } + virtual String get_plugin_name() const override { return "MultiMesh"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/navigation_link_2d_editor_plugin.h b/editor/plugins/navigation_link_2d_editor_plugin.h index 7a4be18c3167..d4032590191e 100644 --- a/editor/plugins/navigation_link_2d_editor_plugin.h +++ b/editor/plugins/navigation_link_2d_editor_plugin.h @@ -67,7 +67,7 @@ class NavigationLink2DEditorPlugin : public EditorPlugin { virtual bool forward_canvas_gui_input(const Ref &p_event) override { return editor->forward_canvas_gui_input(p_event); } virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { editor->forward_canvas_draw_over_viewport(p_overlay); } - virtual String get_name() const override { return "NavigationLink2D"; } + virtual String get_plugin_name() const override { return "NavigationLink2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.h b/editor/plugins/navigation_obstacle_3d_editor_plugin.h index b6f3a11cf66c..86f7f2d961ce 100644 --- a/editor/plugins/navigation_obstacle_3d_editor_plugin.h +++ b/editor/plugins/navigation_obstacle_3d_editor_plugin.h @@ -124,7 +124,7 @@ class NavigationObstacle3DEditorPlugin : public EditorPlugin { virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref &p_event) override; - virtual String get_name() const override { return "NavigationObstacle3D"; } + virtual String get_plugin_name() const override { return "NavigationObstacle3DEditor"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index dd89511d2939..6b603864c2c6 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -1013,7 +1013,7 @@ class Node3DEditorPlugin : public EditorPlugin { public: Node3DEditor *get_spatial_editor() { return spatial_editor; } - virtual String get_name() const override { return "3D"; } + virtual String get_plugin_name() const override { return "3D"; } bool has_main_screen() const override { return true; } virtual void make_visible(bool p_visible) override; virtual void edit(Object *p_object) override; diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.h b/editor/plugins/occluder_instance_3d_editor_plugin.h index 7920ff59c9ed..d94980467f26 100644 --- a/editor/plugins/occluder_instance_3d_editor_plugin.h +++ b/editor/plugins/occluder_instance_3d_editor_plugin.h @@ -53,7 +53,7 @@ class OccluderInstance3DEditorPlugin : public EditorPlugin { static void _bind_methods(); public: - virtual String get_name() const override { return "OccluderInstance3D"; } + virtual String get_plugin_name() const override { return "OccluderInstance3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/parallax_background_editor_plugin.h b/editor/plugins/parallax_background_editor_plugin.h index 07a562edac14..552e35feab25 100644 --- a/editor/plugins/parallax_background_editor_plugin.h +++ b/editor/plugins/parallax_background_editor_plugin.h @@ -55,7 +55,7 @@ class ParallaxBackgroundEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "ParallaxBackground"; } + virtual String get_plugin_name() const override { return "ParallaxBackground"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index f2f03f12f1f1..236d492ed6fa 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -130,7 +130,7 @@ class Path2DEditorPlugin : public EditorPlugin { virtual bool forward_canvas_gui_input(const Ref &p_event) override { return path2d_editor->forward_gui_input(p_event); } virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { path2d_editor->forward_canvas_draw_over_viewport(p_overlay); } - virtual String get_name() const override { return "Path2D"; } + virtual String get_plugin_name() const override { return "Path2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h index 3e45c2718fe1..a85682c1d484 100644 --- a/editor/plugins/path_3d_editor_plugin.h +++ b/editor/plugins/path_3d_editor_plugin.h @@ -170,7 +170,7 @@ class Path3DEditorPlugin : public EditorPlugin { inline static Path3DEditorPlugin *singleton = nullptr; virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref &p_event) override; - virtual String get_name() const override { return "Path3D"; } + virtual String get_plugin_name() const override { return "Path3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/physical_bone_3d_editor_plugin.h b/editor/plugins/physical_bone_3d_editor_plugin.h index b057644bb12b..87d582545aea 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.h +++ b/editor/plugins/physical_bone_3d_editor_plugin.h @@ -66,7 +66,7 @@ class PhysicalBone3DEditorPlugin : public EditorPlugin { PhysicalBone3DEditor physical_bone_editor; public: - virtual String get_name() const override { return "PhysicalBone3D"; } + virtual String get_plugin_name() const override { return "PhysicalBone3D"; } virtual bool handles(Object *p_object) const override { return p_object->is_class("PhysicalBone3D"); } virtual void make_visible(bool p_visible) override; virtual void edit(Object *p_node) override; diff --git a/editor/plugins/polygon_3d_editor_plugin.h b/editor/plugins/polygon_3d_editor_plugin.h index f49663851586..dc8d143881b5 100644 --- a/editor/plugins/polygon_3d_editor_plugin.h +++ b/editor/plugins/polygon_3d_editor_plugin.h @@ -104,7 +104,7 @@ class Polygon3DEditorPlugin : public EditorPlugin { public: virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref &p_event) override { return polygon_editor->forward_3d_gui_input(p_camera, p_event); } - virtual String get_name() const override { return "Polygon3DEditor"; } + virtual String get_plugin_name() const override { return "Polygon3DEditor"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index 76ef2fe9a4df..25e9be222cd1 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -88,7 +88,7 @@ class ResourcePreloaderEditorPlugin : public EditorPlugin { Button *button = nullptr; public: - virtual String get_name() const override { return "ResourcePreloader"; } + virtual String get_plugin_name() const override { return "ResourcePreloader"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 1cab950d0241..73c542d4e7e1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -4481,7 +4481,7 @@ void ScriptEditorPlugin::_focus_another_editor() { } void ScriptEditorPlugin::_save_last_editor(const String &p_editor) { - if (p_editor != get_name()) { + if (p_editor != get_plugin_name()) { last_editor = p_editor; } } diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 5de0aaa1e97d..2f5560bdab4f 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -617,7 +617,7 @@ class ScriptEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "Script"; } + virtual String get_plugin_name() const override { return "Script"; } bool has_main_screen() const override { return true; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index 19e43921c3c6..02dc24165ca4 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -130,7 +130,7 @@ class ShaderEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "Shader"; } + virtual String get_plugin_name() const override { return "Shader"; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; virtual void make_visible(bool p_visible) override; diff --git a/editor/plugins/shader_file_editor_plugin.h b/editor/plugins/shader_file_editor_plugin.h index fea770b7e01c..c9bd737f03e1 100644 --- a/editor/plugins/shader_file_editor_plugin.h +++ b/editor/plugins/shader_file_editor_plugin.h @@ -77,7 +77,7 @@ class ShaderFileEditorPlugin : public EditorPlugin { Button *button = nullptr; public: - virtual String get_name() const override { return "ShaderFile"; } + virtual String get_plugin_name() const override { return "ShaderFile"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index 89e2e5d0f25e..3d9c82b94f90 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -69,7 +69,7 @@ class Skeleton2DEditorPlugin : public EditorPlugin { Skeleton2DEditor *sprite_editor = nullptr; public: - virtual String get_name() const override { return "Skeleton2D"; } + virtual String get_plugin_name() const override { return "Skeleton2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/plugins/skeleton_3d_editor_plugin.h index c6f8c5d357b8..a909a8fac7a6 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.h +++ b/editor/plugins/skeleton_3d_editor_plugin.h @@ -264,7 +264,7 @@ class Skeleton3DEditorPlugin : public EditorPlugin { bool has_main_screen() const override { return false; } virtual bool handles(Object *p_object) const override; - virtual String get_name() const override { return "Skeleton3D"; } + virtual String get_plugin_name() const override { return "Skeleton3D"; } Skeleton3DEditorPlugin(); }; diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.h b/editor/plugins/skeleton_ik_3d_editor_plugin.h index 95ab3696beff..c7c7867ebeb2 100644 --- a/editor/plugins/skeleton_ik_3d_editor_plugin.h +++ b/editor/plugins/skeleton_ik_3d_editor_plugin.h @@ -46,7 +46,7 @@ class SkeletonIK3DEditorPlugin : public EditorPlugin { void _play(); public: - virtual String get_name() const override { return "SkeletonIK3D"; } + virtual String get_plugin_name() const override { return "SkeletonIK3D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h index 7cbde7708189..2b86b20a58a8 100644 --- a/editor/plugins/sprite_2d_editor_plugin.h +++ b/editor/plugins/sprite_2d_editor_plugin.h @@ -121,7 +121,7 @@ class Sprite2DEditorPlugin : public EditorPlugin { Sprite2DEditor *sprite_editor = nullptr; public: - virtual String get_name() const override { return "Sprite2D"; } + virtual String get_plugin_name() const override { return "Sprite2D"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index a85a6b24535e..9addcb74bf7b 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -286,7 +286,7 @@ class SpriteFramesEditorPlugin : public EditorPlugin { Button *button = nullptr; public: - virtual String get_name() const override { return "SpriteFrames"; } + virtual String get_plugin_name() const override { return "SpriteFrames"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h index e793c2c2f385..5814e5ad507c 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/plugins/style_box_editor_plugin.h @@ -70,7 +70,7 @@ class StyleBoxEditorPlugin : public EditorPlugin { GDCLASS(StyleBoxEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "StyleBox"; } + virtual String get_plugin_name() const override { return "StyleBox"; } StyleBoxEditorPlugin(); }; diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.h b/editor/plugins/sub_viewport_preview_editor_plugin.h index d05e90b61e46..d5dcf63be6a9 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.h +++ b/editor/plugins/sub_viewport_preview_editor_plugin.h @@ -47,7 +47,7 @@ class SubViewportPreviewEditorPlugin : public EditorPlugin { GDCLASS(SubViewportPreviewEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "SubViewportPreview"; } + virtual String get_plugin_name() const override { return "SubViewportPreview"; } SubViewportPreviewEditorPlugin(); }; diff --git a/editor/plugins/texture_3d_editor_plugin.h b/editor/plugins/texture_3d_editor_plugin.h index 0712ff423a78..4124fc58414e 100644 --- a/editor/plugins/texture_3d_editor_plugin.h +++ b/editor/plugins/texture_3d_editor_plugin.h @@ -89,7 +89,7 @@ class Texture3DEditorPlugin : public EditorPlugin { GDCLASS(Texture3DEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Texture3D"; } + virtual String get_plugin_name() const override { return "Texture3D"; } Texture3DEditorPlugin(); }; diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index ea31429238ef..dc0140e71ee8 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -69,7 +69,7 @@ class TextureEditorPlugin : public EditorPlugin { GDCLASS(TextureEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "Texture2D"; } + virtual String get_plugin_name() const override { return "Texture2D"; } TextureEditorPlugin(); }; diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/plugins/texture_layered_editor_plugin.h index 900ba94c6dab..5648a04c80f9 100644 --- a/editor/plugins/texture_layered_editor_plugin.h +++ b/editor/plugins/texture_layered_editor_plugin.h @@ -92,7 +92,7 @@ class TextureLayeredEditorPlugin : public EditorPlugin { GDCLASS(TextureLayeredEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "TextureLayered"; } + virtual String get_plugin_name() const override { return "TextureLayered"; } TextureLayeredEditorPlugin(); }; diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h index 0e71ec16e0c5..d3f006536ed5 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/plugins/texture_region_editor_plugin.h @@ -175,7 +175,7 @@ class TextureRegionEditorPlugin : public EditorPlugin { GDCLASS(TextureRegionEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "TextureRegion"; } + virtual String get_plugin_name() const override { return "TextureRegion"; } TextureRegionEditorPlugin(); }; diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index 39dc8d154bb9..313268be3eb7 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -473,7 +473,7 @@ class ThemeEditorPlugin : public EditorPlugin { Button *button = nullptr; public: - virtual String get_name() const override { return "Theme"; } + virtual String get_plugin_name() const override { return "Theme"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/editor/plugins/tool_button_editor_plugin.h b/editor/plugins/tool_button_editor_plugin.h index 2d185c3a8fe2..f4122537a117 100644 --- a/editor/plugins/tool_button_editor_plugin.h +++ b/editor/plugins/tool_button_editor_plugin.h @@ -49,7 +49,7 @@ class ToolButtonEditorPlugin : public EditorPlugin { GDCLASS(ToolButtonEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "ToolButtonEditorPlugin"; } + virtual String get_plugin_name() const override { return "ToolButtonEditorPlugin"; } ToolButtonEditorPlugin(); }; diff --git a/editor/plugins/voxel_gi_editor_plugin.h b/editor/plugins/voxel_gi_editor_plugin.h index 01a2ab4bd1d7..60163e2ab827 100644 --- a/editor/plugins/voxel_gi_editor_plugin.h +++ b/editor/plugins/voxel_gi_editor_plugin.h @@ -61,7 +61,7 @@ class VoxelGIEditorPlugin : public EditorPlugin { void _notification(int p_what); public: - virtual String get_name() const override { return "VoxelGI"; } + virtual String get_plugin_name() const override { return "VoxelGI"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/modules/csg/editor/csg_gizmos.h b/modules/csg/editor/csg_gizmos.h index c562fe9fe78b..d410290d0998 100644 --- a/modules/csg/editor/csg_gizmos.h +++ b/modules/csg/editor/csg_gizmos.h @@ -98,7 +98,7 @@ class EditorPluginCSG : public EditorPlugin { CSGShapeEditor *csg_shape_editor = nullptr; public: - virtual String get_name() const override { return "CSGShape3D"; } + virtual String get_plugin_name() const override { return "CSGShape3D"; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp index 872054ec2e58..17b70941de26 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp @@ -41,7 +41,7 @@ #include "editor/import/3d/scene_import_settings.h" #include "editor/themes/editor_scale.h" -String SceneExporterGLTFPlugin::get_name() const { +String SceneExporterGLTFPlugin::get_plugin_name() const { return "ConvertGLTF2"; } diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h index 6bc61605716c..85b8ce3b5286 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h @@ -52,7 +52,7 @@ class SceneExporterGLTFPlugin : public EditorPlugin { void _export_scene_as_gltf(const String &p_file_path); public: - virtual String get_name() const override; + virtual String get_plugin_name() const override; bool has_main_screen() const override; SceneExporterGLTFPlugin(); }; diff --git a/modules/gridmap/editor/grid_map_editor_plugin.h b/modules/gridmap/editor/grid_map_editor_plugin.h index 2d43a5c83058..55d9266aceb7 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.h +++ b/modules/gridmap/editor/grid_map_editor_plugin.h @@ -274,7 +274,7 @@ class GridMapEditorPlugin : public EditorPlugin { public: virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref &p_event) override { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); } - virtual String get_name() const override { return "GridMap"; } + virtual String get_plugin_name() const override { return "GridMap"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h index 3c50b0d5cce9..1155d70e7a84 100644 --- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h +++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h @@ -102,7 +102,7 @@ class AudioStreamInteractiveEditorPlugin : public EditorPlugin { GDCLASS(AudioStreamInteractiveEditorPlugin, EditorPlugin); public: - virtual String get_name() const override { return "AudioStreamInteractive"; } + virtual String get_plugin_name() const override { return "AudioStreamInteractive"; } AudioStreamInteractiveEditorPlugin(); }; diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.h b/modules/navigation/editor/navigation_mesh_editor_plugin.h index f5a471d5318a..65cd97070940 100644 --- a/modules/navigation/editor/navigation_mesh_editor_plugin.h +++ b/modules/navigation/editor/navigation_mesh_editor_plugin.h @@ -74,7 +74,7 @@ class NavigationMeshEditorPlugin : public EditorPlugin { NavigationMeshEditor *navigation_mesh_editor = nullptr; public: - virtual String get_name() const override { return "NavigationMesh"; } + virtual String get_plugin_name() const override { return "NavigationMesh"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; diff --git a/modules/noise/editor/noise_editor_plugin.cpp b/modules/noise/editor/noise_editor_plugin.cpp index 200f31cca1ca..4f1df2f4fff8 100644 --- a/modules/noise/editor/noise_editor_plugin.cpp +++ b/modules/noise/editor/noise_editor_plugin.cpp @@ -139,7 +139,7 @@ class NoiseEditorInspectorPlugin : public EditorInspectorPlugin { ///////////////////////////////////////////////////////////////////////////////// -String NoiseEditorPlugin::get_name() const { +String NoiseEditorPlugin::get_plugin_name() const { return Noise::get_class_static(); } diff --git a/modules/noise/editor/noise_editor_plugin.h b/modules/noise/editor/noise_editor_plugin.h index aa94cf4d234e..29c8e8580573 100644 --- a/modules/noise/editor/noise_editor_plugin.h +++ b/modules/noise/editor/noise_editor_plugin.h @@ -39,7 +39,7 @@ class NoiseEditorPlugin : public EditorPlugin { GDCLASS(NoiseEditorPlugin, EditorPlugin) public: - String get_name() const override; + String get_plugin_name() const override; NoiseEditorPlugin(); }; diff --git a/modules/openxr/editor/openxr_editor_plugin.h b/modules/openxr/editor/openxr_editor_plugin.h index 18c82b24ac65..58debb3fd632 100644 --- a/modules/openxr/editor/openxr_editor_plugin.h +++ b/modules/openxr/editor/openxr_editor_plugin.h @@ -47,7 +47,7 @@ class OpenXREditorPlugin : public EditorPlugin { #endif public: - virtual String get_name() const override { return "OpenXRPlugin"; } + virtual String get_plugin_name() const override { return "OpenXRPlugin"; } bool has_main_screen() const override { return false; } virtual void edit(Object *p_node) override; virtual bool handles(Object *p_node) const override;