summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-12 09:57:06 +0200
committerLioncash <mathew1800@gmail.com>2018-08-12 09:57:16 +0200
commit7b6519741bd588006e2b93778d47d4d25e0548c2 (patch)
tree16d26f3bee59bb94ecb740152389a8ac423a6542
parentcard_image: Simplify return statement of GetSubdirectories() (diff)
downloadyuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.gz
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.bz2
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.lz
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.xz
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.zst
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.zip
-rw-r--r--src/core/file_sys/card_image.cpp6
-rw-r--r--src/core/file_sys/card_image.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index 1188813c7..8e05b9d0e 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/src/core/file_sys/card_image.cpp
@@ -107,11 +107,11 @@ VirtualFile XCI::GetNCAFileByType(NCAContentType type) const {
return nullptr;
}
-std::vector<std::shared_ptr<VfsFile>> XCI::GetFiles() const {
+std::vector<VirtualFile> XCI::GetFiles() const {
return {};
}
-std::vector<std::shared_ptr<VfsDirectory>> XCI::GetSubdirectories() const {
+std::vector<VirtualDir> XCI::GetSubdirectories() const {
return {};
}
@@ -119,7 +119,7 @@ std::string XCI::GetName() const {
return file->GetName();
}
-std::shared_ptr<VfsDirectory> XCI::GetParentDirectory() const {
+VirtualDir XCI::GetParentDirectory() const {
return file->GetContainingDirectory();
}
diff --git a/src/core/file_sys/card_image.h b/src/core/file_sys/card_image.h
index e089d737c..4618d9c00 100644
--- a/src/core/file_sys/card_image.h
+++ b/src/core/file_sys/card_image.h
@@ -71,13 +71,13 @@ public:
std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;
VirtualFile GetNCAFileByType(NCAContentType type) const;
- std::vector<std::shared_ptr<VfsFile>> GetFiles() const override;
+ std::vector<VirtualFile> GetFiles() const override;
- std::vector<std::shared_ptr<VfsDirectory>> GetSubdirectories() const override;
+ std::vector<VirtualDir> GetSubdirectories() const override;
std::string GetName() const override;
- std::shared_ptr<VfsDirectory> GetParentDirectory() const override;
+ VirtualDir GetParentDirectory() const override;
protected:
bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;