Moved SyntaxHighlighter.

Relintai · Dec 10, 2023 · 11b8f50 · 11b8f50
1 parent b342586
commit 11b8f50
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → scene/gui/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp → scene/gui/resources/syntax_highlighter.cpp
diff --git a/scene/resources/syntax_highlighter.h → scene/gui/resources/syntax_highlighter.h b/scene/resources/syntax_highlighter.h → scene/gui/resources/syntax_highlighter.h
diff --git 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
@@ -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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		Import("env")

		env.add_source_files(env.scene_sources, "*.cpp")
		env.add_source_files(env.scene_sources, "resources/*.cpp")