diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-04-22 20:00:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-22 20:00:03 -0500 |
| commit | 31a3de819d7d8d5cc6a39cd3f835ad0dac7f70a7 (patch) | |
| tree | ae671aef3242cbe7b4316a9555d7675f7b10ee77 /Source/Core/DiscIO/DirectoryBlob.cpp | |
| parent | 0fd090ce198a247c71deaaa0aef9b12c142ed13d (diff) | |
| parent | ecafd8058fac02ea2bdff72616bcf59c3a21156d (diff) | |
Merge pull request #13540 from tygyh/DiscIO-Remove-redundant-qualifiers
DiscIO: Remove redundant qualifiers
Diffstat (limited to 'Source/Core/DiscIO/DirectoryBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DirectoryBlob.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index 442c8ae851..2623a2e420 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -354,7 +354,7 @@ std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::stri } std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create( - std::unique_ptr<DiscIO::VolumeDisc> volume, + std::unique_ptr<VolumeDisc> volume, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes)>& sys_callback, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes, FSTBuilderNode* dol_node)>& fst_callback) @@ -414,7 +414,7 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& game_partition_root, } DirectoryBlobReader::DirectoryBlobReader( - std::unique_ptr<DiscIO::VolumeDisc> volume, + std::unique_ptr<VolumeDisc> volume, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes)>& sys_callback, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes, FSTBuilderNode* dol_node)>& fst_callback) @@ -699,7 +699,7 @@ void DirectoryBlobReader::SetPartitionHeader(DirectoryBlobPartition* partition, constexpr u32 TMD_OFFSET = 0x2c0; constexpr u32 H3_OFFSET = 0x4000; - const std::optional<DiscIO::Partition>& wrapped_partition = partition->GetWrappedPartition(); + const std::optional<Partition>& wrapped_partition = partition->GetWrappedPartition(); const std::string& partition_root = partition->GetRootDirectory(); u64 ticket_size; @@ -797,8 +797,7 @@ void DirectoryBlobReader::SetPartitionHeader(DirectoryBlobPartition* partition, partition->SetKey(ticket.GetTitleKey()); } -static void GenerateBuilderNodesFromFileSystem(const DiscIO::VolumeDisc& volume, - const DiscIO::Partition& partition, +static void GenerateBuilderNodesFromFileSystem(const VolumeDisc& volume, const Partition& partition, std::vector<FSTBuilderNode>* nodes, const FileInfo& parent_info) { @@ -875,7 +874,7 @@ static std::vector<u8> ExtractNodeToVector(std::vector<FSTBuilderNode>* nodes, v } DirectoryBlobPartition::DirectoryBlobPartition( - DiscIO::VolumeDisc* volume, const DiscIO::Partition& partition, std::optional<bool> is_wii, + VolumeDisc* volume, const Partition& partition, std::optional<bool> is_wii, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes)>& sys_callback, const std::function<void(std::vector<FSTBuilderNode>* fst_nodes, FSTBuilderNode* dol_node)>& fst_callback, |