piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-modernize -add-override

Browse Source
This commit is contained in:
Tillmann Karras
2014-03-08 01:54:44 +01:00
parent c89f04a7c5
commit f28116b7da
67 changed files with 401 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DiscIO/BannerLoaderGC.h
View File

@ -26,13 +26,13 @@ class CBannerLoaderGC
CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume);
virtual ~CBannerLoaderGC();
virtual bool IsValid();
virtual bool IsValid() override;
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight);
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
virtual std::vector<std::string> GetNames();
virtual std::string GetCompany();
virtual std::vector<std::string> GetDescriptions();
virtual std::vector<std::string> GetNames() override;
virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions() override;
private:
enum

10
Source/Core/DiscIO/BannerLoaderWii.h
View File

@ -24,13 +24,13 @@ class CBannerLoaderWii
virtual ~CBannerLoaderWii();
virtual bool IsValid();
virtual bool IsValid() override;
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight);
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
virtual std::vector<std::string> GetNames();
virtual std::string GetCompany();
virtual std::vector<std::string> GetDescriptions();
virtual std::vector<std::string> GetNames() override;
virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions() override;
private:

2
Source/Core/DiscIO/Blob.h
View File

@ -58,7 +58,7 @@ public:
// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
const u8 *GetBlockData(u64 block_num);
virtual bool Read(u64 offset, u64 size, u8 *out_ptr);
virtual bool Read(u64 offset, u64 size, u8 *out_ptr) override;
friend class DriveReader;
};

6
Source/Core/DiscIO/CISOBlob.h
View File

@ -35,9 +35,9 @@ class CISOFileReader : public IBlobReader
public:
static CISOFileReader* Create(const char* filename);
u64 GetDataSize() const;
u64 GetRawSize() const;
bool Read(u64 offset, u64 nbytes, u8* out_ptr);
u64 GetDataSize() const override;
u64 GetRawSize() const override;
bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
private:
CISOFileReader(std::FILE* file);

6
Source/Core/DiscIO/CompressedBlob.h
View File

@ -49,10 +49,10 @@ public:
static CompressedBlobReader* Create(const char *filename);
~CompressedBlobReader();
const CompressedBlobHeader &GetHeader() const { return header; }
u64 GetDataSize() const { return header.data_size; }
u64 GetRawSize() const { return file_size; }
u64 GetDataSize() const override { return header.data_size; }
u64 GetRawSize() const override { return file_size; }
u64 GetBlockCompressedSize(u64 block_num) const;
void GetBlock(u64 block_num, u8 *out_ptr);
void GetBlock(u64 block_num, u8 *out_ptr) override;
private:
CompressedBlobReader(const char *filename);

8
Source/Core/DiscIO/DriveBlob.h
View File

@ -20,7 +20,7 @@ class DriveReader : public SectorReader
{
private:
DriveReader(const char *drive);
void GetBlock(u64 block_num, u8 *out_ptr);
void GetBlock(u64 block_num, u8 *out_ptr) override;
#ifdef _WIN32
HANDLE hDisc;
@ -35,10 +35,10 @@ private:
public:
static DriveReader *Create(const char *drive);
~DriveReader();
u64 GetDataSize() const { return size; }
u64 GetRawSize() const { return size; }
u64 GetDataSize() const override { return size; }
u64 GetRawSize() const override { return size; }
virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr);
virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override;
};
} // namespace

6
Source/Core/DiscIO/FileBlob.h
View File

@ -23,9 +23,9 @@ class PlainFileReader : public IBlobReader
public:
static PlainFileReader* Create(const char* filename);
u64 GetDataSize() const { return m_size; }
u64 GetRawSize() const { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr);
u64 GetDataSize() const override { return m_size; }
u64 GetRawSize() const override { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
};
} // namespace

20
Source/Core/DiscIO/FileSystemGCWii.h
View File

@ -21,16 +21,16 @@ class CFileSystemGCWii : public IFileSystem
public:
CFileSystemGCWii(const IVolume* _rVolume);
virtual ~CFileSystemGCWii();
virtual bool IsValid() const { return m_Valid; }
virtual u64 GetFileSize(const char* _rFullPath);
virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames);
virtual const char* GetFileName(u64 _Address);
virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize);
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename);
virtual bool ExportApploader(const char* _rExportFolder) const;
virtual bool ExportDOL(const char* _rExportFolder) const;
virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const;
virtual u32 GetBootDOLSize() const;
virtual bool IsValid() const override { return m_Valid; }
virtual u64 GetFileSize(const char* _rFullPath) override;
virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) override;
virtual const char* GetFileName(u64 _Address) override;
virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) override;
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) override;
virtual bool ExportApploader(const char* _rExportFolder) const override;
virtual bool ExportDOL(const char* _rExportFolder) const override;
virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const override;
virtual u32 GetBootDOLSize() const override;
private:
bool m_Initialized;

