mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-04 11:14:54 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/AudioCommon/AOSoundStream.h
View file

@ -31,11 +31,11 @@ public:
virtual ~AOSound(); 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() { static bool isValid() {
return true; return true;
@ -45,7 +45,7 @@ public:
return true; return true;
} }
virtual void Update(); virtual void Update() override;
#else #else
public: public:

8
Source/Core/AudioCommon/AlsaSoundStream.h
View file

@ -19,9 +19,9 @@ public:
AlsaSound(CMixer *mixer); AlsaSound(CMixer *mixer);
virtual ~AlsaSound(); virtual ~AlsaSound();
virtual bool Start(); virtual bool Start() override;
virtual void SoundLoop(); virtual void SoundLoop() override;
virtual void Stop(); virtual void Stop() override;
static bool isValid() { static bool isValid() {
return true; return true;
@ -30,7 +30,7 @@ public:
return true; return true;
} }
virtual void Update(); virtual void Update() override;
private: private:
bool AlsaInit(); bool AlsaInit();

12
Source/Core/AudioCommon/NullSoundStream.h
View file

@ -21,12 +21,12 @@ public:
virtual ~NullSound() {} virtual ~NullSound() {}
virtual bool Start(); virtual bool Start() override;
virtual void SoundLoop(); virtual void SoundLoop() override;
virtual void SetVolume(int volume); virtual void SetVolume(int volume) override;
virtual void Stop(); virtual void Stop() override;
virtual void Clear(bool mute); virtual void Clear(bool mute) override;
static bool isValid() { return true; } static bool isValid() { return true; }
virtual bool usesMixer() const { return true; } virtual bool usesMixer() const { return true; }
virtual void Update(); virtual void Update() override;
}; };

12
Source/Core/AudioCommon/OpenALStream.h
View file

@ -51,14 +51,14 @@ public:
virtual ~OpenALStream() {} virtual ~OpenALStream() {}
virtual bool Start(); virtual bool Start() override;
virtual void SoundLoop(); virtual void SoundLoop() override;
virtual void SetVolume(int volume); virtual void SetVolume(int volume) override;
virtual void Stop(); virtual void Stop() override;
virtual void Clear(bool mute); virtual void Clear(bool mute) override;
static bool isValid() { return true; } static bool isValid() { return true; }
virtual bool usesMixer() const { return true; } virtual bool usesMixer() const { return true; }
virtual void Update(); virtual void Update() override;
private: private:
std::thread thread; std::thread thread;

8
Source/Core/AudioCommon/PulseAudioStream.h
View file

@ -20,21 +20,21 @@ class PulseAudio : public SoundStream
public: public:
PulseAudio(CMixer *mixer); PulseAudio(CMixer *mixer);
virtual bool Start(); virtual bool Start() override;
virtual void Stop(); virtual void Stop() override;
static bool isValid() {return true;} static bool isValid() {return true;}
virtual bool usesMixer() const {return true;} virtual bool usesMixer() const {return true;}
virtual void Update(); virtual void Update() override;
void StateCallback(pa_context *c); void StateCallback(pa_context *c);
void WriteCallback(pa_stream *s, size_t length); void WriteCallback(pa_stream *s, size_t length);
void UnderflowCallback(pa_stream *s); void UnderflowCallback(pa_stream *s);
private: private:
virtual void SoundLoop(); virtual void SoundLoop() override;
bool PulseInit(); bool PulseInit();
void PulseShutdown(); void PulseShutdown();

2
Source/Core/Common/ConsoleListener.h
View file

@ -26,7 +26,7 @@ public:
#ifdef _WIN32 #ifdef _WIN32
COORD GetCoordinates(int BytesRead, int BufferWidth); COORD GetCoordinates(int BytesRead, int BufferWidth);
#endif #endif
void Log(LogTypes::LOG_LEVELS, const char *Text); void Log(LogTypes::LOG_LEVELS, const char *Text) override;
void ClearScreen(bool Cursor = true); void ClearScreen(bool Cursor = true);
private: private:

4
Source/Core/Common/LogManager.h
View file

@ -29,7 +29,7 @@ class FileLogListener : public LogListener
public: public:
FileLogListener(const char *filename); 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 IsValid() { return !m_logfile.fail(); }
bool IsEnabled() const { return m_enable; } bool IsEnabled() const { return m_enable; }
@ -46,7 +46,7 @@ private:
class DebuggerLogListener : public LogListener class DebuggerLogListener : public LogListener
{ {
public: public:
void Log(LogTypes::LOG_LEVELS, const char *msg); void Log(LogTypes::LOG_LEVELS, const char *msg) override;
}; };
class LogContainer class LogContainer

48
Source/Core/Core/Debugger/PPCDebugInterface.h
View file

