Use Core/Scene stringnames consistently

core/config/project_settings.cpp

@@ -31,7 +31,6 @@
 #include "project_settings.h"
 
 #include "core/core_bind.h" // For Compression enum.
-#include "core/core_string_names.h"
 #include "core/input/input_map.h"
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"

core/io/marshalls.cpp

@@ -30,7 +30,6 @@
 
 #include "marshalls.h"
 
-#include "core/core_string_names.h"
 #include "core/io/resource_loader.h"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"

core/io/packed_data_container.cpp

@@ -30,7 +30,6 @@
 
 #include "packed_data_container.h"
 
-#include "core/core_string_names.h"
 #include "core/io/marshalls.h"
 
 Variant PackedDataContainer::getvar(const Variant &p_key, bool *r_valid) const {

core/io/resource.cpp

@@ -30,7 +30,6 @@
 
 #include "resource.h"
 
-#include "core/core_string_names.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"

core/object/class_db.cpp

@@ -31,7 +31,6 @@
 #include "class_db.h"
 
 #include "core/config/engine.h"
-#include "core/core_string_names.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
 #include "core/os/mutex.h"

core/object/message_queue.cpp

@@ -31,7 +31,6 @@
 #include "message_queue.h"
 
 #include "core/config/project_settings.h"
-#include "core/core_string_names.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 

core/object/object.cpp

@@ -31,7 +31,6 @@
 #include "object.h"
 #include "object.compat.inc"
 
-#include "core/core_string_names.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/io/resource.h"
 #include "core/object/class_db.h"

core/object/script_language.cpp

@@ -31,7 +31,6 @@
 #include "script_language.h"
 
 #include "core/config/project_settings.h"
-#include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"

core/register_core_types.cpp

@@ -33,7 +33,6 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_bind.h"
-#include "core/core_string_names.h"
 #include "core/crypto/aes_context.h"
 #include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"

core/variant/variant.cpp

@@ -30,7 +30,6 @@
 
 #include "variant.h"
 
-#include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"

core/variant/variant.h

@@ -31,6 +31,7 @@
 #ifndef VARIANT_H
 #define VARIANT_H
 
+#include "core/core_string_names.h"
 #include "core/input/input_enums.h"
 #include "core/io/ip_address.h"
 #include "core/math/aabb.h"

core/variant/variant_call.cpp

@@ -30,7 +30,6 @@
 
 #include "variant.h"
 
-#include "core/core_string_names.h"
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/compression.h"

core/variant/variant_construct.h

@@ -33,7 +33,6 @@
 
 #include "variant.h"
 
-#include "core/core_string_names.h"
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/compression.h"

core/variant/variant_op.h

@@ -33,7 +33,6 @@
 
 #include "variant.h"
 
-#include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/object/class_db.h"
 

core/variant/variant_setget.h

@@ -33,7 +33,6 @@
 
 #include "variant.h"
 
-#include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/object/class_db.h"
 #include "core/templates/local_vector.h"

core/variant/variant_utility.cpp

@@ -30,7 +30,6 @@
 
 #include "variant_utility.h"
 
-#include "core/core_string_names.h"
 #include "core/io/marshalls.h"
 #include "core/object/ref_counted.h"
 #include "core/os/os.h"

editor/action_map_editor.cpp

@@ -38,7 +38,6 @@
 #include "scene/gui/check_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/tree.h"
-#include "scene/scene_string_names.h"
 
 static bool _is_action_name_valid(const String &p_name) {
  const char32_t *cstr = p_name.get_data();

editor/animation_bezier_editor.cpp

@@ -1939,7 +1939,7 @@ AnimationBezierTrackEdit::AnimationBezierTrackEdit() {
  play_position->set_mouse_filter(MOUSE_FILTER_PASS);
  add_child(play_position);
  play_position->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
- play_position->connect("draw", callable_mp(this, &AnimationBezierTrackEdit::_play_position_draw));
+ play_position->connect(SceneStringName(draw), callable_mp(this, &AnimationBezierTrackEdit::_play_position_draw));
  set_focus_mode(FOCUS_CLICK);
 
  set_clip_contents(true);

editor/animation_track_editor.cpp

@@ -55,7 +55,6 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
-#include "scene/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
 void AnimationTrackKeyEdit::_bind_methods() {
@@ -1896,7 +1895,7 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
  play_position->set_mouse_filter(MOUSE_FILTER_PASS);
  add_child(play_position);
  play_position->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
- play_position->connect("draw", callable_mp(this, &AnimationTimelineEdit::_play_position_draw));
+ play_position->connect(SceneStringName(draw), callable_mp(this, &AnimationTimelineEdit::_play_position_draw));
 
  add_track = memnew(MenuButton);
  add_track->set_position(Vector2(0, 0));
@@ -2962,7 +2961,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
  }
 
  path->set_text(animation->track_get_path(track));
- Vector2 theme_ofs = path->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit"))->get_offset();
+ Vector2 theme_ofs = path->get_theme_stylebox(CoreStringName(normal), SNAME("LineEdit"))->get_offset();
  path_popup->set_position(get_screen_position() + path_rect.position - theme_ofs);
  path_popup->set_size(path_rect.size);
  path_popup->popup();
@@ -3363,7 +3362,7 @@ AnimationTrackEdit::AnimationTrackEdit() {
  play_position->set_mouse_filter(MOUSE_FILTER_PASS);
  add_child(play_position);
  play_position->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
- play_position->connect("draw", callable_mp(this, &AnimationTrackEdit::_play_position_draw));
+ play_position->connect(SceneStringName(draw), callable_mp(this, &AnimationTrackEdit::_play_position_draw));
  set_focus_mode(FOCUS_CLICK);
  set_mouse_filter(MOUSE_FILTER_PASS); // Scroll has to work too for selection.
 }
@@ -3586,13 +3585,13 @@ void AnimationTrackEditor::_root_removed() {
 
 void AnimationTrackEditor::set_root(Node *p_root) {
  if (root) {
- root->disconnect("tree_exiting", callable_mp(this, &AnimationTrackEditor::_root_removed));
+ root->disconnect(SceneStringName(tree_exiting), callable_mp(this, &AnimationTrackEditor::_root_removed));
  }
 
  root = p_root;
 
  if (root) {
- root->connect("tree_exiting", callable_mp(this, &AnimationTrackEditor::_root_removed), CONNECT_ONE_SHOT);
+ root->connect(SceneStringName(tree_exiting), callable_mp(this, &AnimationTrackEditor::_root_removed), CONNECT_ONE_SHOT);
  }
 
  _update_tracks();
@@ -7195,8 +7194,8 @@ AnimationTrackEditor::AnimationTrackEditor() {
  scroll->remove_child(sb);
  timeline_scroll->add_child(sb); // Move here so timeline and tracks are always aligned.
  scroll->set_focus_mode(FOCUS_CLICK);
- scroll->connect("gui_input", callable_mp(this, &AnimationTrackEditor::_scroll_input));
- scroll->connect("focus_exited", callable_mp(panner.ptr(), &ViewPanner::release_pan_key));
+ scroll->connect(SceneStringName(gui_input), callable_mp(this, &AnimationTrackEditor::_scroll_input));
+ scroll->connect(SceneStringName(focus_exited), callable_mp(panner.ptr(), &ViewPanner::release_pan_key));
 
  bezier_edit = memnew(AnimationBezierTrackEdit);
  timeline_vbox->add_child(bezier_edit);
@@ -7373,7 +7372,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
  pick_track->set_title(TTR("Pick a node to animate:"));
  pick_track->connect("selected", callable_mp(this, &AnimationTrackEditor::_new_track_node_selected));
  pick_track->get_filter_line_edit()->connect("text_changed", callable_mp(this, &AnimationTrackEditor::_pick_track_filter_text_changed));
- pick_track->get_filter_line_edit()->connect("gui_input", callable_mp(this, &AnimationTrackEditor::_pick_track_filter_input));
+ pick_track->get_filter_line_edit()->connect(SceneStringName(gui_input), callable_mp(this, &AnimationTrackEditor::_pick_track_filter_input));
 
  prop_selector = memnew(PropertySelector);
  add_child(prop_selector);
@@ -7406,7 +7405,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
  box_selection->set_as_top_level(true);
  box_selection->set_mouse_filter(MOUSE_FILTER_IGNORE);
  box_selection->hide();
- box_selection->connect("draw", callable_mp(this, &AnimationTrackEditor::_box_selection_draw));
+ box_selection->connect(SceneStringName(draw), callable_mp(this, &AnimationTrackEditor::_box_selection_draw));
 
  // Default Plugins.
 

editor/code_editor.cpp

@@ -709,7 +709,7 @@ FindReplaceBar::FindReplaceBar() {
  search_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
  search_text->connect("text_changed", callable_mp(this, &FindReplaceBar::_search_text_changed));
  search_text->connect("text_submitted", callable_mp(this, &FindReplaceBar::_search_text_submitted));
- search_text->connect("focus_exited", callable_mp(this, &FindReplaceBar::_focus_lost));
+ search_text->connect(SceneStringName(focus_exited), callable_mp(this, &FindReplaceBar::_focus_lost));
 
  matches_label = memnew(Label);
  hbc_button_search->add_child(matches_label);
@@ -748,7 +748,7 @@ FindReplaceBar::FindReplaceBar() {
  replace_text->set_tooltip_text(TTR("Replace"));
  replace_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
  replace_text->connect("text_submitted", callable_mp(this, &FindReplaceBar::_replace_text_submitted));
- replace_text->connect("focus_exited", callable_mp(this, &FindReplaceBar::_focus_lost));
+ replace_text->connect(SceneStringName(focus_exited), callable_mp(this, &FindReplaceBar::_focus_lost));
 
  replace = memnew(Button);
  hbc_button_replace->add_child(replace);
@@ -1727,7 +1727,7 @@ CodeTextEditor::CodeTextEditor() {
  scroll->add_child(error);
  error->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
  error->set_mouse_filter(MOUSE_FILTER_STOP);
- error->connect("gui_input", callable_mp(this, &CodeTextEditor::_error_pressed));
+ error->connect(SceneStringName(gui_input), callable_mp(this, &CodeTextEditor::_error_pressed));
 
  // Errors
  error_button = memnew(Button);
@@ -1788,7 +1788,7 @@ CodeTextEditor::CodeTextEditor() {
  indentation_txt->set_tooltip_text(TTR("Indentation"));
  indentation_txt->set_mouse_filter(MOUSE_FILTER_STOP);
 
- text_editor->connect("gui_input", callable_mp(this, &CodeTextEditor::_text_editor_gui_input));
+ text_editor->connect(SceneStringName(gui_input), callable_mp(this, &CodeTextEditor::_text_editor_gui_input));
  text_editor->connect("caret_changed", callable_mp(this, &CodeTextEditor::_line_col_changed));
  text_editor->connect("text_changed", callable_mp(this, &CodeTextEditor::_text_changed));
  text_editor->connect("code_completion_requested", callable_mp(this, &CodeTextEditor::_complete_request));

editor/connections_dialog.cpp

@@ -1622,7 +1622,7 @@ ConnectionsDock::ConnectionsDock() {
  connect_dialog->connect("connected", callable_mp(this, &ConnectionsDock::_make_or_edit_connection));
  tree->connect("item_selected", callable_mp(this, &ConnectionsDock::_tree_item_selected));
  tree->connect("item_activated", callable_mp(this, &ConnectionsDock::_tree_item_activated));
- tree->connect("gui_input", callable_mp(this, &ConnectionsDock::_tree_gui_input));
+ tree->connect(SceneStringName(gui_input), callable_mp(this, &ConnectionsDock::_tree_gui_input));
 
  add_theme_constant_override("separation", 3 * EDSCALE);
 }

editor/create_dialog.cpp

@@ -807,7 +807,7 @@ CreateDialog::CreateDialog() {
  search_box->set_clear_button_enabled(true);
  search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
  search_box->connect("text_changed", callable_mp(this, &CreateDialog::_text_changed));
- search_box->connect("gui_input", callable_mp(this, &CreateDialog::_sbox_input));
+ search_box->connect(SceneStringName(gui_input), callable_mp(this, &CreateDialog::_sbox_input));
 
  HBoxContainer *search_hb = memnew(HBoxContainer);
  search_hb->add_child(search_box);

editor/debugger/editor_performance_profiler.cpp

@@ -111,7 +111,7 @@ void EditorPerformanceProfiler::_monitor_draw() {
 
  info_message->hide();
 
- Ref<StyleBox> graph_style_box = get_theme_stylebox(SNAME("normal"), SNAME("TextEdit"));
+ Ref<StyleBox> graph_style_box = get_theme_stylebox(CoreStringName(normal), SNAME("TextEdit"));
  Ref<Font> graph_font = get_theme_font(SNAME("font"), SNAME("TextEdit"));
  int font_size = get_theme_font_size(SNAME("font_size"), SNAME("TextEdit"));
 
@@ -276,7 +276,7 @@ void EditorPerformanceProfiler::_marker_input(const Ref<InputEvent> &p_event) {
  } else {
  marker_key = "";
  }
- Ref<StyleBox> graph_style_box = get_theme_stylebox(SNAME("normal"), SNAME("TextEdit"));
+ Ref<StyleBox> graph_style_box = get_theme_stylebox(CoreStringName(normal), SNAME("TextEdit"));
  rect.position += graph_style_box->get_offset();
  rect.size -= graph_style_box->get_minimum_size();
  Vector2 point = mb->get_position() - rect.position;
@@ -397,8 +397,8 @@ EditorPerformanceProfiler::EditorPerformanceProfiler() {
 
  monitor_draw = memnew(Control);
  monitor_draw->set_clip_contents(true);
- monitor_draw->connect("draw", callable_mp(this, &EditorPerformanceProfiler::_monitor_draw));
- monitor_draw->connect("gui_input", callable_mp(this, &EditorPerformanceProfiler::_marker_input));
+ monitor_draw->connect(SceneStringName(draw), callable_mp(this, &EditorPerformanceProfiler::_monitor_draw));
+ monitor_draw->connect(SceneStringName(gui_input), callable_mp(this, &EditorPerformanceProfiler::_marker_input));
  add_child(monitor_draw);
 
  info_message = memnew(Label);

editor/debugger/editor_profiler.cpp

@@ -694,9 +694,9 @@ EditorProfiler::EditorProfiler() {
  graph = memnew(TextureRect);
  graph->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
  graph->set_mouse_filter(MOUSE_FILTER_STOP);
- graph->connect("draw", callable_mp(this, &EditorProfiler::_graph_tex_draw));
- graph->connect("gui_input", callable_mp(this, &EditorProfiler::_graph_tex_input));
- graph->connect("mouse_exited", callable_mp(this, &EditorProfiler::_graph_tex_mouse_exit));
+ graph->connect(SceneStringName(draw), callable_mp(this, &EditorProfiler::_graph_tex_draw));
+ graph->connect(SceneStringName(gui_input), callable_mp(this, &EditorProfiler::_graph_tex_input));
+ graph->connect(SceneStringName(mouse_exited), callable_mp(this, &EditorProfiler::_graph_tex_mouse_exit));
 
  h_split->add_child(graph);
  graph->set_h_size_flags(SIZE_EXPAND_FILL);

editor/debugger/editor_visual_profiler.cpp

@@ -802,9 +802,9 @@ EditorVisualProfiler::EditorVisualProfiler() {
  graph = memnew(TextureRect);
  graph->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
  graph->set_mouse_filter(MOUSE_FILTER_STOP);
- graph->connect("draw", callable_mp(this, &EditorVisualProfiler::_graph_tex_draw));
- graph->connect("gui_input", callable_mp(this, &EditorVisualProfiler::_graph_tex_input));
- graph->connect("mouse_exited", callable_mp(this, &EditorVisualProfiler::_graph_tex_mouse_exit));
+ graph->connect(SceneStringName(draw), callable_mp(this, &EditorVisualProfiler::_graph_tex_draw));
+ graph->connect(SceneStringName(gui_input), callable_mp(this, &EditorVisualProfiler::_graph_tex_input));
+ graph->connect(SceneStringName(mouse_exited), callable_mp(this, &EditorVisualProfiler::_graph_tex_mouse_exit));
 
  h_split->add_child(graph);
  graph->set_h_size_flags(SIZE_EXPAND_FILL);

editor/editor_about.cpp

@@ -52,13 +52,13 @@ void EditorAbout::_notification(int p_what) {
  _tpl_text->begin_bulk_theme_override();
  _tpl_text->add_theme_font_override("normal_font", font);
  _tpl_text->add_theme_font_size_override("normal_font_size", font_size);
- _tpl_text->add_theme_constant_override("line_separation", 4 * EDSCALE);
+ _tpl_text->add_theme_constant_override(SceneStringName(line_separation), 4 * EDSCALE);
  _tpl_text->end_bulk_theme_override();
 
  license_text_label->begin_bulk_theme_override();
  license_text_label->add_theme_font_override("normal_font", font);
  license_text_label->add_theme_font_size_override("normal_font_size", font_size);
- license_text_label->add_theme_constant_override("line_separation", 4 * EDSCALE);
+ license_text_label->add_theme_constant_override(SceneStringName(line_separation), 4 * EDSCALE);
  license_text_label->end_bulk_theme_override();
 
  _logo->set_texture(get_editor_theme_icon(SNAME("Logo")));
@@ -130,8 +130,8 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
  il->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 
  il->connect("item_activated", callable_mp(this, &EditorAbout::_item_with_website_selected).bind(il));
- il->connect("resized", callable_mp(this, &EditorAbout::_item_list_resized).bind(il));
- il->connect("focus_exited", callable_mp(il, &ItemList::deselect_all));
+ il->connect(SceneStringName(resized), callable_mp(this, &EditorAbout::_item_list_resized).bind(il));
+ il->connect(SceneStringName(focus_exited), callable_mp(il, &ItemList::deselect_all));
 
  il->add_theme_style_override("focus", empty_stylebox);
  il->add_theme_style_override("selected", empty_stylebox);

editor/editor_audio_buses.cpp

@@ -805,7 +805,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 
  track_name = memnew(LineEdit);
  track_name->connect("text_submitted", callable_mp(this, &EditorAudioBus::_name_changed));
- track_name->connect("focus_exited", callable_mp(this, &EditorAudioBus::_name_focus_exit));
+ track_name->connect(SceneStringName(focus_exited), callable_mp(this, &EditorAudioBus::_name_focus_exit));
  vb->add_child(track_name);
 
  HBoxContainer *hbc = memnew(HBoxContainer);
@@ -926,14 +926,14 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
  vb->add_child(effects);
  effects->connect("item_edited", callable_mp(this, &EditorAudioBus::_effect_edited));
  effects->connect("cell_selected", callable_mp(this, &EditorAudioBus::_effect_selected));
- effects->connect("focus_exited", callable_mp(effects, &Tree::deselect_all));
+ effects->connect(SceneStringName(focus_exited), callable_mp(effects, &Tree::deselect_all));
  effects->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true);
  SET_DRAG_FORWARDING_GCD(effects, EditorAudioBus);
  effects->connect("item_mouse_selected", callable_mp(this, &EditorAudioBus::_effect_rmb));
  effects->set_allow_rmb_select(true);
  effects->set_focus_mode(FOCUS_CLICK);
  effects->set_allow_reselect(true);
- effects->connect("gui_input", callable_mp(this, &EditorAudioBus::_effects_gui_input));
+ effects->connect(SceneStringName(gui_input), callable_mp(this, &EditorAudioBus::_effects_gui_input));
 
  send = memnew(OptionButton);
  send->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
@@ -982,7 +982,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 void EditorAudioBusDrop::_notification(int p_what) {
  switch (p_what) {
  case NOTIFICATION_DRAW: {
- draw_style_box(get_theme_stylebox(SNAME("normal"), SNAME("Button")), Rect2(Vector2(), get_size()));
+ draw_style_box(get_theme_stylebox(CoreStringName(normal), SNAME("Button")), Rect2(Vector2(), get_size()));
 
  if (hovering_drop) {
  Color accent = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));