Prefix filenames in the editor_script_editor module with editor_.

editor/connections_dialog.cpp

@@ -75,7 +75,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {

editor/editor_data.cpp

@@ -46,7 +46,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 class Resource;

editor/editor_export.cpp

@@ -60,7 +60,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 static int _get_pad(int p_alignment, int p_n) {

editor/editor_help.cpp

@@ -66,7 +66,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 #define CONTRIBUTE_URL vformat("%s/community/contributing/updating_the_class_reference.html", VERSION_DOCS_URL)

editor/editor_node.cpp

@@ -193,9 +193,9 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
-#include "editor_code_editor/script_text_editor.h"
+#include "editor_code_editor/editor_script_text_editor.h"
-#include "editor_code_editor/text_editor.h"
+#include "editor_code_editor/editor_text_editor.h"
 #endif
 
 class Camera;

editor/editor_plugin.cpp

@@ -77,7 +77,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 class ConfigFile;

editor/editor_resource_picker.cpp

@@ -72,8 +72,8 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
-#include "editor_code_editor/script_editor_base.h"
+#include "editor_code_editor/editor_script_editor_base.h"
 #endif
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;

editor/editor_run.cpp

@@ -45,7 +45,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 EditorRun::Status EditorRun::get_status() const {

editor/plugins/canvas_item_editor_plugin.cpp

@@ -103,7 +103,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 // Min and Max are power of two in order to play nicely with successive increment.

editor/plugins/spatial_editor_plugin.cpp

@@ -102,7 +102,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 #define DISTANCE_DEFAULT 4

editor/scene_tree_dock.cpp

@@ -99,7 +99,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 void SceneTreeDock::_nodes_drag_begin() {

editor/scene_tree_editor.cpp

@@ -67,8 +67,8 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
-#include "editor_code_editor/script_editor_base.h"
+#include "editor_code_editor/editor_script_editor_base.h"
 #endif
 
 Node *SceneTreeEditor::get_scene_node() {

editor/settings_config_dialog.cpp

@@ -70,7 +70,7 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 void EditorSettingsDialog::ok_pressed() {

editor_modules/editor_code_editor/SCsub

@@ -7,17 +7,17 @@ env_mlp = env.Clone()
 sources = [
     "register_types.cpp",
 
-    "code_text_editor.cpp",
+    "editor_code_text_editor.cpp",
-    "script_text_editor.cpp",
+    "editor_script_text_editor.cpp",
-    "text_editor.cpp",
+    "editor_text_editor.cpp",
-    "script_editor_base.cpp",
+    "editor_script_editor_base.cpp",
-    "connection_info_dialog.cpp",
+    "editor_connection_info_dialog.cpp",
-    "goto_line_dialog.cpp",
+    "editor_goto_line_dialog.cpp",
-    "find_replace_bar.cpp",
+    "editor_find_replace_bar.cpp",
-    "script_editor_quick_open.cpp",
+    "editor_script_editor_quick_open.cpp",
 
     "script_editor_plugin.cpp",
-    "script_editor.cpp",
+    "editor_script_editor.cpp",
 ]
 
 env_mlp.add_source_files(env.modules_sources, sources)

editor_modules/editor_code_editor/editor_code_text_editor.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "code_text_editor.h"
+#include "editor_code_text_editor.h"
 
 #include "core/containers/vector.h"
 #include "core/input/input.h"
@@ -64,10 +64,10 @@
 #include "scene/resources/font.h"
 #include "scene/resources/texture.h"
 
-#include "find_replace_bar.h"
+#include "editor_find_replace_bar.h"
-#include "goto_line_dialog.h"
+#include "editor_goto_line_dialog.h"
 
-#include "script_editor.h"
+#include "editor_script_editor.h"
 
 // This function should be used to handle shortcuts that could otherwise
 // be handled too late if they weren't handled here.

editor_modules/editor_code_editor/editor_code_text_editor.h

@@ -1,5 +1,5 @@
-#ifndef CODE_EDITOR_H
+#ifndef EDITOR_CODE_EDITOR_H
-#define CODE_EDITOR_H
+#define EDITOR_CODE_EDITOR_H
 
 /*************************************************************************/
 /*  code_editor.h                                                        */

editor_modules/editor_code_editor/editor_connection_info_dialog.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "connection_info_dialog.h"
+#include "editor_connection_info_dialog.h"
 
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"

editor_modules/editor_code_editor/editor_connection_info_dialog.h

@@ -1,5 +1,5 @@
-#ifndef CONNECTION_INFO_DIALOG_H
+#ifndef EDITOR_CONNECTION_INFO_DIALOG_H
-#define CONNECTION_INFO_DIALOG_H
+#define EDITOR_CONNECTION_INFO_DIALOG_H
 
 /*************************************************************************/
 /*  script_text_editor.h                                                 */

editor_modules/editor_code_editor/editor_find_replace_bar.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "find_replace_bar.h"
+#include "editor_find_replace_bar.h"
 
 #include "core/input/input.h"
 #include "core/input/input_event.h"

editor_modules/editor_code_editor/editor_find_replace_bar.h

@@ -1,5 +1,5 @@
-#ifndef FIND_REPLACE_BAR_H
+#ifndef EDITOR_FIND_REPLACE_BAR_H
-#define FIND_REPLACE_BAR_H
+#define EDITOR_FIND_REPLACE_BAR_H
 
 /*************************************************************************/
 /*  code_editor.h                                                        */

editor_modules/editor_code_editor/editor_goto_line_dialog.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "goto_line_dialog.h"
+#include "editor_goto_line_dialog.h"
 
 #include "scene/gui/line_edit.h"
 #include "scene/gui/text_edit.h"

editor_modules/editor_code_editor/editor_goto_line_dialog.h

@@ -1,5 +1,5 @@
-#ifndef GOTO_LINE_DIALOH_H
+#ifndef EDITOR_GOTO_LINE_DIALOH_H
-#define GOTO_LINE_DIALOH_H
+#define EDITOR_GOTO_LINE_DIALOH_H
 
 /*************************************************************************/
 /*  code_editor.h                                                        */

editor_modules/editor_code_editor/editor_script_editor.cpp

@@ -29,7 +29,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "script_editor.h"
+#include "editor_script_editor.h"
 
 #include "core/config/project_settings.h"
 #include "core/containers/pair.h"
@@ -91,9 +91,9 @@
 #include "scene/resources/texture.h"
 #include "scene/scene_string_names.h"
 
-#include "script_editor_quick_open.h"
+#include "editor_script_editor_quick_open.h"
-#include "script_text_editor.h"
+#include "editor_script_text_editor.h"
-#include "text_editor.h"
+#include "editor_text_editor.h"
 
 #include "modules/modules_enabled.gen.h"
 

editor_modules/editor_code_editor/editor_script_editor.h

@@ -1,5 +1,5 @@
-#ifndef SCRIPT_EDITOR_H
+#ifndef EDITOR_SCRIPT_EDITOR_H
-#define SCRIPT_EDITOR_H
+#define EDITOR_SCRIPT_EDITOR_H
 
 /*************************************************************************/
 /*  script_editor_plugin.h                                               */
@@ -52,7 +52,7 @@
 #include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
-#include "script_editor_base.h"
+#include "editor_script_editor_base.h"
 
 class Button;
 class ConfigFile;

editor_modules/editor_code_editor/editor_script_editor_base.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "script_editor_base.h"
+#include "editor_script_editor_base.h"
 
 void ScriptEditorBase::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("name_changed"));

editor_modules/editor_code_editor/editor_script_editor_base.h

@@ -1,5 +1,5 @@
-#ifndef SCRIPT_EDITOR_BASE_H
+#ifndef EDITOR_SCRIPT_EDITOR_BASE_H
-#define SCRIPT_EDITOR_BASE_H
+#define EDITOR_SCRIPT_EDITOR_BASE_H
 
 /*************************************************************************/
 /*  script_editor_plugin.h                                               */

editor_modules/editor_code_editor/editor_script_editor_quick_open.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "script_editor_quick_open.h"
+#include "editor_script_editor_quick_open.h"
 
 #include "core/os/keyboard.h"
 

editor_modules/editor_code_editor/editor_script_editor_quick_open.h

@@ -1,5 +1,5 @@
-#ifndef SCRIPT_EDITOR_QUICK_OPEN_H
+#ifndef EDITOR_SCRIPT_EDITOR_QUICK_OPEN_H
-#define SCRIPT_EDITOR_QUICK_OPEN_H
+#define EDITOR_SCRIPT_EDITOR_QUICK_OPEN_H
 
 /*************************************************************************/
 /*  script_editor_plugin.h                                               */

editor_modules/editor_code_editor/editor_script_text_editor.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "script_text_editor.h"
+#include "editor_script_text_editor.h"
 
 #include "core/config/project_settings.h"
 #include "core/containers/rb_set.h"
@@ -68,12 +68,13 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/texture.h"
-#include "script_editor_quick_open.h"
 
-#include "connection_info_dialog.h"
+#include "editor_script_editor_quick_open.h"
-#include "script_editor.h"
+
-#include "goto_line_dialog.h"
+#include "editor_connection_info_dialog.h"
-#include "find_replace_bar.h"
+#include "editor_script_editor.h"
+#include "editor_goto_line_dialog.h"
+#include "editor_find_replace_bar.h"
 
 Vector<String> ScriptTextEditor::get_functions() {
 	String errortxt;

editor_modules/editor_code_editor/editor_script_text_editor.h

@@ -1,5 +1,6 @@
-#ifndef SCRIPT_TEXT_EDITOR_H
+#ifndef EDITOR_SCRIPT_TEXT_EDITOR_H
-#define SCRIPT_TEXT_EDITOR_H
+#define EDITOR_SCRIPT_TEXT_EDITOR_H
+
 /*************************************************************************/
 /*  script_text_editor.h                                                 */
 /*************************************************************************/
@@ -32,12 +33,13 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "script_editor_base.h"
+#include "editor_script_editor_base.h"
 
 #include "core/containers/vector.h"
 #include "core/object/reference.h"
 
-#include "code_text_editor.h"
+#include "editor_code_text_editor.h"
+
 #include "core/containers/list.h"
 #include "core/containers/rb_map.h"
 #include "core/math/color.h"

editor_modules/editor_code_editor/editor_text_editor.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "text_editor.h"
+#include "editor_text_editor.h"
 
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
@@ -50,9 +50,9 @@
 #include "scene/resources/text_file.h"
 #include "scene/resources/texture.h"
 
-#include "script_editor.h"
+#include "editor_script_editor.h"
-#include "goto_line_dialog.h"
+#include "editor_goto_line_dialog.h"
-#include "find_replace_bar.h"
+#include "editor_find_replace_bar.h"
 
 void TextEditor::add_syntax_highlighter(SyntaxHighlighter *p_highlighter) {
 	highlighters[p_highlighter->get_name()] = p_highlighter;

editor_modules/editor_code_editor/editor_text_editor.h

@@ -1,5 +1,6 @@
-#ifndef TEXT_EDITOR_H
+#ifndef EDITOR_TEXT_EDITOR_H
-#define TEXT_EDITOR_H
+#define EDITOR_TEXT_EDITOR_H
+
 /*************************************************************************/
 /*  text_editor.h                                                        */
 /*************************************************************************/
@@ -30,9 +31,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "script_editor_base.h"
+#include "editor_script_editor_base.h"
+
+#include "editor_code_text_editor.h"
 
-#include "code_text_editor.h"
 #include "core/containers/list.h"
 #include "core/containers/rb_map.h"
 #include "core/containers/vector.h"

editor_modules/editor_code_editor/register_types.cpp

@@ -1,10 +1,10 @@
 
 #include "register_types.h"
 
-#include "script_editor.h"
+#include "editor_script_editor.h"
 #include "script_editor_plugin.h"
 
-#include "script_editor_base.h"
+#include "editor_script_editor_base.h"
 //#include "script_text_editor.h"
 //#include "text_editor.h"
 //#include "code_text_editor.h"

editor_modules/editor_code_editor/script_editor_plugin.cpp

@@ -90,11 +90,11 @@
 #include "scene/resources/texture.h"
 #include "scene/scene_string_names.h"
 
-#include "script_editor_quick_open.h"
+#include "editor_script_editor_quick_open.h"
-#include "script_text_editor.h"
+#include "editor_script_text_editor.h"
-#include "text_editor.h"
+#include "editor_text_editor.h"
 
-#include "script_editor.h"
+#include "editor_script_editor.h"
 
 static bool _is_built_in_script(Script *p_script) {
 	String path = p_script->get_path();

editor_modules/shader_editor/shader_editor_plugin.cpp

@@ -65,8 +65,8 @@
 #include "servers/rendering/shader_types.h"
 #include "servers/rendering_server.h"
 
-#include "editor_code_editor/goto_line_dialog.h"
+#include "editor_code_editor/editor_goto_line_dialog.h"
-#include "editor_code_editor/find_replace_bar.h"
+#include "editor_code_editor/editor_find_replace_bar.h"
 
 struct ScriptCodeCompletionOption;
 

editor_modules/shader_editor/shader_editor_plugin.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor_code_editor/code_text_editor.h"
+#include "editor_code_editor/editor_code_text_editor.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/margin_container.h"
 

editor_modules/text_editor/text_editor_vanilla_editor.cpp

@@ -14,8 +14,8 @@
 #include "scene/gui/text_edit.h"
 #include "scene/gui/texture_rect.h"
 
-#include "editor_code_editor/code_text_editor.h"
+#include "editor_code_editor/editor_code_text_editor.h"
-#include "editor_code_editor/find_replace_bar.h"
+#include "editor_code_editor/editor_find_replace_bar.h"
 
 #include "scene/resources/dynamic_font.h"
 

main/main.cpp

@@ -86,7 +86,7 @@
 
 #include "modules/modules_enabled.gen.h"
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 /* Static members */

modules/cscript/register_types.cpp

@@ -51,7 +51,7 @@ Ref<ResourceFormatSaverCScript> resource_saver_cscript;
 #include "editor/editor_settings.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 class EditorExportCScript : public EditorExportPlugin {

modules/gdscript/register_types.cpp

@@ -51,7 +51,7 @@ Ref<ResourceFormatSaverGDScript> resource_saver_gd;
 #include "editor/gdscript_highlighter.h"
 
 #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
-#include "editor_code_editor/script_editor.h"
+#include "editor_code_editor/editor_script_editor.h"
 #endif
 
 class EditorExportGDScript : public EditorExportPlugin {