@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface
{ {
public: public:
PPCDebugInterface(){} PPCDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size) 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; virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
virtual int GetInstructionSize(int /*instruction*/) final {return 4;} virtual int GetInstructionSize(int /*instruction*/) final override {return 4;}
virtual bool IsAlive() final; virtual bool IsAlive() final override;
virtual bool IsBreakpoint(unsigned int address) final; virtual bool IsBreakpoint(unsigned int address) final override;
virtual void SetBreakpoint(unsigned int address) final; virtual void SetBreakpoint(unsigned int address) final override;
virtual void ClearBreakpoint(unsigned int address) final; virtual void ClearBreakpoint(unsigned int address) final override;
virtual void ClearAllBreakpoints() final; virtual void ClearAllBreakpoints() final override;
virtual void ToggleBreakpoint(unsigned int address) final; virtual void ToggleBreakpoint(unsigned int address) final override;
virtual void ClearAllMemChecks() final; virtual void ClearAllMemChecks() final override;
virtual bool IsMemCheck(unsigned int address) final; virtual bool IsMemCheck(unsigned int address) final override;
virtual void ToggleMemCheck(unsigned int address) final; virtual void ToggleMemCheck(unsigned int address) final override;
virtual unsigned int ReadMemory(unsigned int address) final; virtual unsigned int ReadMemory(unsigned int address) final override;
enum { enum {
EXTRAMEM_ARAM = 1, EXTRAMEM_ARAM = 1,
}; };
virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final; virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final override;
virtual unsigned int ReadInstruction(unsigned int address) final; virtual unsigned int ReadInstruction(unsigned int address) final override;
virtual unsigned int GetPC() final; virtual unsigned int GetPC() final override;
virtual void SetPC(unsigned int address) final; virtual void SetPC(unsigned int address) final override;
virtual void Step() final {} virtual void Step() final override {}
virtual void BreakNow() final; virtual void BreakNow() final override;
virtual void RunToBreakpoint() final; virtual void RunToBreakpoint() final override;
virtual void InsertBLR(unsigned int address, unsigned int value) final; virtual void InsertBLR(unsigned int address, unsigned int value) final override;
virtual int GetColor(unsigned int address) final; virtual int GetColor(unsigned int address) final override;
virtual std::string GetDescription(unsigned int address) final; virtual std::string GetDescription(unsigned int address) final override;
virtual void ShowJitResults(u32 address) final; virtual void ShowJitResults(u32 address) final override;
}; };

42
Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
View file

@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface
{ {
public: public:
DSPDebugInterface(){} DSPDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size) 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; virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
virtual int GetInstructionSize(int instruction) final {return 1;} virtual int GetInstructionSize(int instruction) final override {return 1;}
virtual bool IsAlive() final; virtual bool IsAlive() final override;
virtual bool IsBreakpoint(unsigned int address) final; virtual bool IsBreakpoint(unsigned int address) final override;
virtual void SetBreakpoint(unsigned int address) final; virtual void SetBreakpoint(unsigned int address) final override;
virtual void ClearBreakpoint(unsigned int address) final; virtual void ClearBreakpoint(unsigned int address) final override;
virtual void ClearAllBreakpoints() final; virtual void ClearAllBreakpoints() final override;
virtual void ToggleBreakpoint(unsigned int address) final; virtual void ToggleBreakpoint(unsigned int address) final override;
virtual void ClearAllMemChecks() final; virtual void ClearAllMemChecks() final override;
virtual bool IsMemCheck(unsigned int address) final; virtual bool IsMemCheck(unsigned int address) final override;
virtual void ToggleMemCheck(unsigned int address) final; virtual void ToggleMemCheck(unsigned int address) final override;
virtual unsigned int ReadMemory(unsigned int address) final; virtual unsigned int ReadMemory(unsigned int address) final override;
virtual unsigned int ReadInstruction(unsigned int address) final; virtual unsigned int ReadInstruction(unsigned int address) final override;
virtual unsigned int GetPC() final; virtual unsigned int GetPC() final override;
virtual void SetPC(unsigned int address) final; virtual void SetPC(unsigned int address) final override;
virtual void Step() final {} virtual void Step() final override {}
virtual void RunToBreakpoint() final; virtual void RunToBreakpoint() final override;
virtual void InsertBLR(unsigned int address, unsigned int value) final; virtual void InsertBLR(unsigned int address, unsigned int value) final override;
virtual int GetColor(unsigned int address) final; virtual int GetColor(unsigned int address) final override;
virtual std::string GetDescription(unsigned int address) final; virtual std::string GetDescription(unsigned int address) final override;
}; };

32
Source/Core/Core/HW/DSPLLE/DSPLLE.h
View file

@ -15,24 +15,24 @@ class DSPLLE : public DSPEmulator
public: public:
DSPLLE(); DSPLLE();
virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread); virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread) override;
virtual void Shutdown(); virtual void Shutdown() override;
virtual bool IsLLE() { return true; } virtual bool IsLLE() override { return true; }
virtual void DoState(PointerWrap &p); virtual void DoState(PointerWrap &p) override;
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short); virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short); virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox); virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox); virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadControlRegister(); virtual unsigned short DSP_ReadControlRegister() override;
virtual unsigned short DSP_WriteControlRegister(unsigned short); virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples); virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override;
virtual void DSP_Update(int cycles); virtual void DSP_Update(int cycles) override;
virtual void DSP_StopSoundStream(); virtual void DSP_StopSoundStream() override;
virtual void DSP_ClearAudioBuffer(bool mute); virtual void DSP_ClearAudioBuffer(bool mute) override;
virtual u32 DSP_UpdateRate(); virtual u32 DSP_UpdateRate() override;
private: private:
static void dsp_thread(DSPLLE* lpParameter); static void dsp_thread(DSPLLE* lpParameter);

8
Source/Core/Core/HW/EXI_DeviceIPL.h
View file

@ -13,9 +13,9 @@ public:
CEXIIPL(); CEXIIPL();
virtual ~CEXIIPL(); virtual ~CEXIIPL();
virtual void SetCS(int _iCS); virtual void SetCS(int _iCS) override;
bool IsPresent(); bool IsPresent() override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
static u32 GetGCTime(); static u32 GetGCTime();
static u32 NetPlay_GetGCTime(); static u32 NetPlay_GetGCTime();
@ -62,7 +62,7 @@ private:
int m_count; int m_count;
bool m_FontsLoaded; bool m_FontsLoaded;
virtual void TransferByte(u8 &_uByte); virtual void TransferByte(u8 &_uByte) override;
bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }

8
Source/Core/Core/HW/EXI_DeviceMic.h
View file

