diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-14 14:00:03 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-15 14:54:15 +0100 |
| commit | 11572c6e309692b62554ae852dfa8fb8943bcbd7 (patch) | |
| tree | 32280e24a2957b4edf32157f40a43a602ff147fb /platform/javascript | |
| parent | 1d910b1e5868814938d644ff181cf30d75516762 (diff) | |
Editor: Cleanup some includes dependencies
Removes some unnecessary includes from `editor_node.h`, and instead add
those where they're used.
Removes unnecessary `editor_node.h` includes in various editor classes.
Renames `dynamicfont` to `dynamic_font` in a couple files.
Misc cleanup while jumping through that rabbit hole.
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/export/export_plugin.cpp | 1 | ||||
| -rw-r--r-- | platform/javascript/export/export_plugin.h | 3 | ||||
| -rw-r--r-- | platform/javascript/export/export_server.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp index d40ba2320a..c7e503732d 100644 --- a/platform/javascript/export/export_plugin.cpp +++ b/platform/javascript/export/export_plugin.cpp @@ -31,7 +31,6 @@ #include "export_plugin.h" #include "core/config/project_settings.h" -#include "editor/editor_node.h" Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) { FileAccess *src_f = nullptr; diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h index 8d4307548c..d17fd2f674 100644 --- a/platform/javascript/export/export_plugin.h +++ b/platform/javascript/export/export_plugin.h @@ -37,14 +37,13 @@ #include "core/io/tcp_server.h" #include "core/io/zip_io.h" #include "editor/editor_export.h" +#include "editor/editor_node.h" #include "main/splash.gen.h" #include "platform/javascript/logo.gen.h" #include "platform/javascript/run_icon.gen.h" #include "export_server.h" -class EditorNode; - class EditorExportPlatformJavaScript : public EditorExportPlatform { GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform); diff --git a/platform/javascript/export/export_server.h b/platform/javascript/export/export_server.h index 1380f34ad7..1b908ad9b0 100644 --- a/platform/javascript/export/export_server.h +++ b/platform/javascript/export/export_server.h @@ -36,7 +36,7 @@ #include "core/io/tcp_server.h" #include "core/io/zip_io.h" #include "editor/editor_export.h" -#include "editor/editor_node.h" +#include "editor/editor_paths.h" class EditorHTTPServer : public RefCounted { private: |