diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-08 10:41:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 10:41:17 +0100 |
| commit | 90edd839d5f67d4252923a720feeef6ad0d76107 (patch) | |
| tree | a1dd3ae46bf575cb8296df38568dfce237c6ecd8 /editor/debugger | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
| parent | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (diff) | |
Merge pull request #43385 from reduz/reorganize-core
Reorganize and clean up core/ directory
Diffstat (limited to 'editor/debugger')
| -rw-r--r-- | editor/debugger/editor_debugger_server.h | 2 | ||||
| -rw-r--r-- | editor/debugger/editor_performance_profiler.h | 4 | ||||
| -rw-r--r-- | editor/debugger/script_editor_debugger.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editor/debugger/editor_debugger_server.h b/editor/debugger/editor_debugger_server.h index 10a9a232ab..3ad9d3a9a9 100644 --- a/editor/debugger/editor_debugger_server.h +++ b/editor/debugger/editor_debugger_server.h @@ -32,7 +32,7 @@ #define EDITOR_DEBUGGER_CONNECTION_H #include "core/debugger/remote_debugger_peer.h" -#include "core/reference.h" +#include "core/object/reference.h" class EditorDebuggerServer : public Reference { public: diff --git a/editor/debugger/editor_performance_profiler.h b/editor/debugger/editor_performance_profiler.h index 144dd34103..554a0650b8 100644 --- a/editor/debugger/editor_performance_profiler.h +++ b/editor/debugger/editor_performance_profiler.h @@ -31,8 +31,8 @@ #ifndef EDITOR_PERFORMANCE_PROFILER_H #define EDITOR_PERFORMANCE_PROFILER_H -#include "core/map.h" -#include "core/ordered_hash_map.h" +#include "core/templates/map.h" +#include "core/templates/ordered_hash_map.h" #include "main/performance.h" #include "scene/gui/control.h" #include "scene/gui/label.h" diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 1fca95b6da..2d8a174773 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -30,11 +30,11 @@ #include "script_editor_debugger.h" +#include "core/config/project_settings.h" #include "core/debugger/debugger_marshalls.h" #include "core/debugger/remote_debugger.h" #include "core/io/marshalls.h" -#include "core/project_settings.h" -#include "core/ustring.h" +#include "core/string/ustring.h" #include "editor/debugger/editor_network_profiler.h" #include "editor/debugger/editor_performance_profiler.h" #include "editor/debugger/editor_profiler.h" |