@ -13,9 +13,9 @@ class CEXIMic : public IEXIDevice
public: public:
CEXIMic(const int index); CEXIMic(const int index);
virtual ~CEXIMic(); virtual ~CEXIMic();
void SetCS(int cs); void SetCS(int cs) override;
bool IsInterruptSet(); bool IsInterruptSet() override;
bool IsPresent(); bool IsPresent() override;
private: private:
static u8 const exi_id[]; static u8 const exi_id[];
@ -93,7 +93,7 @@ public:
int samples_avail; int samples_avail;
protected: protected:
virtual void TransferByte(u8 &byte); virtual void TransferByte(u8 &byte) override;
}; };
#else // HAVE_PORTAUDIO #else // HAVE_PORTAUDIO

10
Source/Core/Core/HW/SI_DeviceGCController.h
View file

@ -85,20 +85,20 @@ public:
CSIDevice_GCController(SIDevices device, int _iDeviceNumber); CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer // 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 // Send and Receive pad input from network
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Return true on new data // Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low); virtual bool GetData(u32& _Hi, u32& _Low) override;
// Send a command directly // Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll); virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support // Savestate support
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p) override;
}; };
@ -108,7 +108,7 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController
public: public:
CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { } 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); CSIDevice_GCController::GetData(_Hi, _Low);
_Hi &= ~PAD_USE_ORIGIN << 16; _Hi &= ~PAD_USE_ORIGIN << 16;

8
Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
View file

@ -85,18 +85,18 @@ public:
CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber); CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer // 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 // Send and Receive pad input from network
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Return true on new data // Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low); virtual bool GetData(u32& _Hi, u32& _Low) override;
// Send a command directly // Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll); virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support // Savestate support
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p) override;
}; };

4
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View file

@ -116,7 +116,7 @@ public:
}; };
Wiimote(const unsigned int index); Wiimote(const unsigned int index);
std::string GetName() const; std::string GetName() const override;
void Update(); void Update();
void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size); void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size);
@ -125,7 +125,7 @@ public:
void DoState(PointerWrap& p); void DoState(PointerWrap& p);
void RealState(); void RealState();
void LoadDefaults(const ControllerInterface& ciface); void LoadDefaults(const ControllerInterface& ciface) override;
protected: protected:
bool Step(); bool Step();

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
View file

@ -224,7 +224,7 @@ public:
{ {
} }
bool Open(u32 CommandAddress, u32 Mode) bool Open(u32 CommandAddress, u32 Mode) override
{ {
(void)Mode; (void)Mode;
WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str()); WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
@ -232,7 +232,7 @@ public:
m_Active = true; m_Active = true;
return 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()); WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
if (!bForce) if (!bForce)
@ -241,13 +241,13 @@ public:
return true; return true;
} }
bool IOCtl(u32 CommandAddress) bool IOCtl(u32 CommandAddress) override
{ {
WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str()); WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str());
Memory::Write_U32(FS_SUCCESS, CommandAddress + 4); Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
return true; return true;
} }
bool IOCtlV(u32 CommandAddress) bool IOCtlV(u32 CommandAddress) override
{ {
WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str()); WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str());
Memory::Write_U32(FS_SUCCESS, CommandAddress + 4); Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
View file

@ -20,13 +20,13 @@ public:
virtual ~CWII_IPC_HLE_Device_di(); virtual ~CWII_IPC_HLE_Device_di();
bool Open(u32 _CommandAddress, u32 _Mode); bool Open(u32 _CommandAddress, u32 _Mode) override;
bool Close(u32 _CommandAddress, bool _bForce); bool Close(u32 _CommandAddress, bool _bForce) override;
bool IOCtl(u32 _CommandAddress); bool IOCtl(u32 _CommandAddress) override;
bool IOCtlV(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress) override;
int GetCmdDelay(u32); int GetCmdDelay(u32) override;
private: private:

14
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
View file

@ -17,13 +17,13 @@ public:
virtual ~CWII_IPC_HLE_Device_FileIO(); virtual ~CWII_IPC_HLE_Device_FileIO();
bool Close(u32 _CommandAddress, bool _bForce); bool Close(u32 _CommandAddress, bool _bForce) override;
bool Open(u32 _CommandAddress, u32 _Mode); bool Open(u32 _CommandAddress, u32 _Mode) override;
bool Seek(u32 _CommandAddress); bool Seek(u32 _CommandAddress) override;
bool Read(u32 _CommandAddress); bool Read(u32 _CommandAddress) override;
bool Write(u32 _CommandAddress); bool Write(u32 _CommandAddress) override;
bool IOCtl(u32 _CommandAddress); bool IOCtl(u32 _CommandAddress) override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
File::IOFile OpenFile(); File::IOFile OpenFile();

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
View file

@ -22,13 +22,13 @@ public:
void OpenInternal(); 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); static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
// This should only be cleared on power reset // This should only be cleared on power reset

12
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
View file

@ -36,15 +36,15 @@ public:
CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName); CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_fs(); 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 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 IOCtl(u32 _CommandAddress) override;
virtual bool IOCtlV(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress) override;
virtual int GetCmdDelay(u32); virtual int GetCmdDelay(u32) override;
private: private:

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
View file

@ -25,12 +25,12 @@ public:
virtual ~CWII_IPC_HLE_Device_hid(); virtual ~CWII_IPC_HLE_Device_hid();
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 u32 Update(); virtual u32 Update() override;
virtual bool IOCtlV(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress) override;
virtual bool IOCtl(u32 _CommandAddress); virtual bool IOCtl(u32 _CommandAddress) override;
private: private:
enum enum

34
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
View file

