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

45 files changed, 301 insertions, 301 deletions

diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
index 575121b983..71ab0d79c6 100644
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
index b420070f58..9cff0e8baf 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
+++ b/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 void DoState(PointerWrap &p);
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-
-	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 bool Initialize(bool bWii, bool bDSPThread) override;
+	virtual void Shutdown() override;
+	virtual bool IsLLE() override { return false ; }
+
+	virtual void DoState(PointerWrap &p) override;
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+
+	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; }
 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
index 4437887603..d19291d567 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
+++ b/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;
 };
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
index 5af2daed12..5539a00820 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
+++ b/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.
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
index 5e8080b97a..a9e6950684 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
+++ b/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);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
index 831bf63c8e..a1e1bd901a 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
index e2e5ddd8bb..61e68a916b 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
+++ b/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;
 };
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
index 17b74d4b59..79d59ac1bc 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
+++ b/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();
 };
 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
index e6dbe80f1e..791ba588d5 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
index 9b4d82136d..76f2663317 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
+++ b/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;
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
index da739a008e..c9b8214157 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
@@ -16,7 +16,7 @@ public:
 	DSPSymbolDB() {}
 	~DSPSymbolDB() {}
 
-	Symbol *GetSymbolFromAddr(u32 addr);
+	Symbol *GetSymbolFromAddr(u32 addr) override;
 
 };
 
diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp
index 74f96f756c..a1c6e5ed80 100644
--- a/Source/Core/Core/Src/HW/EXI_Device.cpp
+++ b/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);}
 };
 
 
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
index ec1b920081..b80db4882b 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
index 7a51a81baa..7ac6e9b624 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
+++ b/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];
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
index f75c136db4..ba66e816f8 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
index f720a83a5d..97bb1b6829 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
index 1bc012e9bf..2651ca08f0 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h
index cb6971c0ed..94d07b539f 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.h
+++ b/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:
 
diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp
index a6d5c8afde..ee0e649b5e 100644
--- a/Source/Core/Core/Src/HW/SI_Device.cpp
+++ b/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 {}
 };
 
 
diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
index 8c135ca980..d7b31a5ede 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
+++ b/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
diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
index a9d5aefb69..f2dbb2f311 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
@@ -86,20 +86,20 @@ public:
 	CSIDevice_DanceMat(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;
 };
 
 #endif
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.h b/Source/Core/Core/Src/HW/SI_DeviceGBA.h
index 7783d06285..d2fa333096 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.h
@@ -39,10 +39,10 @@ public:
 	~CSIDevice_GBA() {}
 
 	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
 
-	virtual bool GetData(u32& _Hi, u32& _Low) { return true; }
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) {}
+	virtual bool GetData(u32& _Hi, u32& _Low) override { return true; }
+	virtual void SendCommand(u32 _Cmd, u8 _Poll) override {}
 };
 
 #endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
index dfa292bf3b..e965261d21 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
@@ -18,7 +18,7 @@ public:
 
 	virtual void GetState( u8* const data, const bool focus = true ) {}
 	void Reset();
