summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/file_sys/archive_backend.h (renamed from src/core/file_sys/archive.h)4
-rw-r--r--src/core/file_sys/archive_romfs.h4
-rw-r--r--src/core/file_sys/archive_sdmc.h4
-rw-r--r--src/core/hle/service/fs/archive.cpp6
-rw-r--r--src/core/hle/service/fs/archive.h4
6 files changed, 12 insertions, 12 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 18a417475..463f14eee 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -93,7 +93,7 @@ set(HEADERS
arm/skyeye_common/vfp/vfp.h
arm/skyeye_common/vfp/vfp_helper.h
arm/arm_interface.h
- file_sys/archive.h
+ file_sys/archive_backend.h
file_sys/archive_romfs.h
file_sys/archive_sdmc.h
file_sys/file.h
diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive_backend.h
index b7978bfbe..0558698f6 100644
--- a/src/core/file_sys/archive.h
+++ b/src/core/file_sys/archive_backend.h
@@ -160,9 +160,9 @@ private:
std::u16string u16str;
};
-class Archive : NonCopyable {
+class ArchiveBackend : NonCopyable {
public:
- virtual ~Archive() { }
+ virtual ~ArchiveBackend() { }
/**
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h
index b60fcca99..91505da49 100644
--- a/src/core/file_sys/archive_romfs.h
+++ b/src/core/file_sys/archive_romfs.h
@@ -8,7 +8,7 @@
#include "common/common_types.h"
-#include "core/file_sys/archive.h"
+#include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
namespace FileSys {
/// File system interface to the RomFS archive
-class Archive_RomFS final : public Archive {
+class Archive_RomFS final : public ArchiveBackend {
public:
Archive_RomFS(const Loader::AppLoader& app_loader);
~Archive_RomFS() override;
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 54c18cb0c..347f3945e 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -6,7 +6,7 @@
#include "common/common_types.h"
-#include "core/file_sys/archive.h"
+#include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
namespace FileSys {
/// File system interface to the SDMC archive
-class Archive_SDMC final : public Archive {
+class Archive_SDMC final : public ArchiveBackend {
public:
Archive_SDMC(const std::string& mount_point);
~Archive_SDMC() override;
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 61cbfa73c..6ec310a63 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -8,7 +8,7 @@
#include "common/file_util.h"
#include "common/math_util.h"
-#include "core/file_sys/archive.h"
+#include "core/file_sys/archive_backend.h"
#include "core/file_sys/archive_sdmc.h"
#include "core/file_sys/directory.h"
#include "core/hle/service/fs/archive.h"
@@ -46,7 +46,7 @@ public:
std::string GetName() const override { return "Archive: " + backend->GetName(); }
ArchiveIdCode id_code; ///< Id code of the archive
- FileSys::Archive* backend; ///< Archive backend interface
+ FileSys::ArchiveBackend* backend; ///< Archive backend interface
ResultVal<bool> SyncRequest() override {
u32* cmd_buff = Kernel::GetCommandBuffer();
@@ -267,7 +267,7 @@ ResultCode MountArchive(Archive* archive) {
return RESULT_SUCCESS;
}
-ResultCode CreateArchive(FileSys::Archive* backend, ArchiveIdCode id_code) {
+ResultCode CreateArchive(FileSys::ArchiveBackend* backend, ArchiveIdCode id_code) {
Archive* archive = new Archive;
Handle handle = Kernel::g_object_pool.Create(archive);
archive->id_code = id_code;
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h
index 9a1df5110..2c50dfff0 100644
--- a/src/core/hle/service/fs/archive.h
+++ b/src/core/hle/service/fs/archive.h
@@ -6,7 +6,7 @@
#include "common/common_types.h"
-#include "core/file_sys/archive.h"
+#include "core/file_sys/archive_backend.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/result.h"
@@ -42,7 +42,7 @@ ResultCode CloseArchive(ArchiveIdCode id_code);
* @param backend File system backend interface to the archive
* @param id_code Id code used to access this type of archive
*/
-ResultCode CreateArchive(FileSys::Archive* backend, ArchiveIdCode id_code);
+ResultCode CreateArchive(FileSys::ArchiveBackend* backend, ArchiveIdCode id_code);
/**
* Open a File from an Archive