amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 21:47:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add override keyword

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-21 20:01:23 +02:00
parent 1bb61ea9ac
commit 4bd29f0eda
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/error.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ String Error::what() const {
const wxString& GetStackTrace() const { return m_stackTrace; } const wxString& GetStackTrace() const { return m_stackTrace; }
protected: protected:
virtual void OnStackFrame(const wxStackFrame& frame) { void OnStackFrame(const wxStackFrame& frame) override {
m_stackTrace << wxString::Format(_("[%02d] "), frame.GetLevel()); m_stackTrace << wxString::Format(_("[%02d] "), frame.GetLevel());
wxString name = frame.GetName(); wxString name = frame.GetName();
src/util/file_utils.cpp
+4 -4
View File
@@ -158,7 +158,7 @@ public:
} }
} }
wxDirTraverseResult OnFile(const String& filename) { wxDirTraverseResult OnFile(const String& filename) override {
if (!remove_file(filename)) { if (!remove_file(filename)) {
ok = false; ok = false;
handle_error(_("Cannot delete ") + filename + _("\n") handle_error(_("Cannot delete ") + filename + _("\n")
@@ -167,7 +167,7 @@ public:
} }
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
wxDirTraverseResult OnDir(const String& dirname) { wxDirTraverseResult OnDir(const String& dirname) override {
to_delete.push_back(dirname); to_delete.push_back(dirname);
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
@@ -210,11 +210,11 @@ public:
IgnoredMover(const String& from, const String& to) IgnoredMover(const String& from, const String& to)
: from(from), to(to) : from(from), to(to)
{} {}
wxDirTraverseResult OnFile(const String& filename) { wxDirTraverseResult OnFile(const String& filename) override {
tryMove(filename); tryMove(filename);
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
wxDirTraverseResult OnDir(const String& dirname) { wxDirTraverseResult OnDir(const String& dirname) override {
return tryMove(dirname) ? wxDIR_IGNORE : wxDIR_CONTINUE; return tryMove(dirname) ? wxDIR_IGNORE : wxDIR_CONTINUE;
} }
private: private: