Remove unnecessary virtual keywords

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();

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:

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;
 };

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 ; }
+	bool Initialize(bool bWii, bool bDSPThread) override;
+	void Shutdown() override;
+	bool IsLLE() override { return false ; }
 
-	virtual void DoState(PointerWrap &p) override;
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+	void DoState(PointerWrap &p) override;
+	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;
+	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; }
 

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:

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);

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;
 };

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; }
+	bool Initialize(bool bWii, bool bDSPThread) override;
+	void Shutdown() override;
+	bool IsLLE() override { return true; }
 
-	virtual void DoState(PointerWrap &p) override;
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+	void DoState(PointerWrap &p) override;
+	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;
+	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);

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;
 };

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];

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; }
 

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;
 };

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

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;
 };

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;
 };

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];

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);
 

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;
 };

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
 	{

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);