Moved class File and the MD5 stuff to namespace Common

svn-id: r18037

4 files changed, 14 insertions, 10 deletions

diff --git a/sky/compact.cpp b/sky/compact.cpp
index de9b5c7b3b..3cc3bad054 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -118,7 +118,7 @@ static const uint32 turnTableOffsets[] = {
 #define TURNTABLE_SIZE (sizeof(turnTableOffsets)/sizeof(uint32))
 
 SkyCompact::SkyCompact(void) {
-	_cptFile = new File();
+	_cptFile = new Common::File();
 	if (!_cptFile->open("sky.cpt")) {
 		GUI::MessageDialog dialog("Unable to find \"sky.cpt\" file!\n"
 								  "Please download it from www.scummvm.org", "OK", NULL);
diff --git a/sky/compact.h b/sky/compact.h
index 972c7b60d1..9440ad2101 100644
--- a/sky/compact.h
+++ b/sky/compact.h
@@ -26,7 +26,9 @@
 #include "sky/struc.h"
 #include "sky/skydefs.h"
 
-class File;
+namespace Common {
+	class File;
+}
 
 enum CptIds {
 	CPT_JOEY = 1,
@@ -79,7 +81,7 @@ private:
 	char    ***_cptNames;
 	uint16	**_cptSizes;
 	uint16  **_cptTypes;
-	File	*_cptFile;
+	Common::File	*_cptFile;
 	uint32	_resetDataPos;
 };
 
diff --git a/sky/disk.cpp b/sky/disk.cpp
index 06a59f0b4b..a6573d2efe 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -41,8 +41,8 @@ static const char *dinnerFilename = "sky.dnr";
 Disk::Disk(const Common::String &gameDataPath) {
 	_prefRoot = NULL;
 
-	_dataDiskHandle = new File();
-	_dnrHandle = new File();
+	_dataDiskHandle = new Common::File();
+	_dnrHandle = new Common::File();
 
 	uint32 entriesRead;
 
@@ -404,14 +404,14 @@ void Disk::fnFlushBuffers(void) {
 
 void Disk::dumpFile(uint16 fileNr) {
 	char buf[128];
-	File out;
+	Common::File out;
 	byte* filePtr;
 
 	filePtr = loadFile(fileNr);
 	sprintf(buf, "dumps/file-%d.dmp", fileNr);
 
 	if (!out.exists(buf, "")) {
-		if (out.open(buf, File::kFileWriteMode, ""))
+		if (out.open(buf, Common::File::kFileWriteMode, ""))
 			out.write(filePtr, _lastLoadedFileSize);
 	}
 	free(filePtr);
diff --git a/sky/disk.h b/sky/disk.h
index 3b4b16ed2b..c885ab65bf 100644
--- a/sky/disk.h
+++ b/sky/disk.h
@@ -27,7 +27,9 @@
 #include "common/str.h"
 #include "sky/rnc_deco.h"
 
-class File;
+namespace Common {
+	class File;
+}
 
 namespace Sky {
 
@@ -73,8 +75,8 @@ protected:
 
 	uint32 _dinnerTableEntries;
 	uint8 *_dinnerTableArea;
-	File *_dataDiskHandle;
-	File *_dnrHandle;
+	Common::File *_dataDiskHandle;
+	Common::File *_dnrHandle;
 	RncDecoder _rncDecoder;
 	
 	uint16 _buildList[MAX_FILES_IN_LIST];