From 11b8f50a82d65a51a7fa1372f07ec9c7e305fccf Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 10 Dec 2023 13:44:52 +0100 Subject: [PATCH] Moved SyntaxHighlighter. --- editor_modules/editor_code_editor/editor_syntax_highlighter.h | 2 +- editor_modules/shader_editor/shader_editor_plugin.cpp | 2 +- editor_modules/text_editor/text_editor_vanilla_editor.cpp | 2 +- scene/gui/SCsub | 1 + scene/{ => gui}/resources/syntax_highlighter.cpp | 0 scene/{ => gui}/resources/syntax_highlighter.h | 0 scene/gui/text_edit.h | 2 +- scene/register_scene_types.cpp | 2 +- 8 files changed, 6 insertions(+), 5 deletions(-) rename scene/{ => gui}/resources/syntax_highlighter.cpp (100%) rename scene/{ => gui}/resources/syntax_highlighter.h (100%) diff --git a/editor_modules/editor_code_editor/editor_syntax_highlighter.h b/editor_modules/editor_code_editor/editor_syntax_highlighter.h index 44e1764ec..1bae2e89e 100644 --- a/editor_modules/editor_code_editor/editor_syntax_highlighter.h +++ b/editor_modules/editor_code_editor/editor_syntax_highlighter.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" -#include "scene/resources/syntax_highlighter.h" +#include "scene/gui/resources/syntax_highlighter.h" class EditorSyntaxHighlighter : public SyntaxHighlighter { GDCLASS(EditorSyntaxHighlighter, SyntaxHighlighter) diff --git a/editor_modules/shader_editor/shader_editor_plugin.cpp b/editor_modules/shader_editor/shader_editor_plugin.cpp index a3eeb2f62..22266b007 100644 --- a/editor_modules/shader_editor/shader_editor_plugin.cpp +++ b/editor_modules/shader_editor/shader_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/gui/popup_menu.h" #include "scene/gui/text_edit.h" #include "scene/gui/tool_button.h" -#include "scene/resources/syntax_highlighter.h" +#include "scene/gui/resources/syntax_highlighter.h" #include "servers/rendering/shader_language.h" #include "servers/rendering/shader_types.h" #include "servers/rendering_server.h" diff --git a/editor_modules/text_editor/text_editor_vanilla_editor.cpp b/editor_modules/text_editor/text_editor_vanilla_editor.cpp index be8098303..175859b2e 100644 --- a/editor_modules/text_editor/text_editor_vanilla_editor.cpp +++ b/editor_modules/text_editor/text_editor_vanilla_editor.cpp @@ -13,7 +13,7 @@ #include "scene/gui/line_edit.h" #include "scene/gui/text_edit.h" #include "scene/gui/texture_rect.h" -#include "scene/resources/syntax_highlighter.h" +#include "scene/gui/resources/syntax_highlighter.h" #include "editor_code_editor/editor_code_text_editor.h" #include "editor_code_editor/editor_find_replace_bar.h" diff --git a/scene/gui/SCsub b/scene/gui/SCsub index fc6125024..ca3b3dbcb 100644 --- a/scene/gui/SCsub +++ b/scene/gui/SCsub @@ -3,3 +3,4 @@ Import("env") env.add_source_files(env.scene_sources, "*.cpp") +env.add_source_files(env.scene_sources, "resources/*.cpp") diff --git a/scene/resources/syntax_highlighter.cpp b/scene/gui/resources/syntax_highlighter.cpp similarity index 100% rename from scene/resources/syntax_highlighter.cpp rename to scene/gui/resources/syntax_highlighter.cpp diff --git a/scene/resources/syntax_highlighter.h b/scene/gui/resources/syntax_highlighter.h similarity index 100% rename from scene/resources/syntax_highlighter.h rename to scene/gui/resources/syntax_highlighter.h diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 63632e28a..e4b742e28 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -32,7 +32,7 @@ #include "scene/gui/control.h" -#include "scene/resources/syntax_highlighter.h" +#include "scene/gui/resources/syntax_highlighter.h" class PopupMenu; class Timer; diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 1e8b97fb5..969924231 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -177,7 +177,7 @@ #include "scene/resources/sky.h" #include "scene/resources/sphere_shape.h" #include "scene/resources/surface_tool.h" -#include "scene/resources/syntax_highlighter.h" +#include "scene/gui/resources/syntax_highlighter.h" #include "scene/resources/text_file.h" #include "scene/resources/texture.h" #include "scene/resources/video_stream.h"