ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2789 from lioncash/virt 

Remove unnecessary virtual keywords
This commit is contained in:
Markus Wick 2015-07-30 17:53:35 +02:00
parent 567d0b20fa 7ee0e75633
commit ab2e68aa16
38 changed files with 211 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/PulseAudioStream.h
View File

@ -31,7 +31,7 @@ public:
void UnderflowCallback(pa_stream *s); void UnderflowCallback(pa_stream *s);
private: private:
virtual void SoundLoop() override; void SoundLoop() override;
bool PulseInit(); bool PulseInit();
void PulseShutdown(); void PulseShutdown();

12
Source/Core/Core/DSP/DSPCaptureLogger.h
View File

@ -43,9 +43,9 @@ public:
class DefaultDSPCaptureLogger : public DSPCaptureLogger class DefaultDSPCaptureLogger : public DSPCaptureLogger
{ {
public: public:
virtual void LogIFXRead(u16 address, u16 read_value) override {} void LogIFXRead(u16 address, u16 read_value) override {}
virtual void LogIFXWrite(u16 address, u16 written_value) override {} void LogIFXWrite(u16 address, u16 written_value) override {}
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 {} u16 length, const u8* data) override {}
}; };
@ -60,15 +60,15 @@ public:
PCAPDSPCaptureLogger(PCAP* pcap); PCAPDSPCaptureLogger(PCAP* pcap);
PCAPDSPCaptureLogger(std::unique_ptr<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); 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); 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; u16 length, const u8* data) override;
private: private:

46
Source/Core/Core/Debugger/PPCDebugInterface.h
View File

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

28
Source/Core/Core/HW/DSPHLE/DSPHLE.h
View File

@ -15,22 +15,22 @@ class DSPHLE : public DSPEmulator {
public: public:
DSPHLE(); DSPHLE();
virtual bool Initialize(bool bWii, bool bDSPThread) override; bool Initialize(bool bWii, bool bDSPThread) override;
virtual void Shutdown() override; void Shutdown() override;
virtual bool IsLLE() override { return false ; } bool IsLLE() override { return false ; }
virtual void DoState(PointerWrap &p) override; void DoState(PointerWrap &p) override;
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override; void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override; void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override; void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override; unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override; unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadControlRegister() override; unsigned short DSP_ReadControlRegister() override;
virtual unsigned short DSP_WriteControlRegister(unsigned short) override; unsigned short DSP_WriteControlRegister(unsigned short) override;
virtual void DSP_Update(int cycles) override; void DSP_Update(int cycles) override;
virtual void DSP_StopSoundStream() override; void DSP_StopSoundStream() override;
virtual u32 DSP_UpdateRate() override; u32 DSP_UpdateRate() override;
CMailHandler& AccessMailHandler() { return m_MailHandler; } CMailHandler& AccessMailHandler() { return m_MailHandler; }

6
Source/Core/Core/HW/DSPHLE/UCodes/AX.h
View File

@ -55,9 +55,9 @@ public:
AXUCode(DSPHLE* dsphle, u32 crc); AXUCode(DSPHLE* dsphle, u32 crc);
virtual ~AXUCode(); virtual ~AXUCode();
virtual void HandleMail(u32 mail) override; void HandleMail(u32 mail) override;
virtual void Update() override; void Update() override;
virtual void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
u32 GetUpdateMs() override; u32 GetUpdateMs() override;
protected: protected:

4
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
View File

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

45
Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
View File

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

28
Source/Core/Core/HW/DSPLLE/DSPLLE.h
View File

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

8
Source/Core/Core/HW/EXI_DeviceAD16.h
View File

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

10
Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
View File

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

4
Source/Core/Core/HW/EXI_DeviceIPL.h
View File

@ -16,7 +16,7 @@ public:
CEXIIPL(); CEXIIPL();
virtual ~CEXIIPL(); virtual ~CEXIIPL();
virtual void SetCS(int _iCS) override; void SetCS(int _iCS) override;
bool IsPresent() const override; bool IsPresent() const override;
void DoState(PointerWrap &p) override; void DoState(PointerWrap &p) override;
@ -64,7 +64,7 @@ private:
std::string m_buffer; std::string m_buffer;
bool m_FontsLoaded; bool m_FontsLoaded;
virtual void TransferByte(u8 &_uByte) override; void TransferByte(u8& _uByte) override;
bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }

