Run code through clang-modernize -add-override to add 'override' decls.

Source/Core/Core/Src/Debugger/PPCDebugInterface.h

@@ -15,33 +15,33 @@ class PPCDebugInterface : public DebugInterface
 {
 public:
 	PPCDebugInterface(){}
-	virtual void disasm(unsigned int address, char *dest, int max_size);
-	virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size);
-	virtual int getInstructionSize(int /*instruction*/) {return 4;}
-	virtual bool isAlive();
-	virtual bool isBreakpoint(unsigned int address);
-	virtual void setBreakpoint(unsigned int address);
-	virtual void clearBreakpoint(unsigned int address);
-	virtual void clearAllBreakpoints();
-	virtual void toggleBreakpoint(unsigned int address);
-	virtual bool isMemCheck(unsigned int address);
-	virtual void toggleMemCheck(unsigned int address);
-	virtual unsigned int readMemory(unsigned int address);
+	virtual void disasm(unsigned int address, char *dest, int max_size) override;
+	virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
+	virtual int getInstructionSize(int /*instruction*/) override {return 4;}
+	virtual bool isAlive() override;
+	virtual bool isBreakpoint(unsigned int address) override;
+	virtual void setBreakpoint(unsigned int address) override;
+	virtual void clearBreakpoint(unsigned int address) override;
+	virtual void clearAllBreakpoints() override;
+	virtual void toggleBreakpoint(unsigned int address) override;
+	virtual bool isMemCheck(unsigned int address) override;
+	virtual void toggleMemCheck(unsigned int address) override;
+	virtual unsigned int readMemory(unsigned int address) override;
 
 	enum {
 		EXTRAMEM_ARAM = 1,
 	};
-	virtual unsigned int readExtraMemory(int memory, unsigned int address);
-	virtual unsigned int readInstruction(unsigned int address);
-	virtual unsigned int getPC();
-	virtual void setPC(unsigned int address);
-	virtual void step() {}
-	virtual void breakNow();
-	virtual void runToBreakpoint();
-	virtual void insertBLR(unsigned int address, unsigned int value);
-	virtual int getColor(unsigned int address);
-	virtual std::string getDescription(unsigned int address);
-	virtual void showJitResults(u32 address);
+	virtual unsigned int readExtraMemory(int memory, unsigned int address) override;
+	virtual unsigned int readInstruction(unsigned int address) override;
+	virtual unsigned int getPC() override;
+	virtual void setPC(unsigned int address) override;
+	virtual void step() override {}
+	virtual void breakNow() override;
+	virtual void runToBreakpoint() override;
+	virtual void insertBLR(unsigned int address, unsigned int value) override;
+	virtual int getColor(unsigned int address) override;
+	virtual std::string getDescription(unsigned int address) override;
+	virtual void showJitResults(u32 address) override;
 };
 
 #endif

Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h

@@ -16,24 +16,24 @@ class DSPHLE : public DSPEmulator {
 public:
 	DSPHLE();
 
-	virtual bool Initialize(bool bWii, bool bDSPThread);
-	virtual void Shutdown();
-	virtual bool IsLLE() { return false; }
+	virtual bool Initialize(bool bWii, bool bDSPThread) override;
+	virtual void Shutdown() override;
+	virtual bool IsLLE() override { return false ; }
 
-	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;
 
 	CMailHandler& AccessMailHandler() { return m_MailHandler; }
 

Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h

@@ -15,7 +15,7 @@ public:
 	HLEMixer(DSPHLE *dsp_hle, unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000)
 		: CMixer(AISampleRate, DACSampleRate, BackendSampleRate), m_DSPHLE(dsp_hle) {};
 
-	virtual void Premix(short *samples, unsigned int numSamples);
+	virtual void Premix(short *samples, unsigned int numSamples) override;
 private:
 	DSPHLE *m_DSPHLE;
 };

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h

@@ -56,11 +56,11 @@ public:
 	CUCode_AX(DSPHLE* dsp_hle, u32 crc);
 	virtual ~CUCode_AX();
 
-	virtual void HandleMail(u32 mail);
-	virtual void MixAdd(short* out_buffer, int nsamples);
-	virtual void Update(int cycles);
-	virtual void DoState(PointerWrap& p);
-	u32 GetUpdateMs();
+	virtual void HandleMail(u32 mail) override;
+	virtual void MixAdd(short* out_buffer, int nsamples) override;
+	virtual void Update(int cycles) override;
+	virtual void DoState(PointerWrap& p) override;
+	u32 GetUpdateMs() override;
 
 	// Needed because StdThread.h std::thread implem does not support member
 	// pointers. TODO(delroth): obsolete.

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h

