[Scummvm-cvs-logs] scummvm master -> 253e18c44080f57eb2334296e09297a2db5efda9

salty-horse ori at avtalion.name
Thu Apr 14 12:30:50 CEST 2016 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
253e18c440 JANITORIAL: Reduce GUI header dependencies


Commit: 253e18c44080f57eb2334296e09297a2db5efda9
    https://github.com/scummvm/scummvm/commit/253e18c44080f57eb2334296e09297a2db5efda9
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-04-14T13:30:14+03:00

Commit Message:
JANITORIAL: Reduce GUI header dependencies

Changed paths:
    engines/agos/saveload.cpp
    engines/agos/string.cpp
    engines/bbvs/dialogs.cpp
    engines/bbvs/dialogs.h
    engines/bbvs/minigames/bbairguitar.cpp
    engines/cge/events.cpp
    engines/cge2/events.cpp
    engines/hopkins/hopkins.h
    engines/kyra/debugger.cpp
    engines/kyra/kyra_lok.cpp
    engines/mohawk/dialogs.h
    engines/mohawk/myst_scripts.cpp
    engines/mohawk/myst_stacks/credits.cpp
    engines/mohawk/myst_stacks/intro.cpp
    engines/mohawk/myst_stacks/makingof.cpp
    engines/mohawk/myst_stacks/myst.cpp
    engines/mohawk/myst_stacks/selenitic.cpp
    engines/mohawk/myst_stacks/slides.cpp
    engines/mohawk/riven.cpp
    engines/mohawk/riven.h
    engines/parallaction/saveload.cpp
    engines/sci/engine/kgraphics32.cpp
    engines/scumm/dialogs.cpp
    engines/scumm/dialogs.h
    engines/scumm/input.cpp
    engines/scumm/players/player_mac.cpp
    engines/scumm/scumm.cpp
    engines/sword1/sword1.cpp
    engines/testbed/sound.h
    engines/toon/toon.cpp
    engines/tsage/blue_force/blueforce_dialogs.cpp
    engines/tsage/ringworld/ringworld_dialogs.cpp
    engines/tsage/ringworld2/ringworld2_dialogs.cpp
    gui/recorderdialog.cpp
    gui/saveload.cpp
    gui/saveload.h



diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index b968ae6..66a7fa9 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 3eb0aca..4f6c62c 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 c8470f8..1609794 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 7db0b18..af1f70e 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 04175f7..f826667 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 c2f8982..5d3d0a1 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 96cecc8..2dac04a 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 b782d10..30140ba 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 6683f97..614d23f 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 80511c6..118ca8d 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 bc25c72..59b3e01 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 6ad7dd0..596180d 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 b4a2076..c382263 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 1d733d8..f448108 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 1059fd0..a0a1f35 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 4dc392a..bd50c4f 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 5402e5a..454435c 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 a1413f0..0560608 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 898f68c..178139a 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 9c23d07..3ea50bb 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 6d598d9..eff088d 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 7850a10..d5540f7 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 ba9cb2a..178c6b7 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 08222dd..bd06455 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 1234eda..1204763 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 634fd2d..87406f4 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 d9148ed..e711861 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 1e9b7f7..1556f08 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 893a89b..5de8877 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 3ab23a1..169e2ef 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 3697ca7..99db61b 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 9fa17f3..bc357ca 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 027fb55..5cd124f 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 2d74ceb..c08b3e1 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 c1c1d12..b94d302 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 22c26d4..01a78c4 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 {

More information about the Scummvm-git-logs mailing list