@ -394,9 +394,9 @@ public:
virtual ~CWII_IPC_HLE_Device_net_kd_request(); virtual ~CWII_IPC_HLE_Device_net_kd_request();
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 IOCtl(u32 _CommandAddress) override;
private: private:
enum enum
@ -456,14 +456,14 @@ public:
virtual ~CWII_IPC_HLE_Device_net_kd_time() 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"); INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
Memory::Write_U32(GetDeviceID(), _CommandAddress+4); Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
return true; 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"); INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
if (!_bForce) if (!_bForce)
@ -471,7 +471,7 @@ public:
return true; return true;
} }
virtual bool IOCtl(u32 _CommandAddress) virtual bool IOCtl(u32 _CommandAddress) override
{ {
u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10);
@ -596,12 +596,12 @@ public:
virtual ~CWII_IPC_HLE_Device_net_ip_top(); virtual ~CWII_IPC_HLE_Device_net_ip_top();
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 IOCtl(u32 _CommandAddress) override;
virtual bool IOCtlV(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress) override;
virtual u32 Update(); virtual u32 Update() override;
private: private:
#ifdef _WIN32 #ifdef _WIN32
@ -620,9 +620,9 @@ public:
virtual ~CWII_IPC_HLE_Device_net_ncd_manage(); virtual ~CWII_IPC_HLE_Device_net_ncd_manage();
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;
private: private:
enum enum
@ -648,9 +648,9 @@ public:
virtual ~CWII_IPC_HLE_Device_net_wd_command(); virtual ~CWII_IPC_HLE_Device_net_wd_command();
virtual bool Open(u32 CommandAddress, u32 Mode); virtual bool Open(u32 CommandAddress, u32 Mode) override;
virtual bool Close(u32 CommandAddress, bool Force); virtual bool Close(u32 CommandAddress, bool Force) override;
virtual bool IOCtlV(u32 CommandAddress); virtual bool IOCtlV(u32 CommandAddress) override;
private: private:
enum enum

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
View file

@ -76,12 +76,12 @@ public:
virtual ~CWII_IPC_HLE_Device_net_ssl(); 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 IOCtl(u32 _CommandAddress) override;
virtual bool IOCtlV(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress) override;
int getSSLFreeID(); int getSSLFreeID();
static WII_SSL _SSL[NET_SSL_MAXINSTANCES]; static WII_SSL _SSL[NET_SSL_MAXINSTANCES];

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
View file

@ -14,12 +14,12 @@ public:
CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName); 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 Open(u32 _CommandAddress, u32 _Mode) override;
bool Close(u32 _CommandAddress, bool _bForce); bool Close(u32 _CommandAddress, bool _bForce) override;
bool IOCtl(u32 _CommandAddress); bool IOCtl(u32 _CommandAddress) override;
bool IOCtlV(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress) override;
void EventNotify(); void EventNotify();

12
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
View file

@ -36,7 +36,7 @@ public:
virtual ~CWII_IPC_HLE_Device_stm_immediate() 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"); INFO_LOG(WII_IPC_STM, "STM immediate: Open");
Memory::Write_U32(GetDeviceID(), _CommandAddress+4); Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
@ -44,7 +44,7 @@ public:
return true; 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"); INFO_LOG(WII_IPC_STM, "STM immediate: Close");
if (!_bForce) if (!_bForce)
@ -53,7 +53,7 @@ public:
return true; return true;
} }
virtual bool IOCtl(u32 _CommandAddress) virtual bool IOCtl(u32 _CommandAddress) override
{ {
u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); 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); Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
m_Active = true; m_Active = true;
return true; return true;
} }
virtual bool Close(u32 _CommandAddress, bool _bForce) virtual bool Close(u32 _CommandAddress, bool _bForce) override
{ {
m_EventHookAddress = 0; m_EventHookAddress = 0;
@ -143,7 +143,7 @@ public:
return true; return true;
} }
virtual bool IOCtl(u32 _CommandAddress) virtual bool IOCtl(u32 _CommandAddress) override
{ {
u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C); u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10);

12
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
View file

@ -50,13 +50,13 @@ public:
virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305(); virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305();
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;
virtual bool IOCtl(u32 _CommandAddress); virtual bool IOCtl(u32 _CommandAddress) override;
virtual u32 Update(); virtual u32 Update() override;
// Send ACL data back to bt stack // Send ACL data back to bt stack
void SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size); 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(const bdaddr_t& _rAddr);
CWII_IPC_HLE_WiiMote* AccessWiiMote(u16 _ConnectionHandle); CWII_IPC_HLE_WiiMote* AccessWiiMote(u16 _ConnectionHandle);
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
void NetPlay_WiimoteUpdate(int _number); void NetPlay_WiimoteUpdate(int _number);

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
View file

@ -10,11 +10,11 @@ public:
CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName); CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_usb_kbd(); virtual ~CWII_IPC_HLE_Device_usb_kbd();
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 Write(u32 _CommandAddress); virtual bool Write(u32 _CommandAddress) override;
virtual bool IOCtl(u32 _CommandAddress); virtual bool IOCtl(u32 _CommandAddress) override;
virtual u32 Update(); virtual u32 Update() override;
private: private:
enum enum

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

@ -26,13 +26,13 @@ class CBannerLoaderGC
CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume); CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume);
virtual ~CBannerLoaderGC(); 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::vector<std::string> GetNames() override;
virtual std::string GetCompany(); virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions(); virtual std::vector<std::string> GetDescriptions() override;
private: private:
enum enum

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

@ -24,13 +24,13 @@ class CBannerLoaderWii
virtual ~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::vector<std::string> GetNames() override;
virtual std::string GetCompany(); virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions(); virtual std::vector<std::string> GetDescriptions() override;
private: 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. // A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
const u8 *GetBlockData(u64 block_num); 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; friend class DriveReader;
}; };

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

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

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

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

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

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

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

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

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

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

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

@ -31,25 +31,25 @@ public:
static bool IsValidDirectory(const std::string& _rDirectory); static bool IsValidDirectory(const std::string& _rDirectory);
bool Read(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; bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
std::string GetUniqueID() const; std::string GetUniqueID() const override;
void SetUniqueID(std::string _ID); 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); 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 GetSize() const override;
u64 GetRawSize() const; u64 GetRawSize() const override;
void BuildFST(); void BuildFST();

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

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

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

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

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

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

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

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