-	std::string GetName() const;
+	std::string GetName() const override;
 
 	const char*	const			name;
 	WiimoteEmu::ExtensionReg&	reg;
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
index 245ebabb90..1e33830a14 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
@@ -11,7 +11,7 @@ class Guitar : public Attachment
 {
 public:
 	Guitar(WiimoteEmu::ExtensionReg& _reg);
-	void GetState( u8* const data, const bool focus );
+	void GetState( u8* const data, const bool focus ) override;
 
 	enum
 	{
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
index 76518d9543..975e1fbfee 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
@@ -17,7 +17,7 @@ class Nunchuk : public Attachment
 public:
 	Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
 
-	virtual void GetState( u8* const data, const bool focus );
+	virtual void GetState( u8* const data, const bool focus ) override;
 
 	enum
 	{
@@ -25,7 +25,7 @@ public:
 		BUTTON_Z = 0x01,
 	};
 
-	void LoadDefaults(const ControllerInterface& ciface);
+	void LoadDefaults(const ControllerInterface& ciface) override;
 
 private:
 	Tilt*			m_tilt;
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
index b2c73e1920..c416d69cfc 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
@@ -11,7 +11,7 @@ class Turntable : public Attachment
 {
 public:
 	Turntable(WiimoteEmu::ExtensionReg& _reg);
-	void GetState(u8* const data, const bool focus);
+	void GetState(u8* const data, const bool focus) override;
 
 	enum
 	{
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
index dcb1a53b54..dfbe4eb003 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
@@ -19,15 +19,15 @@
 class Interpreter : public CPUCoreBase
 {
 public:
-	void Init();
-	void Shutdown();
+	void Init() override;
+	void Shutdown() override;
 	void Reset();
-	void SingleStep();
+	void SingleStep() override;
 	int SingleStepInner();
 
-	void Run();
-	void ClearCache();
-	const char *GetName();
+	void Run() override;
+	void ClearCache() override;
+	const char *GetName() override;
 
 	typedef void (*_interpreterInstruction)(UGeckoInstruction instCode);
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
index 08f238dcdf..4bd7ab5d15 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
@@ -62,30 +62,30 @@ public:
 	Jit64() : code_buffer(32000) {}
 	~Jit64() {}
 
-	void Init();
-	void Shutdown();
+	void Init() override;
+	void Shutdown() override;
 
 	// Jit!
 
-	void Jit(u32 em_address);
+	void Jit(u32 em_address) override;
 	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
 
 	u32 RegistersInUse();
 
-	JitBlockCache *GetBlockCache() { return &blocks; }
+	JitBlockCache *GetBlockCache() override { return &blocks; }
 
 	void Trace();
 
-	void ClearCache();
+	void ClearCache() override;
 
 	const u8 *GetDispatcher() {
 		return asm_routines.dispatcher;
 	}
-	const CommonAsmRoutines *GetAsmRoutines() {
+	const CommonAsmRoutines *GetAsmRoutines() override {
 		return &asm_routines;
 	}
 
-	const char *GetName() {
+	const char *GetName() override {
 #ifdef _M_X64
 		return "JIT64";
 #else
@@ -94,8 +94,8 @@ public:
 	}
 	// Run!
 
-	void Run();
-	void SingleStep();
+	void Run() override;
+	void SingleStep() override;
 
 	// Utilities for use by opcodes
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
index 30ae663231..cacd1e0e4e 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
@@ -121,11 +121,11 @@ public:
 class GPRRegCache : public RegCache
 {
 public:
-	void Start(PPCAnalyst::BlockRegStats &stats);
-	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
-	void StoreFromRegister(int preg);
-	OpArg GetDefaultLocation(int reg) const;
-	const int *GetAllocationOrder(int &count);
+	void Start(PPCAnalyst::BlockRegStats &stats) override;
+	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
+	void StoreFromRegister(int preg) override;
+	OpArg GetDefaultLocation(int reg) const override;
+	const int *GetAllocationOrder(int &count) override;
 	void SetImmediate32(int preg, u32 immValue);
 };
 
@@ -133,11 +133,11 @@ public:
 class FPURegCache : public RegCache
 {
 public:
-	void Start(PPCAnalyst::BlockRegStats &stats);
-	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
-	void StoreFromRegister(int preg);
-	const int *GetAllocationOrder(int &count);
-	OpArg GetDefaultLocation(int reg) const;
+	void Start(PPCAnalyst::BlockRegStats &stats) override;
+	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
+	void StoreFromRegister(int preg) override;
+	const int *GetAllocationOrder(int &count) override;
+	OpArg GetDefaultLocation(int reg) const override;
 };
 
 #endif  // _JIT64REGCACHE_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
index 4deb048bb6..3f0e847d91 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
@@ -70,31 +70,31 @@ public:
 
 	// Initialization, etc
 
-	void Init();
-	void Shutdown();
+	void Init() override;
+	void Shutdown() override;
 
 	// Jit!
 
-	void Jit(u32 em_address);
+	void Jit(u32 em_address) override;
 	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
 
 	void Trace();
 
-	JitBlockCache *GetBlockCache() { return &blocks; }
+	JitBlockCache *GetBlockCache() override { return &blocks; }
 
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { return NULL; };
+	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override { return NULL; };
 
-	bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
+	bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
 
-	void ClearCache();
+	void ClearCache() override;
 	const u8 *GetDispatcher() {
 		return asm_routines.dispatcher;  // asm_routines.dispatcher
 	}
-	const CommonAsmRoutines *GetAsmRoutines() {
+	const CommonAsmRoutines *GetAsmRoutines() override {
 		return &asm_routines;
 	}
 
-	const char *GetName() {
+	const char *GetName() override {
 #ifdef _M_X64
 		return "JIT64IL";
 #else
@@ -104,8 +104,8 @@ public:
 
 	// Run!
 
-	void Run();
-	void SingleStep();
+	void Run() override;
+	void SingleStep() override;
 
 	// Utilities for use by opcodes
 
@@ -128,16 +128,16 @@ public:
 	void WriteCode();
 
 	// OPCODES
-	void unknown_instruction(UGeckoInstruction _inst);
-	void Default(UGeckoInstruction _inst);
-	void DoNothing(UGeckoInstruction _inst);
-	void HLEFunction(UGeckoInstruction _inst);
-
-	void DynaRunTable4(UGeckoInstruction _inst);
-	void DynaRunTable19(UGeckoInstruction _inst);
-	void DynaRunTable31(UGeckoInstruction _inst);
-	void DynaRunTable59(UGeckoInstruction _inst);
-	void DynaRunTable63(UGeckoInstruction _inst);
+	void unknown_instruction(UGeckoInstruction _inst) override;
+	void Default(UGeckoInstruction _inst) override;
+	void DoNothing(UGeckoInstruction _inst) override;
+	void HLEFunction(UGeckoInstruction _inst) override;
+
+	void DynaRunTable4(UGeckoInstruction _inst) override;
+	void DynaRunTable19(UGeckoInstruction _inst) override;
+	void DynaRunTable31(UGeckoInstruction _inst) override;
+	void DynaRunTable59(UGeckoInstruction _inst) override;
+	void DynaRunTable63(UGeckoInstruction _inst) override;
 };
 
 void Jit(u32 em_address);
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
index 1bf2d70c53..2beb58d0d6 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
@@ -95,11 +95,11 @@ protected:
 	JitBlockCache blocks;
 	TrampolineCache trampolines;
 public:
-	JitBlockCache *GetBlockCache() { return &blocks; }
+	JitBlockCache *GetBlockCache() override { return &blocks; }
 
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx);
+	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override;
 
-	bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
+	bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
 };
 
 extern JitBase *jit;
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
index 4b540ee2ff..b81c5d837a 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
@@ -128,7 +128,7 @@ public:
 class JitBlockCache : public JitBaseBlockCache
 {
 private:
-	void WriteLinkBlock(u8* location, const u8* address);
-	void WriteDestroyBlock(const u8* location, u32 address);
+	void WriteLinkBlock(u8* location, const u8* address) override;
+	void WriteDestroyBlock(const u8* location, u32 address) override;
 };
 #endif
diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
index 157d9d1379..27b80eb683 100644
--- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
+++ b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
@@ -23,10 +23,10 @@ public:
 	PPCSymbolDB();
 	~PPCSymbolDB();
 
-	Symbol *AddFunction(u32 startAddr);
+	Symbol *AddFunction(u32 startAddr) override;
 	void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION);
 
-	Symbol *GetSymbolFromAddr(u32 addr);
+	Symbol *GetSymbolFromAddr(u32 addr) override;
 
 	const char *GetDescription(u32 addr);
 
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
index 8dc6a9e3cb..e5b36c54d5 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -92,24 +92,24 @@ public:
 
 	virtual ~CNANDContentLoader();
 
-	bool IsValid() const	{ return m_Valid; }
-	void RemoveTitle(void) const;
-	u64 GetTitleID() const  { return m_TitleID; }
-	u16 GetIosVersion() const { return m_IosVersion; }
-	u32 GetBootIndex() const  { return m_BootIndex; }
-	size_t GetContentSize() const { return m_Content.size(); }
-	const SNANDContent* GetContentByIndex(int _Index) const;
-	const u8* GetTMDView() const { return m_TMDView; }
-	const u8* GetTMDHeader() const { return m_TMDHeader; }
-	u32 GetTIKSize() const { return m_TIKSize; }
-	const u8* GetTIK() const { return m_TIK; }
-
-	const std::vector<SNANDContent>& GetContent() const { return m_Content; }
-
-	u16 GetTitleVersion() const {return m_TitleVersion;}
-	u16 GetNumEntries() const {return m_numEntries;}
-	DiscIO::IVolume::ECountry GetCountry() const;
-	u8 GetCountryChar() const {return m_Country; }
+	bool IsValid() const override	{ return m_Valid; }
+	void RemoveTitle(void) const override;
+	u64 GetTitleID() const override  { return m_TitleID; }
+	u16 GetIosVersion() const override { return m_IosVersion; }
+	u32 GetBootIndex() const override  { return m_BootIndex; }
+	size_t GetContentSize() const override { return m_Content.size(); }
+	const SNANDContent* GetContentByIndex(int _Index) const override;
+	const u8* GetTMDView() const override { return m_TMDView; }
+	const u8* GetTMDHeader() const override { return m_TMDHeader; }
+	u32 GetTIKSize() const override { return m_TIKSize; }
+	const u8* GetTIK() const override { return m_TIK; }
+
+	const std::vector<SNANDContent>& GetContent() const override { return m_Content; }
+
+	u16 GetTitleVersion() const override {return m_TitleVersion;}
+	u16 GetNumEntries() const override {return m_numEntries;}
+	DiscIO::IVolume::ECountry GetCountry() const override;
+	u8 GetCountryChar() const override {return m_Country; }
 
 private:
 
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index b6c3d9e8ea..a191b79677 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -919,7 +919,7 @@ public:
 		Create();
 	}
 
-	virtual ExitCode Entry()
+	virtual ExitCode Entry() override
 	{
 		return (ExitCode)m_Partition.Partition->CheckIntegrity();
 	}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index d91fbc587c..b313559907 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -222,22 +222,22 @@ public:
 
 	ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
 		return control->ToInput()->GetState();
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
 		control->ToOutput()->SetState(value);
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return 1;
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return "`" + (std::string)qualifier + "`";
 	}
@@ -257,7 +257,7 @@ public:
 		delete rhs;
 	}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
 		ControlState lhsValue = lhs->GetValue();
 		ControlState rhsValue = rhs->GetValue();
@@ -275,7 +275,7 @@ public:
 		}
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
 		// Don't do anything special with the op we have.
 		// Treat "A & B" the same as "A | B".
@@ -283,12 +283,12 @@ public:
 		rhs->SetValue(value);
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return lhs->CountNumControls() + rhs->CountNumControls();
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
 	}
@@ -306,7 +306,7 @@ public:
 		delete inner;
 	}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
 		ControlState value = inner->GetValue();
 		switch (op)
