Service.FS: Rename FileSys::File to FileBackend

src/core/CMakeLists.txt

@@ -96,7 +96,7 @@ set(HEADERS
             file_sys/archive_backend.h
             file_sys/archive_romfs.h
             file_sys/archive_sdmc.h
-            file_sys/file.h
+            file_sys/file_backend.h
             file_sys/file_romfs.h
             file_sys/file_sdmc.h
             file_sys/directory_backend.h

src/core/file_sys/archive_backend.h

@@ -10,7 +10,7 @@
 #include "common/string_util.h"
 #include "common/bit_field.h"
 
-#include "core/file_sys/file.h"
+#include "core/file_sys/file_backend.h"
 #include "core/file_sys/directory_backend.h"
 
 #include "core/mem_map.h"
@@ -175,7 +175,7 @@ public:
      * @param mode Mode to open the file with
      * @return Opened file, or nullptr
      */
-    virtual std::unique_ptr<File> OpenFile(const Path& path, const Mode mode) const = 0;
+    virtual std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const = 0;
 
     /**
      * Delete a file specified by its path

src/core/file_sys/archive_romfs.cpp

@@ -29,8 +29,8 @@ Archive_RomFS::~Archive_RomFS() {
  * @param mode Mode to open the file with
  * @return Opened file, or nullptr
  */
-std::unique_ptr<File> Archive_RomFS::OpenFile(const Path& path, const Mode mode) const {
+std::unique_ptr<FileBackend> Archive_RomFS::OpenFile(const Path& path, const Mode mode) const {
-    return std::unique_ptr<File>(new File_RomFS);
+    return std::unique_ptr<FileBackend>(new File_RomFS);
 }
 
 /**

src/core/file_sys/archive_romfs.h

@@ -30,7 +30,7 @@ public:
      * @param mode Mode to open the file with
      * @return Opened file, or nullptr
      */
-    std::unique_ptr<File> OpenFile(const Path& path, const Mode mode) const override;
+    std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
 
     /**
      * Delete a file specified by its path

src/core/file_sys/archive_sdmc.cpp

@@ -49,12 +49,12 @@ bool Archive_SDMC::Initialize() {
  * @param mode Mode to open the file with
  * @return Opened file, or nullptr
  */
-std::unique_ptr<File> Archive_SDMC::OpenFile(const Path& path, const Mode mode) const {
+std::unique_ptr<FileBackend> Archive_SDMC::OpenFile(const Path& path, const Mode mode) const {
     LOG_DEBUG(Service_FS, "called path=%s mode=%u", path.DebugStr().c_str(), mode.hex);
     File_SDMC* file = new File_SDMC(this, path, mode);
     if (!file->Open())
         return nullptr;
-    return std::unique_ptr<File>(file);
+    return std::unique_ptr<FileBackend>(file);
 }
 
 /**

src/core/file_sys/archive_sdmc.h

@@ -34,7 +34,7 @@ public:
      * @param mode Mode to open the file with
      * @return Opened file, or nullptr
      */
-    std::unique_ptr<File> OpenFile(const Path& path, const Mode mode) const override;
+    std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
 
     /**
      * Delete a file specified by its path

src/core/file_sys/file_backend.h

@@ -13,10 +13,10 @@
 
 namespace FileSys {
 
-class File : NonCopyable {
+class FileBackend : NonCopyable {
 public:
-    File() { }
+    FileBackend() { }
-    virtual ~File() { }
+    virtual ~FileBackend() { }
 
     /**
      * Open the file

src/core/file_sys/file_romfs.h

@@ -6,7 +6,7 @@
 
 #include "common/common_types.h"
 
-#include "core/file_sys/file.h"
+#include "core/file_sys/file_backend.h"
 #include "core/loader/loader.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,7 @@
 
 namespace FileSys {
 
-class File_RomFS final : public File {
+class File_RomFS final : public FileBackend {
 public:
     File_RomFS();
     ~File_RomFS() override;

src/core/file_sys/file_sdmc.h

@@ -7,7 +7,7 @@
 #include "common/common_types.h"
 #include "common/file_util.h"
 
-#include "core/file_sys/file.h"
+#include "core/file_sys/file_backend.h"
 #include "core/file_sys/archive_sdmc.h"
 #include "core/loader/loader.h"
 
@@ -16,7 +16,7 @@
 
 namespace FileSys {
 
-class File_SDMC final : public File {
+class File_SDMC final : public FileBackend {
 public:
     File_SDMC();
     File_SDMC(const Archive_SDMC* archive, const Path& path, const Mode mode);

src/core/hle/service/fs/archive.cpp

@@ -112,7 +112,7 @@ public:
     std::string GetName() const override { return "Path: " + path.DebugStr(); }
 
     FileSys::Path path; ///< Path of the file
-    std::unique_ptr<FileSys::File> backend; ///< File backend interface
+    std::unique_ptr<FileSys::FileBackend> backend; ///< File backend interface
 
     ResultVal<bool> SyncRequest() override {
         u32* cmd_buff = Kernel::GetCommandBuffer();