2
Source/Core/DolphinWX/Debugger/BreakpointView.h
View file

@ -14,6 +14,6 @@ class CBreakPointView : public wxListCtrl
public: public:
CBreakPointView(wxWindow* parent, const wxWindowID id); CBreakPointView(wxWindow* parent, const wxWindowID id);
void Update(); void Update() override;
void DeleteCurrentSelection(); void DeleteCurrentSelection();
}; };

2
Source/Core/DolphinWX/Debugger/CodeWindow.h
View file

@ -62,7 +62,7 @@ class CCodeWindow
bool JITBlockLinking(); bool JITBlockLinking();
void JumpToAddress(u32 _Address); void JumpToAddress(u32 _Address);
void Update(); void Update() override;
void NotifyMapLoaded(); void NotifyMapLoaded();
void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar);
void CreateMenuOptions(wxMenu *pMenu); void CreateMenuOptions(wxMenu *pMenu);

2
Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
View file

@ -27,7 +27,7 @@ public:
DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY);
virtual ~DSPDebuggerLLE(); virtual ~DSPDebuggerLLE();
void Update(); void Update() override;
private: private:
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();

14
Source/Core/DolphinWX/Debugger/DSPRegisterView.h
View file

@ -30,12 +30,12 @@ public:
memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged)); memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
} }
int GetNumberCols(void) {return 2;} int GetNumberCols(void) override {return 2;}
int GetNumberRows(void) {return 32;} int GetNumberRows(void) override {return 32;}
bool IsEmptyCell(int row, int col) {return false;} bool IsEmptyCell(int row, int col) override {return false;}
wxString GetValue(int row, int col); wxString GetValue(int row, int col) override;
void SetValue(int row, int col, const wxString &); void SetValue(int row, int col, const wxString &) override;
wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind); wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
void UpdateCachedRegs(); void UpdateCachedRegs();
}; };
@ -43,5 +43,5 @@ class DSPRegisterView : public wxGrid
{ {
public: public:
DSPRegisterView(wxWindow* parent, wxWindowID id); DSPRegisterView(wxWindow* parent, wxWindowID id);
void Update(); void Update() override;
}; };

4
Source/Core/DolphinWX/Debugger/DebuggerPanel.h
View file

@ -40,10 +40,10 @@ public:
bool bSaveTargets; bool bSaveTargets;
bool bSaveShaders; bool bSaveShaders;
void OnPause(); void OnPause() override;
// Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished // Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished
void OnContinue(); void OnContinue() override;
private: private:
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();

4
Source/Core/DolphinWX/Debugger/JitWindow.h
View file

@ -27,7 +27,7 @@ class JitBlockList : public wxListCtrl
public: public:
JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style); JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
void Init(); void Init();
void Update(); void Update() override;
}; };
class CJitWindow : public wxPanel class CJitWindow : public wxPanel
@ -41,7 +41,7 @@ public:
const wxString& name = _("JIT block viewer")); const wxString& name = _("JIT block viewer"));
void ViewAddr(u32 em_address); void ViewAddr(u32 em_address);
void Update(); void Update() override;
private: private:
void OnRefresh(wxCommandEvent& /*event*/); void OnRefresh(wxCommandEvent& /*event*/);

2
Source/Core/DolphinWX/Debugger/MemoryWindow.h
View file

@ -43,7 +43,7 @@ class CMemoryWindow
void Save(IniFile& _IniFile) const; void Save(IniFile& _IniFile) const;
void Load(IniFile& _IniFile); void Load(IniFile& _IniFile);
void Update(); void Update() override;
void NotifyMapLoaded(); void NotifyMapLoaded();
void JumpToAddress(u32 _Address); void JumpToAddress(u32 _Address);

14
Source/Core/DolphinWX/Debugger/RegisterView.h
View file

@ -45,12 +45,12 @@ public:
memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged)); memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged));
memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged)); memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged));
} }
int GetNumberCols(void) {return 5;} int GetNumberCols(void) override {return 5;}
int GetNumberRows(void) {return 32 + NUM_SPECIALS;} int GetNumberRows(void) override {return 32 + NUM_SPECIALS;}
bool IsEmptyCell(int row, int col) {return row > 31 && col > 2;} bool IsEmptyCell(int row, int col) override {return row > 31 && col > 2;}
wxString GetValue(int row, int col); wxString GetValue(int row, int col) override;
void SetValue(int row, int col, const wxString &); void SetValue(int row, int col, const wxString &) override;
wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind); wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
void UpdateCachedRegs(); void UpdateCachedRegs();
private: private:
@ -68,5 +68,5 @@ class CRegisterView : public wxGrid
{ {
public: public:
CRegisterView(wxWindow* parent, wxWindowID id); CRegisterView(wxWindow* parent, wxWindowID id);
void Update(); void Update() override;
}; };

16
Source/Core/DolphinWX/GLInterface/GLX.h
View file

@ -13,12 +13,12 @@ private:
cX11Window XWindow; cX11Window XWindow;
public: public:
friend class cX11Window; friend class cX11Window;
void SwapInterval(int Interval); void SwapInterval(int Interval) override;
void Swap(); void Swap() override;
void UpdateFPSDisplay(const char *Text); void UpdateFPSDisplay(const char *Text) override;
void* GetFuncAddress(std::string name); void* GetFuncAddress(std::string name) override;
bool Create(void *&window_handle); bool Create(void *&window_handle) override;
bool MakeCurrent(); bool MakeCurrent() override;
bool ClearCurrent(); bool ClearCurrent() override;
void Shutdown(); void Shutdown() override;
}; };

2
Source/Core/DolphinWX/GameListCtrl.h
View file