20
Source/Core/DiscIO/VolumeDirectory.h
View File

@ -31,25 +31,25 @@ public:
static bool IsValidDirectory(const std::string& _rDirectory);
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
std::string GetUniqueID() const;
std::string GetUniqueID() const override;
void SetUniqueID(std::string _ID);
std::string GetMakerID() const;
std::string GetMakerID() const override;
std::vector<std::string> GetNames() const;
std::vector<std::string> GetNames() const override;
void SetName(std::string);
u32 GetFSTSize() const;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const;
std::string GetApploaderDate() const override;
ECountry GetCountry() const;
ECountry GetCountry() const override;
u64 GetSize() const;
u64 GetRawSize() const;
u64 GetSize() const override;
u64 GetRawSize() const override;
void BuildFST();

26
Source/Core/DiscIO/VolumeGC.h
View File

@ -22,19 +22,19 @@ class CVolumeGC : public IVolume
public:
CVolumeGC(IBlobReader* _pReader);
~CVolumeGC();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
std::string GetUniqueID() const;
std::string GetRevisionSpecificUniqueID() const;
std::string GetMakerID() const;
int GetRevision() const;
std::vector<std::string> GetNames() const;
u32 GetFSTSize() const;
std::string GetApploaderDate() const;
ECountry GetCountry() const;
u64 GetSize() const;
u64 GetRawSize() const;
bool IsDiscTwo() const;
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
std::string GetUniqueID() const override;
std::string GetRevisionSpecificUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
std::vector<std::string> GetNames() const override;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const override;
ECountry GetCountry() const override;
u64 GetSize() const override;
u64 GetRawSize() const override;
bool IsDiscTwo() const override;
typedef std::string(*StringDecoder)(const std::string&);

22
Source/Core/DiscIO/VolumeWad.h
View File

@ -24,17 +24,17 @@ class CVolumeWAD : public IVolume
public:
CVolumeWAD(IBlobReader* _pReader);
~CVolumeWAD();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const { return false; }
bool GetTitleID(u8* _pBuffer) const;
std::string GetUniqueID() const;
std::string GetMakerID() const;
std::vector<std::string> GetNames() const;
u32 GetFSTSize() const { return 0; }
std::string GetApploaderDate() const { return "0"; }
ECountry GetCountry() const;
u64 GetSize() const;
u64 GetRawSize() const;
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override { return false; }
bool GetTitleID(u8* _pBuffer) const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
std::vector<std::string> GetNames() const override;
u32 GetFSTSize() const override { return 0; }
std::string GetApploaderDate() const override { return "0"; }
ECountry GetCountry() const override;
u64 GetSize() const override;
u64 GetRawSize() const override;
private:
IBlobReader* m_pReader;

28
Source/Core/DiscIO/VolumeWiiCrypted.h
View File

@ -23,21 +23,21 @@ class CVolumeWiiCrypted : public IVolume
public:
CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, const unsigned char* _pVolumeKey);
~CVolumeWiiCrypted();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
bool GetTitleID(u8* _pBuffer) const;
void GetTMD(u8* _pBuffer, u32* _sz) const;
std::string GetUniqueID() const;
std::string GetMakerID() const;
std::vector<std::string> GetNames() const;
u32 GetFSTSize() const;
std::string GetApploaderDate() const;
ECountry GetCountry() const;
u64 GetSize() const;
u64 GetRawSize() const;
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
bool GetTitleID(u8* _pBuffer) const override;
void GetTMD(u8* _pBuffer, u32* _sz) const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
std::vector<std::string> GetNames() const override;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const override;
ECountry GetCountry() const override;
u64 GetSize() const override;
u64 GetRawSize() const override;
bool SupportsIntegrityCheck() const { return true; }
bool CheckIntegrity() const;
bool SupportsIntegrityCheck() const override { return true; }
bool CheckIntegrity() const override;
private:
IBlobReader* m_pReader;

6
Source/Core/DiscIO/WbfsBlob.h
View File

@ -56,9 +56,9 @@ class WbfsFileReader : public IBlobReader
public:
static WbfsFileReader* Create(const char* filename);
u64 GetDataSize() const { return m_size; }
u64 GetRawSize() const { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr);
u64 GetDataSize() const override { return m_size; }
u64 GetRawSize() const override { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
};
bool IsWbfsBlob(const char* filename);