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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Oct 4 22:01:29 CEST 2009


Revision: 44632
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44632&view=rev
Author:   fingolfin
Date:     2009-10-04 20:01:21 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI: Add include guards for gui headers; don't include gui/gui.h from engine/state.h

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/gui/gui.h
    scummvm/trunk/engines/sci/gui/gui_font.h
    scummvm/trunk/engines/sci/gui/gui_gfx.h
    scummvm/trunk/engines/sci/gui/gui_helpers.h
    scummvm/trunk/engines/sci/gui/gui_memmgr.h
    scummvm/trunk/engines/sci/gui/gui_picture.h
    scummvm/trunk/engines/sci/gui/gui_screen.h
    scummvm/trunk/engines/sci/gui/gui_view.h
    scummvm/trunk/engines/sci/gui/gui_windowmgr.h
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -49,6 +49,7 @@
 namespace Sci {
 
 class Menubar;
+class SciGUI;
 
 struct GfxState;
 struct GfxPort;

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_GUI_H
+#define SCI_GUI_GUI_H
+
 #include "sci/gui/gui_helpers.h"
 
 namespace Sci {
@@ -94,3 +97,5 @@
 };
 
 } // End of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_font.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_font.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_font.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_FONT_H
+#define SCI_GUI_FONT_H
+
 namespace Sci {
 
 class SciGUIfont {
@@ -55,4 +58,6 @@
 	charinfo* mChars;
 };
 
-} // end of namespace Sci
+} // End of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_GFX_H
+#define SCI_GUI_GFX_H
+
 namespace Sci {
 
 #define SCI_PATTERN_CODE_RECTANGLE 0x10
@@ -162,4 +165,6 @@
 	SciGUIfont *_font;
 };
 
-} // end of namespace Sci
+} // End of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_helpers.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_HELPERS_H
+#define SCI_GUI_HELPERS_H
+
 #include "common/rect.h"
 #include "sci/engine/vm_types.h"
 
@@ -102,4 +105,6 @@
 	GFX_REMOVEVIEW = 0x80
 };
 
-}
+} // End of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_memmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_memmgr.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_memmgr.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_MEMMGR_H
-#define SCI_MEMMGR_H
+#ifndef SCI_GUI_MEMMGR_H
+#define SCI_GUI_MEMMGR_H
 
 #include "common/savefile.h"
 #include "common/endian.h"
@@ -118,6 +118,6 @@
 bool saveMemState(Common::OutSaveFile *pFile);
 bool restoreMemState(Common::InSaveFile *pFile);
 
-} // end of namespace SCI
+} // End of namespace SCI
 
 #endif

Modified: scummvm/trunk/engines/sci/gui/gui_picture.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_PICTURE_H
+#define SCI_GUI_PICTURE_H
+
 namespace Sci {
 
 #define SCI_PAL_FORMAT_VARIABLE_FLAGS 0
@@ -67,3 +70,5 @@
 };
 
 } // end of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_screen.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_screen.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_SCREEN_H
+#define SCI_GUI_SCREEN_H
+
 namespace Sci {
 
 #define SCI_SCREEN_MAXHEIGHT 400
@@ -86,3 +89,5 @@
 };
 
 } // end of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_view.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_VIEW_H
+#define SCI_GUI_VIEW_H
+
 namespace Sci {
 
 struct sciViewCellInfo {
@@ -76,3 +79,5 @@
 };
 
 } // end of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_WINDOWMGR_H
+#define SCI_GUI_WINDOWMGR_H
+
 #include "common/list.h"
 
 namespace Sci {
@@ -55,3 +58,5 @@
 };
 
 } // end of namespace Sci
+
+#endif

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 19:49:47 UTC (rev 44631)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-04 20:01:21 UTC (rev 44632)
@@ -23,6 +23,11 @@
  *
  */
 
+#ifndef SCI_GUI32_GUI32_H
+#define SCI_GUI32_GUI32_H
+
+#include "sci/gui/gui.h"
+
 namespace Sci {
 
 class SciGUI32 : public SciGUI {
@@ -104,3 +109,5 @@
 };
 
 } // End of namespace Sci
+
+#endif


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