[Scummvm-cvs-logs] SF.net SVN: scummvm:[48936] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue May 4 14:00:16 CEST 2010


Revision: 48936
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48936&view=rev
Author:   fingolfin
Date:     2010-05-04 12:00:16 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Reduce indirect header dependencies further

Modified Paths:
--------------
    scummvm/trunk/common/debug.h
    scummvm/trunk/engines/draci/animation.h
    scummvm/trunk/engines/draci/surface.h
    scummvm/trunk/engines/gob/demos/scnplayer.h
    scummvm/trunk/engines/groovie/vdx.cpp
    scummvm/trunk/engines/kyra/kyra_v1.h
    scummvm/trunk/engines/lure/res.h
    scummvm/trunk/engines/m4/globals.h
    scummvm/trunk/engines/parallaction/disk.h
    scummvm/trunk/engines/parallaction/disk_br.cpp
    scummvm/trunk/engines/parallaction/disk_ns.cpp
    scummvm/trunk/engines/saga/events.h
    scummvm/trunk/engines/saga/font.h
    scummvm/trunk/engines/saga/resource.h
    scummvm/trunk/engines/saga/saga.h
    scummvm/trunk/engines/sword1/animation.h

Modified: scummvm/trunk/common/debug.h
===================================================================
--- scummvm/trunk/common/debug.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/common/debug.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -26,7 +26,6 @@
 #define COMMON_DEBUG_H
 
 #include "common/scummsys.h"
-#include "common/debug-channels.h"
 #include "common/textconsole.h"
 
 namespace Common {

Modified: scummvm/trunk/engines/draci/animation.h
===================================================================
--- scummvm/trunk/engines/draci/animation.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/draci/animation.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -26,6 +26,8 @@
 #ifndef DRACI_ANIMATION_H
 #define DRACI_ANIMATION_H
 
+#include "common/array.h"
+#include "common/list.h"
 #include "common/rect.h"
 #include "draci/sprite.h"
 

Modified: scummvm/trunk/engines/draci/surface.h
===================================================================
--- scummvm/trunk/engines/draci/surface.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/draci/surface.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -26,6 +26,7 @@
 #ifndef DRACI_SURFACE_H
 #define DRACI_SURFACE_H
 
+#include "common/list.h"
 #include "graphics/surface.h"
 
 namespace Draci {

Modified: scummvm/trunk/engines/gob/demos/scnplayer.h
===================================================================
--- scummvm/trunk/engines/gob/demos/scnplayer.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/gob/demos/scnplayer.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -28,6 +28,7 @@
 
 #include "common/str.h"
 #include "common/hashmap.h"
+#include "common/hash-str.h"
 
 #include "gob/demos/demoplayer.h"
 

Modified: scummvm/trunk/engines/groovie/vdx.cpp
===================================================================
--- scummvm/trunk/engines/groovie/vdx.cpp	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/groovie/vdx.cpp	2010-05-04 12:00:16 UTC (rev 48936)
@@ -27,6 +27,7 @@
 #include "groovie/lzss.h"
 #include "groovie/vdx.h"
 
+#include "common/debug-channels.h"
 #include "sound/mixer.h"
 #include "sound/decoders/raw.h"
 

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -31,6 +31,7 @@
 #include "common/array.h"
 #include "common/events.h"
 #include "common/random.h"
+#include "common/hashmap.h"
 #include "common/system.h"
 
 #include "sound/mixer.h"

Modified: scummvm/trunk/engines/lure/res.h
===================================================================
--- scummvm/trunk/engines/lure/res.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/lure/res.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -32,6 +32,7 @@
 #include "lure/hotspots.h"
 #include "lure/palette.h"
 
+#include "common/array.h"
 #include "common/file.h"
 #include "common/list.h"
 #include "common/random.h"

Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/m4/globals.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -26,11 +26,11 @@
 #ifndef M4_GLOBALS_H
 #define M4_GLOBALS_H
 
+#include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
-#include "common/scummsys.h"
-
 #include "common/file.h"
+#include "common/list.h"
 #include "common/ptr.h"
 
 namespace M4 {

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/parallaction/disk.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -29,12 +29,13 @@
 #define PATH_LEN 200
 
 #include "common/archive.h"
-#include "common/fs.h"
-#include "common/file.h"
 
 #include "graphics/surface.h"
 #include "graphics/iff.h"
 
+namespace Common {
+	class FSDirectory;
+}
 
 
 namespace Parallaction {

Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp	2010-05-04 12:00:16 UTC (rev 48936)
@@ -26,6 +26,7 @@
 #include "graphics/iff.h"
 
 #include "common/config-manager.h"
+#include "common/fs.h"
 #include "parallaction/parallaction.h"
 #include "parallaction/parser.h"
 

Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp	2010-05-04 12:00:16 UTC (rev 48936)
@@ -24,6 +24,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/fs.h"
 #include "parallaction/parser.h"
 #include "parallaction/parallaction.h"
 

Modified: scummvm/trunk/engines/saga/events.h
===================================================================
--- scummvm/trunk/engines/saga/events.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/saga/events.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -28,6 +28,7 @@
 #ifndef SAGA_EVENT_H
 #define SAGA_EVENT_H
 
+#include "common/list.h"
 
 namespace Saga {
 

Modified: scummvm/trunk/engines/saga/font.h
===================================================================
--- scummvm/trunk/engines/saga/font.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/saga/font.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -28,6 +28,7 @@
 #ifndef SAGA_FONT_H
 #define SAGA_FONT_H
 
+#include "common/list.h"
 #include "saga/gfx.h"
 
 namespace Saga {

Modified: scummvm/trunk/engines/saga/resource.h
===================================================================
--- scummvm/trunk/engines/saga/resource.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/saga/resource.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -29,6 +29,7 @@
 #define SAGA_RESOURCE_H
 
 #include "common/file.h"
+#include "common/list.h"
 
 namespace Saga {
 

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/saga/saga.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -28,6 +28,7 @@
 
 #include "engines/engine.h"
 
+#include "common/array.h"
 #include "common/random.h"
 #include "common/stream.h"
 #include "sound/mididrv.h"

Modified: scummvm/trunk/engines/sword1/animation.h
===================================================================
--- scummvm/trunk/engines/sword1/animation.h	2010-05-04 11:59:22 UTC (rev 48935)
+++ scummvm/trunk/engines/sword1/animation.h	2010-05-04 12:00:16 UTC (rev 48936)
@@ -30,9 +30,12 @@
 #include "graphics/video/smk_decoder.h"
 #include "graphics/video/video_player.h"
 
+#include "common/array.h"
+
+#include "sound/audiostream.h"
+
 #include "sword1/screen.h"
 #include "sword1/sound.h"
-#include "sound/audiostream.h"
 
 namespace Sword1 {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list