summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-13 07:42:07 +0200
committerGitHub <noreply@github.com>2018-08-13 07:42:07 +0200
commitbd146534179114abc88bd8cac319f962cbcc45da (patch)
tree69a9dc8af9018d3d5bc64dfdd6a10bd2f4f3a9c9
parentMerge pull request #1048 from lioncash/atomic (diff)
parentcard_image: Use type aliases to shorten definitions (diff)
downloadyuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar.gz
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar.bz2
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar.lz
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar.xz
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.tar.zst
yuzu-bd146534179114abc88bd8cac319f962cbcc45da.zip
-rw-r--r--src/core/file_sys/card_image.cpp8
-rw-r--r--src/core/file_sys/card_image.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index a4823353e..8e05b9d0e 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/src/core/file_sys/card_image.cpp
@@ -107,19 +107,19 @@ 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 {
- return std::vector<std::shared_ptr<VfsDirectory>>();
+std::vector<VirtualDir> XCI::GetSubdirectories() const {
+ return {};
}
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;