Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Common: Rename the File namespace to FileUtil, to match the filename and prevent collisions.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2014-09-12 00:17:15 +02:00
parent edaf59a759
commit 6b7b36a874
8 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/common/chunk_file.h
View file

@ -671,7 +671,7 @@ public:
_failureReason->clear();
_failureReason->append("LoadStateWrongVersion");
if (!File::Exists(_rFilename)) {
if (!FileUtil::Exists(_rFilename)) {
_failureReason->clear();
_failureReason->append("LoadStateDoesntExist");
ERROR_LOG(COMMON, "ChunkReader: File doesn't exist");
@ -679,7 +679,7 @@ public:
}
// Check file size
const u64 fileSize = File::GetSize(_rFilename);
const u64 fileSize = FileUtil::GetSize(_rFilename);
static const u64 headerSize = sizeof(SChunkHeader);
if (fileSize < headerSize)
{
@ -687,7 +687,7 @@ public:
return ERROR_BAD_FILE;
}
File::IOFile pFile(_rFilename, "rb");
FileUtil::IOFile pFile(_rFilename, "rb");
if (!pFile)
{
ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading");
@ -765,7 +765,7 @@ public:
{
INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str());
File::IOFile pFile(_rFilename, "wb");
FileUtil::IOFile pFile(_rFilename, "wb");
if (!pFile)
{
ERROR_LOG(COMMON,"ChunkReader: Error opening file for write");