From 7ee0e756335bc9fa4ca17cafc9aa8b37371a903a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 30 Jul 2015 06:47:02 -0400 Subject: Remove unnecessary virtual keywords --- Source/Core/DiscIO/Blob.h | 2 +- Source/Core/DiscIO/DriveBlob.h | 2 +- Source/Core/DiscIO/FileSystemGCWii.h | 21 +++++++++++---------- Source/Core/DiscIO/VolumeGC.h | 2 +- Source/Core/DiscIO/VolumeWiiCrypted.h | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'Source/Core/DiscIO') diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h index 54ef5580c2..a66a62d97b 100644 --- a/Source/Core/DiscIO/Blob.h +++ b/Source/Core/DiscIO/Blob.h @@ -46,7 +46,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) override; + bool Read(u64 offset, u64 size, u8 *out_ptr) override; friend class DriveReader; protected: diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index 2c46e5b225..f4716c1cf0 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -26,7 +26,7 @@ public: u64 GetDataSize() const override { return m_size; } u64 GetRawSize() const override { return m_size; } - virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override; + bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override; private: DriveReader(const std::string& drive); diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index 0112b695ef..f244b1a60f 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -21,16 +21,17 @@ class CFileSystemGCWii : public IFileSystem public: CFileSystemGCWii(const IVolume* _rVolume); virtual ~CFileSystemGCWii(); - virtual bool IsValid() const override { return m_Valid; } - virtual u64 GetFileSize(const std::string& _rFullPath) override; - virtual const std::vector& GetFileList() override; - virtual const std::string GetFileName(u64 _Address) override; - virtual u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override; - virtual bool ExportFile(const std::string& _rFullPath, const std::string&_rExportFilename) override; - virtual bool ExportApploader(const std::string& _rExportFolder) const override; - virtual bool ExportDOL(const std::string& _rExportFolder) const override; - virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const override; - virtual u32 GetBootDOLSize() const override; + + bool IsValid() const override { return m_Valid; } + u64 GetFileSize(const std::string& _rFullPath) override; + const std::vector& GetFileList() override; + const std::string GetFileName(u64 _Address) override; + u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override; + bool ExportFile(const std::string& _rFullPath, const std::string&_rExportFilename) override; + bool ExportApploader(const std::string& _rExportFolder) const override; + bool ExportDOL(const std::string& _rExportFolder) const override; + bool GetBootDOL(u8* &buffer, u32 DolSize) const override; + u32 GetBootDOLSize() const override; private: bool m_Initialized; diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index 35599cacf6..c1abcb28d2 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -28,7 +28,7 @@ public: std::string GetUniqueID() const override; std::string GetMakerID() const override; u16 GetRevision() const override; - virtual std::string GetInternalName() const override; + std::string GetInternalName() const override; std::map GetNames(bool prefer_long) const override; std::map GetDescriptions() const override; std::string GetCompany() const override; diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index 6fd687db3d..88773af68b 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -27,7 +27,7 @@ public: ~CVolumeWiiCrypted(); bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override; bool GetTitleID(u8* _pBuffer) const override; - virtual std::unique_ptr GetTMD(u32 *_sz) const override; + std::unique_ptr GetTMD(u32 *_sz) const override; std::string GetUniqueID() const override; std::string GetMakerID() const override; u16 GetRevision() const override; -- cgit v1.2.3