Merge pull request #2789 from lioncash/virt

Remove unnecessary virtual keywords

38 files changed, 215 insertions, 211 deletions

diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h
index e3c74463b6..b47c580caa 100644
--- a/Source/Core/AudioCommon/PulseAudioStream.h
+++ b/Source/Core/AudioCommon/PulseAudioStream.h
@@ -31,7 +31,7 @@ public:
 	void UnderflowCallback(pa_stream *s);
 
 private:
-	virtual void SoundLoop() override;
+	void SoundLoop() override;
 
 	bool PulseInit();
 	void PulseShutdown();
diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h
index e8e7d2ccc0..a5028352b2 100644
--- a/Source/Core/Core/DSP/DSPCaptureLogger.h
+++ b/Source/Core/Core/DSP/DSPCaptureLogger.h
@@ -43,9 +43,9 @@ public:
 class DefaultDSPCaptureLogger : public DSPCaptureLogger
 {
 public:
-	virtual void LogIFXRead(u16 address, u16 read_value) override {}
-	virtual void LogIFXWrite(u16 address, u16 written_value) override {}
-	virtual void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+	void LogIFXRead(u16 address, u16 read_value) override {}
+	void LogIFXWrite(u16 address, u16 written_value) override {}
+	void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
 	                    u16 length, const u8* data) override {}
 };
 
@@ -60,15 +60,15 @@ public:
 	PCAPDSPCaptureLogger(PCAP* pcap);
 	PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap);
 
-	virtual void LogIFXRead(u16 address, u16 read_value) override
+	void LogIFXRead(u16 address, u16 read_value) override
 	{
 		LogIFXAccess(true, address, read_value);
 	}
-	virtual void LogIFXWrite(u16 address, u16 written_value) override
+	void LogIFXWrite(u16 address, u16 written_value) override
 	{
 		LogIFXAccess(false, address, written_value);
 	}
-	virtual void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+	void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
 	                    u16 length, const u8* data) override;
 
 private:
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
index 62575a7015..4b24c6488c 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.h
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -14,33 +14,33 @@ class PPCDebugInterface final : public DebugInterface
 {
 public:
 	PPCDebugInterface(){}
-	virtual std::string Disassemble(unsigned int address) 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 AddWatch(unsigned int address) override;
-	virtual void ToggleBreakpoint(unsigned int address) override;
-	virtual void ClearAllMemChecks() override;
-	virtual bool IsMemCheck(unsigned int address) override;
-	virtual void ToggleMemCheck(unsigned int address) override;
-	virtual unsigned int ReadMemory(unsigned int address) override;
+	std::string Disassemble(unsigned int address) override;
+	void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
+	int GetInstructionSize(int /*instruction*/) override {return 4;}
+	bool IsAlive() override;
+	bool IsBreakpoint(unsigned int address) override;
+	void SetBreakpoint(unsigned int address) override;
+	void ClearBreakpoint(unsigned int address) override;
+	void ClearAllBreakpoints() override;
+	void AddWatch(unsigned int address) override;
+	void ToggleBreakpoint(unsigned int address) override;
+	void ClearAllMemChecks() override;
+	bool IsMemCheck(unsigned int address) override;
+	void ToggleMemCheck(unsigned int address) override;
+	unsigned int ReadMemory(unsigned int address) override;
 
 	enum
 	{
 		EXTRAMEM_ARAM = 1,
 	};
 
-	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 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;
+	unsigned int ReadExtraMemory(int memory, unsigned int address) override;
+	unsigned int ReadInstruction(unsigned int address) override;
+	unsigned int GetPC() override;
+	void SetPC(unsigned int address) override;
+	void Step() override {}
+	void RunToBreakpoint() override;
+	void InsertBLR(unsigned int address, unsigned int value) override;
+	int GetColor(unsigned int address) override;
+	std::string GetDescription(unsigned int address) override;
 };
diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h
index b5ff933c84..fe59e52f6a 100644
--- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h
+++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h
@@ -15,22 +15,22 @@ class DSPHLE : public DSPEmulator {
 public:
 	DSPHLE();
 
-	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_Update(int cycles) override;
-	virtual void DSP_StopSoundStream() override;
-	virtual u32 DSP_UpdateRate() override;
+	bool Initialize(bool bWii, bool bDSPThread) override;
+	void Shutdown() override;
+	bool IsLLE() override { return false ; }
+
+	void DoState(PointerWrap &p) override;
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+
+	void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
+	void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
+	unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
+	unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
+	unsigned short DSP_ReadControlRegister() override;
+	unsigned short DSP_WriteControlRegister(unsigned short) override;
+	void DSP_Update(int cycles) override;
+	void DSP_StopSoundStream() override;
+	u32 DSP_UpdateRate() override;
 
 	CMailHandler& AccessMailHandler() { return m_MailHandler; }
 
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
index 329e06084d..1af79ebb4f 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
@@ -55,9 +55,9 @@ public:
 	AXUCode(DSPHLE* dsphle, u32 crc);
 	virtual ~AXUCode();
 
-	virtual void HandleMail(u32 mail) override;
-	virtual void Update() override;
-	virtual void DoState(PointerWrap& p) override;
+	void HandleMail(u32 mail) override;
+	void Update() override;
+	void DoState(PointerWrap& p) override;
 	u32 GetUpdateMs() override;
 
 protected:
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
index 3cdba24d7e..13a5d3dc41 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
@@ -13,7 +13,7 @@ public:
 	virtual ~AXWiiUCode();
 	u32 GetUpdateMs() override;
 
-	virtual void DoState(PointerWrap &p) override;
+	void DoState(PointerWrap &p) override;
 
 protected:
 	// Additional AUX buffers
@@ -55,7 +55,7 @@ protected:
 	// but this gives better precision and nicer code.
 	void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
 
-	virtual void HandleCommandList() override;
+	void HandleCommandList() override;
 
 	void SetupProcessing(u32 init_addr);
 	void AddToLR(u32 val_addr, bool neg);
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
index 69d8209d91..b8bdd83e5c 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
+++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
@@ -12,26 +12,27 @@
 class DSPDebugInterface final : public DebugInterface
 {
 public:
-	DSPDebugInterface(){}
-	virtual std::string Disassemble(unsigned int address) override;
-	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
-	virtual int GetInstructionSize(int instruction) override { return 1; }
-	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 void ClearAllMemChecks() override;
-	virtual bool IsMemCheck(unsigned int address) override;
-	virtual void ToggleMemCheck(unsigned int address) override;
-	virtual unsigned int ReadMemory(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 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;
+	DSPDebugInterface() {}
+
+	std::string Disassemble(unsigned int address) override;
+	void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
+	int GetInstructionSize(int instruction) override { return 1; }
+	bool IsAlive() override;
+	bool IsBreakpoint(unsigned int address) override;
+	void SetBreakpoint(unsigned int address) override;
+	void ClearBreakpoint(unsigned int address) override;
+	void ClearAllBreakpoints() override;
+	void ToggleBreakpoint(unsigned int address) override;
+	void ClearAllMemChecks() override;
+	bool IsMemCheck(unsigned int address) override;
+	void ToggleMemCheck(unsigned int address) override;
+	unsigned int ReadMemory(unsigned int address) override;
+	unsigned int ReadInstruction(unsigned int address) override;
+	unsigned int GetPC() override;
+	void SetPC(unsigned int address) override;
+	void Step() override {}
+	void RunToBreakpoint() override;
+	void InsertBLR(unsigned int address, unsigned int value) override;
+	int GetColor(unsigned int address) override;
+	std::string GetDescription(unsigned int address) override;
 };
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h
index b8e92e1c06..c40063bcae 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h
@@ -18,22 +18,22 @@ class DSPLLE : public DSPEmulator
 public:
 	DSPLLE();
 
-	virtual bool Initialize(bool bWii, bool bDSPThread) override;
-	virtual void Shutdown() override;
-	virtual bool IsLLE() override { return true; }
-
-	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_Update(int cycles) override;
-	virtual void DSP_StopSoundStream() override;
-	virtual u32 DSP_UpdateRate() override;
+	bool Initialize(bool bWii, bool bDSPThread) override;
+	void Shutdown() override;
+	bool IsLLE() override { return true; }
+
+	void DoState(PointerWrap &p) override;
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+
+	void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
+	void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
+	unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
+	unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
+	unsigned short DSP_ReadControlRegister() override;
+	unsigned short DSP_WriteControlRegister(unsigned short) override;
+	void DSP_Update(int cycles) override;
+	void DSP_StopSoundStream() override;
+	u32 DSP_UpdateRate() override;
 
 private:
 	static void DSPThread(DSPLLE* lpParameter);
diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI_DeviceAD16.h
index b9ce260fc6..c3bcf8a4a9 100644
--- a/Source/Core/Core/HW/EXI_DeviceAD16.h
+++ b/Source/Core/Core/HW/EXI_DeviceAD16.h
@@ -12,9 +12,9 @@ class CEXIAD16 : public IEXIDevice
 {
 public:
 	CEXIAD16();
-	virtual void SetCS(int _iCS) override;
-	virtual bool IsPresent() const override;
-	virtual void DoState(PointerWrap &p) override;
+	void SetCS(int _iCS) override;
+	bool IsPresent() const override;
+	void DoState(PointerWrap &p) override;
 
 private:
 	enum
@@ -35,5 +35,5 @@ private:
 	u32 m_uCommand;
 	UAD16Reg m_uAD16Register;
 
-	virtual void TransferByte(u8& _uByte) override;
+	void TransferByte(u8& _uByte) override;
 };
diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
index 24a1e3c579..50b9d0354a 100644
--- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
@@ -13,13 +13,13 @@ class CEXIAMBaseboard : public IEXIDevice
 public:
 	CEXIAMBaseboard();
 
-	virtual void SetCS(int _iCS) override;
-	virtual bool IsPresent() const override;
-	virtual bool IsInterruptSet() override;
-	virtual void DoState(PointerWrap &p) override;
+	void SetCS(int _iCS) override;
+	bool IsPresent() const override;
+	bool IsInterruptSet() override;
+	void DoState(PointerWrap &p) override;
 
 private:
-	virtual void TransferByte(u8& _uByte) override;
+	void TransferByte(u8& _uByte) override;
 	int m_position;
 	bool m_have_irq;
 	unsigned char m_command[4];
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h
index b7b80b3a69..25bb53c9b9 100644
--- a/Source/Core/Core/HW/EXI_DeviceIPL.h
+++ b/Source/Core/Core/HW/EXI_DeviceIPL.h
@@ -16,7 +16,7 @@ public:
 	CEXIIPL();
 	virtual ~CEXIIPL();
 
-	virtual void SetCS(int _iCS) override;
+	void SetCS(int _iCS) override;
 	bool IsPresent() const override;
 	void DoState(PointerWrap &p) override;
 
@@ -64,7 +64,7 @@ private:
 	std::string m_buffer;
 	bool m_FontsLoaded;
 
-	virtual void TransferByte(u8 &_uByte) override;
+	void TransferByte(u8& _uByte) override;
 	bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
 	u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }
 
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
index 87932e45da..2c1d0e08ca 100644
--- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
+++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
@@ -83,5 +83,5 @@ private:
 	std::unique_ptr<MemoryCardBase> memorycard;
 
 protected:
-	virtual void TransferByte(u8 &byte) override;
+	void TransferByte(u8& byte) override;
 };
diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h
index e61d1965eb..3fbfcb8e70 100644
--- a/Source/Core/Core/HW/EXI_DeviceMic.h
+++ b/Source/Core/Core/HW/EXI_DeviceMic.h
@@ -95,7 +95,7 @@ public:
 	int samples_avail;
 
 protected:
-	virtual void TransferByte(u8 &byte) override;
+	void TransferByte(u8& byte) override;
 };
 
 #else // HAVE_PORTAUDIO
diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
index 4dbeeb1132..43f2beb8a9 100644
--- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
@@ -21,11 +21,11 @@ public:
 	CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
 
 	// run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
 
 	// return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low) override;
+	bool GetData(u32& _Hi, u32& _Low) override;
 
 	// send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
+	void SendCommand(u32 _Cmd, u8 _Poll) override;
 };
diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h
index c015cca6e5..9947038f3f 100644
--- a/Source/Core/Core/HW/SI_DeviceDanceMat.h
+++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h
@@ -12,7 +12,8 @@ class CSIDevice_DanceMat : public CSIDevice_GCController
 {
 public:
 	CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
-	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
-	virtual u32 MapPadStatus(const GCPadStatus& pad_status) override;
-	virtual bool GetData(u32& _Hi, u32& _Low) override;
+
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
+	u32 MapPadStatus(const GCPadStatus& pad_status) override;
+	bool GetData(u32& _Hi, u32& _Low) override;
 };
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI_DeviceGBA.h
index 9faed5a026..6bd3ce291d 100644
--- a/Source/Core/Core/HW/SI_DeviceGBA.h
+++ b/Source/Core/Core/HW/SI_DeviceGBA.h
@@ -48,11 +48,11 @@ public:
 	CSIDevice_GBA(SIDevices device, int _iDeviceNumber);
 	~CSIDevice_GBA();
 
