From b1edd862fc80657cbd8f120a8ba38c0a584ff555 Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 13 Nov 2024 08:53:08 -0500 Subject: [PATCH] Reorder includes in assembly and dungeon editor files for improved clarity; remove unused headers --- src/app/editor/code/assembly_editor.cc | 5 +++-- src/app/editor/dungeon/dungeon_editor.h | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/editor/code/assembly_editor.cc b/src/app/editor/code/assembly_editor.cc index 99b95596..d833ce05 100644 --- a/src/app/editor/code/assembly_editor.cc +++ b/src/app/editor/code/assembly_editor.cc @@ -1,7 +1,8 @@ #include "assembly_editor.h" -#include "ImGuiFileDialog/ImGuiFileDialog.h" #include "ImGuiColorTextEdit/TextEditor.h" +#include "ImGuiFileDialog/ImGuiFileDialog.h" +#include "absl/strings/str_cat.h" #include "app/core/platform/file_dialog.h" #include "app/gui/icons.h" @@ -12,7 +13,7 @@ namespace editor { using core::FileDialogWrapper; namespace { - + std::vector RemoveIgnoredFiles( const std::vector& files, const std::vector& ignored_files) { diff --git a/src/app/editor/dungeon/dungeon_editor.h b/src/app/editor/dungeon/dungeon_editor.h index f4d0ef89..2b0c56fa 100644 --- a/src/app/editor/dungeon/dungeon_editor.h +++ b/src/app/editor/dungeon/dungeon_editor.h @@ -2,12 +2,10 @@ #define YAZE_APP_EDITOR_DUNGEONEDITOR_H #include "app/core/common.h" -#include "app/core/project.h" #include "app/editor/graphics/gfx_group_editor.h" #include "app/editor/graphics/palette_editor.h" #include "app/editor/utils/editor.h" #include "app/gui/canvas.h" -#include "app/gui/icons.h" #include "app/rom.h" #include "imgui/imgui.h" #include "zelda3/dungeon/room.h"