@@ -12,9 +12,9 @@ class CUCode_AXWii : public CUCode_AX
 public:
 	CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
 	virtual ~CUCode_AXWii();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	virtual void DoState(PointerWrap &p);
+	virtual void DoState(PointerWrap &p) override;
 
 protected:
 	// Additional AUX buffers
@@ -56,7 +56,7 @@ protected:
 	// but this gives better precision and nicer code.
 	void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
 
-	virtual void HandleCommandList();
+	virtual void HandleCommandList() override;
 
 	void SetupProcessing(u32 init_addr);
 	void AddToLR(u32 val_addr, bool neg);

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h

@@ -12,10 +12,10 @@ class CUCode_CARD : public IUCode
 public:
 	CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_CARD();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
+	void HandleMail(u32 _uMail) override;
+	void Update(int cycles) override;
 };
 
 #endif

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h

@@ -10,8 +10,8 @@ struct CUCode_GBA : public IUCode
 {
 	CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_GBA();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
+	void HandleMail(u32 _uMail) override;
+	void Update(int cycles) override;
 };

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h

@@ -12,10 +12,10 @@ class CUCode_InitAudioSystem : public IUCode
 public:
 	CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_InitAudioSystem();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
+	void HandleMail(u32 _uMail) override;
+	void Update(int cycles) override;
 	void Init();
 };
 

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h

@@ -12,12 +12,12 @@ class CUCode_Rom : public IUCode
 public:
 	CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
 	virtual ~CUCode_Rom();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
+	void HandleMail(u32 _uMail) override;
+	void Update(int cycles) override;
 
-	void DoState(PointerWrap &p);
+	void DoState(PointerWrap &p) override;
 
 private:
 	struct SUCode

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h

@@ -120,20 +120,20 @@ class CUCode_Zelda : public IUCode
 public:
 	CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC);
 	virtual ~CUCode_Zelda();
-	u32 GetUpdateMs();
+	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail);
+	void HandleMail(u32 _uMail) override;
 	void HandleMail_LightVersion(u32 _uMail);
 	void HandleMail_SMSVersion(u32 _uMail);
 	void HandleMail_NormalVersion(u32 _uMail);
 
-	void Update(int cycles);
-	void MixAdd(short* buffer, int size);
+	void Update(int cycles) override;
+	void MixAdd(short* buffer, int size) override;
 
 	void CopyPBsFromRAM();
 	void CopyPBsToRAM();
 
-	void DoState(PointerWrap &p);
+	void DoState(PointerWrap &p) override;
 
 	int *templbuffer;
 	int *temprbuffer;

Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h

@@ -16,7 +16,7 @@ public:
 	DSPSymbolDB() {}
 	~DSPSymbolDB() {}
 
-	Symbol *GetSymbolFromAddr(u32 addr);
+	Symbol *GetSymbolFromAddr(u32 addr) override;
 
 };
 

Source/Core/Core/Src/HW/EXI_Device.cpp

