From 37df87163b956c8d7a00a0519dc4ce257bbcc0ee Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 24 Apr 2024 23:39:22 +0100 Subject: [PATCH] BAGEL: Review all the files to remove useless includes --- engines/bagel/bagel.cpp | 1 - engines/bagel/baglib/bagel.h | 1 - engines/bagel/baglib/base_pda.h | 1 - engines/bagel/baglib/expression.h | 1 - engines/bagel/baglib/expression_object.h | 1 - engines/bagel/baglib/fmovie.h | 3 --- engines/bagel/baglib/inv.cpp | 1 - engines/bagel/baglib/object.h | 1 - engines/bagel/baglib/rp_object.h | 1 - engines/bagel/baglib/storage_dev_bmp.h | 1 - engines/bagel/baglib/storage_dev_win.cpp | 1 - engines/bagel/boflib/gfx/cursor.h | 2 -- engines/bagel/boflib/gui/movie.cpp | 2 ++ engines/bagel/boflib/options.h | 1 + engines/bagel/dialogs/credits_dialog.h | 1 - engines/bagel/dialogs/opt_window.h | 1 - engines/bagel/dialogs/save_dialog.h | 1 - 17 files changed, 3 insertions(+), 18 deletions(-) diff --git a/engines/bagel/bagel.cpp b/engines/bagel/bagel.cpp index 34966590de7..88edca2bb9a 100644 --- a/engines/bagel/bagel.cpp +++ b/engines/bagel/bagel.cpp @@ -48,7 +48,6 @@ #include "bagel/boflib/gfx/cursor.h" #include "bagel/boflib/error.h" #include "bagel/boflib/sound.h" -#include "bagel/boflib/gfx/cursor.h" #include "bagel/boflib/gfx/palette.h" #include "bagel/boflib/gfx/sprite.h" #include "bagel/boflib/gui/window.h" diff --git a/engines/bagel/baglib/bagel.h b/engines/bagel/baglib/bagel.h index d64ebec068a..b535648baf2 100644 --- a/engines/bagel/baglib/bagel.h +++ b/engines/bagel/baglib/bagel.h @@ -28,7 +28,6 @@ #include "bagel/boflib/options.h" #include "bagel/boflib/error.h" #include "bagel/baglib/master_win.h" -#include "bagel/baglib/res.h" #include "bagel/boflib/gfx/cursor.h" #include "bagel/boflib/list.h" #include "bagel/boflib/string.h" diff --git a/engines/bagel/baglib/base_pda.h b/engines/bagel/baglib/base_pda.h index 21dffd5670d..546184971d1 100644 --- a/engines/bagel/baglib/base_pda.h +++ b/engines/bagel/baglib/base_pda.h @@ -23,7 +23,6 @@ #ifndef BAGEL_BAGLIB_BASE_PDA_H #define BAGEL_BAGLIB_BASE_PDA_H -#include "bagel/boflib/stdinc.h" #include "bagel/baglib/storage_dev_bmp.h" namespace Bagel { diff --git a/engines/bagel/baglib/expression.h b/engines/bagel/baglib/expression.h index 4b97f8399f6..fbf86c79321 100644 --- a/engines/bagel/baglib/expression.h +++ b/engines/bagel/baglib/expression.h @@ -25,7 +25,6 @@ #include "bagel/baglib/parse_object.h" #include "bagel/baglib/var.h" -#include "bagel/boflib/string.h" #include "bagel/boflib/list.h" namespace Bagel { diff --git a/engines/bagel/baglib/expression_object.h b/engines/bagel/baglib/expression_object.h index 052e4805865..e6a1ba7a6ad 100644 --- a/engines/bagel/baglib/expression_object.h +++ b/engines/bagel/baglib/expression_object.h @@ -25,7 +25,6 @@ #include "bagel/baglib/object.h" #include "bagel/baglib/expression.h" -#include "bagel/boflib/stdinc.h" namespace Bagel { diff --git a/engines/bagel/baglib/fmovie.h b/engines/bagel/baglib/fmovie.h index dda0a2cf9aa..f81ae886b6a 100644 --- a/engines/bagel/baglib/fmovie.h +++ b/engines/bagel/baglib/fmovie.h @@ -28,10 +28,7 @@ #include "bagel/boflib/gui/dialog.h" #include "bagel/boflib/rect.h" #include "bagel/boflib/error.h" -#include "bagel/boflib/object.h" #include "bagel/boflib/gfx/palette.h" -#include "bagel/boflib/llist.h" -#include "bagel/baglib/storage_dev_win.h" namespace Bagel { diff --git a/engines/bagel/baglib/inv.cpp b/engines/bagel/baglib/inv.cpp index cebdd648f99..f820b9b394b 100644 --- a/engines/bagel/baglib/inv.cpp +++ b/engines/bagel/baglib/inv.cpp @@ -24,7 +24,6 @@ #include "bagel/baglib/movie_object.h" #include "bagel/baglib/master_win.h" #include "bagel/baglib/zoom_pda.h" -#include "bagel/boflib/sound.h" #include "bagel/baglib/pda.h" namespace Bagel { diff --git a/engines/bagel/baglib/object.h b/engines/bagel/baglib/object.h index c15e81e31d9..ed23f3c1cf0 100644 --- a/engines/bagel/baglib/object.h +++ b/engines/bagel/baglib/object.h @@ -28,7 +28,6 @@ #include "bagel/baglib/res.h" #include "bagel/boflib/gfx/bitmap.h" #include "bagel/boflib/string.h" -#include "bagel/boflib/res.h" #include "bagel/baglib/parse_object.h" namespace Bagel { diff --git a/engines/bagel/baglib/rp_object.h b/engines/bagel/baglib/rp_object.h index 411ffbaeb70..a420950e38d 100644 --- a/engines/bagel/baglib/rp_object.h +++ b/engines/bagel/baglib/rp_object.h @@ -28,7 +28,6 @@ #include "bagel/baglib/expression.h" #include "bagel/baglib/movie_object.h" #include "bagel/baglib/text_object.h" -#include "bagel/baglib/variable_object.h" namespace Bagel { diff --git a/engines/bagel/baglib/storage_dev_bmp.h b/engines/bagel/baglib/storage_dev_bmp.h index fbdda74d8a8..70209c12ca9 100644 --- a/engines/bagel/baglib/storage_dev_bmp.h +++ b/engines/bagel/baglib/storage_dev_bmp.h @@ -25,7 +25,6 @@ #include "bagel/baglib/bmp_object.h" #include "bagel/baglib/storage_dev_win.h" -#include "bagel/boflib/list.h" namespace Bagel { diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp index 40bd380cf56..58526a0635b 100644 --- a/engines/bagel/baglib/storage_dev_win.cpp +++ b/engines/bagel/baglib/storage_dev_win.cpp @@ -50,7 +50,6 @@ #include "bagel/baglib/pan_window.h" #include "bagel/bagel.h" #include "bagel/boflib/file_functions.h" -#include "bagel/boflib/log.h" namespace Bagel { diff --git a/engines/bagel/boflib/gfx/cursor.h b/engines/bagel/boflib/gfx/cursor.h index 2600db686a7..1876ee02d7a 100644 --- a/engines/bagel/boflib/gfx/cursor.h +++ b/engines/bagel/boflib/gfx/cursor.h @@ -23,10 +23,8 @@ #ifndef BAGEL_BOFLIB_GFX_CURSOR_H #define BAGEL_BOFLIB_GFX_CURSOR_H -#include "graphics/managed_surface.h" #include "bagel/boflib/error.h" #include "bagel/boflib/object.h" -#include "graphics/cursorman.h" namespace Bagel { diff --git a/engines/bagel/boflib/gui/movie.cpp b/engines/bagel/boflib/gui/movie.cpp index 10db4560760..53c34f6fb60 100644 --- a/engines/bagel/boflib/gui/movie.cpp +++ b/engines/bagel/boflib/gui/movie.cpp @@ -19,6 +19,8 @@ * */ +#include "graphics/cursorman.h" + #include "bagel/boflib/string.h" #include "bagel/boflib/gui/movie.h" #include "bagel/boflib/gfx/cursor.h" diff --git a/engines/bagel/boflib/options.h b/engines/bagel/boflib/options.h index e1dcd032ecd..4a89a85d8a0 100644 --- a/engines/bagel/boflib/options.h +++ b/engines/bagel/boflib/options.h @@ -24,6 +24,7 @@ #define BAGEL_BOFLIB_OPTIONS_H #include "common/stream.h" + #include "bagel/boflib/stdinc.h" #include "bagel/boflib/llist.h" #include "bagel/boflib/object.h" diff --git a/engines/bagel/dialogs/credits_dialog.h b/engines/bagel/dialogs/credits_dialog.h index eb290c2d684..17f3134c315 100644 --- a/engines/bagel/dialogs/credits_dialog.h +++ b/engines/bagel/dialogs/credits_dialog.h @@ -24,7 +24,6 @@ #define BAGEL_BAGLIB_CREDITS_DIALOG_H #include "bagel/boflib/gui/dialog.h" -#include "bagel/boflib/gui/button.h" #include "bagel/boflib/gfx/text.h" namespace Bagel { diff --git a/engines/bagel/dialogs/opt_window.h b/engines/bagel/dialogs/opt_window.h index e8052c0d21b..97162b0555c 100644 --- a/engines/bagel/dialogs/opt_window.h +++ b/engines/bagel/dialogs/opt_window.h @@ -28,7 +28,6 @@ #include "bagel/boflib/gui/button.h" #include "bagel/boflib/gui/scroll_bar.h" #include "bagel/boflib/gui/text_box.h" -#include "bagel/dialogs/save_dialog.h" namespace Bagel { diff --git a/engines/bagel/dialogs/save_dialog.h b/engines/bagel/dialogs/save_dialog.h index 5ba756e2cd9..4a4a0ea1c7a 100644 --- a/engines/bagel/dialogs/save_dialog.h +++ b/engines/bagel/dialogs/save_dialog.h @@ -29,7 +29,6 @@ #include "bagel/boflib/gui/scroll_bar.h" #include "bagel/boflib/gui/button.h" #include "bagel/boflib/gui/edit_text.h" -#include "bagel/boflib/string.h" namespace Bagel {