2
Source/Core/Core/HW/EXI_DeviceMemoryCard.h
View File

@ -83,5 +83,5 @@ private:
std::unique_ptr<MemoryCardBase> memorycard; std::unique_ptr<MemoryCardBase> memorycard;
protected: protected:
virtual void TransferByte(u8 &byte) override; void TransferByte(u8& byte) override;
}; };

2
Source/Core/Core/HW/EXI_DeviceMic.h
View File

@ -95,7 +95,7 @@ public:
int samples_avail; int samples_avail;
protected: protected:
virtual void TransferByte(u8 &byte) override; void TransferByte(u8& byte) override;
}; };
#else // HAVE_PORTAUDIO #else // HAVE_PORTAUDIO

6
Source/Core/Core/HW/SI_DeviceAMBaseboard.h
View File

@ -21,11 +21,11 @@ public:
CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber); CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
// run the SI Buffer // run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength) override; int RunBuffer(u8* _pBuffer, int _iLength) override;
// return true on new data // return true on new data
virtual bool GetData(u32& _Hi, u32& _Low) override; bool GetData(u32& _Hi, u32& _Low) override;
// send a command directly // send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll) override; void SendCommand(u32 _Cmd, u8 _Poll) override;
}; };

7
Source/Core/Core/HW/SI_DeviceDanceMat.h
View File

@ -12,7 +12,8 @@ class CSIDevice_DanceMat : public CSIDevice_GCController
{ {
public: public:
CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber); CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
virtual u32 MapPadStatus(const GCPadStatus& pad_status) override; int RunBuffer(u8* _pBuffer, int _iLength) override;
virtual bool GetData(u32& _Hi, u32& _Low) override; u32 MapPadStatus(const GCPadStatus& pad_status) override;
bool GetData(u32& _Hi, u32& _Low) override;
}; };

8
Source/Core/Core/HW/SI_DeviceGBA.h
View File

@ -48,11 +48,11 @@ public:
CSIDevice_GBA(SIDevices device, int _iDeviceNumber); CSIDevice_GBA(SIDevices device, int _iDeviceNumber);
~CSIDevice_GBA(); ~CSIDevice_GBA();
virtual int RunBuffer(u8* _pBuffer, int _iLength) override; int RunBuffer(u8* _pBuffer, int _iLength) override;
virtual int TransferInterval() override; int TransferInterval() override;
virtual bool GetData(u32& _Hi, u32& _Low) override { return false; } bool GetData(u32& _Hi, u32& _Low) override { return false; }
virtual void SendCommand(u32 _Cmd, u8 _Poll) override {} void SendCommand(u32 _Cmd, u8 _Poll) override {}
private: private:
u8 send_data[5]; u8 send_data[5];

24
Source/Core/Core/HW/SI_DeviceGCController.h
View File

@ -85,24 +85,24 @@ public:
CSIDevice_GCController(SIDevices device, int _iDeviceNumber); CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer // Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength) override; 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);
// Return true on new data // 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 GCPadStatus GetPadStatus();
virtual u32 MapPadStatus(const GCPadStatus& pad_status); virtual u32 MapPadStatus(const GCPadStatus& pad_status);
virtual void HandleButtonCombos(const GCPadStatus& pad_status); virtual void HandleButtonCombos(const GCPadStatus& pad_status);
// Send a command directly // Send and Receive pad input from network
virtual void SendCommand(u32 _Cmd, u8 _Poll) override; static bool NetPlay_GetInput(u8 numPAD, GCPadStatus* status);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Savestate support
virtual void DoState(PointerWrap& p) override;
private: private:
void Calibrate(); void Calibrate();
@ -115,7 +115,7 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController
public: public:
CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { } CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { }
virtual bool GetData(u32& _Hi, u32& _Low) override bool GetData(u32& _Hi, u32& _Low) override
{ {
CSIDevice_GCController::GetData(_Hi, _Low); CSIDevice_GCController::GetData(_Hi, _Low);

7
Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
View File

@ -26,7 +26,8 @@ private:
public: public:
CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber); CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
virtual int RunBuffer(u8* _pBuffer, int _iLength);
virtual bool GetData(u32& _Hi, u32& _Low); int RunBuffer(u8* _pBuffer, int _iLength) override;
virtual void SendCommand(u32 _Cmd, u8 _Poll); bool GetData(u32& _Hi, u32& _Low) override;
void SendCommand(u32 _Cmd, u8 _Poll) override;
}; };

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
View File

