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

[peres001 at users.sourceforge.net]

Revision: 34343
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34343&view=rev
Author:   peres001
Date:     2008-09-05 11:41:39 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers.

Modified Paths:
--------------
    scummvm/trunk/common/system.cpp
    scummvm/trunk/graphics/dxa_player.cpp
    scummvm/trunk/graphics/dxa_player.h
    scummvm/trunk/gui/theme.cpp
    scummvm/trunk/gui/theme.h
    scummvm/trunk/sound/audiocd.cpp
    scummvm/trunk/sound/flac.cpp
    scummvm/trunk/sound/mixer.cpp
    scummvm/trunk/sound/mods/infogrames.cpp
    scummvm/trunk/sound/mods/infogrames.h
    scummvm/trunk/sound/mp3.cpp
    scummvm/trunk/sound/vorbis.cpp

Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/common/system.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -126,10 +126,9 @@
  Port specific variants should be pushed into the respective ports.
 
  Ideally, the default OSystem::openConfigFileForReading/Writing methods
- should be removed completely. 
+ should be removed completely.
 */
 
-#include "common/file.h"
 
 #ifdef __PLAYSTATION2__
 #include "backends/platform/ps2/systemps2.h"

Modified: scummvm/trunk/graphics/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/dxa_player.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/graphics/dxa_player.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -24,6 +24,7 @@
  */
 
 #include "common/endian.h"
+#include "common/file.h"
 #include "graphics/dxa_player.h"
 #include "common/util.h"
 

Modified: scummvm/trunk/graphics/dxa_player.h
===================================================================
--- scummvm/trunk/graphics/dxa_player.h	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/graphics/dxa_player.h	2008-09-05 11:41:39 UTC (rev 34343)
@@ -27,12 +27,8 @@
 #define GRAPHICS_DXA_PLAYER_H
 
 #include "common/scummsys.h"
-#include "common/file.h"
+#include "common/stream.h"
 
-namespace Common {
-	class File;
-}
-
 namespace Graphics {
 
 enum ScaleMode {

Modified: scummvm/trunk/gui/theme.cpp
===================================================================
--- scummvm/trunk/gui/theme.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/gui/theme.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -24,6 +24,7 @@
 
 #include "gui/theme.h"
 #include "gui/eval.h"
+#include "common/file.h"
 
 #include "common/unzip.h"
 

Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/gui/theme.h	2008-09-05 11:41:39 UTC (rev 34343)
@@ -28,7 +28,6 @@
 #include "common/system.h"
 #include "common/rect.h"
 #include "common/str.h"
-#include "common/file.h"
 #include "common/config-file.h"
 
 #include "graphics/surface.h"

Modified: scummvm/trunk/sound/audiocd.cpp
===================================================================
--- scummvm/trunk/sound/audiocd.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/audiocd.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -29,7 +29,6 @@
 #include "sound/vorbis.h"
 #include "sound/flac.h"
 #include "engines/engine.h"
-#include "common/file.h"
 #include "common/util.h"
 #include "common/system.h"
 

Modified: scummvm/trunk/sound/flac.cpp
===================================================================
--- scummvm/trunk/sound/flac.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/flac.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -27,7 +27,7 @@
 
 #ifdef USE_FLAC
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiostream.h"

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/mixer.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/file.h"
 #include "common/util.h"
 #include "common/system.h"
 

Modified: scummvm/trunk/sound/mods/infogrames.cpp
===================================================================
--- scummvm/trunk/sound/mods/infogrames.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/mods/infogrames.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -25,6 +25,7 @@
 
 #include "sound/mods/infogrames.h"
 #include "common/endian.h"
+#include "common/file.h"
 
 namespace Audio {
 
@@ -50,6 +51,14 @@
 	_sampleData = 0;
 }
 
+bool Infogrames::Instruments::load(const char *ins) {
+	Common::File f;
+
+	if (f.open(ins))
+		return load(f);
+	return false;
+}
+
 bool Infogrames::Instruments::load(Common::SeekableReadStream &ins) {
 	int i;
 	uint32 fsize;
@@ -191,6 +200,14 @@
 		_chn[i].cmdBlockIndices = 0;
 }
 
+bool Infogrames::load(const char *dum) {
+	Common::File f;
+
+	if (f.open(dum))
+		return load(f);
+	return false;
+}
+
 bool Infogrames::load(Common::SeekableReadStream &dum) {
 	int subSong = 0;
 	int i;

Modified: scummvm/trunk/sound/mods/infogrames.h
===================================================================
--- scummvm/trunk/sound/mods/infogrames.h	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/mods/infogrames.h	2008-09-05 11:41:39 UTC (rev 34343)
@@ -28,7 +28,6 @@
 
 #include "sound/mods/paula.h"
 #include "common/stream.h"
-#include "common/file.h"
 
 namespace Audio {
 
@@ -46,13 +45,7 @@
 		~Instruments();
 
 		bool load(Common::SeekableReadStream &ins);
-		bool load(const char *ins) {
-			Common::File f;
-
-			if (f.open(ins))
-				return load(f);
-			return false;
-		}
+		bool load(const char *ins);
 		void unload(void);
 
 		uint8 getCount(void) const { return _count; }
@@ -82,13 +75,7 @@
 	void setRepeating (int32 repCount) { _repCount = repCount; }
 
 	bool load(Common::SeekableReadStream &dum);
-	bool load(const char *dum) {
-		Common::File f;
-
-		if (f.open(dum))
-			return load(f);
-		return false;
-	}
+	bool load(const char *dum);
 	void unload(void);
 	void restart(void) {
 		if (_data) {

Modified: scummvm/trunk/sound/mp3.cpp
===================================================================
--- scummvm/trunk/sound/mp3.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/mp3.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -27,7 +27,7 @@
 
 #ifdef USE_MAD
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiocd.h"

Modified: scummvm/trunk/sound/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/vorbis.cpp	2008-09-05 11:33:19 UTC (rev 34342)
+++ scummvm/trunk/sound/vorbis.cpp	2008-09-05 11:41:39 UTC (rev 34343)
@@ -27,7 +27,7 @@
 
 #ifdef USE_VORBIS
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiostream.h"


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