@@ -319,7 +319,7 @@ public:
 		}
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
 		switch (op)
 		{
@@ -330,12 +330,12 @@ public:
 		}
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return inner->CountNumControls();
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
 	}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
index 8b802540b1..f1714b253e 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
@@ -43,9 +43,9 @@ private:
 	class Button : public Core::Device::Input
 	{
 	public:
-		std::string GetName() const;
+		std::string GetName() const override;
 		Button(u8 index, SDL_Joystick* js) : m_js(js), m_index(index) {}
-		ControlState GetState() const;
+		ControlState GetState() const override;
 	private:
 		 SDL_Joystick* const m_js;
 		 const u8 m_index;
@@ -54,9 +54,9 @@ private:
 	class Axis : public Core::Device::Input
 	{
 	public:
-		std::string GetName() const;
+		std::string GetName() const override;
 		Axis(u8 index, SDL_Joystick* js, Sint16 range) : m_js(js), m_range(range), m_index(index) {}
-		ControlState GetState() const;
+		ControlState GetState() const override;
 	private:
 		SDL_Joystick* const m_js;
 		const Sint16 m_range;
@@ -66,9 +66,9 @@ private:
 	class Hat : public Input
 	{
 	public:
-		std::string GetName() const;
+		std::string GetName() const override;
 		Hat(u8 index, SDL_Joystick* js, u8 direction) : m_js(js), m_direction(direction), m_index(index) {}
-		ControlState GetState() const;
+		ControlState GetState() const override;
 	private:
 		SDL_Joystick* const m_js;
 		const u8 m_direction;
@@ -130,15 +130,15 @@ private:
 #endif
 
 public:
-	bool UpdateInput();
-	bool UpdateOutput();
+	bool UpdateInput() override;
+	bool UpdateOutput() override;
 
 	Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
 	~Joystick();
 
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
+	std::string GetName() const override;
+	int GetId() const override;
+	std::string GetSource() const override;
 
 private:
 	SDL_Joystick* const			m_joystick;
diff --git a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
index 681f4e3569..47c8b2048d 100644
--- a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
+++ b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
@@ -49,10 +49,10 @@ struct XFBSource : public XFBSourceBase
 	XFBSource(GLuint tex) : texture(tex) {}
 	~XFBSource();
 
-	void CopyEFB(float Gamma);
-	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
+	void CopyEFB(float Gamma) override;
+	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
 	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
+		const MathUtil::Rectangle<float> &drawrc, int width, int height) const override;
 
 	const GLuint texture;
 };
@@ -99,10 +99,10 @@ public:
 	static void ReinterpretPixelData(unsigned int convtype);
 
 private:
-	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
-	void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc);
+	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height) override;
+	void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) override;
 
