[Scummvm-git-logs] scummvm master -> 5186f7194b6dec2f1efa71bd4bede19f11ad0670

sev- sev at scummvm.org
Wed Jul 1 15:50:04 UTC 2020 

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

Summary:
ee9b52bc31 DIRECTOR: Reduce header dependency
2d66bb22c6 DIRECTORL Reduce header dependency
1aa1fe2802 DIRECTOR: Furhter decrease of header dependency
5186f7194b DIRECTOR: Reduce header dependency


Commit: ee9b52bc319ac7014fbf62e1d78266a8f680ba66
    https://github.com/scummvm/scummvm/commit/ee9b52bc319ac7014fbf62e1d78266a8f680ba66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-01T17:49:48+02:00

Commit Message:
DIRECTOR: Reduce header dependency

Changed paths:
    engines/director/cast.cpp
    engines/director/cast.h


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 93a8af992a..2fd9891dcc 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -24,14 +24,11 @@
 #include "common/file.h"
 #include "common/memstream.h"
 #include "common/substream.h"
-#include "common/system.h"
 
 #include "graphics/macgui/macfontmanager.h"
-#include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/images.h"
@@ -93,7 +90,7 @@ Cast::~Cast() {
 	if (_loadedCast)
 		for (Common::HashMap<int, CastMember *>::iterator it = _loadedCast->begin(); it != _loadedCast->end(); ++it)
 			delete it->_value;
-	
+
 	delete _loadedStxts;
 	delete _loadedCast;
 }
diff --git a/engines/director/cast.h b/engines/director/cast.h
index 0117f5be93..b7b2eb594d 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -24,7 +24,6 @@
 #define DIRECTOR_CAST_H
 
 #include "common/hash-str.h"