-	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
-	virtual int TransferInterval() override;
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
+	int TransferInterval() override;
 
-	virtual bool GetData(u32& _Hi, u32& _Low) override { return false; }
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) override {}
+	bool GetData(u32& _Hi, u32& _Low) override { return false; }
+	void SendCommand(u32 _Cmd, u8 _Poll) override {}
 
 private:
 	u8 send_data[5];
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI_DeviceGCController.h
index 1a341051e4..855ae89127 100644
--- a/Source/Core/Core/HW/SI_DeviceGCController.h
+++ b/Source/Core/Core/HW/SI_DeviceGCController.h
@@ -85,24 +85,24 @@ public:
 	CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
 
 	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
-
-	// Send and Receive pad input from network
-	static bool NetPlay_GetInput(u8 numPAD, GCPadStatus* status);
-	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
 
 	// Return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low) override;
+	bool GetData(u32& _Hi, u32& _Low) override;
+
+	// Send a command directly
+	void SendCommand(u32 _Cmd, u8 _Poll) override;
+
+	// Savestate support
+	void DoState(PointerWrap& p) override;
 
 	virtual GCPadStatus GetPadStatus();
 	virtual u32 MapPadStatus(const GCPadStatus& pad_status);
 	virtual void HandleButtonCombos(const GCPadStatus& pad_status);
 
-	// Send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
-
-	// Savestate support
-	virtual void DoState(PointerWrap& p) override;
+	// Send and Receive pad input from network
+	static bool NetPlay_GetInput(u8 numPAD, GCPadStatus* status);
+	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
 
 private:
 	void Calibrate();
@@ -115,7 +115,7 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController
 public:
 	CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { }
 
-	virtual bool GetData(u32& _Hi, u32& _Low) override
+	bool GetData(u32& _Hi, u32& _Low) override
 	{
 		CSIDevice_GCController::GetData(_Hi, _Low);
 
diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
index b468466e2c..fcc0805971 100644
--- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
+++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
@@ -26,7 +26,8 @@ private:
 
 public:
 	CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-	virtual bool GetData(u32& _Hi, u32& _Low);
-	virtual void SendCommand(u32 _Cmd, u8 _Poll);
+
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
+	bool GetData(u32& _Hi, u32& _Low) override;
+	void SendCommand(u32 _Cmd, u8 _Poll) override;
 };
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
index 0f1e4d53bb..b97509c6d5 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
@@ -16,7 +16,7 @@ class Nunchuk : public Attachment
 public:
 	Nunchuk(WiimoteEmu::ExtensionReg& _reg);
 
