diff options
| author | 2014-09-12 00:17:15 +0200 | |
|---|---|---|
| committer | 2014-09-17 14:35:45 +0000 | |
| commit | 6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc (patch) | |
| tree | dd5cdcd8b1f9822a019362b44a44ec9505adff8a /src/common/chunk_file.h | |
| parent | Common: Return the number of items read/written in IOFile’s methods instead... (diff) | |
| download | yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.gz yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.tar.xz yuzu-6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc.zip | |
Common: Rename the File namespace to FileUtil, to match the filename and prevent collisions.
Diffstat (limited to 'src/common/chunk_file.h')
| -rw-r--r-- | src/common/chunk_file.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 2b0f120e6..7a3b537c7 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h | |||
| @@ -671,7 +671,7 @@ public: | |||
| 671 | _failureReason->clear(); | 671 | _failureReason->clear(); |
| 672 | _failureReason->append("LoadStateWrongVersion"); | 672 | _failureReason->append("LoadStateWrongVersion"); |
| 673 | 673 | ||
| 674 | if (!File::Exists(_rFilename)) { | 674 | if (!FileUtil::Exists(_rFilename)) { |
| 675 | _failureReason->clear(); | 675 | _failureReason->clear(); |
| 676 | _failureReason->append("LoadStateDoesntExist"); | 676 | _failureReason->append("LoadStateDoesntExist"); |
| 677 | ERROR_LOG(COMMON, "ChunkReader: File doesn't exist"); | 677 | ERROR_LOG(COMMON, "ChunkReader: File doesn't exist"); |
| @@ -679,7 +679,7 @@ public: | |||
| 679 | } | 679 | } |
| 680 | 680 | ||
| 681 | // Check file size | 681 | // Check file size |
| 682 | const u64 fileSize = File::GetSize(_rFilename); | 682 | const u64 fileSize = FileUtil::GetSize(_rFilename); |
| 683 | static const u64 headerSize = sizeof(SChunkHeader); | 683 | static const u64 headerSize = sizeof(SChunkHeader); |
| 684 | if (fileSize < headerSize) | 684 | if (fileSize < headerSize) |
| 685 | { | 685 | { |
| @@ -687,7 +687,7 @@ public: | |||
| 687 | return ERROR_BAD_FILE; | 687 | return ERROR_BAD_FILE; |
| 688 | } | 688 | } |
| 689 | 689 | ||
| 690 | File::IOFile pFile(_rFilename, "rb"); | 690 | FileUtil::IOFile pFile(_rFilename, "rb"); |
| 691 | if (!pFile) | 691 | if (!pFile) |
| 692 | { | 692 | { |
| 693 | ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading"); | 693 | ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading"); |
| @@ -765,7 +765,7 @@ public: | |||
| 765 | { | 765 | { |
| 766 | INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str()); | 766 | INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str()); |
| 767 | 767 | ||
| 768 | File::IOFile pFile(_rFilename, "wb"); | 768 | FileUtil::IOFile pFile(_rFilename, "wb"); |
| 769 | if (!pFile) | 769 | if (!pFile) |
| 770 | { | 770 | { |
| 771 | ERROR_LOG(COMMON,"ChunkReader: Error opening file for write"); | 771 | ERROR_LOG(COMMON,"ChunkReader: Error opening file for write"); |