-#include "director/types.h"
 
 namespace Common {
 	class ReadStreamEndian;


Commit: 2d66bb22c6fe6158ec86c7a5f7810dee4d34c501
    https://github.com/scummvm/scummvm/commit/2d66bb22c6fe6158ec86c7a5f7810dee4d34c501
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-01T17:49:48+02:00

Commit Message:
DIRECTORL Reduce header dependency

Changed paths:
    engines/director/cast.cpp
    engines/director/castmember.cpp
    engines/director/castmember.h
    engines/director/director.h
    engines/director/frame.h


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 2fd9891dcc..dd67fb90e0 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -29,6 +29,7 @@
 #include "image/bmp.h"
 
 #include "director/director.h"
+#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/images.h"
diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index fc415f7b9e..02d88724b7 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "common/substream.h"
 #include "graphics/surface.h"
 #include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/mactext.h"
@@ -28,6 +27,7 @@
 #include "image/image_decoder.h"
 
 #include "director/director.h"
+#include "director/archive.h"
 #include "director/castmember.h"
 #include "director/movie.h"
 #include "director/score.h"
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 961ae52a7b..6abf607135 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -23,11 +23,10 @@
 #ifndef DIRECTOR_CASTMEMBER_H
 #define DIRECTOR_CASTMEMBER_H
 
-#include "director/archive.h"
-#include "director/types.h"
-
 #include "graphics/font.h"
 
+#include "director/archive.h"
+
 namespace Graphics {
 struct Surface;
 class MacText;
@@ -49,6 +48,7 @@ namespace Director {
 
 class Stxt;
 class AudioDecoder;
+struct Resource;
 
 class CastMember {
 public:
diff --git a/engines/director/director.h b/engines/director/director.h
index 6d503e6f2d..3d13f55eb0 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -29,7 +29,6 @@
 
 #include "common/hashmap.h"
 #include "engines/engine.h"
-#include "graphics/managed_surface.h"
 
 #include "director/types.h"
 
@@ -43,6 +42,8 @@ namespace Graphics {
 class MacWindowManager;
 struct MacPlotData;
 typedef Common::Array<byte *> MacPatterns;
+
+class ManagedSurface;
 }
 
 namespace Director {
diff --git a/engines/director/frame.h b/engines/director/frame.h
index e4d888e800..85412b6e72 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -24,16 +24,16 @@
 #define DIRECTOR_FRAME_H
 
 namespace Image {
-	class ImageDecoder;
+class ImageDecoder;
 }
 
 namespace Graphics {
-	class ManagedSurface;
-	struct Surface;
+class ManagedSurface;
+struct Surface;
 }
 
 namespace Common {
-	class ReadStreamEndian;
+class ReadStreamEndian;
 }
 
 namespace Director {


Commit: 1aa1fe2802dcd520d114680034c4e1cc428e2320
    https://github.com/scummvm/scummvm/commit/1aa1fe2802dcd520d114680034c4e1cc428e2320
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-01T17:49:48+02:00

Commit Message:
DIRECTOR: Furhter decrease of header dependency

Changed paths:
    engines/director/cast.cpp
    engines/director/castmember.cpp
    engines/director/director.cpp
    engines/director/events.cpp
    engines/director/frame.cpp
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-the.cpp
    engines/director/movie.cpp
    engines/director/movie.h
    engines/director/resource.cpp
    engines/director/score.cpp
    engines/director/score.h
    engines/director/stage.cpp
    engines/director/stage.h
    engines/director/transitions.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index dd67fb90e0..5ac8463b96 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -26,19 +26,19 @@
 #include "common/substream.h"
 
 #include "graphics/macgui/macfontmanager.h"
+#include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/images.h"
-#include "director/lingo/lingo.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/stxt.h"
 #include "director/util.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 02d88724b7..5763d9d71d 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -20,18 +20,13 @@
  *
  */
 
-#include "graphics/surface.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/mactext.h"
 #include "graphics/macgui/macbutton.h"
 #include "image/image_decoder.h"
 
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/castmember.h"
 #include "director/movie.h"
-#include "director/score.h"
-#include "director/sound.h"
+#include "director/stage.h"
 #include "director/stxt.h"
 
 namespace Director {
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 979aefd19a..e69cb34253 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -25,8 +25,6 @@
 #include "common/error.h"
 #include "common/substream.h"
 
-#include "audio/mixer.h"
-
 #include "common/macresman.h"
 
 #include "graphics/macgui/macwindowmanager.h"
@@ -38,8 +36,8 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/stage.h"
-#include "director/lingo/lingo.h"
 #include "director/util.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index f3a395f07b..fc6b280c4d 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -25,7 +25,6 @@
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
-#include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sprite.h"
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 1134b77adc..1c732c6d04 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -20,15 +20,10 @@
  *
  */
 
-#include "common/system.h"
 #include "common/substream.h"
 
-#include "graphics/primitives.h"
-
 #include "director/director.h"
-#include "director/castmember.h"
 #include "director/frame.h"
-#include "director/score.h"
 #include "director/sprite.h"
 #include "director/util.h"
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 1ac52d5acb..703a2afb45 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -33,6 +33,7 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/sprite.h"
+#include "director/stage.h"
 #include "director/stxt.h"
 #include "director/util.h"
 
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index bc841ece76..75c0bb5200 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -34,6 +34,7 @@
 #include "director/sound.h"
 #include "director/sprite.h"
 #include "director/score.h"
+#include "director/stage.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-the.h"
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 8c5e6668d6..b765d60628 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -26,10 +26,10 @@
 #include "director/director.h"
 #include "director/archive.h"
 #include "director/cast.h"
-#include "director/lingo/lingo.h"
 #include "director/movie.h"
 #include "director/score.h"
-#include "director/util.h"
+#include "director/stage.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/movie.h b/engines/director/movie.h
index 76e550c20b..dc315f96e2 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -23,13 +23,9 @@
 #ifndef DIRECTOR_MOVIE_H
 #define DIRECTOR_MOVIE_H
 
-#include "common/hash-str.h"
-#include "common/rect.h"
-#include "director/types.h"
-
 namespace Common {
-	class ReadStreamEndian;
-	class SeekableSubReadStreamEndian;
+class ReadStreamEndian;
+class SeekableSubReadStreamEndian;
 }
 
 namespace Director {
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 9ebfeed7d0..6948a743a7 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -22,19 +22,12 @@
 
 #include "common/config-manager.h"
 #include "common/macresman.h"
-#include "common/substream.h"
 #include "common/file.h"
 
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/macfontmanager.h"
-
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/movie.h"
-#include "director/score.h"
-#include "director/util.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c7c0144178..4c4464d064 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -44,6 +44,7 @@
 #include "director/movie.h"
 #include "director/sound.h"
 #include "director/sprite.h"
+#include "director/stage.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"
 
diff --git a/engines/director/score.h b/engines/director/score.h
index d718898716..6d13ffaa1a 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -23,9 +23,7 @@
 #ifndef DIRECTOR_SCORE_H
 #define DIRECTOR_SCORE_H
 
-#include "common/hash-str.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "director/stage.h"
+//#include "graphics/macgui/macwindowmanager.h"
 
 namespace Graphics {
 	class ManagedSurface;
diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index 376be73276..cf6ba974d2 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "graphics/primitives.h"
+#include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/movie.h"
diff --git a/engines/director/stage.h b/engines/director/stage.h
index 9495afbabc..0c1597a4d8 100644
--- a/engines/director/stage.h
+++ b/engines/director/stage.h
@@ -23,11 +23,8 @@
 #ifndef DIRECTOR_STAGE_H
 #define DIRECTOR_STAGE_H
 
-#include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/macwindow.h"
 
-#include "director/types.h"
-
 namespace Graphics {
 class ManagedSurface;
 class MacWindow;
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index d4a981a9cc..df9e3fee38 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -30,6 +30,7 @@
 #include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
+#include "director/stage.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"
 


Commit: 5186f7194b6dec2f1efa71bd4bede19f11ad0670
    https://github.com/scummvm/scummvm/commit/5186f7194b6dec2f1efa71bd4bede19f11ad0670
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-01T17:49:48+02:00

Commit Message:
DIRECTOR: Reduce header dependency

Changed paths:
    engines/director/score.cpp
    engines/director/sound.cpp
    engines/director/sprite.cpp
    engines/director/stage.cpp
    engines/director/tests.cpp
    engines/director/transitions.cpp
    engines/director/util.cpp
    engines/director/video.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 4c4464d064..3cfdc0dfa9 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -24,13 +24,9 @@
 #include "common/file.h"
 #include "common/memstream.h"
 #include "common/substream.h"
-#include "common/system.h"
 
 #include "engines/util.h"
-#include "graphics/primitives.h"
-#include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/mactext.h"
-#include "graphics/surface.h"
 
 #ifdef USE_PNG
 #include "image/png.h"
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index a1a6880b64..b3d7b25d12 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -29,7 +29,6 @@
 
 #include "audio/decoders/wave.h"
 #include "audio/decoders/raw.h"
-#include "audio/mixer.h"
 #include "audio/softsynth/pcspk.h"
 #include "audio/decoders/aiff.h"
 
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 5cb5cc0082..aff4fb243f 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -20,14 +20,12 @@
  *
  */
 
+#include "graphics/macgui/macwidget.h"
+
 #include "director/director.h"
 #include "director/castmember.h"
-#include "director/lingo/lingo.h"
 #include "director/sprite.h"
-
-#include "director/score.h"
-
-#include "graphics/macgui/macwidget.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index cf6ba974d2..da0c2f84f8 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -30,8 +30,6 @@
 #include "director/castmember.h"
 #include "director/sprite.h"
 
-#include "common/file.h"
-
 namespace Director {
 
 Stage::Stage(int id, bool scrollable, bool resizable, bool editable, Graphics::MacWindowManager *wm)
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index d5c996ba94..a804012798 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -36,7 +36,6 @@
 #include "director/director.h"
 #include "director/archive.h"
 #include "director/movie.h"
-#include "director/score.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index df9e3fee38..9b37f0880a 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -22,12 +22,10 @@
 
 #include "common/system.h"
 
-#include "graphics/managed_surface.h"
 #include "graphics/primitives.h"
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
-#include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/stage.h"
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index c79c51602c..adda30cd47 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -22,8 +22,6 @@
 
 #include "common/file.h"
 #include "common/keyboard.h"
-#include "common/str.h"
-#include "common/textconsole.h"
 
 #include "director/director.h"
 #include "director/util.h"
diff --git a/engines/director/video.cpp b/engines/director/video.cpp
index f303f0bf1e..736129eccf 100644
--- a/engines/director/video.cpp
+++ b/engines/director/video.cpp
@@ -24,8 +24,8 @@
 #include "graphics/managed_surface.h"
 #include "video/qt_decoder.h"
 
-#include "director/video.h"
 #include "director/util.h"
+#include "director/video.h"
 
 namespace Director {

More information about the Scummvm-git-logs mailing list