@ -16,7 +16,7 @@ class Nunchuk : public Attachment
public: public:
Nunchuk(WiimoteEmu::ExtensionReg& _reg); Nunchuk(WiimoteEmu::ExtensionReg& _reg);
virtual void GetState(u8* const data) override; void GetState(u8* const data) override;
enum enum
{ {

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

@ -30,12 +30,12 @@ public:
void OpenInternal(); void OpenInternal();
virtual void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) 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); static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
View File

@ -38,13 +38,13 @@ public:
CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName); CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_fs(); virtual ~CWII_IPC_HLE_Device_fs();
virtual void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
virtual IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtl(u32 _CommandAddress) override;
virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override; IPCCommandResult IOCtlV(u32 _CommandAddress) override;
private: private:

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
View File

@ -38,11 +38,11 @@ public:
virtual ~CWII_IPC_HLE_Device_hid(); virtual ~CWII_IPC_HLE_Device_hid();
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override; IPCCommandResult IOCtlV(u32 _CommandAddress) override;
virtual IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtl(u32 _CommandAddress) override;
private: private:
enum enum

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

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

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

@ -76,11 +76,11 @@ public:
virtual ~CWII_IPC_HLE_Device_net_ssl(); virtual ~CWII_IPC_HLE_Device_net_ssl();
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
virtual IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtl(u32 _CommandAddress) override;
virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override; IPCCommandResult IOCtlV(u32 _CommandAddress) override;
int GetSSLFreeID() const; int GetSSLFreeID() const;

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
View File

@ -18,7 +18,7 @@ public:
CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName); CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
virtual void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;

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

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

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
View File

@ -52,13 +52,13 @@ public:
virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305(); virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305();
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override; IPCCommandResult IOCtlV(u32 _CommandAddress) override;
virtual IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtl(u32 _CommandAddress) override;
virtual u32 Update() override; u32 Update() override;
static void EnqueueReply(u32 CommandAddress); static void EnqueueReply(u32 CommandAddress);

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

@ -15,11 +15,11 @@ public:
CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName); CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_usb_kbd(); virtual ~CWII_IPC_HLE_Device_usb_kbd();
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override; IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override; IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
virtual IPCCommandResult Write(u32 _CommandAddress) override; IPCCommandResult Write(u32 _CommandAddress) override;
virtual IPCCommandResult IOCtl(u32 _CommandAddress) override; IPCCommandResult IOCtl(u32 _CommandAddress) override;
virtual u32 Update() override; u32 Update() override;
private: private:
enum enum

2
Source/Core/DiscIO/Blob.h
View File

@ -46,7 +46,7 @@ public:
// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again. // A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
const u8 *GetBlockData(u64 block_num); const u8 *GetBlockData(u64 block_num);
virtual bool Read(u64 offset, u64 size, u8 *out_ptr) override; bool Read(u64 offset, u64 size, u8 *out_ptr) override;
friend class DriveReader; friend class DriveReader;
protected: protected:

2
Source/Core/DiscIO/DriveBlob.h
View File

@ -26,7 +26,7 @@ public:
u64 GetDataSize() const override { return m_size; } u64 GetDataSize() const override { return m_size; }
u64 GetRawSize() 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: private:
DriveReader(const std::string& drive); DriveReader(const std::string& drive);

21
Source/Core/DiscIO/FileSystemGCWii.h
View File

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

2
Source/Core/DiscIO/VolumeGC.h
View File

@ -28,7 +28,7 @@ public:
std::string GetUniqueID() const override; std::string GetUniqueID() const override;
std::string GetMakerID() const override; std::string GetMakerID() const override;
u16 GetRevision() 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> GetNames(bool prefer_long) const override;
std::map<ELanguage, std::string> GetDescriptions() const override; std::map<ELanguage, std::string> GetDescriptions() const override;
std::string GetCompany() const override; std::string GetCompany() const override;

2
Source/Core/DiscIO/VolumeWiiCrypted.h
View File

@ -27,7 +27,7 @@ public:
~CVolumeWiiCrypted(); ~CVolumeWiiCrypted();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override; bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
bool GetTitleID(u8* _pBuffer) 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 GetUniqueID() const override;
std::string GetMakerID() const override; std::string GetMakerID() const override;
u16 GetRevision() const override; u16 GetRevision() const override;

