summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-12 03:57:06 -0400
committerGravatar Lioncash2018-08-12 03:57:16 -0400
commit7b6519741bd588006e2b93778d47d4d25e0548c2 (patch)
tree16d26f3bee59bb94ecb740152389a8ac423a6542
parentcard_image: Simplify return statement of GetSubdirectories() (diff)
downloadyuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.gz
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.tar.xz
yuzu-7b6519741bd588006e2b93778d47d4d25e0548c2.zip
card_image: Use type aliases to shorten definitions
We have the aliases, so we may as well use 'em.
-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 {
107 return nullptr; 107 return nullptr;
108} 108}
109 109
110std::vector<std::shared_ptr<VfsFile>> XCI::GetFiles() const { 110std::vector<VirtualFile> XCI::GetFiles() const {
111 return {}; 111 return {};
112} 112}
113 113
114std::vector<std::shared_ptr<VfsDirectory>> XCI::GetSubdirectories() const { 114std::vector<VirtualDir> XCI::GetSubdirectories() const {
115 return {}; 115 return {};
116} 116}
117 117
@@ -119,7 +119,7 @@ std::string XCI::GetName() const {
119 return file->GetName(); 119 return file->GetName();
120} 120}
121 121
122std::shared_ptr<VfsDirectory> XCI::GetParentDirectory() const { 122VirtualDir XCI::GetParentDirectory() const {
123 return file->GetContainingDirectory(); 123 return file->GetContainingDirectory();
124} 124}
125 125
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:
71 std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const; 71 std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;
72 VirtualFile GetNCAFileByType(NCAContentType type) const; 72 VirtualFile GetNCAFileByType(NCAContentType type) const;
73 73
74 std::vector<std::shared_ptr<VfsFile>> GetFiles() const override; 74 std::vector<VirtualFile> GetFiles() const override;
75 75
76 std::vector<std::shared_ptr<VfsDirectory>> GetSubdirectories() const override; 76 std::vector<VirtualDir> GetSubdirectories() const override;
77 77
78 std::string GetName() const override; 78 std::string GetName() const override;
79 79
80 std::shared_ptr<VfsDirectory> GetParentDirectory() const override; 80 VirtualDir GetParentDirectory() const override;
81 81
82protected: 82protected:
83 bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override; 83 bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;