Merge pull request #4226 from lioncash/fs

Filesystem: Return strings from GetFileName without the const qualifier
This commit is contained in:
Markus Wick 2016-09-19 22:11:54 +02:00 committed by GitHub
commit 26bb012178
3 changed files with 3 additions and 3 deletions

View File

@ -44,7 +44,7 @@ u64 CFileSystemGCWii::GetFileSize(const std::string& _rFullPath)
return 0; return 0;
} }
const std::string CFileSystemGCWii::GetFileName(u64 _Address) std::string CFileSystemGCWii::GetFileName(u64 _Address)
{ {
if (!m_Initialized) if (!m_Initialized)
InitFileSystem(); InitFileSystem();

View File

@ -24,7 +24,7 @@ public:
bool IsValid() const override { return m_Valid; } bool IsValid() const override { return m_Valid; }
u64 GetFileSize(const std::string& _rFullPath) override; u64 GetFileSize(const std::string& _rFullPath) override;
const std::vector<SFileInfo>& GetFileList() override; const std::vector<SFileInfo>& GetFileList() override;
const std::string GetFileName(u64 _Address) override; std::string GetFileName(u64 _Address) override;
u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize,
u64 _OffsetInFile) override; u64 _OffsetInFile) override;
bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) override; bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) override;

View File

@ -46,7 +46,7 @@ public:
virtual bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) = 0; virtual bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) = 0;
virtual bool ExportApploader(const std::string& _rExportFolder) const = 0; virtual bool ExportApploader(const std::string& _rExportFolder) const = 0;
virtual bool ExportDOL(const std::string& _rExportFolder) const = 0; virtual bool ExportDOL(const std::string& _rExportFolder) const = 0;
virtual const std::string GetFileName(u64 _Address) = 0; virtual std::string GetFileName(u64 _Address) = 0;
virtual u64 GetBootDOLOffset() const = 0; virtual u64 GetBootDOLOffset() const = 0;
virtual u32 GetBootDOLSize(u64 dol_offset) const = 0; virtual u32 GetBootDOLSize(u64 dol_offset) const = 0;