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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Feb 8 22:51:36 CET 2010


Revision: 48010
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48010&view=rev
Author:   fingolfin
Date:     2010-02-08 21:51:36 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
Reduce header interdependencies

Modified Paths:
--------------
    scummvm/trunk/common/unarj.cpp
    scummvm/trunk/common/unarj.h
    scummvm/trunk/engines/drascula/drascula.h
    scummvm/trunk/engines/drascula/resource.cpp

Modified: scummvm/trunk/common/unarj.cpp
===================================================================
--- scummvm/trunk/common/unarj.cpp	2010-02-08 21:46:50 UTC (rev 48009)
+++ scummvm/trunk/common/unarj.cpp	2010-02-08 21:51:36 UTC (rev 48010)
@@ -32,6 +32,8 @@
 #include "common/debug.h"
 #include "common/util.h"
 #include "common/unarj.h"
+#include "common/file.h"
+#include "common/hash-str.h"
 
 namespace Common {
 

Modified: scummvm/trunk/common/unarj.h
===================================================================
--- scummvm/trunk/common/unarj.h	2010-02-08 21:46:50 UTC (rev 48009)
+++ scummvm/trunk/common/unarj.h	2010-02-08 21:51:36 UTC (rev 48010)
@@ -26,12 +26,11 @@
 #ifndef COMMON_UNARJ_H
 #define COMMON_UNARJ_H
 
-#include "common/file.h"
-#include "common/hash-str.h"
-#include "common/archive.h"
-
 namespace Common {
 
+class Archive;
+class String;
+
 /**
  * This factory method creates an Archive instance corresponding to the content
  * of the ARJ compressed file with the given name.

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2010-02-08 21:46:50 UTC (rev 48009)
+++ scummvm/trunk/engines/drascula/drascula.h	2010-02-08 21:51:36 UTC (rev 48010)
@@ -35,7 +35,6 @@
 #include "common/hash-str.h"
 #include "common/events.h"
 #include "common/keyboard.h"
-#include "common/unarj.h"
 #include "common/archive.h"
 
 #include "sound/mixer.h"

Modified: scummvm/trunk/engines/drascula/resource.cpp
===================================================================
--- scummvm/trunk/engines/drascula/resource.cpp	2010-02-08 21:46:50 UTC (rev 48009)
+++ scummvm/trunk/engines/drascula/resource.cpp	2010-02-08 21:51:36 UTC (rev 48010)
@@ -24,6 +24,7 @@
  */
 
 #include "drascula/drascula.h"
+#include "common/unarj.h"
 
 namespace Drascula {
 


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