-	virtual void GetState(u8* const data) override;
+	void GetState(u8* const data) override;
 
 	enum
 	{
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
index 3ad6e7c520..2391be80de 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
@@ -30,12 +30,12 @@ public:
 
 	void OpenInternal();
 
-	virtual void DoState(PointerWrap& p) override;
+	void DoState(PointerWrap& p) override;
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
 
 	static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
index d2531ba50f..31abbacebb 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
@@ -38,13 +38,13 @@ public:
 	CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
 	virtual ~CWII_IPC_HLE_Device_fs();
 
-	virtual void DoState(PointerWrap& p) override;
+	void DoState(PointerWrap& p) override;
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
 
 private:
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
index e8270138c2..db016472dd 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
@@ -38,11 +38,11 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_hid();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
 
 private:
 	enum
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
index c1cecee67e..bca0730635 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -394,9 +394,9 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_net_kd_request();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
 
 private:
 	enum
@@ -457,14 +457,14 @@ public:
 	virtual ~CWII_IPC_HLE_Device_net_kd_time()
 	{}
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
 	{
 		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
 		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
 	{
 		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
 		if (!_bForce)
@@ -472,7 +472,7 @@ public:
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	IPCCommandResult IOCtl(u32 _CommandAddress) override
 	{
 		u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
 		u32 BufferIn  = Memory::Read_U32(_CommandAddress + 0x10);
@@ -601,12 +601,12 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_net_ip_top();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
 
-	virtual u32 Update() override;
+	u32 Update() override;
 
 private:
 #ifdef _WIN32
@@ -625,9 +625,9 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_net_ncd_manage();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
 
 private:
 	enum
@@ -653,9 +653,9 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_net_wd_command();
 
-	virtual IPCCommandResult Open(u32 CommandAddress, u32 Mode) override;
-	virtual IPCCommandResult Close(u32 CommandAddress, bool Force) override;
-	virtual IPCCommandResult IOCtlV(u32 CommandAddress) override;
+	IPCCommandResult Open(u32 CommandAddress, u32 Mode) override;
+	IPCCommandResult Close(u32 CommandAddress, bool Force) override;
+	IPCCommandResult IOCtlV(u32 CommandAddress) override;
 
 private:
 	enum
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
index b6ab53c960..66bd4cab1d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
@@ -76,11 +76,11 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_net_ssl();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
 
 	int GetSSLFreeID() const;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
index 7161e4c264..93af6785be 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
@@ -18,7 +18,7 @@ public:
 
 	CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
 
-	virtual void DoState(PointerWrap& p) override;
+	void DoState(PointerWrap& p) override;
 
 	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
 	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
index 01aa4d6e8a..50010a3bfb 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
@@ -37,7 +37,7 @@ public:
 	virtual ~CWII_IPC_HLE_Device_stm_immediate()
 	{}
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
 	{
 		INFO_LOG(WII_IPC_STM, "STM immediate: Open");
 		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
@@ -45,7 +45,7 @@ public:
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
 	{
 		INFO_LOG(WII_IPC_STM, "STM immediate: Close");
 		if (!_bForce)
@@ -54,7 +54,7 @@ public:
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	IPCCommandResult IOCtl(u32 _CommandAddress) override
 	{
 		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
 		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
@@ -126,14 +126,14 @@ public:
 	{
 	}
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
 	{
 		Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
 		m_Active = true;
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
 	{
 		m_EventHookAddress = 0;
 
@@ -144,7 +144,7 @@ public:
 		return IPC_DEFAULT_REPLY;
 	}
 
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	IPCCommandResult IOCtl(u32 _CommandAddress) override
 	{
 		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
 		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
index 03676c5f76..c516dfac5a 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
@@ -52,13 +52,13 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
 
-	virtual u32 Update() override;
+	u32 Update() override;
 
 	static void EnqueueReply(u32 CommandAddress);
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
index 4d075eed21..457d22bee6 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
@@ -15,11 +15,11 @@ public:
 	CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
 	virtual ~CWII_IPC_HLE_Device_usb_kbd();
 
-	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
-	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
-	virtual IPCCommandResult Write(u32 _CommandAddress) override;
-	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
-	virtual u32 Update() override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Write(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	u32 Update() override;
 
 private:
 	enum
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
index 54ef5580c2..a66a62d97b 100644
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@@ -46,7 +46,7 @@ public:
 
 	// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
 	const u8 *GetBlockData(u64 block_num);
-	virtual bool Read(u64 offset, u64 size, u8 *out_ptr) override;
+	bool Read(u64 offset, u64 size, u8 *out_ptr) override;
 	friend class DriveReader;
 
 protected:
diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h
index 2c46e5b225..f4716c1cf0 100644
--- a/Source/Core/DiscIO/DriveBlob.h
+++ b/Source/Core/DiscIO/DriveBlob.h
@@ -26,7 +26,7 @@ public:
 	u64 GetDataSize() const override { return m_size; }
 	u64 GetRawSize() const override { return m_size; }
 
-	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override;
+	bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override;
 
 private:
 	DriveReader(const std::string& drive);
diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h
index 0112b695ef..f244b1a60f 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@@ -21,16 +21,17 @@ class CFileSystemGCWii : public IFileSystem
 public:
 	CFileSystemGCWii(const IVolume* _rVolume);
 	virtual ~CFileSystemGCWii();
-	virtual bool IsValid() const override { return m_Valid; }
-	virtual u64 GetFileSize(const std::string& _rFullPath) override;
-	virtual const std::vector<SFileInfo>& GetFileList() override;
-	virtual const std::string GetFileName(u64 _Address) override;
-	virtual u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override;
-	virtual bool ExportFile(const std::string& _rFullPath, const std::string&_rExportFilename) override;
-	virtual bool ExportApploader(const std::string& _rExportFolder) const override;
-	virtual bool ExportDOL(const std::string& _rExportFolder) const override;
-	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const override;
-	virtual u32 GetBootDOLSize() const override;
+
+	bool IsValid() const override { return m_Valid; }
+	u64 GetFileSize(const std::string& _rFullPath) override;
+	const std::vector<SFileInfo>& GetFileList() override;
+	const std::string GetFileName(u64 _Address) override;
+	u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override;
+	bool ExportFile(const std::string& _rFullPath, const std::string&_rExportFilename) override;
+	bool ExportApploader(const std::string& _rExportFolder) const override;
+	bool ExportDOL(const std::string& _rExportFolder) const override;
+	bool GetBootDOL(u8* &buffer, u32 DolSize) const override;
+	u32 GetBootDOLSize() const override;
 
 private:
 	bool m_Initialized;
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index 35599cacf6..c1abcb28d2 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -28,7 +28,7 @@ public:
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
 	u16 GetRevision() const override;
-	virtual std::string GetInternalName() const override;
+	std::string GetInternalName() const override;
 	std::map<ELanguage, std::string> GetNames(bool prefer_long) const override;
 	std::map<ELanguage, std::string> GetDescriptions() const override;
 	std::string GetCompany() const override;
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
index 6fd687db3d..88773af68b 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -27,7 +27,7 @@ public:
 	~CVolumeWiiCrypted();
 	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
 	bool GetTitleID(u8* _pBuffer) const override;
-	virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
+	std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
 	u16 GetRevision() const override;
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index abb712b3c1..7e00579c9d 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -120,7 +120,7 @@ public:
 	void UpdateTitle(const std::string &str);
 
 	const CGameListCtrl *GetGameListCtrl() const;
-	virtual wxMenuBar* GetMenuBar() const override;
+	wxMenuBar* GetMenuBar() const override;
 
 #ifdef __WXGTK__
 	Common::Event panic_event;
diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
index 8479b6eb6d..0bb25ffe87 100644
--- a/Source/Core/DolphinWX/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -949,7 +949,7 @@ public:
 		Create();
 	}
 
-	virtual ExitCode Entry() override
+	ExitCode Entry() override
 	{
 		return (ExitCode)m_Partition.Partition->CheckIntegrity();
 	}
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
index 9837ea74cb..40d61b0e77 100644
--- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
@@ -254,22 +254,22 @@ public:
 
 	ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
 
-	virtual ControlState GetValue() override
+	ControlState GetValue() override
 	{
 		return control->ToInput()->GetGatedState();
 	}
 
-	virtual void SetValue(ControlState value) override
+	void SetValue(ControlState value) override
 	{
 		control->ToOutput()->SetGatedState(value);
 	}
 
-	virtual int CountNumControls() override
+	int CountNumControls() override
 	{
 		return 1;
 	}
 
-	virtual operator std::string() override
+	operator std::string() override
 	{
 		return "`" + (std::string)qualifier + "`";
 	}
@@ -289,7 +289,7 @@ public:
 		delete rhs;
 	}
 
-	virtual ControlState GetValue() override
+	ControlState GetValue() override
 	{
 		ControlState lhsValue = lhs->GetValue();
 		ControlState rhsValue = rhs->GetValue();
@@ -307,7 +307,7 @@ public:
 		}
 	}
 
-	virtual void SetValue(ControlState value) override
+	void SetValue(ControlState value) override
 	{
 		// Don't do anything special with the op we have.
 		// Treat "A & B" the same as "A | B".
@@ -315,12 +315,12 @@ public:
 		rhs->SetValue(value);
 	}
 
-	virtual int CountNumControls() override
+	int CountNumControls() override
 	{
 		return lhs->CountNumControls() + rhs->CountNumControls();
 	}
 
-	virtual operator std::string() override
+	operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
 	}
@@ -338,7 +338,7 @@ public:
 		delete inner;
 	}
 
-	virtual ControlState GetValue() override
+	ControlState GetValue() override
 	{
 		ControlState value = inner->GetValue();
 		switch (op)
@@ -351,7 +351,7 @@ public:
 		}
 	}
 
-	virtual void SetValue(ControlState value) override
+	void SetValue(ControlState value) override
 	{
 		switch (op)
 		{
@@ -364,12 +364,12 @@ public:
 		}
 	}
 
-	virtual int CountNumControls() override
+	int CountNumControls() override
 	{
 		return inner->CountNumControls();
 	}
 
-	virtual operator std::string() override
+	operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
 	}
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h
index 03a1385ab7..4b54a138bb 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.h
+++ b/Source/Core/VideoBackends/D3D/VertexManager.h
@@ -20,7 +20,7 @@ public:
 	void DestroyDeviceObjects() override;
 
 protected:
-	virtual void ResetBuffer(u32 stride) override;
+	void ResetBuffer(u32 stride) override;
 	u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
 
 private:
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h
index 5c9dd0e81e..9bcef24589 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.h
+++ b/Source/Core/VideoBackends/OGL/VertexManager.h
@@ -17,8 +17,8 @@ namespace OGL
 		GLVertexFormat();
 		~GLVertexFormat();
 
-		virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
-		virtual void SetupVertexPointers() override;
+		void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
+		void SetupVertexPointers() override;
 
 		GLuint VAO;
 	};
@@ -39,7 +39,7 @@ public:
 	GLuint m_index_buffers;
 	GLuint m_last_vao;
 protected:
-	virtual void ResetBuffer(u32 stride) override;
+	void ResetBuffer(u32 stride) override;
 
 private:
 	void Draw(u32 stride);