@ -38,7 +38,7 @@ public:
CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style); CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
~CGameListCtrl(); ~CGameListCtrl();
void Update(); void Update() override;
void BrowseForDirectory(); void BrowseForDirectory();
const GameListItem *GetSelectedISO(); const GameListItem *GetSelectedISO();

16
Source/Core/DolphinWX/InputConfigDiag.h
View file

@ -61,8 +61,8 @@ class PadSettingExtension : public PadSetting
{ {
public: public:
PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext); PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext);
void UpdateGUI(); void UpdateGUI() override;
void UpdateValue(); void UpdateValue() override;
ControllerEmu::Extension* const extension; ControllerEmu::Extension* const extension;
}; };
@ -75,8 +75,8 @@ public:
, wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100))) , wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100)))
, value(setting->value) {} , value(setting->value) {}
void UpdateGUI(); void UpdateGUI() override;
void UpdateValue(); void UpdateValue() override;
ControlState& value; ControlState& value;
}; };
@ -85,8 +85,8 @@ class PadSettingCheckBox : public PadSetting
{ {
public: public:
PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label); PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label);
void UpdateGUI(); void UpdateGUI() override;
void UpdateValue(); void UpdateValue() override;
ControlState& value; ControlState& value;
}; };
@ -100,7 +100,7 @@ public:
wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent); wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent);
virtual bool Validate(); virtual bool Validate() override;
void DetectControl(wxCommandEvent& event); void DetectControl(wxCommandEvent& event);
void ClearControl(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(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num = 0);
//~InputConfigDialog(); //~InputConfigDialog();
bool Destroy(); bool Destroy() override;
void ClickSave(wxCommandEvent& event); void ClickSave(wxCommandEvent& event);

2
Source/Core/DolphinWX/LogWindow.h
View file

@ -53,7 +53,7 @@ public:
~CLogWindow(); ~CLogWindow();
void SaveSettings(); void SaveSettings();
void Log(LogTypes::LOG_LEVELS, const char *text); void Log(LogTypes::LOG_LEVELS, const char *text) override;
int x, y, winpos; int x, y, winpos;

8
Source/Core/DolphinWX/Main.h
View file

@ -22,10 +22,10 @@ public:
CFrame* GetCFrame(); CFrame* GetCFrame();
private: private:
bool OnInit(); bool OnInit() override;
int OnExit(); int OnExit() override;
void OnFatalException(); void OnFatalException() override;
bool Initialize(int& c, wxChar **v); bool Initialize(int& c, wxChar **v) override;
void InitLanguageSupport(); void InitLanguageSupport();
void MacOpenFile(const wxString &fileName); void MacOpenFile(const wxString &fileName);

16
Source/Core/DolphinWX/NetWindow.h
View file

@ -67,19 +67,19 @@ public:
void OnStart(wxCommandEvent& event); void OnStart(wxCommandEvent& event);
// implementation of NetPlayUI methods // implementation of NetPlayUI methods
void BootGame(const std::string& filename); void BootGame(const std::string& filename) override;
void StopGame(); void StopGame() override;
void Update(); void Update() override;
void AppendChat(const std::string& msg); void AppendChat(const std::string& msg) override;
void OnMsgChangeGame(const std::string& filename); void OnMsgChangeGame(const std::string& filename) override;
void OnMsgStartGame(); void OnMsgStartGame() override;
void OnMsgStopGame(); void OnMsgStopGame() override;
static NetPlayDiag *&GetInstance() { return npd; }; static NetPlayDiag *&GetInstance() { return npd; };
bool IsRecording(); bool IsRecording() override;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

8
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View file

@ -96,8 +96,8 @@ public:
{ {
public: public:
InputReference() : ControlReference(true) {} InputReference() : ControlReference(true) {}
ControlState State(const ControlState state); ControlState State(const ControlState state) override;
Device::Control* Detect(const unsigned int ms, Device* const device); Device::Control* Detect(const unsigned int ms, Device* const device) override;
}; };
// //
@ -109,8 +109,8 @@ public:
{ {
public: public:
OutputReference() : ControlReference(false) {} OutputReference() : ControlReference(false) {}
ControlState State(const ControlState state); ControlState State(const ControlState state) override;
Device::Control* Detect(const unsigned int ms, Device* const device); Device::Control* Detect(const unsigned int ms, Device* const device) override;
}; };
ControllerInterface() : m_is_init(false), m_hwnd(NULL) {} ControllerInterface() : m_is_init(false), m_hwnd(NULL) {}

8
Source/Core/InputCommon/ControllerInterface/Device.h
View file

@ -59,7 +59,7 @@ public:
virtual ControlState GetState() const = 0; 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; virtual void SetState(ControlState state) = 0;
Output* ToOutput() { return this; } Output* ToOutput() override { return this; }
}; };
virtual ~Device(); virtual ~Device();
@ -104,12 +104,12 @@ protected:
: m_low(*low), m_high(*high) : m_low(*low), m_high(*high)
{} {}
ControlState GetState() const ControlState GetState() const override
{ {
return (1 + m_high.GetState() - m_low.GetState()) / 2; 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(); return m_low.GetName() + *m_high.GetName().rbegin();
} }

16
Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View file