@@ -71,7 +71,7 @@ class CEXIDummy : public IEXIDevice
 {
 	std::string m_strName;
 
-	void TransferByte(u8& _byte) {}
+	void TransferByte(u8& _byte) override {}
 
 public:
 	CEXIDummy(const std::string& _strName) :
@@ -81,10 +81,10 @@ public:
 
 	virtual ~CEXIDummy(){}
 
-	void ImmWrite(u32 data, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
-	u32  ImmRead (u32 size)				{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
-	void DMAWrite(u32 addr, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
-	void DMARead (u32 addr, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead:  %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
+	void ImmWrite(u32 data, u32 size) override	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
+	u32  ImmRead (u32 size) override				{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
+	void DMAWrite(u32 addr, u32 size) override	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
+	void DMARead (u32 addr, u32 size) override	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead:  %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
 };
 
 

Source/Core/Core/Src/HW/EXI_DeviceAD16.h

@@ -9,9 +9,9 @@ class CEXIAD16 : public IEXIDevice
 {
 public:
 	CEXIAD16();
-	virtual void SetCS(int _iCS);
-	virtual bool IsPresent();
-	virtual void DoState(PointerWrap &p);
+	virtual void SetCS(int _iCS) override;
+	virtual bool IsPresent() override;
+	virtual void DoState(PointerWrap &p) override;
 
 private:
 	enum
@@ -32,7 +32,7 @@ private:
 	u32 m_uCommand;
 	UAD16Reg m_uAD16Register;
 
-	virtual void TransferByte(u8& _uByte);
+	virtual void TransferByte(u8& _uByte) override;
 };
 
 #endif

Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h

@@ -10,13 +10,13 @@ class CEXIAMBaseboard : public IEXIDevice
 public:
 	CEXIAMBaseboard();
 
-	virtual void SetCS(int _iCS);
-	virtual bool IsPresent();
-	virtual bool IsInterruptSet();
-	virtual void DoState(PointerWrap &p);
+	virtual void SetCS(int _iCS) override;
+	virtual bool IsPresent() override;
+	virtual bool IsInterruptSet() override;
+	virtual void DoState(PointerWrap &p) override;
 
 private:
-	virtual void TransferByte(u8& _uByte);
+	virtual void TransferByte(u8& _uByte) override;
 	int m_position;
 	bool m_have_irq;
 	unsigned char m_command[4];

Source/Core/Core/Src/HW/EXI_DeviceEthernet.h

@@ -189,14 +189,14 @@ class CEXIETHERNET : public IEXIDevice
 public:
 	CEXIETHERNET();
 	virtual ~CEXIETHERNET();
-	void SetCS(int cs);
-	bool IsPresent();
-	bool IsInterruptSet();
-	void ImmWrite(u32 data,  u32 size);
-	u32  ImmRead(u32 size);
-	void DMAWrite(u32 addr, u32 size);
-	void DMARead(u32 addr, u32 size);
-	void DoState(PointerWrap &p);
+	void SetCS(int cs) override;
+	bool IsPresent() override;
+	bool IsInterruptSet() override;
+	void ImmWrite(u32 data,  u32 size) override;
+	u32  ImmRead(u32 size) override;
+	void DMAWrite(u32 addr, u32 size) override;
+	void DMARead(u32 addr, u32 size) override;
+	void DoState(PointerWrap &p) override;
 
 //private:
 	struct

Source/Core/Core/Src/HW/EXI_DeviceGecko.h

@@ -48,8 +48,8 @@ class CEXIGecko
 {
 public:
 	CEXIGecko() {}
-	bool IsPresent() { return true; }
-	void ImmReadWrite(u32 &_uData, u32 _uSize);
+	bool IsPresent() override { return true; }
+	void ImmReadWrite(u32 &_uData, u32 _uSize) override;
 
 private:
 	enum

Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h

@@ -21,13 +21,13 @@ class CEXIMemoryCard : public IEXIDevice
 public:
 	CEXIMemoryCard(const int index);
 	virtual ~CEXIMemoryCard();
-	void SetCS(int cs);
-	void Update();
-	bool IsInterruptSet();
-	bool IsPresent();
-	void DoState(PointerWrap &p);
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
+	void SetCS(int cs) override;
+	void Update() override;
+	bool IsInterruptSet() override;
+	bool IsPresent() override;
+	void DoState(PointerWrap &p) override;
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) override;
 
 private:
 	// This is scheduled whenever a page write is issued. The this pointer is passed
@@ -89,7 +89,7 @@ private:
 	std::thread flushThread;
 
 protected:
-	virtual void TransferByte(u8 &byte);
+	virtual void TransferByte(u8 &byte) override;
 };
 
 #endif

Source/Core/Core/Src/HW/GCPadEmu.h

@@ -20,9 +20,9 @@ public:
 
 	bool GetMicButton() const;
 
-	std::string GetName() const;
+	std::string GetName() const override;
 
-	void LoadDefaults(const ControllerInterface& ciface);
+	void LoadDefaults(const ControllerInterface& ciface) override;
 
 private:
 

Source/Core/Core/Src/HW/SI_Device.cpp

@@ -44,15 +44,15 @@ public:
 	CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {}
 	virtual ~CSIDevice_Null() {}
 
-	int RunBuffer(u8* _pBuffer, int _iLength) {
+	int RunBuffer(u8* _pBuffer, int _iLength) override {
 		reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE;
 		return 4;
 	}
-	bool GetData(u32& _Hi, u32& _Low) {
+	bool GetData(u32& _Hi, u32& _Low) override {
 		_Hi = 0x80000000;
 		return true;
 	}
-	void SendCommand(u32 _Cmd, u8 _Poll) {}
+	void SendCommand(u32 _Cmd, u8 _Poll) override {}
 };
 
 

Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h

@@ -20,13 +20,13 @@ public:
 	CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
 
 	// run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
 
 	// 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;
 };
 
 #endif // _SIDEVICE_AMBASEBOARD_H