2
Source/Core/DolphinWX/Frame.h
View File

@ -120,7 +120,7 @@ public:
void UpdateTitle(const std::string &str); void UpdateTitle(const std::string &str);
const CGameListCtrl *GetGameListCtrl() const; const CGameListCtrl *GetGameListCtrl() const;
virtual wxMenuBar* GetMenuBar() const override; wxMenuBar* GetMenuBar() const override;
#ifdef __WXGTK__ #ifdef __WXGTK__
Common::Event panic_event; Common::Event panic_event;

2
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -949,7 +949,7 @@ public:
Create(); Create();
} }
virtual ExitCode Entry() override ExitCode Entry() override
{ {
return (ExitCode)m_Partition.Partition->CheckIntegrity(); return (ExitCode)m_Partition.Partition->CheckIntegrity();
} }

24
Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
View File

@ -254,22 +254,22 @@ public:
ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {} ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
virtual ControlState GetValue() override ControlState GetValue() override
{ {
return control->ToInput()->GetGatedState(); return control->ToInput()->GetGatedState();
} }
virtual void SetValue(ControlState value) override void SetValue(ControlState value) override
{ {
control->ToOutput()->SetGatedState(value); control->ToOutput()->SetGatedState(value);
} }
virtual int CountNumControls() override int CountNumControls() override
{ {
return 1; return 1;
} }
virtual operator std::string() override operator std::string() override
{ {
return "`" + (std::string)qualifier + "`"; return "`" + (std::string)qualifier + "`";
} }
@ -289,7 +289,7 @@ public:
delete rhs; delete rhs;
} }
virtual ControlState GetValue() override ControlState GetValue() override
{ {
ControlState lhsValue = lhs->GetValue(); ControlState lhsValue = lhs->GetValue();
ControlState rhsValue = rhs->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. // Don't do anything special with the op we have.
// Treat "A & B" the same as "A | B". // Treat "A & B" the same as "A | B".
@ -315,12 +315,12 @@ public:
rhs->SetValue(value); rhs->SetValue(value);
} }
virtual int CountNumControls() override int CountNumControls() override
{ {
return lhs->CountNumControls() + rhs->CountNumControls(); return lhs->CountNumControls() + rhs->CountNumControls();
} }
virtual operator std::string() override operator std::string() override
{ {
return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")"; return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
} }
@ -338,7 +338,7 @@ public:
delete inner; delete inner;
} }
virtual ControlState GetValue() override ControlState GetValue() override
{ {
ControlState value = inner->GetValue(); ControlState value = inner->GetValue();
switch (op) switch (op)
@ -351,7 +351,7 @@ public:
} }
} }
virtual void SetValue(ControlState value) override void SetValue(ControlState value) override
{ {
switch (op) switch (op)
{ {
@ -364,12 +364,12 @@ public:
} }
} }
virtual int CountNumControls() override int CountNumControls() override
{ {
return inner->CountNumControls(); return inner->CountNumControls();
} }
virtual operator std::string() override operator std::string() override
{ {
return OpName(op) + "(" + (std::string)(*inner) + ")"; return OpName(op) + "(" + (std::string)(*inner) + ")";
} }

2
Source/Core/VideoBackends/D3D/VertexManager.h
View File

@ -20,7 +20,7 @@ public:
void DestroyDeviceObjects() override; void DestroyDeviceObjects() override;
protected: protected:
virtual void ResetBuffer(u32 stride) override; void ResetBuffer(u32 stride) override;
u16* GetIndexBuffer() { return &LocalIBuffer[0]; } u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
private: private:

6
Source/Core/VideoBackends/OGL/VertexManager.h
View File

@ -17,8 +17,8 @@ namespace OGL
GLVertexFormat(); GLVertexFormat();
~GLVertexFormat(); ~GLVertexFormat();
virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override; void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
virtual void SetupVertexPointers() override; void SetupVertexPointers() override;
GLuint VAO; GLuint VAO;
}; };
@ -39,7 +39,7 @@ public:
GLuint m_index_buffers; GLuint m_index_buffers;
GLuint m_last_vao; GLuint m_last_vao;
protected: protected:
virtual void ResetBuffer(u32 stride) override; void ResetBuffer(u32 stride) override;
private: private:
void Draw(u32 stride); void Draw(u32 stride);