[Scummvm-cvs-logs] SF.net SVN: scummvm:[44767] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 44767
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44767&view=rev
Author:   fingolfin
Date:     2009-10-07 23:04:13 +0000 (Wed, 07 Oct 2009)

Log Message:
-----------
SCI: Reduce header interdepencies once again. Rule of thumb: Never include a header file from another header file unless you absolutely *must* do it; if possible, try to use class forwards instead, and include the headers from source files only

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/gfx/gfx_driver.h
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
    scummvm/trunk/engines/sci/gfx/gfx_resource.h
    scummvm/trunk/engines/sci/gfx/gfx_tools.h
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/console.cpp	2009-10-07 23:04:13 UTC (rev 44767)
@@ -41,6 +41,7 @@
 #include "sci/sfx/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
 #include "sci/sfx/sci_midi.h"
 #include "sci/vocabulary.h"
+#include "sci/gui/gui.h"
 
 #include "common/savefile.h"
 

Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.h	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.h	2009-10-07 23:04:13 UTC (rev 44767)
@@ -37,7 +37,9 @@
 	GFX_BUFFER_STATIC = 2
 };
 
+class SciGuiScreen;
 
+
 /**
  * Graphics driver.
  *

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-07 23:04:13 UTC (rev 44767)
@@ -23,24 +23,25 @@
  *
  */
 
-#ifndef SCI_GFX_GFX_resMan_H
-#define SCI_GFX_GFX_resMan_H
+#ifndef SCI_GFX_GFX_RESMAN_H
+#define SCI_GFX_GFX_RESMAN_H
 
+#include "common/hashmap.h"
+#include "common/rect.h"
+
 // FIXME/TODO: The name "(Graphics) resource manager", and the associated
 // filenames, are misleading. This should be renamed to "Graphics manager"
 // or something like that.
 
 #include "sci/gfx/gfx_resource.h"
-#include "sci/gui/gui_palette.h"
+
 #include "sci/resource.h"
 
-#include "common/hashmap.h"
-#include "common/rect.h"
-
 namespace Sci {
 
 struct gfx_bitmap_font_t;
 class ResourceManager;
+class SciGuiPalette;
 
 enum gfx_resource_type_t {
 	GFX_RESOURCE_TYPE_VIEW = 0,
@@ -310,4 +311,4 @@
 
 } // End of namespace Sci
 
-#endif // SCI_GFX_GFX_RSMGR_H
+#endif // SCI_GFX_GFX_RESMAN_H

Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.h	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.h	2009-10-07 23:04:13 UTC (rev 44767)
@@ -31,7 +31,6 @@
 #define SCI_GFX_GFX_RESOURCE_H
 
 #include "sci/gfx/gfx_system.h"
-#include "sci/gui/gui_screen.h"
 #include "sci/gfx/gfx_driver.h"
 
 #include "common/rect.h"

Modified: scummvm/trunk/engines/sci/gfx/gfx_tools.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_tools.h	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/gfx/gfx_tools.h	2009-10-07 23:04:13 UTC (rev 44767)
@@ -29,7 +29,6 @@
 #include "graphics/pixelformat.h"
 
 #include "sci/gfx/gfx_system.h"
-#include "sci/gui/gui_screen.h"
 #include "sci/gfx/gfx_driver.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-10-07 22:53:32 UTC (rev 44766)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-10-07 23:04:13 UTC (rev 44767)
@@ -39,6 +39,7 @@
 #include "sci/gui32/gui32.h"
 #include "sci/gui/gui_palette.h"
 #include "sci/gui/gui_cursor.h"
+#include "sci/gui/gui_screen.h"
 
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_tools.h"


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