archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing override specifiers

Browse source
This commit is contained in:
Danila Malyutin 2015-07-26 16:41:23 +03:00
parent e810eabd32
commit 5ae6586803
11 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utilities/Log.cpp
View file

@ -82,7 +82,7 @@ void LogChannel::removeListener(std::shared_ptr<LogListener> listener)
struct CoutListener : LogListener struct CoutListener : LogListener
{ {
void log(const LogMessage &msg) void log(const LogMessage &msg) override
{ {
std::cerr << msg.mText << std::endl; 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; std::string text = msg.mText;
if (mPrependChannelName) if (mPrependChannelName)

7
rpcs3/Emu/Cell/PPUThread.h
View file

@ -701,7 +701,7 @@ public:
FPSCR.FI = val; FPSCR.FI = val;
} }
virtual std::string RegsToString() const virtual std::string RegsToString() const override
{ {
std::string ret = "Registers:\n=========\n"; std::string ret = "Registers:\n=========\n";
@ -729,7 +729,7 @@ public:
return ret; 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('['); std::string::size_type first_brk = reg.find('[');
if (first_brk != std::string::npos) if (first_brk != std::string::npos)
@ -748,7 +748,8 @@ public:
return ""; 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; while (value.length() < 32) value = "0"+value;
std::string::size_type first_brk = reg.find('['); std::string::size_type first_brk = reg.find('[');
try try

6
rpcs3/Emu/Cell/SPUThread.h
View file

@ -705,7 +705,7 @@ public:
void fast_call(u32 ls_addr); void fast_call(u32 ls_addr);
virtual std::string RegsToString() const virtual std::string RegsToString() const override
{ {
std::string ret = "Registers:\n=========\n"; std::string ret = "Registers:\n=========\n";
@ -714,7 +714,7 @@ public:
return ret; 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('['); std::string::size_type first_brk = reg.find('[');
if (first_brk != std::string::npos) if (first_brk != std::string::npos)
@ -726,7 +726,7 @@ public:
return ""; 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; while (value.length() < 32) value = "0"+value;
std::string::size_type first_brk = reg.find('['); std::string::size_type first_brk = reg.find('[');

2
rpcs3/Emu/FS/vfsLocalDir.h
View file

@ -18,5 +18,5 @@ public:
virtual bool Rename(const std::string& from, const std::string& to) override; virtual bool Rename(const std::string& from, const std::string& to) override;
virtual bool Remove(const std::string& path) override; virtual bool Remove(const std::string& path) override;
virtual bool IsOpened() const override; virtual bool IsOpened() const override;
virtual bool IsExists(const std::string& path) const; virtual bool IsExists(const std::string& path) const override;
}; };

6
rpcs3/Emu/HDD/HDD.h
View file

@ -158,7 +158,7 @@ public:
int OpenDir(const std::string& name); 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(); u64 FindFreeBlock();
@ -182,7 +182,7 @@ public:
bool GetNextEntry(u64& block, vfsHDD_Entry& entry, std::string& name); 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); bool HasEntry(const std::string& name);
@ -204,5 +204,5 @@ public:
virtual bool IsOpened() const override; virtual bool IsOpened() const override;
virtual u64 GetSize() const; virtual u64 GetSize() const override;
}; };

12
rpcs3/Emu/RSX/GL/GLGSRender.h
View file

@ -174,7 +174,7 @@ private:
void InitFragmentData(); void InitFragmentData();
void Enable(bool enable, const u32 cap); void Enable(bool enable, const u32 cap);
virtual void Close(); virtual void Close() override;
bool LoadProgram(); bool LoadProgram();
void WriteBuffers(); void WriteBuffers();
void WriteDepthBuffer(); void WriteDepthBuffer();
@ -188,13 +188,13 @@ private:
void InitDrawBuffers(); void InitDrawBuffers();
protected: protected:
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;
virtual void Clear(u32 cmd) override; virtual void Clear(u32 cmd) override;
virtual void Draw() override; virtual void Draw() override;
virtual void Flip(); virtual void Flip() override;
virtual void semaphorePGRAPHTextureReadRelease(u32 offset, u32 value) override; virtual void semaphorePGRAPHTextureReadRelease(u32 offset, u32 value) override;
virtual void semaphorePGRAPHBackendRelease(u32 offset, u32 value) override; virtual void semaphorePGRAPHBackendRelease(u32 offset, u32 value) override;

12
rpcs3/Emu/RSX/Null/NullGSRender.h
View file

@ -18,19 +18,19 @@ public:
} }
private: 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()) if (joinable())
{ {

2
rpcs3/Gui/ConLogFrame.cpp
View file

@ -102,7 +102,7 @@ struct wxWriter : Log::LogListener
} }
//put message into the log buffer //put message into the log buffer
void log(const Log::LogMessage &msg) void log(const Log::LogMessage &msg) override
{ {
u8 logLevel = Ini.HLELogLvl.GetValue(); u8 logLevel = Ini.HLELogLvl.GetValue();
if (msg.mType != Log::TTY && logLevel != 0) if (msg.mType != Log::TTY && logLevel != 0)

2
rpcs3/Gui/GLGSFrame.h
View file

@ -24,7 +24,7 @@ struct GLGSFrame : public GSFrame, public GSFrameBase
wxGLCanvas* GetCanvas() const { return canvas; } 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: private:
virtual void OnSize(wxSizeEvent& event); virtual void OnSize(wxSizeEvent& event);

4
rpcs3/Gui/GameViewer.cpp
View file

@ -40,14 +40,14 @@ public:
class WxDirDeleteTraverser : public wxDirTraverser class WxDirDeleteTraverser : public wxDirTraverser
{ {
public: public:
virtual wxDirTraverseResult OnFile(const wxString& filename) virtual wxDirTraverseResult OnFile(const wxString& filename) override
{ {
if (!wxRemoveFile(filename)){ if (!wxRemoveFile(filename)){
LOG_ERROR(HLE, "Couldn't delete File: %s", fmt::ToUTF8(filename).c_str()); LOG_ERROR(HLE, "Couldn't delete File: %s", fmt::ToUTF8(filename).c_str());
} }
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
virtual wxDirTraverseResult OnDir(const wxString& dirname) virtual wxDirTraverseResult OnDir(const wxString& dirname) override
{ {
wxDir dir(dirname); wxDir dir(dirname);
dir.Traverse(*this); dir.Traverse(*this);