diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index ec88ea1285..10dab1f065 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -82,7 +82,7 @@ void LogChannel::removeListener(std::shared_ptr listener) struct CoutListener : LogListener { - void log(const LogMessage &msg) + void log(const LogMessage &msg) override { std::cerr << msg.mText << std::endl; } @@ -103,7 +103,7 @@ struct FileListener : LogListener } } - void log(const LogMessage &msg) + void log(const LogMessage &msg) override { std::string text = msg.mText; if (mPrependChannelName) diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp index c960be7b11..b45f6ef737 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp @@ -723,4 +723,4 @@ u32 ppu_recompiler_llvm::CPUHybridDecoderRecompiler::ExecuteTillReturn(PPUThread bool ppu_recompiler_llvm::CPUHybridDecoderRecompiler::PollStatus(PPUThread * ppu_state) { return ppu_state->check_status(); -} \ No newline at end of file +} diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 36c80173ee..5dbd52bf68 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -701,7 +701,7 @@ public: FPSCR.FI = val; } - virtual std::string RegsToString() const + virtual std::string RegsToString() const override { std::string ret = "Registers:\n=========\n"; @@ -729,7 +729,7 @@ public: return ret; } - virtual std::string ReadRegString(const std::string& reg) const + virtual std::string ReadRegString(const std::string& reg) const override { std::string::size_type first_brk = reg.find('['); if (first_brk != std::string::npos) @@ -748,7 +748,8 @@ public: return ""; } - bool WriteRegString(const std::string& reg, std::string value) { + bool WriteRegString(const std::string& reg, std::string value) override + { while (value.length() < 32) value = "0"+value; std::string::size_type first_brk = reg.find('['); try diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 1ed4a49a58..dd849954a7 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -705,7 +705,7 @@ public: void fast_call(u32 ls_addr); - virtual std::string RegsToString() const + virtual std::string RegsToString() const override { std::string ret = "Registers:\n=========\n"; @@ -714,7 +714,7 @@ public: return ret; } - virtual std::string ReadRegString(const std::string& reg) const + virtual std::string ReadRegString(const std::string& reg) const override { std::string::size_type first_brk = reg.find('['); if (first_brk != std::string::npos) @@ -726,7 +726,7 @@ public: return ""; } - bool WriteRegString(const std::string& reg, std::string value) + bool WriteRegString(const std::string& reg, std::string value) override { while (value.length() < 32) value = "0"+value; std::string::size_type first_brk = reg.find('['); diff --git a/rpcs3/Emu/FS/vfsLocalDir.h b/rpcs3/Emu/FS/vfsLocalDir.h index 59e4709b3c..06fe0eb2de 100644 --- a/rpcs3/Emu/FS/vfsLocalDir.h +++ b/rpcs3/Emu/FS/vfsLocalDir.h @@ -18,5 +18,5 @@ public: virtual bool Rename(const std::string& from, const std::string& to) override; virtual bool Remove(const std::string& path) override; virtual bool IsOpened() const override; - virtual bool IsExists(const std::string& path) const; + virtual bool IsExists(const std::string& path) const override; }; diff --git a/rpcs3/Emu/HDD/HDD.h b/rpcs3/Emu/HDD/HDD.h index 4274bd66d4..8818ba56cd 100644 --- a/rpcs3/Emu/HDD/HDD.h +++ b/rpcs3/Emu/HDD/HDD.h @@ -158,7 +158,7 @@ public: int OpenDir(const std::string& name); - bool Rename(const std::string& from, const std::string& to); + bool Rename(const std::string& from, const std::string& to) override; u64 FindFreeBlock(); @@ -182,7 +182,7 @@ public: bool GetNextEntry(u64& block, vfsHDD_Entry& entry, std::string& name); - virtual bool Open(const std::string& path, u32 mode = vfsRead); + virtual bool Open(const std::string& path, u32 mode = vfsRead) override; bool HasEntry(const std::string& name); @@ -204,5 +204,5 @@ public: virtual bool IsOpened() const override; - virtual u64 GetSize() const; + virtual u64 GetSize() const override; }; diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index 20daf4c088..1fa4bfd315 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -174,7 +174,7 @@ private: void InitFragmentData(); void Enable(bool enable, const u32 cap); - virtual void Close(); + virtual void Close() override; bool LoadProgram(); void WriteBuffers(); void WriteDepthBuffer(); @@ -188,13 +188,13 @@ private: void InitDrawBuffers(); protected: - virtual void OnInit(); - virtual void OnInitThread(); - virtual void OnExitThread(); - virtual void OnReset(); + virtual void OnInit() override; + virtual void OnInitThread() override; + virtual void OnExitThread() override; + virtual void OnReset() override; virtual void Clear(u32 cmd) override; virtual void Draw() override; - virtual void Flip(); + virtual void Flip() override; virtual void semaphorePGRAPHTextureReadRelease(u32 offset, u32 value) override; virtual void semaphorePGRAPHBackendRelease(u32 offset, u32 value) override; diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.h b/rpcs3/Emu/RSX/Null/NullGSRender.h index 1bd5a26a16..c7cd021246 100644 --- a/rpcs3/Emu/RSX/Null/NullGSRender.h +++ b/rpcs3/Emu/RSX/Null/NullGSRender.h @@ -18,19 +18,19 @@ public: } private: - virtual void OnInit() + virtual void OnInit() override { } - virtual void OnInitThread() + virtual void OnInitThread() override { } - virtual void OnExitThread() + virtual void OnExitThread() override { } - virtual void OnReset() + virtual void OnReset() override { } @@ -42,11 +42,11 @@ private: { } - virtual void Flip() + virtual void Flip() override { } - virtual void Close() + virtual void Close() override { if (joinable()) { diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index a7e5a42fcb..ed2bbb41cc 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -102,7 +102,7 @@ struct wxWriter : Log::LogListener } //put message into the log buffer - void log(const Log::LogMessage &msg) + void log(const Log::LogMessage &msg) override { u8 logLevel = Ini.HLELogLvl.GetValue(); if (msg.mType != Log::TTY && logLevel != 0) diff --git a/rpcs3/Gui/GLGSFrame.h b/rpcs3/Gui/GLGSFrame.h index 37f79693fe..ace40928e4 100644 --- a/rpcs3/Gui/GLGSFrame.h +++ b/rpcs3/Gui/GLGSFrame.h @@ -24,7 +24,7 @@ struct GLGSFrame : public GSFrame, public GSFrameBase wxGLCanvas* GetCanvas() const { return canvas; } - virtual void SetViewport(int x, int y, u32 w, u32 h); + virtual void SetViewport(int x, int y, u32 w, u32 h) override; private: virtual void OnSize(wxSizeEvent& event); diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index 4fb909b515..cada6a51fd 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -40,14 +40,14 @@ public: class WxDirDeleteTraverser : public wxDirTraverser { public: - virtual wxDirTraverseResult OnFile(const wxString& filename) + virtual wxDirTraverseResult OnFile(const wxString& filename) override { if (!wxRemoveFile(filename)){ LOG_ERROR(HLE, "Couldn't delete File: %s", fmt::ToUTF8(filename).c_str()); } return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& dirname) + virtual wxDirTraverseResult OnDir(const wxString& dirname) override { wxDir dir(dirname); dir.Traverse(*this);