-	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
+	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;
 
 	static int m_targetWidth;
 	static int m_targetHeight;
diff --git a/Source/Core/VideoBackends/OGL/Src/PerfQuery.h b/Source/Core/VideoBackends/OGL/Src/PerfQuery.h
index b96fe7a4a0..c47fa194d1 100644
--- a/Source/Core/VideoBackends/OGL/Src/PerfQuery.h
+++ b/Source/Core/VideoBackends/OGL/Src/PerfQuery.h
@@ -11,11 +11,11 @@ public:
 	PerfQuery();
 	~PerfQuery();
 
-	void EnableQuery(PerfQueryGroup type);
-	void DisableQuery(PerfQueryGroup type);
-	void ResetQuery();
-	u32 GetQueryResult(PerfQueryType type);
-	void FlushResults();
+	void EnableQuery(PerfQueryGroup type) override;
+	void DisableQuery(PerfQueryGroup type) override;
+	void ResetQuery() override;
+	u32 GetQueryResult(PerfQueryType type) override;
+	void FlushResults() override;
 	bool IsFlushed() const;
 
 private:
diff --git a/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h
index ddf37c0872..a7b21a929d 100644
--- a/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h
@@ -97,7 +97,7 @@ private:
 	class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
 	{
 	public:
-		void Read(const SHADERUID &key, const u8 *value, u32 value_size);
+		void Read(const SHADERUID &key, const u8 *value, u32 value_size) override;
 	};
 
 	static PCache pshaders;