@ -83,9 +83,9 @@ private:
class ConstantEffect : public Output class ConstantEffect : public Output
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
ConstantEffect(EffectIDState& effect) : m_effect(effect) {} ConstantEffect(EffectIDState& effect) : m_effect(effect) {}
void SetState(ControlState state); void SetState(ControlState state) override;
private: private:
EffectIDState& m_effect; EffectIDState& m_effect;
}; };
@ -93,9 +93,9 @@ private:
class RampEffect : public Output class RampEffect : public Output
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
RampEffect(EffectIDState& effect) : m_effect(effect) {} RampEffect(EffectIDState& effect) : m_effect(effect) {}
void SetState(ControlState state); void SetState(ControlState state) override;
private: private:
EffectIDState& m_effect; EffectIDState& m_effect;
}; };
@ -103,9 +103,9 @@ private:
class SineEffect : public Output class SineEffect : public Output
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
SineEffect(EffectIDState& effect) : m_effect(effect) {} SineEffect(EffectIDState& effect) : m_effect(effect) {}
void SetState(ControlState state); void SetState(ControlState state) override;
private: private:
EffectIDState& m_effect; EffectIDState& m_effect;
}; };
@ -125,9 +125,9 @@ private:
class TriangleEffect : public Output class TriangleEffect : public Output
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
TriangleEffect(EffectIDState& effect) : m_effect(effect) {} TriangleEffect(EffectIDState& effect) : m_effect(effect) {}
void SetState(ControlState state); void SetState(ControlState state) override;
private: private:
EffectIDState& m_effect; EffectIDState& m_effect;
}; };

30
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
View file

@ -39,9 +39,9 @@ private:
{ {
friend class KeyboardMouse; friend class KeyboardMouse;
public: public:
std::string GetName() const { return m_keyname; } std::string GetName() const override { return m_keyname; }
Key(Display* display, KeyCode keycode, const char* keyboard); Key(Display* display, KeyCode keycode, const char* keyboard);
ControlState GetState() const; ControlState GetState() const override;
private: private:
std::string m_keyname; std::string m_keyname;
@ -53,9 +53,9 @@ private:
class Button : public Input class Button : public Input
{ {
public: public:
std::string GetName() const { return name; } std::string GetName() const override { return name; }
Button(unsigned int index, unsigned int& buttons); Button(unsigned int index, unsigned int& buttons);
ControlState GetState() const; ControlState GetState() const override;
private: private:
const unsigned int& m_buttons; const unsigned int& m_buttons;
@ -66,10 +66,10 @@ private:
class Cursor : public Input class Cursor : public Input
{ {
public: public:
std::string GetName() const { return name; } std::string GetName() const override { return name; }
bool IsDetectable() { return false; } bool IsDetectable() override { return false; }
Cursor(u8 index, bool positive, const float& cursor); Cursor(u8 index, bool positive, const float& cursor);
ControlState GetState() const; ControlState GetState() const override;
private: private:
const float& m_cursor; const float& m_cursor;
@ -81,10 +81,10 @@ private:
class Axis : public Input class Axis : public Input
{ {
public: public:
std::string GetName() const { return name; } std::string GetName() const override { return name; }
bool IsDetectable() { return false; } bool IsDetectable() override { return false; }
Axis(u8 index, bool positive, const float& axis); Axis(u8 index, bool positive, const float& axis);
ControlState GetState() const; ControlState GetState() const override;
private: private:
const float& m_axis; const float& m_axis;
@ -98,15 +98,15 @@ private:
void UpdateCursor(); void UpdateCursor();
public: public:
bool UpdateInput(); bool UpdateInput() override;
bool UpdateOutput(); bool UpdateOutput() override;
KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
~KeyboardMouse(); ~KeyboardMouse();
std::string GetName() const; std::string GetName() const override;
std::string GetSource() const; std::string GetSource() const override;
int GetId() const; int GetId() const override;
private: private:
Window m_window; Window m_window;

24
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
View file

@ -30,9 +30,9 @@ private:
{ {
friend class KeyboardMouse; friend class KeyboardMouse;
public: public:
std::string GetName() const; std::string GetName() const override;
Key(Display* display, KeyCode keycode, const char* keyboard); Key(Display* display, KeyCode keycode, const char* keyboard);
ControlState GetState() const; ControlState GetState() const override;
private: private:
std::string m_keyname; std::string m_keyname;
@ -44,10 +44,10 @@ private:
class Button : public Input class Button : public Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
Button(unsigned int index, unsigned int& buttons) Button(unsigned int index, unsigned int& buttons)
: m_buttons(buttons), m_index(index) {} : m_buttons(buttons), m_index(index) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
const unsigned int& m_buttons; const unsigned int& m_buttons;
@ -57,11 +57,11 @@ private:
class Cursor : public Input class Cursor : public Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
bool IsDetectable() { return false; } bool IsDetectable() override { return false; }
Cursor(u8 index, bool positive, const float& cursor) Cursor(u8 index, bool positive, const float& cursor)
: m_cursor(cursor), m_index(index), m_positive(positive) {} : m_cursor(cursor), m_index(index), m_positive(positive) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
const float& m_cursor; const float& m_cursor;
@ -70,15 +70,15 @@ private:
}; };
public: public:
bool UpdateInput(); bool UpdateInput() override;
bool UpdateOutput(); bool UpdateOutput() override;
KeyboardMouse(Window window); KeyboardMouse(Window window);
~KeyboardMouse(); ~KeyboardMouse();
std::string GetName() const; std::string GetName() const override;
std::string GetSource() const; std::string GetSource() const override;
int GetId() const; int GetId() const override;
private: private:
Window m_window; Window m_window;

4
Source/Core/InputCommon/UDPWrapper.h
View file

@ -20,8 +20,8 @@ public:
std::string port; std::string port;
UDPWrapper(int index, const char* const _name); UDPWrapper(int index, const char* const _name);
virtual void LoadConfig(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 = ""); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "") override;
void Refresh(); void Refresh();
virtual ~UDPWrapper(); virtual ~UDPWrapper();
}; };

2
Source/Core/VideoBackends/OGL/PerfQuery.h
View file

@ -16,7 +16,7 @@ public:
void ResetQuery() override; void ResetQuery() override;
u32 GetQueryResult(PerfQueryType type) override; u32 GetQueryResult(PerfQueryType type) override;
void FlushResults() override; void FlushResults() override;
bool IsFlushed() const; bool IsFlushed() const override;
private: private:
struct ActiveQuery struct ActiveQuery

2
Source/Core/VideoBackends/OGL/Render.h
View file

@ -77,7 +77,7 @@ public:
void ReinterpretPixelData(unsigned int convtype) override; 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: private:
void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data); void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data);

24
Source/Core/VideoBackends/OGL/StreamBuffer.cpp
View file

@ -147,7 +147,7 @@ public:
~MapAndOrphan() { ~MapAndOrphan() {
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride); Align(stride);
if(m_iterator + size >= m_size) { if(m_iterator + size >= m_size) {
glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW); glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW);
@ -158,7 +158,7 @@ public:
return std::make_pair(pointer, m_iterator); 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); glFlushMappedBufferRange(m_buffertype, 0, used_size);
glUnmapBuffer(m_buffertype); glUnmapBuffer(m_buffertype);
m_iterator += used_size; m_iterator += used_size;
@ -185,7 +185,7 @@ public:
DeleteFences(); DeleteFences();
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride); Align(stride);
AllocMemory(size); AllocMemory(size);
u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size, u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size,
@ -193,7 +193,7 @@ public:
return std::make_pair(pointer, m_iterator); 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); glFlushMappedBufferRange(m_buffertype, 0, used_size);
glUnmapBuffer(m_buffertype); glUnmapBuffer(m_buffertype);
m_iterator += used_size; m_iterator += used_size;
@ -235,13 +235,13 @@ public:
glBindBuffer(m_buffertype, 0); glBindBuffer(m_buffertype, 0);
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride); Align(stride);
AllocMemory(size); AllocMemory(size);
return std::make_pair(m_pointer + m_iterator, m_iterator); 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; m_iterator += used_size;
} }
@ -275,13 +275,13 @@ public:
m_pointer = NULL; m_pointer = NULL;
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride); Align(stride);
AllocMemory(size); AllocMemory(size);
return std::make_pair(m_pointer + m_iterator, m_iterator); 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; m_iterator += used_size;
} }
@ -307,11 +307,11 @@ public:
delete [] m_pointer; delete [] m_pointer;
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
return std::make_pair(m_pointer, 0); 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); glBufferSubData(m_buffertype, 0, used_size, m_pointer);
} }
@ -335,11 +335,11 @@ public:
delete [] m_pointer; delete [] m_pointer;
} }
std::pair<u8*, size_t> Map(size_t size, u32 stride) { std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
return std::make_pair(m_pointer, 0); 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); glBufferData(m_buffertype, used_size, m_pointer, GL_STREAM_DRAW);
} }

