diff --git a/editor_modules/shader_editor/shader_editor_plugin.h b/editor_modules/shader_editor/shader_editor_plugin.h index ff8e91e51..02c373077 100644 --- a/editor_modules/shader_editor/shader_editor_plugin.h +++ b/editor_modules/shader_editor/shader_editor_plugin.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "modules/code_editor/code_editor.h" +#include "modules/code_editor/code_text_editor.h" #include "editor/editor_plugin.h" #include "scene/gui/margin_container.h" diff --git a/editor_modules/text_editor/text_editor_vanilla_editor.cpp b/editor_modules/text_editor/text_editor_vanilla_editor.cpp index 7b51b78a8..4e62e5b7d 100644 --- a/editor_modules/text_editor/text_editor_vanilla_editor.cpp +++ b/editor_modules/text_editor/text_editor_vanilla_editor.cpp @@ -14,7 +14,7 @@ #include "scene/gui/text_edit.h" #include "scene/gui/texture_rect.h" -#include "modules/code_editor/code_editor.h" +#include "modules/code_editor/code_text_editor.h" #include "modules/code_editor/find_replace_bar.h" #include "scene/resources/dynamic_font.h" diff --git a/modules/code_editor/SCsub b/modules/code_editor/SCsub index 38c238d0f..d8ca5c096 100644 --- a/modules/code_editor/SCsub +++ b/modules/code_editor/SCsub @@ -6,7 +6,8 @@ env_mlp = env.Clone() sources = [ "register_types.cpp", - "code_editor.cpp", + + "code_text_editor.cpp", "script_text_editor.cpp", "text_editor.cpp", "script_editor_base.cpp", diff --git a/modules/code_editor/code_editor.cpp b/modules/code_editor/code_text_editor.cpp similarity index 99% rename from modules/code_editor/code_editor.cpp rename to modules/code_editor/code_text_editor.cpp index 6bb9c4b92..14304361f 100644 --- a/modules/code_editor/code_editor.cpp +++ b/modules/code_editor/code_text_editor.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "code_editor.h" +#include "code_text_editor.h" #include "core/containers/vector.h" #include "core/input/input.h" @@ -69,8 +69,6 @@ #include "editor/script_editor.h" -/*** CODE EDITOR ****/ - // This function should be used to handle shortcuts that could otherwise // be handled too late if they weren't handled here. void CodeTextEditor::_input(const Ref &event) { diff --git a/modules/code_editor/code_editor.h b/modules/code_editor/code_text_editor.h similarity index 99% rename from modules/code_editor/code_editor.h rename to modules/code_editor/code_text_editor.h index c2bc4106f..ebec06c2f 100644 --- a/modules/code_editor/code_editor.h +++ b/modules/code_editor/code_text_editor.h @@ -1,5 +1,6 @@ #ifndef CODE_EDITOR_H #define CODE_EDITOR_H + /*************************************************************************/ /* code_editor.h */ /*************************************************************************/ diff --git a/modules/code_editor/register_types.cpp b/modules/code_editor/register_types.cpp index 4f23ed7bc..e0469207b 100644 --- a/modules/code_editor/register_types.cpp +++ b/modules/code_editor/register_types.cpp @@ -1,19 +1,24 @@ #include "register_types.h" -#include "editor/script_editor_plugin.h" #include "editor/script_editor.h" +#include "editor/script_editor_plugin.h" -#include "script_text_editor.h" -#include "text_editor.h" #include "script_editor_base.h" - +//#include "script_text_editor.h" +//#include "text_editor.h" +//#include "code_text_editor.h" void register_code_editor_types(ModuleRegistrationLevel p_level) { if (p_level == MODULE_REGISTRATION_LEVEL_SCENE) { //ClassDB::register_class<>(); ClassDB::register_virtual_class(); + ClassDB::register_virtual_class(); + + //ClassDB::register_class(); + //ClassDB::register_class(); + //ClassDB::register_class(); } #ifdef TOOLS_ENABLED diff --git a/modules/code_editor/script_text_editor.h b/modules/code_editor/script_text_editor.h index e512553e4..3e47af93f 100644 --- a/modules/code_editor/script_text_editor.h +++ b/modules/code_editor/script_text_editor.h @@ -37,7 +37,7 @@ #include "core/containers/vector.h" #include "core/object/reference.h" -#include "code_editor.h" +#include "code_text_editor.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/math/color.h" diff --git a/modules/code_editor/text_editor.h b/modules/code_editor/text_editor.h index ebf22a231..1cab5d2ea 100644 --- a/modules/code_editor/text_editor.h +++ b/modules/code_editor/text_editor.h @@ -32,7 +32,7 @@ #include "script_editor_base.h" -#include "code_editor.h" +#include "code_text_editor.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/containers/vector.h"