diff options
36 files changed, 19 insertions, 61 deletions
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index b968ae645c..66a7fa90b3 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -25,7 +25,6 @@ #include "common/textconsole.h" #include "common/translation.h" -#include "gui/about.h" #include "gui/message.h" #include "agos/agos.h" diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 3eb0aca04d..4f6c62c48a 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -25,7 +25,6 @@ #include "common/file.h" #include "common/textconsole.h" -#include "gui/about.h" #include "gui/message.h" #include "agos/agos.h" diff --git a/engines/bbvs/dialogs.cpp b/engines/bbvs/dialogs.cpp index c8470f8eef..1609794c73 100644 --- a/engines/bbvs/dialogs.cpp +++ b/engines/bbvs/dialogs.cpp @@ -22,10 +22,13 @@ #include "bbvs/dialogs.h" #include "common/events.h" -#include "gui/gui-manager.h" -#include "gui/ThemeEval.h" +#include "gui/widget.h" #include "engines/advancedDetector.h" +namespace GUI { +class CommandSender; +} + namespace Bbvs { struct MenuButton { diff --git a/engines/bbvs/dialogs.h b/engines/bbvs/dialogs.h index 7db0b182b7..af1f70e9a7 100644 --- a/engines/bbvs/dialogs.h +++ b/engines/bbvs/dialogs.h @@ -25,7 +25,11 @@ #include "bbvs/bbvs.h" #include "gui/dialog.h" -#include "gui/widgets/edittext.h" + +namespace GUI { +class ButtonWidget; +class CommandSender; +} namespace Bbvs { diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp index 04175f7290..f826667134 100644 --- a/engines/bbvs/minigames/bbairguitar.cpp +++ b/engines/bbvs/minigames/bbairguitar.cpp @@ -25,7 +25,6 @@ #include "common/savefile.h" #include "common/translation.h" -#include "gui/dialog.h" #include "gui/message.h" #include "gui/filebrowser-dialog.h" diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index c2f8982592..5d3d0a16a0 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -26,8 +26,6 @@ */ #include "gui/saveload.h" -#include "gui/about.h" -#include "gui/message.h" #include "common/config-manager.h" #include "common/events.h" #include "common/translation.h" diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp index 96cecc8e23..2dac04a0a5 100644 --- a/engines/cge2/events.cpp +++ b/engines/cge2/events.cpp @@ -26,8 +26,6 @@ */ #include "gui/saveload.h" -#include "gui/about.h" -#include "gui/message.h" #include "common/config-manager.h" #include "common/events.h" #include "common/translation.h" diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h index b782d103a8..30140baa2e 100644 --- a/engines/hopkins/hopkins.h +++ b/engines/hopkins/hopkins.h @@ -48,7 +48,6 @@ #include "common/util.h" #include "engines/engine.h" #include "graphics/surface.h" -#include "gui/debugger.h" /** * This is the namespace of the Hopkins engine. diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 6683f973ca..614d23f70e 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -31,8 +31,6 @@ #include "common/system.h" #include "common/config-manager.h" -#include "gui/message.h" - namespace Kyra { Debugger::Debugger(KyraEngine_v1 *vm) diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 80511c674d..118ca8dfaa 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -33,8 +33,6 @@ #include "common/config-manager.h" #include "common/debug-channels.h" -#include "gui/message.h" - namespace Kyra { KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags) diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h index bc25c72a43..59b3e01fb7 100644 --- a/engines/mohawk/dialogs.h +++ b/engines/mohawk/dialogs.h @@ -29,11 +29,13 @@ #include "common/str.h" #include "gui/dialog.h" #include "gui/options.h" -#include "gui/widget.h" -#include "gui/widgets/list.h" namespace GUI { class SaveLoadChooser; +class ButtonWidget; +class CheckboxWidget; +class CommandSender; +class StaticTextWidget; } namespace Mohawk { diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 6ad7dd088b..596180ddb2 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -31,7 +31,6 @@ #include "common/system.h" #include "common/memstream.h" #include "common/textconsole.h" -#include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp index b4a2076528..c382263f7c 100644 --- a/engines/mohawk/myst_stacks/credits.cpp +++ b/engines/mohawk/myst_stacks/credits.cpp @@ -28,7 +28,6 @@ #include "mohawk/myst_stacks/credits.h" #include "common/system.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp index 1d733d8100..f448108199 100644 --- a/engines/mohawk/myst_stacks/intro.cpp +++ b/engines/mohawk/myst_stacks/intro.cpp @@ -28,8 +28,6 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/intro.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/makingof.cpp b/engines/mohawk/myst_stacks/makingof.cpp index 1059fd0c5e..a0a1f359ba 100644 --- a/engines/mohawk/myst_stacks/makingof.cpp +++ b/engines/mohawk/myst_stacks/makingof.cpp @@ -27,8 +27,6 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/makingof.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 4dc392a7e9..bd50c4feb3 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -33,8 +33,6 @@ #include "common/system.h" #include "common/textconsole.h" -#include "gui/message.h" - namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index 5402e5a581..454435cf92 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -31,7 +31,6 @@ #include "common/system.h" #include "common/textconsole.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index a1413f0d71..0560608b24 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -29,7 +29,6 @@ #include "mohawk/myst_stacks/slides.h" #include "common/system.h" -#include "gui/message.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 898f68c581..178139ab76 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -25,6 +25,7 @@ #include "common/keyboard.h" #include "common/translation.h" #include "common/system.h" +#include "gui/saveload.h" #include "mohawk/cursors.h" #include "mohawk/installer_archive.h" diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index 9c23d07c52..3ea50bb38d 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -27,8 +27,6 @@ #include "mohawk/mohawk.h" #include "mohawk/riven_scripts.h" -#include "gui/saveload.h" - #include "common/hashmap.h" #include "common/hash-str.h" #include "common/random.h" diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 6d598d9557..eff088d5ee 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -25,10 +25,7 @@ #include "common/textconsole.h" #include "common/translation.h" -#include "gui/dialog.h" #include "gui/saveload.h" -#include "gui/widget.h" -#include "gui/widgets/list.h" #include "gui/message.h" #include "parallaction/parallaction.h" diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 7850a10006..d5540f72b1 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -26,8 +26,6 @@ #include "graphics/cursorman.h" #include "graphics/surface.h" -#include "gui/message.h" - #include "sci/sci.h" #include "sci/event.h" #include "sci/resource.h" diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index ba9cb2a277..178c6b7dea 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -33,10 +33,8 @@ #include "scummhelp.h" #endif -#include "gui/about.h" - #include "gui/gui-manager.h" -#include "gui/widgets/list.h" +#include "gui/widget.h" #include "gui/ThemeEval.h" #include "scumm/dialogs.h" diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h index 08222dd8cd..bd0645597e 100644 --- a/engines/scumm/dialogs.h +++ b/engines/scumm/dialogs.h @@ -24,15 +24,13 @@ #define SCUMM_DIALOGS_H #include "common/str.h" +#include "common/keyboard.h" #include "gui/dialog.h" -#include "gui/widget.h" #include "engines/dialogs.h" -#include "scumm/detection.h" - namespace GUI { -class ListWidget; class CommandSender; +class StaticTextWidget; } diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 1234eda3cc..12047635a0 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -25,9 +25,6 @@ #include "common/system.h" #include "common/translation.h" -#include "gui/message.h" -#include "gui/gui-manager.h" - #include "scumm/debugger.h" #include "scumm/dialogs.h" #include "scumm/insane/insane.h" diff --git a/engines/scumm/players/player_mac.cpp b/engines/scumm/players/player_mac.cpp index 634fd2de2b..87406f4e34 100644 --- a/engines/scumm/players/player_mac.cpp +++ b/engines/scumm/players/player_mac.cpp @@ -22,7 +22,6 @@ #include "common/macresman.h" #include "engines/engine.h" -#include "gui/message.h" #include "scumm/players/player_mac.h" #include "scumm/resource.h" #include "scumm/scumm.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d9148ed300..e7118616ba 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -30,7 +30,6 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/gui-manager.h" #include "graphics/cursorman.h" diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 1e9b7f70f4..1556f080e9 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -39,7 +39,6 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/gui-manager.h" namespace Sword1 { diff --git a/engines/testbed/sound.h b/engines/testbed/sound.h index 893a89b175..5de8877284 100644 --- a/engines/testbed/sound.h +++ b/engines/testbed/sound.h @@ -23,7 +23,6 @@ #ifndef TESTBED_SOUND_H #define TESTBED_SOUND_H -#include "gui/dialog.h" #include "audio/mixer.h" #include "testbed/config.h" #include "testbed/testsuite.h" diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 3ab23a1e51..169e2eff7b 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -35,7 +35,6 @@ #include "graphics/surface.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" -#include "gui/about.h" #include "gui/message.h" #include "toon/resource.h" #include "toon/toon.h" diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp index 3697ca700e..99db61b64d 100644 --- a/engines/tsage/blue_force/blueforce_dialogs.cpp +++ b/engines/tsage/blue_force/blueforce_dialogs.cpp @@ -20,9 +20,6 @@ * */ -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp index 9fa17f3920..bc357cac25 100644 --- a/engines/tsage/ringworld/ringworld_dialogs.cpp +++ b/engines/tsage/ringworld/ringworld_dialogs.cpp @@ -20,9 +20,6 @@ * */ -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp index 027fb558db..5cd124f91d 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp +++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp @@ -22,9 +22,6 @@ #include "common/translation.h" -#include "gui/dialog.h" -#include "gui/widget.h" - #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp index 2d74cebbb6..c08b3e149a 100644 --- a/gui/recorderdialog.cpp +++ b/gui/recorderdialog.cpp @@ -33,7 +33,6 @@ #include "gui/editrecorddialog.h" #include "gui/EventRecorder.h" #include "gui/message.h" -#include "gui/saveload.h" #include "common/system.h" #include "gui/ThemeEval.h" #include "gui/gui-manager.h" diff --git a/gui/saveload.cpp b/gui/saveload.cpp index c1c1d12ec5..b94d30289b 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -25,7 +25,6 @@ #include "gui/saveload.h" #include "gui/saveload-dialog.h" -#include "gui/gui-manager.h" #include "engines/metaengine.h" diff --git a/gui/saveload.h b/gui/saveload.h index 22c26d4c5e..01a78c4924 100644 --- a/gui/saveload.h +++ b/gui/saveload.h @@ -23,7 +23,7 @@ #ifndef GUI_SAVELOAD_H #define GUI_SAVELOAD_H -#include "gui/dialog.h" +#include "common/str.h" #include "engines/metaengine.h" namespace GUI { |