diff --git a/Source/Core/VideoBackends/OGL/Src/Render.h b/Source/Core/VideoBackends/OGL/Src/Render.h
index 58ae98dabf..f38c9b4c58 100644
--- a/Source/Core/VideoBackends/OGL/Src/Render.h
+++ b/Source/Core/VideoBackends/OGL/Src/Render.h
@@ -46,39 +46,39 @@ public:
 	static void Init();
 	static void Shutdown();
 
-	void SetColorMask();
-	void SetBlendMode(bool forceUpdate);
-	void SetScissorRect(const TargetRectangle& rc);
-	void SetGenerationMode();
-	void SetDepthMode();
-	void SetLogicOpMode();
-	void SetDitherMode();
-	void SetLineWidth();
-	void SetSamplerState(int stage,int texindex);
-	void SetInterlacingMode();
+	void SetColorMask() override;
+	void SetBlendMode(bool forceUpdate) override;
+	void SetScissorRect(const TargetRectangle& rc) override;
+	void SetGenerationMode() override;
+	void SetDepthMode() override;
+	void SetLogicOpMode() override;
+	void SetDitherMode() override;
+	void SetLineWidth() override;
+	void SetSamplerState(int stage,int texindex) override;
+	void SetInterlacingMode() override;
 
 	// TODO: Implement and use these
-	void ApplyState(bool bUseDstAlpha) {}
-	void RestoreState() {}
+	void ApplyState(bool bUseDstAlpha) override {}
+	void RestoreState() override {}
 
-	void RenderText(const char* pstr, int left, int top, u32 color);
+	void RenderText(const char* pstr, int left, int top, u32 color) override;
 	void DrawDebugInfo();
 	static void FlipImageData(u8 *data, int w, int h);
 
-	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data);
+	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override;
 
-	void ResetAPIState();
-	void RestoreAPIState();
+	void ResetAPIState() override;
+	void RestoreAPIState() override;
 
-	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc);
+	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) override;
 
-	void Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
+	void Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma) override;
 
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) override;
 
-	void ReinterpretPixelData(unsigned int convtype);
+	void ReinterpretPixelData(unsigned int convtype) override;
 
-	void UpdateViewport();
+	void UpdateViewport() override;
 
 	static void TakeScreenshot(const TargetRectangle &rc, std::string filename);
 
diff --git a/Source/Core/VideoBackends/OGL/Src/TextureCache.h b/Source/Core/VideoBackends/OGL/Src/TextureCache.h
index 137d26704b..1c95d35f98 100644
--- a/Source/Core/VideoBackends/OGL/Src/TextureCache.h
+++ b/Source/Core/VideoBackends/OGL/Src/TextureCache.h
@@ -45,23 +45,23 @@ private:
 		~TCacheEntry();
 
 		void Load(unsigned int width, unsigned int height,
-			unsigned int expanded_width, unsigned int level);
+			unsigned int expanded_width, unsigned int level) override;
 
 		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
 			unsigned int srcFormat, const EFBRectangle& srcRect,
 			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-			const float *colmat);
+			const float *colmat) override;
 
-		void Bind(unsigned int stage);
+		void Bind(unsigned int stage) override;
 		bool Save(const char filename[], unsigned int level);
 	};
 
 	~TextureCache();
 
 	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
-		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
+		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt) override;
 
-	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
+	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) override;
 };
 
 bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level);
diff --git a/Source/Core/VideoBackends/OGL/Src/VertexManager.h b/Source/Core/VideoBackends/OGL/Src/VertexManager.h
index 67017b3436..f96ec7ec97 100644
--- a/Source/Core/VideoBackends/OGL/Src/VertexManager.h
+++ b/Source/Core/VideoBackends/OGL/Src/VertexManager.h
@@ -19,8 +19,8 @@ namespace OGL
 		GLVertexFormat();
 		~GLVertexFormat();
 
-		virtual void Initialize(const PortableVertexDeclaration &_vtx_decl);
-		virtual void SetupVertexPointers();
+		virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
+		virtual void SetupVertexPointers() override;
 
 		GLuint VAO;
 	};
@@ -32,9 +32,9 @@ class VertexManager : public ::VertexManager
 public:
 	VertexManager();
 	~VertexManager();
-	NativeVertexFormat* CreateNativeVertexFormat();
-	void CreateDeviceObjects();
-	void DestroyDeviceObjects();
+	NativeVertexFormat* CreateNativeVertexFormat() override;
+	void CreateDeviceObjects() override;
+	void DestroyDeviceObjects() override;
 
 	// NativeVertexFormat use this
 	GLuint m_vertex_buffers;
