clang-modernize -add-override

This commit is contained in:
Tillmann Karras
2014-03-09 21:12:01 +01:00
parent c89f04a7c5
commit f28116b7da
67 changed files with 401 additions and 401 deletions
+4 -4
View File
@@ -31,11 +31,11 @@ public:
virtual ~AOSound();
virtual bool Start();
virtual bool Start() override;
virtual void SoundLoop();
virtual void SoundLoop() override;
virtual void Stop();
virtual void Stop() override;
static bool isValid() {
return true;
@@ -45,7 +45,7 @@ public:
return true;
}
virtual void Update();
virtual void Update() override;
#else
public:
+4 -4
View File
@@ -19,9 +19,9 @@ public:
AlsaSound(CMixer *mixer);
virtual ~AlsaSound();
virtual bool Start();
virtual void SoundLoop();
virtual void Stop();
virtual bool Start() override;
virtual void SoundLoop() override;
virtual void Stop() override;
static bool isValid() {
return true;
@@ -30,7 +30,7 @@ public:
return true;
}
virtual void Update();
virtual void Update() override;
private:
bool AlsaInit();
+6 -6
View File
@@ -21,12 +21,12 @@ public:
virtual ~NullSound() {}
virtual bool Start();
virtual void SoundLoop();
virtual void SetVolume(int volume);
virtual void Stop();
virtual void Clear(bool mute);
virtual bool Start() override;
virtual void SoundLoop() override;
virtual void SetVolume(int volume) override;
virtual void Stop() override;
virtual void Clear(bool mute) override;
static bool isValid() { return true; }
virtual bool usesMixer() const { return true; }
virtual void Update();
virtual void Update() override;
};
+6 -6
View File
@@ -51,14 +51,14 @@ public:
virtual ~OpenALStream() {}
virtual bool Start();
virtual void SoundLoop();
virtual void SetVolume(int volume);
virtual void Stop();
virtual void Clear(bool mute);
virtual bool Start() override;
virtual void SoundLoop() override;
virtual void SetVolume(int volume) override;
virtual void Stop() override;
virtual void Clear(bool mute) override;
static bool isValid() { return true; }
virtual bool usesMixer() const { return true; }
virtual void Update();
virtual void Update() override;
private:
std::thread thread;
+4 -4
View File
@@ -20,21 +20,21 @@ class PulseAudio : public SoundStream
public:
PulseAudio(CMixer *mixer);
virtual bool Start();
virtual void Stop();
virtual bool Start() override;
virtual void Stop() override;
static bool isValid() {return true;}
virtual bool usesMixer() const {return true;}
virtual void Update();
virtual void Update() override;
void StateCallback(pa_context *c);
void WriteCallback(pa_stream *s, size_t length);
void UnderflowCallback(pa_stream *s);
private:
virtual void SoundLoop();
virtual void SoundLoop() override;
bool PulseInit();
void PulseShutdown();
+1 -1
View File
@@ -26,7 +26,7 @@ public:
#ifdef _WIN32
COORD GetCoordinates(int BytesRead, int BufferWidth);
#endif
void Log(LogTypes::LOG_LEVELS, const char *Text);
void Log(LogTypes::LOG_LEVELS, const char *Text) override;
void ClearScreen(bool Cursor = true);
private:
+2 -2
View File
@@ -29,7 +29,7 @@ class FileLogListener : public LogListener
public:
FileLogListener(const char *filename);
void Log(LogTypes::LOG_LEVELS, const char *msg);
void Log(LogTypes::LOG_LEVELS, const char *msg) override;
bool IsValid() { return !m_logfile.fail(); }
bool IsEnabled() const { return m_enable; }
@@ -46,7 +46,7 @@ private:
class DebuggerLogListener : public LogListener
{
public:
void Log(LogTypes::LOG_LEVELS, const char *msg);
void Log(LogTypes::LOG_LEVELS, const char *msg) override;
};
class LogContainer
+24 -24
View File
@@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface
{
public:
PPCDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
virtual int GetInstructionSize(int /*instruction*/) final {return 4;}
virtual bool IsAlive() final;
virtual bool IsBreakpoint(unsigned int address) final;
virtual void SetBreakpoint(unsigned int address) final;
virtual void ClearBreakpoint(unsigned int address) final;
virtual void ClearAllBreakpoints() final;
virtual void ToggleBreakpoint(unsigned int address) final;
virtual void ClearAllMemChecks() final;
virtual bool IsMemCheck(unsigned int address) final;
virtual void ToggleMemCheck(unsigned int address) final;
virtual unsigned int ReadMemory(unsigned int address) final;
virtual void Disassemble(unsigned int address, char *dest, int max_size) final override;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
virtual int GetInstructionSize(int /*instruction*/) final override {return 4;}
virtual bool IsAlive() final override;
virtual bool IsBreakpoint(unsigned int address) final override;
virtual void SetBreakpoint(unsigned int address) final override;
virtual void ClearBreakpoint(unsigned int address) final override;
virtual void ClearAllBreakpoints() final override;
virtual void ToggleBreakpoint(unsigned int address) final override;
virtual void ClearAllMemChecks() final override;
virtual bool IsMemCheck(unsigned int address) final override;
virtual void ToggleMemCheck(unsigned int address) final override;
virtual unsigned int ReadMemory(unsigned int address) final override;
enum {
EXTRAMEM_ARAM = 1,
};
virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final;
virtual unsigned int ReadInstruction(unsigned int address) final;
virtual unsigned int GetPC() final;
virtual void SetPC(unsigned int address) final;
virtual void Step() final {}
virtual void BreakNow() final;
virtual void RunToBreakpoint() final;
virtual void InsertBLR(unsigned int address, unsigned int value) final;
virtual int GetColor(unsigned int address) final;
virtual std::string GetDescription(unsigned int address) final;
virtual void ShowJitResults(u32 address) final;
virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final override;
virtual unsigned int ReadInstruction(unsigned int address) final override;
virtual unsigned int GetPC() final override;
virtual void SetPC(unsigned int address) final override;
virtual void Step() final override {}
virtual void BreakNow() final override;
virtual void RunToBreakpoint() final override;
virtual void InsertBLR(unsigned int address, unsigned int value) final override;
virtual int GetColor(unsigned int address) final override;
virtual std::string GetDescription(unsigned int address) final override;
virtual void ShowJitResults(u32 address) final override;
};
+21 -21
View File
@@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface
{
public:
DSPDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
virtual int GetInstructionSize(int instruction) final {return 1;}
virtual bool IsAlive() final;
virtual bool IsBreakpoint(unsigned int address) final;
virtual void SetBreakpoint(unsigned int address) final;
virtual void ClearBreakpoint(unsigned int address) final;
virtual void ClearAllBreakpoints() final;
virtual void ToggleBreakpoint(unsigned int address) final;
virtual void ClearAllMemChecks() final;
virtual bool IsMemCheck(unsigned int address) final;
virtual void ToggleMemCheck(unsigned int address) final;
virtual unsigned int ReadMemory(unsigned int address) final;
virtual unsigned int ReadInstruction(unsigned int address) final;
virtual unsigned int GetPC() final;
virtual void SetPC(unsigned int address) final;
virtual void Step() final {}
virtual void RunToBreakpoint() final;
virtual void InsertBLR(unsigned int address, unsigned int value) final;
virtual int GetColor(unsigned int address) final;
virtual std::string GetDescription(unsigned int address) final;
virtual void Disassemble(unsigned int address, char *dest, int max_size) final override;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
virtual int GetInstructionSize(int instruction) final override {return 1;}
virtual bool IsAlive() final override;
virtual bool IsBreakpoint(unsigned int address) final override;
virtual void SetBreakpoint(unsigned int address) final override;
virtual void ClearBreakpoint(unsigned int address) final override;
virtual void ClearAllBreakpoints() final override;
virtual void ToggleBreakpoint(unsigned int address) final override;
virtual void ClearAllMemChecks() final override;
virtual bool IsMemCheck(unsigned int address) final override;
virtual void ToggleMemCheck(unsigned int address) final override;
virtual unsigned int ReadMemory(unsigned int address) final override;
virtual unsigned int ReadInstruction(unsigned int address) final override;
virtual unsigned int GetPC() final override;
virtual void SetPC(unsigned int address) final override;
virtual void Step() final override {}
virtual void RunToBreakpoint() final override;
virtual void InsertBLR(unsigned int address, unsigned int value) final override;
virtual int GetColor(unsigned int address) final override;
virtual std::string GetDescription(unsigned int address) final override;
};
+16 -16
View File
@@ -15,24 +15,24 @@ class DSPLLE : public DSPEmulator
public:
DSPLLE();
virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread);
virtual void Shutdown();
virtual bool IsLLE() { return true; }
virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread) override;
virtual void Shutdown() override;
virtual bool IsLLE() override { return true; }
virtual void DoState(PointerWrap &p);
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
virtual void DoState(PointerWrap &p) override;
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox);
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox);
virtual unsigned short DSP_ReadControlRegister();
virtual unsigned short DSP_WriteControlRegister(unsigned short);
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples);
virtual void DSP_Update(int cycles);
virtual void DSP_StopSoundStream();
virtual void DSP_ClearAudioBuffer(bool mute);
virtual u32 DSP_UpdateRate();
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadControlRegister() override;
virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override;
virtual void DSP_Update(int cycles) override;
virtual void DSP_StopSoundStream() override;
virtual void DSP_ClearAudioBuffer(bool mute) override;
virtual u32 DSP_UpdateRate() override;
private:
static void dsp_thread(DSPLLE* lpParameter);
+4 -4
View File
@@ -13,9 +13,9 @@ public:
CEXIIPL();
virtual ~CEXIIPL();
virtual void SetCS(int _iCS);
bool IsPresent();
void DoState(PointerWrap &p);
virtual void SetCS(int _iCS) override;
bool IsPresent() override;
void DoState(PointerWrap &p) override;
static u32 GetGCTime();
static u32 NetPlay_GetGCTime();
@@ -62,7 +62,7 @@ private:
int m_count;
bool m_FontsLoaded;
virtual void TransferByte(u8 &_uByte);
virtual void TransferByte(u8 &_uByte) override;
bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }
+4 -4
View File
@@ -13,9 +13,9 @@ class CEXIMic : public IEXIDevice
public:
CEXIMic(const int index);
virtual ~CEXIMic();
void SetCS(int cs);
bool IsInterruptSet();
bool IsPresent();
void SetCS(int cs) override;
bool IsInterruptSet() override;
bool IsPresent() override;
private:
static u8 const exi_id[];
@@ -93,7 +93,7 @@ public:
int samples_avail;
protected:
virtual void TransferByte(u8 &byte);
virtual void TransferByte(u8 &byte) override;
};
#else // HAVE_PORTAUDIO
+5 -5
View File
@@ -85,20 +85,20 @@ public:
CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength);
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
// Send and Receive pad input from network
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low);
virtual bool GetData(u32& _Hi, u32& _Low) override;
// Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll);
virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support
virtual void DoState(PointerWrap& p);
virtual void DoState(PointerWrap& p) override;
};
@@ -108,7 +108,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)
virtual bool GetData(u32& _Hi, u32& _Low) override
{
CSIDevice_GCController::GetData(_Hi, _Low);
_Hi &= ~PAD_USE_ORIGIN << 16;
@@ -85,18 +85,18 @@ public:
CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength);
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
// Send and Receive pad input from network
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low);
virtual bool GetData(u32& _Hi, u32& _Low) override;
// Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll);
virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support
virtual void DoState(PointerWrap& p);
virtual void DoState(PointerWrap& p) override;
};
+2 -2
View File
@@ -116,7 +116,7 @@ public:
};
Wiimote(const unsigned int index);
std::string GetName() const;
std::string GetName() const override;
void Update();
void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size);
@@ -125,7 +125,7 @@ public:
void DoState(PointerWrap& p);
void RealState();
void LoadDefaults(const ControllerInterface& ciface);
void LoadDefaults(const ControllerInterface& ciface) override;
protected:
bool Step();
@@ -224,7 +224,7 @@ public:
{
}
bool Open(u32 CommandAddress, u32 Mode)
bool Open(u32 CommandAddress, u32 Mode) override
{
(void)Mode;
WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
@@ -232,7 +232,7 @@ public:
m_Active = true;
return true;
}
bool Close(u32 CommandAddress, bool bForce = false)
bool Close(u32 CommandAddress, bool bForce = false) override
{
WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
if (!bForce)
@@ -241,13 +241,13 @@ public:
return true;
}
bool IOCtl(u32 CommandAddress)
bool IOCtl(u32 CommandAddress) override
{
WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str());
Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
return true;
}
bool IOCtlV(u32 CommandAddress)
bool IOCtlV(u32 CommandAddress) override
{
WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str());
Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
@@ -20,13 +20,13 @@ public:
virtual ~CWII_IPC_HLE_Device_di();
bool Open(u32 _CommandAddress, u32 _Mode);
bool Close(u32 _CommandAddress, bool _bForce);
bool Open(u32 _CommandAddress, u32 _Mode) override;
bool Close(u32 _CommandAddress, bool _bForce) override;
bool IOCtl(u32 _CommandAddress);
bool IOCtlV(u32 _CommandAddress);
bool IOCtl(u32 _CommandAddress) override;
bool IOCtlV(u32 _CommandAddress) override;
int GetCmdDelay(u32);
int GetCmdDelay(u32) override;
private:
@@ -17,13 +17,13 @@ public:
virtual ~CWII_IPC_HLE_Device_FileIO();
bool Close(u32 _CommandAddress, bool _bForce);
bool Open(u32 _CommandAddress, u32 _Mode);
bool Seek(u32 _CommandAddress);
bool Read(u32 _CommandAddress);
bool Write(u32 _CommandAddress);
bool IOCtl(u32 _CommandAddress);
void DoState(PointerWrap &p);
bool Close(u32 _CommandAddress, bool _bForce) override;
bool Open(u32 _CommandAddress, u32 _Mode) override;
bool Seek(u32 _CommandAddress) override;
bool Read(u32 _CommandAddress) override;
bool Write(u32 _CommandAddress) override;
bool IOCtl(u32 _CommandAddress) override;
void DoState(PointerWrap &p) override;
File::IOFile OpenFile();
@@ -22,13 +22,13 @@ public:
void OpenInternal();
virtual void DoState(PointerWrap& p);
virtual void DoState(PointerWrap& p) override;
virtual bool Open(u32 _CommandAddress, u32 _Mode);
virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
virtual bool Close(u32 _CommandAddress, bool _bForce);
virtual bool Close(u32 _CommandAddress, bool _bForce) override;
virtual bool IOCtlV(u32 _CommandAddress);
virtual bool IOCtlV(u32 _CommandAddress) override;
static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
// This should only be cleared on power reset
@@ -36,15 +36,15 @@ public:
CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_fs();
virtual void DoState(PointerWrap& p);
virtual void DoState(PointerWrap& p) override;
virtual bool Open(u32 _CommandAddress, u32 _Mode);
virtual bool Close(u32 _CommandAddress, bool _bForce);
virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
virtual bool Close(u32 _CommandAddress, bool _bForce) override;
virtual bool IOCtl(u32 _CommandAddress);
virtual bool IOCtlV(u32 _CommandAddress);
virtual bool IOCtl(u32 _CommandAddress) override;
virtual bool IOCtlV(u32 _CommandAddress) override;
virtual int GetCmdDelay(u32);
virtual int GetCmdDelay(u32) override;
private:

Some files were not shown because too many files have changed in this diff Show More