From f28116b7da6aac6069084596dc4dbf866bdebfd8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 8 Mar 2014 01:54:44 +0100 Subject: [PATCH] clang-modernize -add-override --- Source/Core/AudioCommon/AOSoundStream.h | 8 ++-- Source/Core/AudioCommon/AlsaSoundStream.h | 8 ++-- Source/Core/AudioCommon/NullSoundStream.h | 12 ++--- Source/Core/AudioCommon/OpenALStream.h | 12 ++--- Source/Core/AudioCommon/PulseAudioStream.h | 8 ++-- Source/Core/Common/ConsoleListener.h | 2 +- Source/Core/Common/LogManager.h | 4 +- Source/Core/Core/Debugger/PPCDebugInterface.h | 48 +++++++++---------- .../Core/Core/HW/DSPLLE/DSPDebugInterface.h | 42 ++++++++-------- Source/Core/Core/HW/DSPLLE/DSPLLE.h | 32 ++++++------- Source/Core/Core/HW/EXI_DeviceIPL.h | 8 ++-- Source/Core/Core/HW/EXI_DeviceMic.h | 8 ++-- Source/Core/Core/HW/SI_DeviceGCController.h | 10 ++-- .../Core/Core/HW/SI_DeviceGCSteeringWheel.h | 8 ++-- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 4 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h | 8 ++-- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h | 10 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 14 +++--- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h | 8 ++-- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h | 12 ++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.h | 10 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.h | 34 ++++++------- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 8 ++-- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h | 10 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_stm.h | 12 ++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.h | 12 ++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h | 10 ++-- Source/Core/DiscIO/BannerLoaderGC.h | 10 ++-- Source/Core/DiscIO/BannerLoaderWii.h | 10 ++-- Source/Core/DiscIO/Blob.h | 2 +- Source/Core/DiscIO/CISOBlob.h | 6 +-- Source/Core/DiscIO/CompressedBlob.h | 6 +-- Source/Core/DiscIO/DriveBlob.h | 8 ++-- Source/Core/DiscIO/FileBlob.h | 6 +-- Source/Core/DiscIO/FileSystemGCWii.h | 20 ++++---- Source/Core/DiscIO/VolumeDirectory.h | 20 ++++---- Source/Core/DiscIO/VolumeGC.h | 26 +++++----- Source/Core/DiscIO/VolumeWad.h | 22 ++++----- Source/Core/DiscIO/VolumeWiiCrypted.h | 28 +++++------ Source/Core/DiscIO/WbfsBlob.h | 6 +-- .../Core/DolphinWX/Debugger/BreakpointView.h | 2 +- Source/Core/DolphinWX/Debugger/CodeWindow.h | 2 +- .../Core/DolphinWX/Debugger/DSPDebugWindow.h | 2 +- .../Core/DolphinWX/Debugger/DSPRegisterView.h | 14 +++--- .../Core/DolphinWX/Debugger/DebuggerPanel.h | 4 +- Source/Core/DolphinWX/Debugger/JitWindow.h | 4 +- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 2 +- Source/Core/DolphinWX/Debugger/RegisterView.h | 14 +++--- Source/Core/DolphinWX/GLInterface/GLX.h | 16 +++---- Source/Core/DolphinWX/GameListCtrl.h | 2 +- Source/Core/DolphinWX/InputConfigDiag.h | 16 +++---- Source/Core/DolphinWX/LogWindow.h | 2 +- Source/Core/DolphinWX/Main.h | 8 ++-- Source/Core/DolphinWX/NetWindow.h | 16 +++---- .../ControllerInterface/ControllerInterface.h | 8 ++-- .../InputCommon/ControllerInterface/Device.h | 8 ++-- .../InputCommon/ControllerInterface/SDL/SDL.h | 16 +++---- .../ControllerInterface/Xlib/XInput2.h | 30 ++++++------ .../ControllerInterface/Xlib/Xlib.h | 24 +++++----- Source/Core/InputCommon/UDPWrapper.h | 4 +- Source/Core/VideoBackends/OGL/PerfQuery.h | 2 +- Source/Core/VideoBackends/OGL/Render.h | 2 +- .../Core/VideoBackends/OGL/StreamBuffer.cpp | 24 +++++----- Source/Core/VideoBackends/OGL/TextureCache.h | 2 +- Source/Core/VideoBackends/OGL/VertexManager.h | 2 +- Source/Core/VideoCommon/VideoBackendBase.h | 40 ++++++++-------- Source/UnitTests/Core/MMIOTest.cpp | 4 +- 67 files changed, 401 insertions(+), 401 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index d2097cadb0..efa2357327 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -31,11 +31,11 @@ public: virtual ~AOSound(); - virtual bool Start(); + virtual bool Start() override; - virtual void SoundLoop(); + virtual void SoundLoop() override; - virtual void Stop(); + virtual void Stop() override; static bool isValid() { return true; @@ -45,7 +45,7 @@ public: return true; } - virtual void Update(); + virtual void Update() override; #else public: diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 78a8576d5e..04672b1e63 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -19,9 +19,9 @@ public: AlsaSound(CMixer *mixer); virtual ~AlsaSound(); - virtual bool Start(); - virtual void SoundLoop(); - virtual void Stop(); + virtual bool Start() override; + virtual void SoundLoop() override; + virtual void Stop() override; static bool isValid() { return true; @@ -30,7 +30,7 @@ public: return true; } - virtual void Update(); + virtual void Update() override; private: bool AlsaInit(); diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index 4b971c97d3..f7e6d0e86a 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -21,12 +21,12 @@ public: virtual ~NullSound() {} - virtual bool Start(); - virtual void SoundLoop(); - virtual void SetVolume(int volume); - virtual void Stop(); - virtual void Clear(bool mute); + virtual bool Start() override; + virtual void SoundLoop() override; + virtual void SetVolume(int volume) override; + virtual void Stop() override; + virtual void Clear(bool mute) override; static bool isValid() { return true; } virtual bool usesMixer() const { return true; } - virtual void Update(); + virtual void Update() override; }; diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 1317a61f7a..5137ce3e43 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -51,14 +51,14 @@ public: virtual ~OpenALStream() {} - virtual bool Start(); - virtual void SoundLoop(); - virtual void SetVolume(int volume); - virtual void Stop(); - virtual void Clear(bool mute); + virtual bool Start() override; + virtual void SoundLoop() override; + virtual void SetVolume(int volume) override; + virtual void Stop() override; + virtual void Clear(bool mute) override; static bool isValid() { return true; } virtual bool usesMixer() const { return true; } - virtual void Update(); + virtual void Update() override; private: std::thread thread; diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index 732772ace2..8dddeca241 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -20,21 +20,21 @@ class PulseAudio : public SoundStream public: PulseAudio(CMixer *mixer); - virtual bool Start(); - virtual void Stop(); + virtual bool Start() override; + virtual void Stop() override; static bool isValid() {return true;} virtual bool usesMixer() const {return true;} - virtual void Update(); + virtual void Update() override; void StateCallback(pa_context *c); void WriteCallback(pa_stream *s, size_t length); void UnderflowCallback(pa_stream *s); private: - virtual void SoundLoop(); + virtual void SoundLoop() override; bool PulseInit(); void PulseShutdown(); diff --git a/Source/Core/Common/ConsoleListener.h b/Source/Core/Common/ConsoleListener.h index 1d61a6811e..9a48ec2070 100644 --- a/Source/Core/Common/ConsoleListener.h +++ b/Source/Core/Common/ConsoleListener.h @@ -26,7 +26,7 @@ public: #ifdef _WIN32 COORD GetCoordinates(int BytesRead, int BufferWidth); #endif - void Log(LogTypes::LOG_LEVELS, const char *Text); + void Log(LogTypes::LOG_LEVELS, const char *Text) override; void ClearScreen(bool Cursor = true); private: diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h index 7484d878d0..eb4f482c29 100644 --- a/Source/Core/Common/LogManager.h +++ b/Source/Core/Common/LogManager.h @@ -29,7 +29,7 @@ class FileLogListener : public LogListener public: FileLogListener(const char *filename); - void Log(LogTypes::LOG_LEVELS, const char *msg); + void Log(LogTypes::LOG_LEVELS, const char *msg) override; bool IsValid() { return !m_logfile.fail(); } bool IsEnabled() const { return m_enable; } @@ -46,7 +46,7 @@ private: class DebuggerLogListener : public LogListener { public: - void Log(LogTypes::LOG_LEVELS, const char *msg); + void Log(LogTypes::LOG_LEVELS, const char *msg) override; }; class LogContainer diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h index c774d26b5b..46af904cf8 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Debugger/PPCDebugInterface.h @@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface { public: PPCDebugInterface(){} - virtual void Disassemble(unsigned int address, char *dest, int max_size) final; - virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final; - virtual int GetInstructionSize(int /*instruction*/) final {return 4;} - virtual bool IsAlive() final; - virtual bool IsBreakpoint(unsigned int address) final; - virtual void SetBreakpoint(unsigned int address) final; - virtual void ClearBreakpoint(unsigned int address) final; - virtual void ClearAllBreakpoints() final; - virtual void ToggleBreakpoint(unsigned int address) final; - virtual void ClearAllMemChecks() final; - virtual bool IsMemCheck(unsigned int address) final; - virtual void ToggleMemCheck(unsigned int address) final; - virtual unsigned int ReadMemory(unsigned int address) final; + virtual void Disassemble(unsigned int address, char *dest, int max_size) final override; + virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override; + virtual int GetInstructionSize(int /*instruction*/) final override {return 4;} + virtual bool IsAlive() final override; + virtual bool IsBreakpoint(unsigned int address) final override; + virtual void SetBreakpoint(unsigned int address) final override; + virtual void ClearBreakpoint(unsigned int address) final override; + virtual void ClearAllBreakpoints() final override; + virtual void ToggleBreakpoint(unsigned int address) final override; + virtual void ClearAllMemChecks() final override; + virtual bool IsMemCheck(unsigned int address) final override; + virtual void ToggleMemCheck(unsigned int address) final override; + virtual unsigned int ReadMemory(unsigned int address) final override; enum { EXTRAMEM_ARAM = 1, }; - virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final; - virtual unsigned int ReadInstruction(unsigned int address) final; - virtual unsigned int GetPC() final; - virtual void SetPC(unsigned int address) final; - virtual void Step() final {} - virtual void BreakNow() final; - virtual void RunToBreakpoint() final; - virtual void InsertBLR(unsigned int address, unsigned int value) final; - virtual int GetColor(unsigned int address) final; - virtual std::string GetDescription(unsigned int address) final; - virtual void ShowJitResults(u32 address) final; + virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final override; + virtual unsigned int ReadInstruction(unsigned int address) final override; + virtual unsigned int GetPC() final override; + virtual void SetPC(unsigned int address) final override; + virtual void Step() final override {} + virtual void BreakNow() final override; + virtual void RunToBreakpoint() final override; + virtual void InsertBLR(unsigned int address, unsigned int value) final override; + virtual int GetColor(unsigned int address) final override; + virtual std::string GetDescription(unsigned int address) final override; + virtual void ShowJitResults(u32 address) final override; }; diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h index 4dd12156d3..41c0200abc 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h @@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface { public: DSPDebugInterface(){} - virtual void Disassemble(unsigned int address, char *dest, int max_size) final; - virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final; - virtual int GetInstructionSize(int instruction) final {return 1;} - virtual bool IsAlive() final; - virtual bool IsBreakpoint(unsigned int address) final; - virtual void SetBreakpoint(unsigned int address) final; - virtual void ClearBreakpoint(unsigned int address) final; - virtual void ClearAllBreakpoints() final; - virtual void ToggleBreakpoint(unsigned int address) final; - virtual void ClearAllMemChecks() final; - virtual bool IsMemCheck(unsigned int address) final; - virtual void ToggleMemCheck(unsigned int address) final; - virtual unsigned int ReadMemory(unsigned int address) final; - virtual unsigned int ReadInstruction(unsigned int address) final; - virtual unsigned int GetPC() final; - virtual void SetPC(unsigned int address) final; - virtual void Step() final {} - virtual void RunToBreakpoint() final; - virtual void InsertBLR(unsigned int address, unsigned int value) final; - virtual int GetColor(unsigned int address) final; - virtual std::string GetDescription(unsigned int address) final; + virtual void Disassemble(unsigned int address, char *dest, int max_size) final override; + virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override; + virtual int GetInstructionSize(int instruction) final override {return 1;} + virtual bool IsAlive() final override; + virtual bool IsBreakpoint(unsigned int address) final override; + virtual void SetBreakpoint(unsigned int address) final override; + virtual void ClearBreakpoint(unsigned int address) final override; + virtual void ClearAllBreakpoints() final override; + virtual void ToggleBreakpoint(unsigned int address) final override; + virtual void ClearAllMemChecks() final override; + virtual bool IsMemCheck(unsigned int address) final override; + virtual void ToggleMemCheck(unsigned int address) final override; + virtual unsigned int ReadMemory(unsigned int address) final override; + virtual unsigned int ReadInstruction(unsigned int address) final override; + virtual unsigned int GetPC() final override; + virtual void SetPC(unsigned int address) final override; + virtual void Step() final override {} + virtual void RunToBreakpoint() final override; + virtual void InsertBLR(unsigned int address, unsigned int value) final override; + virtual int GetColor(unsigned int address) final override; + virtual std::string GetDescription(unsigned int address) final override; }; diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index adb332661d..f7acbbf3f9 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -15,24 +15,24 @@ class DSPLLE : public DSPEmulator public: DSPLLE(); - virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread); - virtual void Shutdown(); - virtual bool IsLLE() { return true; } + virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread) override; + virtual void Shutdown() override; + virtual bool IsLLE() override { return true; } - virtual void DoState(PointerWrap &p); - virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); + virtual void DoState(PointerWrap &p) override; + virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override; - virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short); - virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short); - virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox); - virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox); - virtual unsigned short DSP_ReadControlRegister(); - virtual unsigned short DSP_WriteControlRegister(unsigned short); - virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples); - virtual void DSP_Update(int cycles); - virtual void DSP_StopSoundStream(); - virtual void DSP_ClearAudioBuffer(bool mute); - virtual u32 DSP_UpdateRate(); + virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override; + virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override; + virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override; + virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override; + virtual unsigned short DSP_ReadControlRegister() override; + virtual unsigned short DSP_WriteControlRegister(unsigned short) override; + virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override; + virtual void DSP_Update(int cycles) override; + virtual void DSP_StopSoundStream() override; + virtual void DSP_ClearAudioBuffer(bool mute) override; + virtual u32 DSP_UpdateRate() override; private: static void dsp_thread(DSPLLE* lpParameter); diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index d127977547..d50cf0dbc3 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -13,9 +13,9 @@ public: CEXIIPL(); virtual ~CEXIIPL(); - virtual void SetCS(int _iCS); - bool IsPresent(); - void DoState(PointerWrap &p); + virtual void SetCS(int _iCS) override; + bool IsPresent() override; + void DoState(PointerWrap &p) override; static u32 GetGCTime(); static u32 NetPlay_GetGCTime(); @@ -62,7 +62,7 @@ private: int m_count; bool m_FontsLoaded; - virtual void TransferByte(u8 &_uByte); + virtual void TransferByte(u8 &_uByte) override; bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h index 00cda0f20e..6f5fc20323 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/HW/EXI_DeviceMic.h @@ -13,9 +13,9 @@ class CEXIMic : public IEXIDevice public: CEXIMic(const int index); virtual ~CEXIMic(); - void SetCS(int cs); - bool IsInterruptSet(); - bool IsPresent(); + void SetCS(int cs) override; + bool IsInterruptSet() override; + bool IsPresent() override; private: static u8 const exi_id[]; @@ -93,7 +93,7 @@ public: int samples_avail; protected: - virtual void TransferByte(u8 &byte); + virtual void TransferByte(u8 &byte) override; }; #else // HAVE_PORTAUDIO diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI_DeviceGCController.h index 9c0082266b..10f22d4fce 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/HW/SI_DeviceGCController.h @@ -85,20 +85,20 @@ public: CSIDevice_GCController(SIDevices device, int _iDeviceNumber); // Run the SI Buffer - virtual int RunBuffer(u8* _pBuffer, int _iLength); + virtual int RunBuffer(u8* _pBuffer, int _iLength) override; // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data - virtual bool GetData(u32& _Hi, u32& _Low); + virtual bool GetData(u32& _Hi, u32& _Low) override; // Send a command directly - virtual void SendCommand(u32 _Cmd, u8 _Poll); + virtual void SendCommand(u32 _Cmd, u8 _Poll) override; // Savestate support - virtual void DoState(PointerWrap& p); + virtual void DoState(PointerWrap& p) override; }; @@ -108,7 +108,7 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController public: CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { } - virtual bool GetData(u32& _Hi, u32& _Low) + virtual bool GetData(u32& _Hi, u32& _Low) override { CSIDevice_GCController::GetData(_Hi, _Low); _Hi &= ~PAD_USE_ORIGIN << 16; diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h index 78757d20d0..be9f9e6c4b 100644 --- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h @@ -85,18 +85,18 @@ public: CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber); // Run the SI Buffer - virtual int RunBuffer(u8* _pBuffer, int _iLength); + virtual int RunBuffer(u8* _pBuffer, int _iLength) override; // Send and Receive pad input from network static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); // Return true on new data - virtual bool GetData(u32& _Hi, u32& _Low); + virtual bool GetData(u32& _Hi, u32& _Low) override; // Send a command directly - virtual void SendCommand(u32 _Cmd, u8 _Poll); + virtual void SendCommand(u32 _Cmd, u8 _Poll) override; // Savestate support - virtual void DoState(PointerWrap& p); + virtual void DoState(PointerWrap& p) override; }; diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 99979efb69..9c6cba4d5a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -116,7 +116,7 @@ public: }; Wiimote(const unsigned int index); - std::string GetName() const; + std::string GetName() const override; void Update(); void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size); @@ -125,7 +125,7 @@ public: void DoState(PointerWrap& p); void RealState(); - void LoadDefaults(const ControllerInterface& ciface); + void LoadDefaults(const ControllerInterface& ciface) override; protected: bool Step(); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h index 8b4684569e..26f8224375 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h @@ -224,7 +224,7 @@ public: { } - bool Open(u32 CommandAddress, u32 Mode) + bool Open(u32 CommandAddress, u32 Mode) override { (void)Mode; WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str()); @@ -232,7 +232,7 @@ public: m_Active = true; return true; } - bool Close(u32 CommandAddress, bool bForce = false) + bool Close(u32 CommandAddress, bool bForce = false) override { WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str()); if (!bForce) @@ -241,13 +241,13 @@ public: return true; } - bool IOCtl(u32 CommandAddress) + bool IOCtl(u32 CommandAddress) override { WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str()); Memory::Write_U32(FS_SUCCESS, CommandAddress + 4); return true; } - bool IOCtlV(u32 CommandAddress) + bool IOCtlV(u32 CommandAddress) override { WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str()); Memory::Write_U32(FS_SUCCESS, CommandAddress + 4); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index 0d8b6f2adf..7216d4fd7d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -20,13 +20,13 @@ public: virtual ~CWII_IPC_HLE_Device_di(); - bool Open(u32 _CommandAddress, u32 _Mode); - bool Close(u32 _CommandAddress, bool _bForce); + bool Open(u32 _CommandAddress, u32 _Mode) override; + bool Close(u32 _CommandAddress, bool _bForce) override; - bool IOCtl(u32 _CommandAddress); - bool IOCtlV(u32 _CommandAddress); + bool IOCtl(u32 _CommandAddress) override; + bool IOCtlV(u32 _CommandAddress) override; - int GetCmdDelay(u32); + int GetCmdDelay(u32) override; private: diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index d88c617e55..da68e189f5 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -17,13 +17,13 @@ public: virtual ~CWII_IPC_HLE_Device_FileIO(); - bool Close(u32 _CommandAddress, bool _bForce); - bool Open(u32 _CommandAddress, u32 _Mode); - bool Seek(u32 _CommandAddress); - bool Read(u32 _CommandAddress); - bool Write(u32 _CommandAddress); - bool IOCtl(u32 _CommandAddress); - void DoState(PointerWrap &p); + bool Close(u32 _CommandAddress, bool _bForce) override; + bool Open(u32 _CommandAddress, u32 _Mode) override; + bool Seek(u32 _CommandAddress) override; + bool Read(u32 _CommandAddress) override; + bool Write(u32 _CommandAddress) override; + bool IOCtl(u32 _CommandAddress) override; + void DoState(PointerWrap &p) override; File::IOFile OpenFile(); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h index 8f4d198f98..c7fdbe1aa8 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -22,13 +22,13 @@ public: void OpenInternal(); - virtual void DoState(PointerWrap& p); + virtual void DoState(PointerWrap& p) override; - virtual bool Open(u32 _CommandAddress, u32 _Mode); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; - virtual bool Close(u32 _CommandAddress, bool _bForce); + virtual bool Close(u32 _CommandAddress, bool _bForce) override; - virtual bool IOCtlV(u32 _CommandAddress); + virtual bool IOCtlV(u32 _CommandAddress) override; static u32 ES_DIVerify(u8 *_pTMD, u32 _sz); // This should only be cleared on power reset diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h index f8c7c9661b..41ddfb13d1 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -36,15 +36,15 @@ public: CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName); virtual ~CWII_IPC_HLE_Device_fs(); - virtual void DoState(PointerWrap& p); + virtual void DoState(PointerWrap& p) override; - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; - virtual bool IOCtl(u32 _CommandAddress); - virtual bool IOCtlV(u32 _CommandAddress); + virtual bool IOCtl(u32 _CommandAddress) override; + virtual bool IOCtlV(u32 _CommandAddress) override; - virtual int GetCmdDelay(u32); + virtual int GetCmdDelay(u32) override; private: diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h index c3d3f53580..e74da8b81b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -25,12 +25,12 @@ public: virtual ~CWII_IPC_HLE_Device_hid(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); - virtual u32 Update(); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; + virtual u32 Update() override; - virtual bool IOCtlV(u32 _CommandAddress); - virtual bool IOCtl(u32 _CommandAddress); + virtual bool IOCtlV(u32 _CommandAddress) override; + virtual bool IOCtl(u32 _CommandAddress) override; private: enum diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h index 4c2f112904..5401a74abd 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -394,9 +394,9 @@ public: virtual ~CWII_IPC_HLE_Device_net_kd_request(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); - virtual bool IOCtl(u32 _CommandAddress); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; + virtual bool IOCtl(u32 _CommandAddress) override; private: enum @@ -456,14 +456,14 @@ public: virtual ~CWII_IPC_HLE_Device_net_kd_time() {} - virtual bool Open(u32 _CommandAddress, u32 _Mode) + virtual bool Open(u32 _CommandAddress, u32 _Mode) override { INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open"); Memory::Write_U32(GetDeviceID(), _CommandAddress+4); return true; } - virtual bool Close(u32 _CommandAddress, bool _bForce) + virtual bool Close(u32 _CommandAddress, bool _bForce) override { INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close"); if (!_bForce) @@ -471,7 +471,7 @@ public: return true; } - virtual bool IOCtl(u32 _CommandAddress) + virtual bool IOCtl(u32 _CommandAddress) override { u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); @@ -596,12 +596,12 @@ public: virtual ~CWII_IPC_HLE_Device_net_ip_top(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); - virtual bool IOCtl(u32 _CommandAddress); - virtual bool IOCtlV(u32 _CommandAddress); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; + virtual bool IOCtl(u32 _CommandAddress) override; + virtual bool IOCtlV(u32 _CommandAddress) override; - virtual u32 Update(); + virtual u32 Update() override; private: #ifdef _WIN32 @@ -620,9 +620,9 @@ public: virtual ~CWII_IPC_HLE_Device_net_ncd_manage(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); - virtual bool IOCtlV(u32 _CommandAddress); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; + virtual bool IOCtlV(u32 _CommandAddress) override; private: enum @@ -648,9 +648,9 @@ public: virtual ~CWII_IPC_HLE_Device_net_wd_command(); - virtual bool Open(u32 CommandAddress, u32 Mode); - virtual bool Close(u32 CommandAddress, bool Force); - virtual bool IOCtlV(u32 CommandAddress); + virtual bool Open(u32 CommandAddress, u32 Mode) override; + virtual bool Close(u32 CommandAddress, bool Force) override; + virtual bool IOCtlV(u32 CommandAddress) override; private: enum diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h index 8039d6a5b3..b14ad41c06 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h @@ -76,12 +76,12 @@ public: virtual ~CWII_IPC_HLE_Device_net_ssl(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; - virtual bool Close(u32 _CommandAddress, bool _bForce); + virtual bool Close(u32 _CommandAddress, bool _bForce) override; - virtual bool IOCtl(u32 _CommandAddress); - virtual bool IOCtlV(u32 _CommandAddress); + virtual bool IOCtl(u32 _CommandAddress) override; + virtual bool IOCtlV(u32 _CommandAddress) override; int getSSLFreeID(); static WII_SSL _SSL[NET_SSL_MAXINSTANCES]; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index b237c67fd5..98afcbd51c 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -14,12 +14,12 @@ public: CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName); - virtual void DoState(PointerWrap& p); + virtual void DoState(PointerWrap& p) override; - bool Open(u32 _CommandAddress, u32 _Mode); - bool Close(u32 _CommandAddress, bool _bForce); - bool IOCtl(u32 _CommandAddress); - bool IOCtlV(u32 _CommandAddress); + bool Open(u32 _CommandAddress, u32 _Mode) override; + bool Close(u32 _CommandAddress, bool _bForce) override; + bool IOCtl(u32 _CommandAddress) override; + bool IOCtlV(u32 _CommandAddress) override; void EventNotify(); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h index 10b5ef5d6e..3ea921d480 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h @@ -36,7 +36,7 @@ public: virtual ~CWII_IPC_HLE_Device_stm_immediate() {} - virtual bool Open(u32 _CommandAddress, u32 _Mode) + virtual bool Open(u32 _CommandAddress, u32 _Mode) override { INFO_LOG(WII_IPC_STM, "STM immediate: Open"); Memory::Write_U32(GetDeviceID(), _CommandAddress+4); @@ -44,7 +44,7 @@ public: return true; } - virtual bool Close(u32 _CommandAddress, bool _bForce) + virtual bool Close(u32 _CommandAddress, bool _bForce) override { INFO_LOG(WII_IPC_STM, "STM immediate: Close"); if (!_bForce) @@ -53,7 +53,7 @@ public: return true; } - virtual bool IOCtl(u32 _CommandAddress) + virtual bool IOCtl(u32 _CommandAddress) override { u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); @@ -125,14 +125,14 @@ public: { } - virtual bool Open(u32 _CommandAddress, u32 _Mode) + virtual bool Open(u32 _CommandAddress, u32 _Mode) override { Memory::Write_U32(GetDeviceID(), _CommandAddress + 4); m_Active = true; return true; } - virtual bool Close(u32 _CommandAddress, bool _bForce) + virtual bool Close(u32 _CommandAddress, bool _bForce) override { m_EventHookAddress = 0; @@ -143,7 +143,7 @@ public: return true; } - virtual bool IOCtl(u32 _CommandAddress) + virtual bool IOCtl(u32 _CommandAddress) override { u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h index 0cdcea9575..e2709e9caa 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -50,13 +50,13 @@ public: virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; - virtual bool IOCtlV(u32 _CommandAddress); - virtual bool IOCtl(u32 _CommandAddress); + virtual bool IOCtlV(u32 _CommandAddress) override; + virtual bool IOCtl(u32 _CommandAddress) override; - virtual u32 Update(); + virtual u32 Update() override; // Send ACL data back to bt stack void SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size); @@ -69,7 +69,7 @@ public: CWII_IPC_HLE_WiiMote* AccessWiiMote(const bdaddr_t& _rAddr); CWII_IPC_HLE_WiiMote* AccessWiiMote(u16 _ConnectionHandle); - void DoState(PointerWrap &p); + void DoState(PointerWrap &p) override; void NetPlay_WiimoteUpdate(int _number); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h index e9034db38f..ea3ab329d0 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h @@ -10,11 +10,11 @@ public: CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName); virtual ~CWII_IPC_HLE_Device_usb_kbd(); - virtual bool Open(u32 _CommandAddress, u32 _Mode); - virtual bool Close(u32 _CommandAddress, bool _bForce); - virtual bool Write(u32 _CommandAddress); - virtual bool IOCtl(u32 _CommandAddress); - virtual u32 Update(); + virtual bool Open(u32 _CommandAddress, u32 _Mode) override; + virtual bool Close(u32 _CommandAddress, bool _bForce) override; + virtual bool Write(u32 _CommandAddress) override; + virtual bool IOCtl(u32 _CommandAddress) override; + virtual u32 Update() override; private: enum diff --git a/Source/Core/DiscIO/BannerLoaderGC.h b/Source/Core/DiscIO/BannerLoaderGC.h index a583b3c2d7..64623f8202 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.h +++ b/Source/Core/DiscIO/BannerLoaderGC.h @@ -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 GetBanner(int* pWidth, int* pHeight); + virtual std::vector GetBanner(int* pWidth, int* pHeight) override; - virtual std::vector GetNames(); - virtual std::string GetCompany(); - virtual std::vector GetDescriptions(); + virtual std::vector GetNames() override; + virtual std::string GetCompany() override; + virtual std::vector GetDescriptions() override; private: enum diff --git a/Source/Core/DiscIO/BannerLoaderWii.h b/Source/Core/DiscIO/BannerLoaderWii.h index a43084ee37..f11416ecb6 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.h +++ b/Source/Core/DiscIO/BannerLoaderWii.h @@ -24,13 +24,13 @@ class CBannerLoaderWii virtual ~CBannerLoaderWii(); - virtual bool IsValid(); + virtual bool IsValid() override; - virtual std::vector GetBanner(int* pWidth, int* pHeight); + virtual std::vector GetBanner(int* pWidth, int* pHeight) override; - virtual std::vector GetNames(); - virtual std::string GetCompany(); - virtual std::vector GetDescriptions(); + virtual std::vector GetNames() override; + virtual std::string GetCompany() override; + virtual std::vector GetDescriptions() override; private: diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h index c93d47c984..62c0f10e39 100644 --- a/Source/Core/DiscIO/Blob.h +++ b/Source/Core/DiscIO/Blob.h @@ -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; }; diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h index dd95092b7e..a947f357ab 100644 --- a/Source/Core/DiscIO/CISOBlob.h +++ b/Source/Core/DiscIO/CISOBlob.h @@ -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); diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h index 990deb474a..09590848cf 100644 --- a/Source/Core/DiscIO/CompressedBlob.h +++ b/Source/Core/DiscIO/CompressedBlob.h @@ -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); diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index 8baedaff79..5b4fe14f5d 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -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 diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h index 170cda379d..68eb122eb2 100644 --- a/Source/Core/DiscIO/FileBlob.h +++ b/Source/Core/DiscIO/FileBlob.h @@ -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 diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index 1fe934a256..e882b7a2a5 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -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 &_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 &_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; diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h index ec1527cb02..5f3e316ba8 100644 --- a/Source/Core/DiscIO/VolumeDirectory.h +++ b/Source/Core/DiscIO/VolumeDirectory.h @@ -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 GetNames() const; + std::vector 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(); diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index d48ccbcedf..490a2a6dd8 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -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 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 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&); diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h index dcfb03fc06..4efc95e288 100644 --- a/Source/Core/DiscIO/VolumeWad.h +++ b/Source/Core/DiscIO/VolumeWad.h @@ -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 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 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; diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index e364045b7a..d4e25c5600 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -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 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 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; diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h index 639843d360..dea62819b6 100644 --- a/Source/Core/DiscIO/WbfsBlob.h +++ b/Source/Core/DiscIO/WbfsBlob.h @@ -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); diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Debugger/BreakpointView.h index 74dd63648e..0013e118cf 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.h @@ -14,6 +14,6 @@ class CBreakPointView : public wxListCtrl public: CBreakPointView(wxWindow* parent, const wxWindowID id); - void Update(); + void Update() override; void DeleteCurrentSelection(); }; diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 8804a794ff..90ddff938c 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -62,7 +62,7 @@ class CCodeWindow bool JITBlockLinking(); void JumpToAddress(u32 _Address); - void Update(); + void Update() override; void NotifyMapLoaded(); void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); void CreateMenuOptions(wxMenu *pMenu); diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h index 773a49a17d..af515dd839 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -27,7 +27,7 @@ public: DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); virtual ~DSPDebuggerLLE(); - void Update(); + void Update() override; private: DECLARE_EVENT_TABLE(); diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h index 5f5a9b5bef..d1aba57190 100644 --- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h +++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h @@ -30,12 +30,12 @@ public: memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged)); } - int GetNumberCols(void) {return 2;} - int GetNumberRows(void) {return 32;} - bool IsEmptyCell(int row, int col) {return false;} - wxString GetValue(int row, int col); - void SetValue(int row, int col, const wxString &); - wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind); + int GetNumberCols(void) override {return 2;} + int GetNumberRows(void) override {return 32;} + bool IsEmptyCell(int row, int col) override {return false;} + wxString GetValue(int row, int col) override; + void SetValue(int row, int col, const wxString &) override; + wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override; void UpdateCachedRegs(); }; @@ -43,5 +43,5 @@ class DSPRegisterView : public wxGrid { public: DSPRegisterView(wxWindow* parent, wxWindowID id); - void Update(); + void Update() override; }; diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index 796f015bd8..45cbaa68c5 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -40,10 +40,10 @@ public: bool bSaveTargets; bool bSaveShaders; - void OnPause(); + void OnPause() override; // Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished - void OnContinue(); + void OnContinue() override; private: DECLARE_EVENT_TABLE(); diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h index 44a8a52c6d..577daf3452 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.h +++ b/Source/Core/DolphinWX/Debugger/JitWindow.h @@ -27,7 +27,7 @@ class JitBlockList : public wxListCtrl public: JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style); void Init(); - void Update(); + void Update() override; }; class CJitWindow : public wxPanel @@ -41,7 +41,7 @@ public: const wxString& name = _("JIT block viewer")); void ViewAddr(u32 em_address); - void Update(); + void Update() override; private: void OnRefresh(wxCommandEvent& /*event*/); diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index b3ffb13230..59b7d1da9d 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -43,7 +43,7 @@ class CMemoryWindow void Save(IniFile& _IniFile) const; void Load(IniFile& _IniFile); - void Update(); + void Update() override; void NotifyMapLoaded(); void JumpToAddress(u32 _Address); diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h index 9b91cae47a..d29c180273 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.h +++ b/Source/Core/DolphinWX/Debugger/RegisterView.h @@ -45,12 +45,12 @@ public: memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged)); memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged)); } - int GetNumberCols(void) {return 5;} - int GetNumberRows(void) {return 32 + NUM_SPECIALS;} - bool IsEmptyCell(int row, int col) {return row > 31 && col > 2;} - wxString GetValue(int row, int col); - void SetValue(int row, int col, const wxString &); - wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind); + int GetNumberCols(void) override {return 5;} + int GetNumberRows(void) override {return 32 + NUM_SPECIALS;} + bool IsEmptyCell(int row, int col) override {return row > 31 && col > 2;} + wxString GetValue(int row, int col) override; + void SetValue(int row, int col, const wxString &) override; + wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override; void UpdateCachedRegs(); private: @@ -68,5 +68,5 @@ class CRegisterView : public wxGrid { public: CRegisterView(wxWindow* parent, wxWindowID id); - void Update(); + void Update() override; }; diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h index 3b6639553c..264d3e37e7 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/GLInterface/GLX.h @@ -13,12 +13,12 @@ private: cX11Window XWindow; public: friend class cX11Window; - void SwapInterval(int Interval); - void Swap(); - void UpdateFPSDisplay(const char *Text); - void* GetFuncAddress(std::string name); - bool Create(void *&window_handle); - bool MakeCurrent(); - bool ClearCurrent(); - void Shutdown(); + void SwapInterval(int Interval) override; + void Swap() override; + void UpdateFPSDisplay(const char *Text) override; + void* GetFuncAddress(std::string name) override; + bool Create(void *&window_handle) override; + bool MakeCurrent() override; + bool ClearCurrent() override; + void Shutdown() override; }; diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 1c183a550e..402fcf283c 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -38,7 +38,7 @@ public: CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style); ~CGameListCtrl(); - void Update(); + void Update() override; void BrowseForDirectory(); const GameListItem *GetSelectedISO(); diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index f4eeafee08..6a5b0db00c 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -61,8 +61,8 @@ class PadSettingExtension : public PadSetting { public: PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext); - void UpdateGUI(); - void UpdateValue(); + void UpdateGUI() override; + void UpdateValue() override; ControllerEmu::Extension* const extension; }; @@ -75,8 +75,8 @@ public: , wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100))) , value(setting->value) {} - void UpdateGUI(); - void UpdateValue(); + void UpdateGUI() override; + void UpdateValue() override; ControlState& value; }; @@ -85,8 +85,8 @@ class PadSettingCheckBox : public PadSetting { public: PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label); - void UpdateGUI(); - void UpdateValue(); + void UpdateGUI() override; + void UpdateValue() override; ControlState& value; }; @@ -100,7 +100,7 @@ public: wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent); - virtual bool Validate(); + virtual bool Validate() override; void DetectControl(wxCommandEvent& event); void ClearControl(wxCommandEvent& event); @@ -234,7 +234,7 @@ public: InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num = 0); //~InputConfigDialog(); - bool Destroy(); + bool Destroy() override; void ClickSave(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 8260668c48..c3797e9d22 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -53,7 +53,7 @@ public: ~CLogWindow(); void SaveSettings(); - void Log(LogTypes::LOG_LEVELS, const char *text); + void Log(LogTypes::LOG_LEVELS, const char *text) override; int x, y, winpos; diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 1e4b7c6bb7..80c6f6db50 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -22,10 +22,10 @@ public: CFrame* GetCFrame(); private: - bool OnInit(); - int OnExit(); - void OnFatalException(); - bool Initialize(int& c, wxChar **v); + bool OnInit() override; + int OnExit() override; + void OnFatalException() override; + bool Initialize(int& c, wxChar **v) override; void InitLanguageSupport(); void MacOpenFile(const wxString &fileName); diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index e9e70929ea..8d3e6e58d4 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -67,19 +67,19 @@ public: void OnStart(wxCommandEvent& event); // implementation of NetPlayUI methods - void BootGame(const std::string& filename); - void StopGame(); + void BootGame(const std::string& filename) override; + void StopGame() override; - void Update(); - void AppendChat(const std::string& msg); + void Update() override; + void AppendChat(const std::string& msg) override; - void OnMsgChangeGame(const std::string& filename); - void OnMsgStartGame(); - void OnMsgStopGame(); + void OnMsgChangeGame(const std::string& filename) override; + void OnMsgStartGame() override; + void OnMsgStopGame() override; static NetPlayDiag *&GetInstance() { return npd; }; - bool IsRecording(); + bool IsRecording() override; private: DECLARE_EVENT_TABLE() diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index affabafc9b..898fd954fb 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -96,8 +96,8 @@ public: { public: InputReference() : ControlReference(true) {} - ControlState State(const ControlState state); - Device::Control* Detect(const unsigned int ms, Device* const device); + ControlState State(const ControlState state) override; + Device::Control* Detect(const unsigned int ms, Device* const device) override; }; // @@ -109,8 +109,8 @@ public: { public: OutputReference() : ControlReference(false) {} - ControlState State(const ControlState state); - Device::Control* Detect(const unsigned int ms, Device* const device); + ControlState State(const ControlState state) override; + Device::Control* Detect(const unsigned int ms, Device* const device) override; }; ControllerInterface() : m_is_init(false), m_hwnd(NULL) {} diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 8b4dc65fbb..43f1b738c7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -59,7 +59,7 @@ public: virtual ControlState GetState() const = 0; - Input* ToInput() { return this; } + Input* ToInput() override { return this; } }; // @@ -74,7 +74,7 @@ public: virtual void SetState(ControlState state) = 0; - Output* ToOutput() { return this; } + Output* ToOutput() override { return this; } }; virtual ~Device(); @@ -104,12 +104,12 @@ protected: : m_low(*low), m_high(*high) {} - ControlState GetState() const + ControlState GetState() const override { return (1 + m_high.GetState() - m_low.GetState()) / 2; } - std::string GetName() const + std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); } diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index 15f39998b9..76fc028ec9 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -83,9 +83,9 @@ private: class ConstantEffect : public Output { public: - std::string GetName() const; + std::string GetName() const override; ConstantEffect(EffectIDState& effect) : m_effect(effect) {} - void SetState(ControlState state); + void SetState(ControlState state) override; private: EffectIDState& m_effect; }; @@ -93,9 +93,9 @@ private: class RampEffect : public Output { public: - std::string GetName() const; + std::string GetName() const override; RampEffect(EffectIDState& effect) : m_effect(effect) {} - void SetState(ControlState state); + void SetState(ControlState state) override; private: EffectIDState& m_effect; }; @@ -103,9 +103,9 @@ private: class SineEffect : public Output { public: - std::string GetName() const; + std::string GetName() const override; SineEffect(EffectIDState& effect) : m_effect(effect) {} - void SetState(ControlState state); + void SetState(ControlState state) override; private: EffectIDState& m_effect; }; @@ -125,9 +125,9 @@ private: class TriangleEffect : public Output { public: - std::string GetName() const; + std::string GetName() const override; TriangleEffect(EffectIDState& effect) : m_effect(effect) {} - void SetState(ControlState state); + void SetState(ControlState state) override; private: EffectIDState& m_effect; }; diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 2714b70221..167f9af113 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -39,9 +39,9 @@ private: { friend class KeyboardMouse; public: - std::string GetName() const { return m_keyname; } + std::string GetName() const override { return m_keyname; } Key(Display* display, KeyCode keycode, const char* keyboard); - ControlState GetState() const; + ControlState GetState() const override; private: std::string m_keyname; @@ -53,9 +53,9 @@ private: class Button : public Input { public: - std::string GetName() const { return name; } + std::string GetName() const override { return name; } Button(unsigned int index, unsigned int& buttons); - ControlState GetState() const; + ControlState GetState() const override; private: const unsigned int& m_buttons; @@ -66,10 +66,10 @@ private: class Cursor : public Input { public: - std::string GetName() const { return name; } - bool IsDetectable() { return false; } + std::string GetName() const override { return name; } + bool IsDetectable() override { return false; } Cursor(u8 index, bool positive, const float& cursor); - ControlState GetState() const; + ControlState GetState() const override; private: const float& m_cursor; @@ -81,10 +81,10 @@ private: class Axis : public Input { public: - std::string GetName() const { return name; } - bool IsDetectable() { return false; } + std::string GetName() const override { return name; } + bool IsDetectable() override { return false; } Axis(u8 index, bool positive, const float& axis); - ControlState GetState() const; + ControlState GetState() const override; private: const float& m_axis; @@ -98,15 +98,15 @@ private: void UpdateCursor(); public: - bool UpdateInput(); - bool UpdateOutput(); + bool UpdateInput() override; + bool UpdateOutput() override; KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); ~KeyboardMouse(); - std::string GetName() const; - std::string GetSource() const; - int GetId() const; + std::string GetName() const override; + std::string GetSource() const override; + int GetId() const override; private: Window m_window; diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 9c506f67fe..237b3a484e 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -30,9 +30,9 @@ private: { friend class KeyboardMouse; public: - std::string GetName() const; + std::string GetName() const override; Key(Display* display, KeyCode keycode, const char* keyboard); - ControlState GetState() const; + ControlState GetState() const override; private: std::string m_keyname; @@ -44,10 +44,10 @@ private: class Button : public Input { public: - std::string GetName() const; + std::string GetName() const override; Button(unsigned int index, unsigned int& buttons) : m_buttons(buttons), m_index(index) {} - ControlState GetState() const; + ControlState GetState() const override; private: const unsigned int& m_buttons; @@ -57,11 +57,11 @@ private: class Cursor : public Input { public: - std::string GetName() const; - bool IsDetectable() { return false; } + std::string GetName() const override; + bool IsDetectable() override { return false; } Cursor(u8 index, bool positive, const float& cursor) : m_cursor(cursor), m_index(index), m_positive(positive) {} - ControlState GetState() const; + ControlState GetState() const override; private: const float& m_cursor; @@ -70,15 +70,15 @@ private: }; public: - bool UpdateInput(); - bool UpdateOutput(); + bool UpdateInput() override; + bool UpdateOutput() override; KeyboardMouse(Window window); ~KeyboardMouse(); - std::string GetName() const; - std::string GetSource() const; - int GetId() const; + std::string GetName() const override; + std::string GetSource() const override; + int GetId() const override; private: Window m_window; diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h index 11a5ddb464..728926ec3e 100644 --- a/Source/Core/InputCommon/UDPWrapper.h +++ b/Source/Core/InputCommon/UDPWrapper.h @@ -20,8 +20,8 @@ public: std::string port; UDPWrapper(int index, const char* const _name); - virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = ""); - virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = ""); + virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "") override; + virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "") override; void Refresh(); virtual ~UDPWrapper(); }; diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h index 43534855e3..293cb92a86 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.h +++ b/Source/Core/VideoBackends/OGL/PerfQuery.h @@ -16,7 +16,7 @@ public: void ResetQuery() override; u32 GetQueryResult(PerfQueryType type) override; void FlushResults() override; - bool IsFlushed() const; + bool IsFlushed() const override; private: struct ActiveQuery diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index d6486c6e22..c14faf4ce9 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -77,7 +77,7 @@ public: void ReinterpretPixelData(unsigned int convtype) override; - bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc); + bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override; private: void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data); diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index 775f0c93f3..2de5490eaa 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -147,7 +147,7 @@ public: ~MapAndOrphan() { } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { Align(stride); if(m_iterator + size >= m_size) { glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW); @@ -158,7 +158,7 @@ public: return std::make_pair(pointer, m_iterator); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { glFlushMappedBufferRange(m_buffertype, 0, used_size); glUnmapBuffer(m_buffertype); m_iterator += used_size; @@ -185,7 +185,7 @@ public: DeleteFences(); } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { Align(stride); AllocMemory(size); u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size, @@ -193,7 +193,7 @@ public: return std::make_pair(pointer, m_iterator); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { glFlushMappedBufferRange(m_buffertype, 0, used_size); glUnmapBuffer(m_buffertype); m_iterator += used_size; @@ -235,13 +235,13 @@ public: glBindBuffer(m_buffertype, 0); } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { Align(stride); AllocMemory(size); return std::make_pair(m_pointer + m_iterator, m_iterator); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { m_iterator += used_size; } @@ -275,13 +275,13 @@ public: m_pointer = NULL; } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { Align(stride); AllocMemory(size); return std::make_pair(m_pointer + m_iterator, m_iterator); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { m_iterator += used_size; } @@ -307,11 +307,11 @@ public: delete [] m_pointer; } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { return std::make_pair(m_pointer, 0); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { glBufferSubData(m_buffertype, 0, used_size, m_pointer); } @@ -335,11 +335,11 @@ public: delete [] m_pointer; } - std::pair Map(size_t size, u32 stride) { + std::pair Map(size_t size, u32 stride) override { return std::make_pair(m_pointer, 0); } - void Unmap(size_t used_size) { + void Unmap(size_t used_size) override { glBufferData(m_buffertype, used_size, m_pointer, GL_STREAM_DRAW); } diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index 1f75ae2846..19190efd0d 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -48,7 +48,7 @@ private: const float *colmat) override; void Bind(unsigned int stage) override; - bool Save(const std::string& filename, unsigned int level); + bool Save(const std::string& filename, unsigned int level) override; }; ~TextureCache(); diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index aec0712c2f..ad764a876f 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -39,7 +39,7 @@ public: GLuint m_index_buffers; GLuint m_last_vao; protected: - virtual void ResetBuffer(u32 stride); + virtual void ResetBuffer(u32 stride) override; private: void Draw(u32 stride); void vFlush(bool useDstAlpha) override; diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 66ea7857a8..704afb8adb 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -133,41 +133,41 @@ extern VideoBackend* g_video_backend; // inherited by D3D/OGL backends class VideoBackendHardware : public VideoBackend { - void RunLoop(bool enable); - bool Initialize(void *&) { InitializeShared(); return true; } + void RunLoop(bool enable) override; + bool Initialize(void *&) override { InitializeShared(); return true; } - void EmuStateChange(EMUSTATE_CHANGE); + void EmuStateChange(EMUSTATE_CHANGE) override; - void Video_EnterLoop(); - void Video_ExitLoop(); - void Video_BeginField(u32, u32, u32); - void Video_EndField(); + void Video_EnterLoop() override; + void Video_ExitLoop() override; + void Video_BeginField(u32, u32, u32) override; + void Video_EndField() override; - u32 Video_AccessEFB(EFBAccessType, u32, u32, u32); - u32 Video_GetQueryResult(PerfQueryType type); + u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) override; + u32 Video_GetQueryResult(PerfQueryType type) override; - void Video_AddMessage(const char* pstr, unsigned int milliseconds); - void Video_ClearMessages(); - bool Video_Screenshot(const char* filename); + void Video_AddMessage(const char* pstr, unsigned int milliseconds) override; + void Video_ClearMessages() override; + bool Video_Screenshot(const char* filename) override; - void Video_SetRendering(bool bEnabled); + void Video_SetRendering(bool bEnabled) override; - void Video_GatherPipeBursted(); + void Video_GatherPipeBursted() override; - bool Video_IsPossibleWaitingSetDrawDone(); - bool Video_IsHiWatermarkActive(); - void Video_AbortFrame(); + bool Video_IsPossibleWaitingSetDrawDone() override; + bool Video_IsHiWatermarkActive() override; + void Video_AbortFrame() override; void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override; void RegisterPEMMIO(MMIO::Mapping* mmio, u32 base) override; - void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); - void DoState(PointerWrap &p); + void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override; + void DoState(PointerWrap &p) override; bool m_invalid; public: - void CheckInvalidState(); + void CheckInvalidState() override; protected: void InitializeShared(); diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp index 7a782623f5..64b226ce5d 100644 --- a/Source/UnitTests/Core/MMIOTest.cpp +++ b/Source/UnitTests/Core/MMIOTest.cpp @@ -35,12 +35,12 @@ TEST(IsMMIOAddress, SpecialAddresses) class MappingTest : public testing::Test { protected: - virtual void SetUp() + virtual void SetUp() override { m_mapping = new MMIO::Mapping(); } - virtual void TearDown() + virtual void TearDown() override { delete m_mapping; }