@@ -42,7 +42,7 @@ public:
 	GLuint m_last_vao;
 private:
 	void Draw(u32 stride);
-	void vFlush();
+	void vFlush() override;
 	void PrepareDrawBuffers(u32 stride);
 	NativeVertexFormat *m_CurrentVertexFmt;
 };
diff --git a/Source/Core/VideoBackends/OGL/Src/VideoBackend.h b/Source/Core/VideoBackends/OGL/Src/VideoBackend.h
index 137c09a973..ed4a748eb4 100644
--- a/Source/Core/VideoBackends/OGL/Src/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/Src/VideoBackend.h
@@ -9,19 +9,19 @@ namespace OGL
 
 class VideoBackend : public VideoBackendHardware
 {
-	bool Initialize(void *&);
-	void Shutdown();
+	bool Initialize(void *&) override;
+	void Shutdown() override;
 
-	std::string GetName();
-	std::string GetDisplayName();
+	std::string GetName() override;
+	std::string GetDisplayName() override;
 
-	void Video_Prepare();
-	void Video_Cleanup();
+	void Video_Prepare() override;
+	void Video_Cleanup() override;
 
-	void ShowConfig(void* parent);
+	void ShowConfig(void* parent) override;
 
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
+	void UpdateFPSDisplay(const char*) override;
+	unsigned int PeekMessages() override;
 };
 
 }
diff --git a/Source/Core/VideoBackends/Software/Src/VideoBackend.h b/Source/Core/VideoBackends/Software/Src/VideoBackend.h
index dd62838bc0..4d85c637f0 100644
--- a/Source/Core/VideoBackends/Software/Src/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/Src/VideoBackend.h
@@ -9,57 +9,57 @@ namespace SW
 
 class VideoSoftware : public VideoBackend
 {
-	bool Initialize(void *&);
-	void Shutdown();
+	bool Initialize(void *&) override;
+	void Shutdown() override;
 
-	std::string GetName();
+	std::string GetName() override;
 
-	void EmuStateChange(EMUSTATE_CHANGE newState);
+	void EmuStateChange(EMUSTATE_CHANGE newState) override;
 
-	void RunLoop(bool enable);
+	void RunLoop(bool enable) override;
 
-	void ShowConfig(void* parent);
+	void ShowConfig(void* parent) override;
 
-	void Video_Prepare();
-	void Video_Cleanup();
+	void Video_Prepare() override;
+	void Video_Cleanup() 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;
 
 	int Video_LoadTexture(char *imagedata, u32 width, u32 height);
 	void Video_DeleteTexture(int texID);
 	void Video_DrawTexture(int texID, float *coords);
 
-	void Video_SetRendering(bool bEnabled);
+	void Video_SetRendering(bool bEnabled) override;
 
-	void Video_GatherPipeBursted();
-	bool Video_IsHiWatermarkActive();
-	bool Video_IsPossibleWaitingSetDrawDone();
-	void Video_AbortFrame();
+	void Video_GatherPipeBursted() override;
+	bool Video_IsHiWatermarkActive() override;
+	bool Video_IsPossibleWaitingSetDrawDone() override;
+	void Video_AbortFrame() override;
 
-	readFn16  Video_CPRead16();
-	writeFn16 Video_CPWrite16();
-	readFn16  Video_PERead16();
-	writeFn16 Video_PEWrite16();
-	writeFn32 Video_PEWrite32();
+	readFn16  Video_CPRead16() override;
+	writeFn16 Video_CPWrite16() override;
+	readFn16  Video_PERead16() override;
+	writeFn16 Video_PEWrite16() override;
+	writeFn32 Video_PEWrite32() override;
 
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
+	void UpdateFPSDisplay(const char*) override;
+	unsigned int PeekMessages() 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;
 
 public:
-	void CheckInvalidState();
+	void CheckInvalidState() override;
 };
 
 }