From 56abd0ece3bf7dbf11cbf57577044852a8b6a2fa Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Fri, 10 Oct 2025 10:40:47 +0200 Subject: [PATCH] Remove circular unneeded `debug_adapter_protocol.h` include from `debug_adapter_parser.h`. --- editor/debugger/debug_adapter/debug_adapter_parser.cpp | 2 +- editor/debugger/debug_adapter/debug_adapter_parser.h | 3 +-- editor/debugger/debug_adapter/debug_adapter_protocol.cpp | 1 + editor/debugger/debug_adapter/debug_adapter_protocol.h | 5 ++--- editor/debugger/debug_adapter/debug_adapter_server.h | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/editor/debugger/debug_adapter/debug_adapter_parser.cpp index a98f3911230..e3fcdd9636d 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_parser.cpp @@ -30,7 +30,7 @@ #include "debug_adapter_parser.h" -#include "editor/debugger/debug_adapter/debug_adapter_types.h" +#include "editor/debugger/debug_adapter/debug_adapter_protocol.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" #include "editor/export/editor_export_platform.h" diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.h b/editor/debugger/debug_adapter/debug_adapter_parser.h index 0691e87f41e..5dd139b6a53 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.h +++ b/editor/debugger/debug_adapter/debug_adapter_parser.h @@ -32,8 +32,7 @@ #include "core/config/project_settings.h" #include "core/debugger/remote_debugger.h" -#include "debug_adapter_protocol.h" -#include "debug_adapter_types.h" +#include "editor/debugger/debug_adapter/debug_adapter_types.h" struct DAPeer; class DebugAdapterProtocol; diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 6ca69a8bce1..f876b7154c9 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -34,6 +34,7 @@ #include "core/debugger/debugger_marshalls.h" #include "core/io/json.h" #include "core/io/marshalls.h" +#include "editor/debugger/debug_adapter/debug_adapter_parser.h" #include "editor/debugger/script_editor_debugger.h" #include "editor/editor_log.h" #include "editor/editor_node.h" diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.h b/editor/debugger/debug_adapter/debug_adapter_protocol.h index 9cd5741b19f..5f0e07f9835 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.h +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.h @@ -31,11 +31,10 @@ #pragma once #include "core/debugger/debugger_marshalls.h" +#include "core/debugger/remote_debugger.h" #include "core/io/stream_peer_tcp.h" #include "core/io/tcp_server.h" - -#include "debug_adapter_parser.h" -#include "debug_adapter_types.h" +#include "editor/debugger/debug_adapter/debug_adapter_types.h" #include "scene/debugger/scene_debugger.h" #define DAP_MAX_BUFFER_SIZE 4194304 // 4MB diff --git a/editor/debugger/debug_adapter/debug_adapter_server.h b/editor/debugger/debug_adapter/debug_adapter_server.h index 3f5160d6833..33c513aea88 100644 --- a/editor/debugger/debug_adapter/debug_adapter_server.h +++ b/editor/debugger/debug_adapter/debug_adapter_server.h @@ -30,7 +30,7 @@ #pragma once -#include "debug_adapter_protocol.h" +#include "editor/debugger/debug_adapter/debug_adapter_protocol.h" #include "editor/plugins/editor_plugin.h" class DebugAdapterServer : public EditorPlugin {