From 4bd29f0edac219e438977a6189521ce6a5eb41ef Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Thu, 21 May 2020 20:01:23 +0200 Subject: [PATCH] Add override keyword --- src/util/error.cpp | 2 +- src/util/file_utils.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/error.cpp b/src/util/error.cpp index 6e5fa4bf..bfb211f3 100644 --- a/src/util/error.cpp +++ b/src/util/error.cpp @@ -61,7 +61,7 @@ String Error::what() const { const wxString& GetStackTrace() const { return m_stackTrace; } protected: - virtual void OnStackFrame(const wxStackFrame& frame) { + void OnStackFrame(const wxStackFrame& frame) override { m_stackTrace << wxString::Format(_("[%02d] "), frame.GetLevel()); wxString name = frame.GetName(); diff --git a/src/util/file_utils.cpp b/src/util/file_utils.cpp index f1d465a3..ba494891 100644 --- a/src/util/file_utils.cpp +++ b/src/util/file_utils.cpp @@ -158,7 +158,7 @@ public: } } - wxDirTraverseResult OnFile(const String& filename) { + wxDirTraverseResult OnFile(const String& filename) override { if (!remove_file(filename)) { ok = false; handle_error(_("Cannot delete ") + filename + _("\n") @@ -167,7 +167,7 @@ public: } return wxDIR_CONTINUE; } - wxDirTraverseResult OnDir(const String& dirname) { + wxDirTraverseResult OnDir(const String& dirname) override { to_delete.push_back(dirname); return wxDIR_CONTINUE; } @@ -210,11 +210,11 @@ public: IgnoredMover(const String& from, const String& to) : from(from), to(to) {} - wxDirTraverseResult OnFile(const String& filename) { + wxDirTraverseResult OnFile(const String& filename) override { tryMove(filename); return wxDIR_CONTINUE; } - wxDirTraverseResult OnDir(const String& dirname) { + wxDirTraverseResult OnDir(const String& dirname) override { return tryMove(dirname) ? wxDIR_IGNORE : wxDIR_CONTINUE; } private: