Skip to content

Commit

Permalink
cmake: fix a bunch of override warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tadanokojin committed Oct 3, 2021
1 parent a6e1886 commit e096814
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions pcsx2/GS.h
Expand Up @@ -381,19 +381,19 @@ class SysMtgsThread : public SysThreadBase
void OpenGS();
void CloseGS();

void OnStart();
void OnResumeReady();
void OnStart() override;
void OnResumeReady() override;

void OnSuspendInThread();
void OnSuspendInThread() override;
void OnPauseInThread(SystemsMask systemsToTearDown) override {}
void OnResumeInThread(SystemsMask systemsToReinstate) override;
void OnCleanupInThread();
void OnCleanupInThread() override;

void GenericStall( uint size );

// Used internally by SendSimplePacket type functions
void _FinishSimplePacket();
void ExecuteTaskInThread();
void ExecuteTaskInThread() override;
};

// GetMTGS() is a required external implementation. This function is *NOT* provided
Expand Down
16 changes: 8 additions & 8 deletions pcsx2/System/SysThreads.h
Expand Up @@ -212,13 +212,13 @@ class SysCoreThread : public SysThreadBase

bool HasPendingStateChangeRequest() const;

virtual void OnResumeReady();
virtual void OnResumeReady() override;
virtual void Reset();
virtual void ResetQuick();
virtual void Cancel(bool isBlocking = true);
virtual bool Cancel(const wxTimeSpan& timeout);
virtual void Cancel(bool isBlocking = true) override;
virtual bool Cancel(const wxTimeSpan& timeout) override;

virtual bool StateCheckInThread();
virtual bool StateCheckInThread() override;
virtual void VsyncInThread();
virtual void GameStartingInThread();

Expand All @@ -232,13 +232,13 @@ class SysCoreThread : public SysThreadBase
protected:
void _reset_stuff_as_needed();

virtual void Start();
virtual void OnStart();
virtual void Start() override;
virtual void OnStart() override;
virtual void OnSuspendInThread() override;
virtual void OnPauseInThread(SystemsMask systemsToTearDown) override { TearDownSystems(systemsToTearDown); }
virtual void OnResumeInThread(SystemsMask systemsToReinstate) override;
virtual void OnCleanupInThread();
virtual void ExecuteTaskInThread();
virtual void OnCleanupInThread() override;
virtual void ExecuteTaskInThread() override;
virtual void DoCpuReset();
virtual void DoCpuExecute();

Expand Down
34 changes: 17 additions & 17 deletions pcsx2/gui/AppCoreThread.h
Expand Up @@ -148,29 +148,29 @@ class AppCoreThread : public SysCoreThread

void ResetCdvd() { m_resetCdvd = true; }

virtual void Suspend(bool isBlocking = false);
virtual void Resume();
virtual void Reset();
virtual void ResetQuick();
virtual void Cancel(bool isBlocking = true);
virtual bool StateCheckInThread();
virtual void Suspend(bool isBlocking = false) override;
virtual void Resume() override;
virtual void Reset() override;
virtual void ResetQuick() override;
virtual void Cancel(bool isBlocking = true) override;
virtual bool StateCheckInThread() override;
virtual void ChangeCdvdSource();

virtual void ApplySettings(const Pcsx2Config& src);
virtual void ApplySettings(const Pcsx2Config& src) override;

protected:
virtual void DoCpuExecute();
virtual void DoCpuExecute() override;

virtual void OnResumeReady();
virtual void OnPause();
virtual void OnPauseDebug();
virtual void OnResumeReady() override;
virtual void OnPause() override;
virtual void OnPauseDebug() override;
virtual void OnResumeInThread(SystemsMask systemsToReinstate) override;
virtual void OnSuspendInThread();
virtual void OnCleanupInThread();
virtual void VsyncInThread();
virtual void GameStartingInThread();
virtual void ExecuteTaskInThread();
virtual void DoCpuReset();
virtual void OnSuspendInThread() override;
virtual void OnCleanupInThread() override;
virtual void VsyncInThread() override;
virtual void GameStartingInThread() override;
virtual void ExecuteTaskInThread() override;
virtual void DoCpuReset() override;
};

// --------------------------------------------------------------------------------------
Expand Down

0 comments on commit e096814

Please sign in to comment.