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

3 files changed, 5 insertions, 5 deletions

diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 76c9d6d54..389d5a8c9 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -351,7 +351,7 @@ ResultStatus AppLoader_ELF::Load() {
     if (is_loaded)
         return ResultStatus::ErrorAlreadyLoaded;
 
-    File::IOFile file(filename, "rb");
+    FileUtil::IOFile file(filename, "rb");
 
     if (file.IsOpen()) {
         u32 size = (u32)file.GetSize();
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 577a2297a..a268e021a 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -78,7 +78,7 @@ ResultStatus LoadFile(const std::string& filename) {
     {
         INFO_LOG(LOADER, "Loading BIN file %s...", filename.c_str());
 
-        File::IOFile file(filename, "rb");
+        FileUtil::IOFile file(filename, "rb");
 
         if (file.IsOpen()) {
             file.ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), (size_t)file.GetSize());
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 9af59e419..1e5501e6d 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -138,7 +138,7 @@ ResultStatus AppLoader_NCCH::LoadExec() const {
  */
 ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>& buffer) const {
     // Iterate through the ExeFs archive until we find the .code file...
-    File::IOFile file(filename, "rb");
+    FileUtil::IOFile file(filename, "rb");
     if (file.IsOpen()) {
         for (int i = 0; i < kMaxSections; i++) {
             // Load the specified section...
@@ -199,7 +199,7 @@ ResultStatus AppLoader_NCCH::Load() {
     if (is_loaded)
         return ResultStatus::ErrorAlreadyLoaded;
 
-    File::IOFile file(filename, "rb");
+    FileUtil::IOFile file(filename, "rb");
     if (file.IsOpen()) {
         file.ReadBytes(&ncch_header, sizeof(NCCH_Header));
 
@@ -290,7 +290,7 @@ ResultStatus AppLoader_NCCH::ReadLogo(std::vector<u8>& buffer) const {
  * @return ResultStatus result of function
  */
 ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) const {
-    File::IOFile file(filename, "rb");
+    FileUtil::IOFile file(filename, "rb");
     if (file.IsOpen()) {
         // Check if the NCCH has a RomFS...
         if (ncch_header.romfs_offset != 0 && ncch_header.romfs_size != 0) {