2
Source/Core/VideoBackends/OGL/TextureCache.h
View file

@ -48,7 +48,7 @@ private:
const float *colmat) override; const float *colmat) override;
void Bind(unsigned int stage) 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(); ~TextureCache();

2
Source/Core/VideoBackends/OGL/VertexManager.h
View file

@ -39,7 +39,7 @@ public:
GLuint m_index_buffers; GLuint m_index_buffers;
GLuint m_last_vao; GLuint m_last_vao;
protected: protected:
virtual void ResetBuffer(u32 stride); virtual void ResetBuffer(u32 stride) override;
private: private:
void Draw(u32 stride); void Draw(u32 stride);
void vFlush(bool useDstAlpha) override; void vFlush(bool useDstAlpha) override;

40
Source/Core/VideoCommon/VideoBackendBase.h
View file

@ -133,41 +133,41 @@ extern VideoBackend* g_video_backend;
// inherited by D3D/OGL backends // inherited by D3D/OGL backends
class VideoBackendHardware : public VideoBackend class VideoBackendHardware : public VideoBackend
{ {
void RunLoop(bool enable); void RunLoop(bool enable) override;
bool Initialize(void *&) { InitializeShared(); return true; } bool Initialize(void *&) override { InitializeShared(); return true; }
void EmuStateChange(EMUSTATE_CHANGE); void EmuStateChange(EMUSTATE_CHANGE) override;
void Video_EnterLoop(); void Video_EnterLoop() override;
void Video_ExitLoop(); void Video_ExitLoop() override;
void Video_BeginField(u32, u32, u32); void Video_BeginField(u32, u32, u32) override;
void Video_EndField(); void Video_EndField() override;
u32 Video_AccessEFB(EFBAccessType, u32, u32, u32); u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) override;
u32 Video_GetQueryResult(PerfQueryType type); u32 Video_GetQueryResult(PerfQueryType type) override;
void Video_AddMessage(const char* pstr, unsigned int milliseconds); void Video_AddMessage(const char* pstr, unsigned int milliseconds) override;
void Video_ClearMessages(); void Video_ClearMessages() override;
bool Video_Screenshot(const char* filename); 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_IsPossibleWaitingSetDrawDone() override;
bool Video_IsHiWatermarkActive(); bool Video_IsHiWatermarkActive() override;
void Video_AbortFrame(); void Video_AbortFrame() override;
void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override; void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
void RegisterPEMMIO(MMIO::Mapping* mmio, u32 base) override; void RegisterPEMMIO(MMIO::Mapping* mmio, u32 base) override;
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
bool m_invalid; bool m_invalid;
public: public:
void CheckInvalidState(); void CheckInvalidState() override;
protected: protected:
void InitializeShared(); void InitializeShared();

4
Source/UnitTests/Core/MMIOTest.cpp
View file

@ -35,12 +35,12 @@ TEST(IsMMIOAddress, SpecialAddresses)
class MappingTest : public testing::Test class MappingTest : public testing::Test
{ {
protected: protected:
virtual void SetUp() virtual void SetUp() override
{ {
m_mapping = new MMIO::Mapping(); m_mapping = new MMIO::Mapping();
} }
virtual void TearDown() virtual void TearDown() override
{ {
delete m_mapping; delete m_mapping;
} }