From 41f0fbfd30a6717d52d066b6caf401f63a7a811b Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 4 Jan 2018 05:29:40 +0000 Subject: [PATCH] Add the final keyword to methods --- lib/base/application.hpp | 2 +- lib/base/exception.hpp | 6 +++--- lib/base/logger.hpp | 2 +- lib/base/streamlogger.hpp | 4 ++-- lib/config/expression.hpp | 2 +- lib/db_ido/dbconnection.hpp | 4 ++-- lib/icinga/checkable.hpp | 8 ++++---- lib/icinga/customvarobject.hpp | 2 +- lib/livestatus/table.hpp | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 2ce037b23..4c207c38d 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -174,7 +174,7 @@ protected: virtual void OnShutdown(void); - virtual void ValidateName(const String& value, const ValidationUtils& utils) override; + virtual void ValidateName(const String& value, const ValidationUtils& utils) override final; private: static Application::Ptr m_Instance; /**< The application instance. */ diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 08ec022ff..18dbdd012 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -55,7 +55,7 @@ public: ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); ~ScriptError(void) throw(); - virtual const char *what(void) const throw() override; + virtual const char *what(void) const throw() override final; DebugInfo GetDebugInfo(void) const; bool IsIncompleteExpression(void) const; @@ -79,7 +79,7 @@ public: ValidationError(const ConfigObject::Ptr& object, const std::vector& attributePath, const String& message); ~ValidationError(void) throw(); - virtual const char *what(void) const throw() override; + virtual const char *what(void) const throw() override final; ConfigObject::Ptr GetObject(void) const; std::vector GetAttributePath(void) const; @@ -128,7 +128,7 @@ public: posix_error(void); virtual ~posix_error(void) throw(); - virtual const char *what(void) const throw() override; + virtual const char *what(void) const throw() override final; private: mutable char *m_Message; diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index 69606158c..a7532c615 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -90,7 +90,7 @@ public: static void SetConsoleLogSeverity(LogSeverity logSeverity); static LogSeverity GetConsoleLogSeverity(void); - virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override; + virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override final; protected: virtual void Start(bool runtimeCreated) override; diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index 793c00ccb..e89674f38 100644 --- a/lib/base/streamlogger.hpp +++ b/lib/base/streamlogger.hpp @@ -48,8 +48,8 @@ public: static void ProcessLogEntry(std::ostream& stream, const LogEntry& entry); protected: - virtual void ProcessLogEntry(const LogEntry& entry) override; - virtual void Flush(void) override; + virtual void ProcessLogEntry(const LogEntry& entry) override final; + virtual void Flush(void) override final; private: static boost::mutex m_Mutex; diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index 56ab79c62..d9c3e841b 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -274,7 +274,7 @@ public: { } protected: - virtual const DebugInfo& GetDebugInfo(void) const override; + virtual const DebugInfo& GetDebugInfo(void) const override final; DebugInfo m_DebugInfo; }; diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp index afd8aedaf..eab1170aa 100644 --- a/lib/db_ido/dbconnection.hpp +++ b/lib/db_ido/dbconnection.hpp @@ -76,8 +76,8 @@ public: int GetQueryCount(RingBuffer::SizeType span); virtual int GetPendingQueryCount(void) const = 0; - virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override; - virtual void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) override; + virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override final; + virtual void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) override final; protected: virtual void OnConfigLoaded(void) override; diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index da15fb212..7f1a3a991 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -115,7 +115,7 @@ public: bool HasBeenChecked(void) const; virtual bool IsStateOK(ServiceState state) = 0; - virtual double GetLastCheck(void) const override; + virtual double GetLastCheck(void) const override final; virtual void SaveLastState(ServiceState state, double timestamp) = 0; @@ -145,7 +145,7 @@ public: static boost::signals2::signal OnEventCommandExecuted; /* Downtimes */ - virtual int GetDowntimeDepth(void) const override; + virtual int GetDowntimeDepth(void) const override final; void RemoveAllDowntimes(void); void TriggerDowntimes(void); @@ -191,8 +191,8 @@ public: void RemoveReverseDependency(const intrusive_ptr& dep); std::vector > GetReverseDependencies(void) const; - virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override; - virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override; + virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override final; + virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override final; static void IncreasePendingChecks(void); static void DecreasePendingChecks(void); diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp index 53bf323d8..aa88c64e5 100644 --- a/lib/icinga/customvarobject.hpp +++ b/lib/icinga/customvarobject.hpp @@ -38,7 +38,7 @@ class CustomVarObject : public ObjectImpl public: DECLARE_OBJECT(CustomVarObject); - virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override final; }; int FilterArrayToInt(const Array::Ptr& typeFilters, const std::map& filterMap, int defaultValue); diff --git a/lib/livestatus/table.hpp b/lib/livestatus/table.hpp index d39de04ad..0dddf40ed 100644 --- a/lib/livestatus/table.hpp +++ b/lib/livestatus/table.hpp @@ -58,7 +58,7 @@ public: Column GetColumn(const String& name) const; std::vector GetColumnNames(void) const; - virtual LivestatusGroupByType GetGroupByType(void) const; + LivestatusGroupByType GetGroupByType(void) const; protected: Table(LivestatusGroupByType type = LivestatusGroupByNone);