Ver código fonte

card_image: Use type aliases to shorten definitions

We have the aliases, so we may as well use 'em.
Lioncash 8 anos atrás
pai
commit
7b6519741b

+ 3 - 3
src/core/file_sys/card_image.cpp

@@ -107,11 +107,11 @@ VirtualFile XCI::GetNCAFileByType(NCAContentType type) const {
     return nullptr;
     return nullptr;
 }
 }
 
 
-std::vector<std::shared_ptr<VfsFile>> XCI::GetFiles() const {
+std::vector<VirtualFile> XCI::GetFiles() const {
     return {};
     return {};
 }
 }
 
 
-std::vector<std::shared_ptr<VfsDirectory>> XCI::GetSubdirectories() const {
+std::vector<VirtualDir> XCI::GetSubdirectories() const {
     return {};
     return {};
 }
 }
 
 
@@ -119,7 +119,7 @@ std::string XCI::GetName() const {
     return file->GetName();
     return file->GetName();
 }
 }
 
 
-std::shared_ptr<VfsDirectory> XCI::GetParentDirectory() const {
+VirtualDir XCI::GetParentDirectory() const {
     return file->GetContainingDirectory();
     return file->GetContainingDirectory();
 }
 }
 
 

+ 3 - 3
src/core/file_sys/card_image.h

@@ -71,13 +71,13 @@ public:
     std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;
     std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;
     VirtualFile GetNCAFileByType(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::string GetName() const override;
 
 
-    std::shared_ptr<VfsDirectory> GetParentDirectory() const override;
+    VirtualDir GetParentDirectory() const override;
 
 
 protected:
 protected:
     bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;
     bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;