From: Gunnar Beutner Date: Tue, 18 Aug 2015 07:12:49 +0000 (+0200) Subject: Add 'override' keyword to methods X-Git-Tag: v2.4.0~400 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8cab2f0e8c33809f82fd7ac1dd121beae9865f5;p=icinga2 Add 'override' keyword to methods refs #9929 --- diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index d6a9b8470..7ceec1ff3 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(); + virtual const char *what(void) const throw() override; DebugInfo GetDebugInfo(void) const; bool IsIncompleteExpression(void) const; @@ -75,7 +75,7 @@ public: ValidationError(const ConfigObject::Ptr& object, const std::vector& attributePath, const String& message); ~ValidationError(void) throw(); - virtual const char *what(void) const throw(); + virtual const char *what(void) const throw() override; ConfigObject::Ptr GetObject(void) const; std::vector GetAttributePath(void) const; @@ -124,7 +124,7 @@ public: posix_error(void); virtual ~posix_error(void) throw(); - virtual const char *what(void) const throw(); + virtual const char *what(void) const throw() override; private: mutable char *m_Message; diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index 84c3bb150..db552c4b3 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -41,13 +41,13 @@ public: FIFO(void); ~FIFO(void); - virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false); - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false); - virtual void Write(const void *buffer, size_t count); - virtual void Close(void); - virtual bool IsEof(void) const; - virtual bool SupportsWaiting(void) const; - virtual bool IsDataAvailable(void) const; + virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + virtual void Write(const void *buffer, size_t count) override; + virtual void Close(void) override; + virtual bool IsEof(void) const override; + virtual bool SupportsWaiting(void) const override; + virtual bool IsDataAvailable(void) const override; size_t GetAvailableBytes(void) const; diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index af2d2d24d..733feaa6f 100644 --- a/lib/base/networkstream.hpp +++ b/lib/base/networkstream.hpp @@ -39,12 +39,12 @@ public: NetworkStream(const Socket::Ptr& socket); - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false); - virtual void Write(const void *buffer, size_t count); + virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + virtual void Write(const void *buffer, size_t count) override; - virtual void Close(void); + virtual void Close(void) override; - virtual bool IsEof(void) const; + virtual bool IsEof(void) const override; private: Socket::Ptr m_Socket; diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp index 4853bd192..061927dc9 100644 --- a/lib/base/primitivetype.hpp +++ b/lib/base/primitivetype.hpp @@ -32,15 +32,15 @@ class I2_BASE_API PrimitiveType : public Type public: PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); - virtual String GetName(void) const; - virtual Type::Ptr GetBaseType(void) const; - virtual int GetAttributes(void) const; - virtual int GetFieldId(const String& name) const; - virtual Field GetFieldInfo(int id) const; - virtual int GetFieldCount(void) const; + virtual String GetName(void) const override; + virtual Type::Ptr GetBaseType(void) const override; + virtual int GetAttributes(void) const override; + virtual int GetFieldId(const String& name) const override; + virtual Field GetFieldInfo(int id) const override; + virtual int GetFieldCount(void) const override; protected: - virtual ObjectFactory GetFactory(void) const; + virtual ObjectFactory GetFactory(void) const override; private: String m_Name; diff --git a/lib/base/stdiostream.hpp b/lib/base/stdiostream.hpp index 44e342419..84f59e886 100644 --- a/lib/base/stdiostream.hpp +++ b/lib/base/stdiostream.hpp @@ -34,13 +34,13 @@ public: StdioStream(std::iostream *innerStream, bool ownsStream); ~StdioStream(void); - virtual size_t Read(void *buffer, size_t size, bool allow_partial = false); - virtual void Write(const void *buffer, size_t size); + virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override; + virtual void Write(const void *buffer, size_t size) override; - virtual void Close(void); + virtual void Close(void) override; - virtual bool IsDataAvailable(void) const; - virtual bool IsEof(void) const; + virtual bool IsDataAvailable(void) const override; + virtual bool IsEof(void) const override; private: std::iostream *m_InnerStream; diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp index 59f5d0a39..e0e90a57c 100644 --- a/lib/base/tlsstream.hpp +++ b/lib/base/tlsstream.hpp @@ -56,17 +56,17 @@ public: void Handshake(void); - virtual void Close(void); - virtual void Shutdown(void); + virtual void Close(void) override; + virtual void Shutdown(void) override; - virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false); - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false); - virtual void Write(const void *buffer, size_t count); + virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + virtual void Write(const void *buffer, size_t count) override; - virtual bool IsEof(void) const; + virtual bool IsEof(void) const override; - virtual bool SupportsWaiting(void) const; - virtual bool IsDataAvailable(void) const; + virtual bool SupportsWaiting(void) const override; + virtual bool IsDataAvailable(void) const override; bool IsVerifyOK(void) const; @@ -93,7 +93,7 @@ private: static int m_SSLIndex; static bool m_SSLIndexInitialized; - virtual void OnEvent(int revents); + virtual void OnEvent(int revents) override; void HandleError(void) const; diff --git a/lib/base/type.hpp b/lib/base/type.hpp index c208ffa35..6417a5c84 100644 --- a/lib/base/type.hpp +++ b/lib/base/type.hpp @@ -114,17 +114,17 @@ class I2_BASE_API TypeType : public Type public: DECLARE_PTR_TYPEDEFS(Type); - virtual String GetName(void) const; - virtual Type::Ptr GetBaseType(void) const; - virtual int GetAttributes(void) const; - virtual int GetFieldId(const String& name) const; - virtual Field GetFieldInfo(int id) const; - virtual int GetFieldCount(void) const; + virtual String GetName(void) const override; + virtual Type::Ptr GetBaseType(void) const override; + virtual int GetAttributes(void) const override; + virtual int GetFieldId(const String& name) const override; + virtual Field GetFieldInfo(int id) const override; + virtual int GetFieldCount(void) const override; static Object::Ptr GetPrototype(void); protected: - virtual ObjectFactory GetFactory(void) const; + virtual ObjectFactory GetFactory(void) const override; }; template diff --git a/lib/cli/apisetupcommand.hpp b/lib/cli/apisetupcommand.hpp index c27f172bd..b65d26a78 100644 --- a/lib/cli/apisetupcommand.hpp +++ b/lib/cli/apisetupcommand.hpp @@ -35,11 +35,11 @@ class ApiSetupCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(ApiSetupCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMaxArguments(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMaxArguments(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; }; } diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp index 3c039e43c..b5795b964 100644 --- a/lib/cli/consolecommand.hpp +++ b/lib/cli/consolecommand.hpp @@ -35,12 +35,12 @@ class ConsoleCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(ConsoleCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp index e7d590a4e..8b42cc23e 100644 --- a/lib/cli/daemoncommand.hpp +++ b/lib/cli/daemoncommand.hpp @@ -35,12 +35,12 @@ class DaemonCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(DaemonCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp index e4e4bab43..03b7582ce 100644 --- a/lib/cli/featuredisablecommand.hpp +++ b/lib/cli/featuredisablecommand.hpp @@ -35,13 +35,13 @@ class FeatureDisableCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureDisableCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; - virtual int GetMaxArguments(void) const; - virtual std::vector GetPositionalSuggestions(const String& word) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; + virtual int GetMaxArguments(void) const override; + virtual std::vector GetPositionalSuggestions(const String& word) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp index 7b38a7b6c..433587000 100644 --- a/lib/cli/featureenablecommand.hpp +++ b/lib/cli/featureenablecommand.hpp @@ -35,13 +35,13 @@ class FeatureEnableCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureEnableCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; - virtual int GetMaxArguments(void) const; - virtual std::vector GetPositionalSuggestions(const String& word) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; + virtual int GetMaxArguments(void) const override; + virtual std::vector GetPositionalSuggestions(const String& word) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp index 09e787a17..3548227bb 100644 --- a/lib/cli/featurelistcommand.hpp +++ b/lib/cli/featurelistcommand.hpp @@ -35,9 +35,9 @@ class FeatureListCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureListCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/nodeaddcommand.hpp b/lib/cli/nodeaddcommand.hpp index 0dce9b746..f2a320938 100644 --- a/lib/cli/nodeaddcommand.hpp +++ b/lib/cli/nodeaddcommand.hpp @@ -35,10 +35,10 @@ class NodeAddCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeAddCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/nodeblackandwhitelistcommand.hpp b/lib/cli/nodeblackandwhitelistcommand.hpp index 208a81899..ede555fbc 100644 --- a/lib/cli/nodeblackandwhitelistcommand.hpp +++ b/lib/cli/nodeblackandwhitelistcommand.hpp @@ -45,11 +45,11 @@ public: BlackAndWhitelistCommand(const String& type, BlackAndWhitelistCommandType command); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: String m_Type; diff --git a/lib/cli/nodelistcommand.hpp b/lib/cli/nodelistcommand.hpp index 24537e26f..19aa90256 100644 --- a/lib/cli/nodelistcommand.hpp +++ b/lib/cli/nodelistcommand.hpp @@ -35,11 +35,11 @@ class NodeListCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeListCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/noderemovecommand.hpp b/lib/cli/noderemovecommand.hpp index 9707672f8..130a5f40e 100644 --- a/lib/cli/noderemovecommand.hpp +++ b/lib/cli/noderemovecommand.hpp @@ -35,12 +35,12 @@ class NodeRemoveCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeRemoveCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; - virtual int GetMaxArguments(void) const; - virtual std::vector GetPositionalSuggestions(const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; + virtual int GetMaxArguments(void) const override; + virtual std::vector GetPositionalSuggestions(const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/nodesetcommand.hpp b/lib/cli/nodesetcommand.hpp index ed3c34a01..00b0ce242 100644 --- a/lib/cli/nodesetcommand.hpp +++ b/lib/cli/nodesetcommand.hpp @@ -35,12 +35,12 @@ class NodeSetCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeSetCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/nodesetupcommand.hpp b/lib/cli/nodesetupcommand.hpp index c332e7ae7..2870aaeab 100644 --- a/lib/cli/nodesetupcommand.hpp +++ b/lib/cli/nodesetupcommand.hpp @@ -35,13 +35,13 @@ class NodeSetupCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeSetupCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector& ap); diff --git a/lib/cli/nodeupdateconfigcommand.hpp b/lib/cli/nodeupdateconfigcommand.hpp index e71223206..bcfda7490 100644 --- a/lib/cli/nodeupdateconfigcommand.hpp +++ b/lib/cli/nodeupdateconfigcommand.hpp @@ -35,10 +35,10 @@ class NodeUpdateConfigCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeUpdateConfigCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; }; } diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp index fcd3905eb..a85844eab 100644 --- a/lib/cli/nodewizardcommand.hpp +++ b/lib/cli/nodewizardcommand.hpp @@ -35,11 +35,11 @@ class NodeWizardCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeWizardCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMaxArguments(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMaxArguments(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; }; } diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp index fad0ffe7b..c1bc16d41 100644 --- a/lib/cli/objectlistcommand.hpp +++ b/lib/cli/objectlistcommand.hpp @@ -38,11 +38,11 @@ class ObjectListCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(ObjectListCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintTypeCounts(std::ostream& fp, const std::map& type_count); diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp index 8e5aba9a0..8e33a64e6 100644 --- a/lib/cli/pkinewcacommand.hpp +++ b/lib/cli/pkinewcacommand.hpp @@ -35,9 +35,9 @@ class PKINewCACommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCACommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp index 21550a5d9..938b8ff0e 100644 --- a/lib/cli/pkinewcertcommand.hpp +++ b/lib/cli/pkinewcertcommand.hpp @@ -35,12 +35,12 @@ class PKINewCertCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCertCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp index 55d3e9737..bdce810cd 100644 --- a/lib/cli/pkirequestcommand.hpp +++ b/lib/cli/pkirequestcommand.hpp @@ -35,12 +35,12 @@ class PKIRequestCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKIRequestCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkisavecertcommand.hpp b/lib/cli/pkisavecertcommand.hpp index f6fd223aa..91deb86e0 100644 --- a/lib/cli/pkisavecertcommand.hpp +++ b/lib/cli/pkisavecertcommand.hpp @@ -35,12 +35,12 @@ class PKISaveCertCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISaveCertCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp index b84cf216f..fd76c6ba5 100644 --- a/lib/cli/pkisigncsrcommand.hpp +++ b/lib/cli/pkisigncsrcommand.hpp @@ -35,12 +35,12 @@ class PKISignCSRCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISignCSRCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp index 14914db56..e791d7d31 100644 --- a/lib/cli/pkiticketcommand.hpp +++ b/lib/cli/pkiticketcommand.hpp @@ -35,11 +35,11 @@ class PKITicketCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKITicketCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/repositoryclearchangescommand.hpp b/lib/cli/repositoryclearchangescommand.hpp index e7b7e2a07..7751a506f 100644 --- a/lib/cli/repositoryclearchangescommand.hpp +++ b/lib/cli/repositoryclearchangescommand.hpp @@ -38,10 +38,10 @@ class RepositoryClearChangesCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(RepositoryClearChangesCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/repositorycommitcommand.hpp b/lib/cli/repositorycommitcommand.hpp index a07d41957..46cde9513 100644 --- a/lib/cli/repositorycommitcommand.hpp +++ b/lib/cli/repositorycommitcommand.hpp @@ -38,12 +38,12 @@ class RepositoryCommitCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(RepositoryCommitCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp index 668964731..501329e11 100644 --- a/lib/cli/repositoryobjectcommand.hpp +++ b/lib/cli/repositoryobjectcommand.hpp @@ -46,14 +46,14 @@ public: RepositoryObjectCommand(const String& type, RepositoryCommandType command); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMaxArguments(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMaxArguments(void) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual ImpersonationLevel GetImpersonationLevel(void) const; - virtual std::vector GetPositionalSuggestions(const String& word) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual ImpersonationLevel GetImpersonationLevel(void) const override; + virtual std::vector GetPositionalSuggestions(const String& word) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: String m_Type; diff --git a/lib/cli/troubleshootcommand.hpp b/lib/cli/troubleshootcommand.hpp index d1cb1c7b1..9d61127bf 100644 --- a/lib/cli/troubleshootcommand.hpp +++ b/lib/cli/troubleshootcommand.hpp @@ -37,11 +37,11 @@ class TroubleshootCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(TroubleshootCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; virtual void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; + boost::program_options::options_description& hiddenDesc) const override; private: class InfoLog; diff --git a/lib/cli/variablegetcommand.hpp b/lib/cli/variablegetcommand.hpp index 4f7e7dc7e..a16dcd84f 100644 --- a/lib/cli/variablegetcommand.hpp +++ b/lib/cli/variablegetcommand.hpp @@ -38,12 +38,12 @@ class VariableGetCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableGetCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int GetMinArguments(void) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int GetMinArguments(void) const override; void InitParameters(boost::program_options::options_description& visibleDesc, - boost::program_options::options_description& hiddenDesc) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + boost::program_options::options_description& hiddenDesc) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/variablelistcommand.hpp b/lib/cli/variablelistcommand.hpp index 2845772e4..cb4c162a8 100644 --- a/lib/cli/variablelistcommand.hpp +++ b/lib/cli/variablelistcommand.hpp @@ -38,9 +38,9 @@ class VariableListCommand : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableListCommand); - virtual String GetDescription(void) const; - virtual String GetShortDescription(void) const; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const; + virtual String GetDescription(void) const override; + virtual String GetShortDescription(void) const override; + virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintVariable(std::ostream& fp, const String& message); diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index acb9803d3..b4bb1eb6f 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -210,12 +210,12 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override { return m_Expression->DoEvaluate(frame, dhint); } - virtual const DebugInfo& GetDebugInfo(void) const + virtual const DebugInfo& GetDebugInfo(void) const override { return m_Expression->GetDebugInfo(); } @@ -232,12 +232,12 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override { return m_Future.get()->DoEvaluate(frame, dhint); } - virtual const DebugInfo& GetDebugInfo(void) const + virtual const DebugInfo& GetDebugInfo(void) const override { return m_Future.get()->GetDebugInfo(); } @@ -252,7 +252,7 @@ public: LiteralExpression(const Value& value = Value()); protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Value m_Value; @@ -271,7 +271,7 @@ public: { } protected: - virtual const DebugInfo& GetDebugInfo(void) const; + virtual const DebugInfo& GetDebugInfo(void) const override; DebugInfo m_DebugInfo; }; @@ -324,8 +324,8 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; - virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; private: String m_Variable; @@ -341,7 +341,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API LogicalNegateExpression : public UnaryExpression @@ -352,7 +352,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API AddExpression : public BinaryExpression @@ -363,7 +363,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API SubtractExpression : public BinaryExpression @@ -374,7 +374,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API MultiplyExpression : public BinaryExpression @@ -385,7 +385,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API DivideExpression : public BinaryExpression @@ -396,7 +396,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API ModuloExpression : public BinaryExpression @@ -407,7 +407,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API XorExpression : public BinaryExpression @@ -418,7 +418,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API BinaryAndExpression : public BinaryExpression @@ -429,7 +429,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API BinaryOrExpression : public BinaryExpression @@ -440,7 +440,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API ShiftLeftExpression : public BinaryExpression @@ -451,7 +451,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API ShiftRightExpression : public BinaryExpression @@ -462,7 +462,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API EqualExpression : public BinaryExpression @@ -473,7 +473,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API NotEqualExpression : public BinaryExpression @@ -484,7 +484,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API LessThanExpression : public BinaryExpression @@ -495,7 +495,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API GreaterThanExpression : public BinaryExpression @@ -506,7 +506,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API LessThanOrEqualExpression : public BinaryExpression @@ -517,7 +517,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API GreaterThanOrEqualExpression : public BinaryExpression @@ -528,7 +528,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API InExpression : public BinaryExpression @@ -539,7 +539,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API NotInExpression : public BinaryExpression @@ -550,7 +550,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API LogicalAndExpression : public BinaryExpression @@ -561,7 +561,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API LogicalOrExpression : public BinaryExpression @@ -572,7 +572,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API FunctionCallExpression : public DebuggableExpression @@ -591,7 +591,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; public: Expression *m_FName; @@ -612,7 +612,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector m_Expressions; @@ -634,7 +634,7 @@ public: void MakeInline(void); protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector m_Expressions; @@ -651,7 +651,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: CombinedSetOp m_Op; @@ -674,7 +674,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Expression *m_Condition; @@ -696,7 +696,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Expression *m_Condition; @@ -712,7 +712,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API BreakExpression : public DebuggableExpression @@ -723,7 +723,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API ContinueExpression : public DebuggableExpression @@ -734,7 +734,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class I2_CONFIG_API GetScopeExpression : public Expression @@ -745,7 +745,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: ScopeSpecifier m_ScopeSpec; @@ -759,8 +759,8 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; - virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; friend I2_CONFIG_API void BindToScope(Expression *& expr, ScopeSpecifier scopeSpec); }; @@ -780,7 +780,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Expression *m_Name; @@ -795,7 +795,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector m_Args; @@ -821,7 +821,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_Type; @@ -852,7 +852,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: bool m_Abstract; @@ -879,7 +879,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; + virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_FKVar; diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp index 288331e26..8525b068c 100644 --- a/lib/db_ido/commanddbobject.hpp +++ b/lib/db_ido/commanddbobject.hpp @@ -38,11 +38,11 @@ public: CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; protected: - virtual void OnConfigUpdate(void); + virtual void OnConfigUpdate(void) override; }; } diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp index f468c7e72..973892534 100644 --- a/lib/db_ido/endpointdbobject.hpp +++ b/lib/db_ido/endpointdbobject.hpp @@ -41,8 +41,8 @@ public: static void StaticInitialize(void); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; private: static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint); diff --git a/lib/db_ido/hostdbobject.hpp b/lib/db_ido/hostdbobject.hpp index f3d1fc695..55a2835c9 100644 --- a/lib/db_ido/hostdbobject.hpp +++ b/lib/db_ido/hostdbobject.hpp @@ -38,12 +38,12 @@ public: HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; private: - virtual void OnConfigUpdate(void); - virtual void OnStatusUpdate(void); + virtual void OnConfigUpdate(void) override; + virtual void OnStatusUpdate(void) override; }; } diff --git a/lib/db_ido/hostgroupdbobject.hpp b/lib/db_ido/hostgroupdbobject.hpp index 5544cd861..4d092b8d2 100644 --- a/lib/db_ido/hostgroupdbobject.hpp +++ b/lib/db_ido/hostgroupdbobject.hpp @@ -39,11 +39,11 @@ public: HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; protected: - virtual void OnConfigUpdate(void); + virtual void OnConfigUpdate(void) override; private: static void MembersChangedHandler(const HostGroup::Ptr& hgfilter); diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp index ccc289e6c..33dcd9a3e 100644 --- a/lib/db_ido/servicedbobject.hpp +++ b/lib/db_ido/servicedbobject.hpp @@ -41,14 +41,14 @@ public: static void StaticInitialize(void); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; protected: - virtual bool IsStatusAttribute(const String& attribute) const; + virtual bool IsStatusAttribute(const String& attribute) const override; - virtual void OnConfigUpdate(void); - virtual void OnStatusUpdate(void); + virtual void OnConfigUpdate(void) override; + virtual void OnStatusUpdate(void) override; }; } diff --git a/lib/db_ido/servicegroupdbobject.hpp b/lib/db_ido/servicegroupdbobject.hpp index 4d7a1971a..99f304b70 100644 --- a/lib/db_ido/servicegroupdbobject.hpp +++ b/lib/db_ido/servicegroupdbobject.hpp @@ -39,11 +39,11 @@ public: ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; protected: - virtual void OnConfigUpdate(void); + virtual void OnConfigUpdate(void) override; }; } diff --git a/lib/db_ido/timeperioddbobject.hpp b/lib/db_ido/timeperioddbobject.hpp index 4bedf7f5d..e2cded264 100644 --- a/lib/db_ido/timeperioddbobject.hpp +++ b/lib/db_ido/timeperioddbobject.hpp @@ -38,9 +38,9 @@ public: TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; - virtual void OnConfigUpdate(void); + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; + virtual void OnConfigUpdate(void) override; }; } diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp index 2ea254ef0..42bbaa050 100644 --- a/lib/db_ido/userdbobject.hpp +++ b/lib/db_ido/userdbobject.hpp @@ -38,12 +38,12 @@ public: UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; - virtual void OnConfigUpdate(void); + virtual void OnConfigUpdate(void) override; - virtual bool IsStatusAttribute(const String& attribute) const; + virtual bool IsStatusAttribute(const String& attribute) const override; }; } diff --git a/lib/db_ido/usergroupdbobject.hpp b/lib/db_ido/usergroupdbobject.hpp index d56ec2536..cd3e2decf 100644 --- a/lib/db_ido/usergroupdbobject.hpp +++ b/lib/db_ido/usergroupdbobject.hpp @@ -39,11 +39,11 @@ public: UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; protected: - virtual void OnConfigUpdate(void); + virtual void OnConfigUpdate(void) override; }; } diff --git a/lib/db_ido/zonedbobject.hpp b/lib/db_ido/zonedbobject.hpp index 59b5f3989..30eb556c5 100644 --- a/lib/db_ido/zonedbobject.hpp +++ b/lib/db_ido/zonedbobject.hpp @@ -39,8 +39,8 @@ public: ZoneDbObject(const intrusive_ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields(void) const; - virtual Dictionary::Ptr GetStatusFields(void) const; + virtual Dictionary::Ptr GetConfigFields(void) const override; + virtual Dictionary::Ptr GetStatusFields(void) const override; }; } diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index 04ec9b4c4..06f8e4f68 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -37,7 +37,7 @@ public: AndFilter(void); - virtual bool Apply(const Table::Ptr& table, const Value& row); + virtual bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp index 0676f8049..aaf1511b0 100644 --- a/lib/livestatus/attributefilter.hpp +++ b/lib/livestatus/attributefilter.hpp @@ -37,7 +37,7 @@ public: AttributeFilter(const String& column, const String& op, const String& operand); - virtual bool Apply(const Table::Ptr& table, const Value& row); + virtual bool Apply(const Table::Ptr& table, const Value& row) override; protected: String m_Column; diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index 66b645ea9..12fd6c1c5 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -36,8 +36,8 @@ public: AvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_Avg; diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp index 8f3fc048e..16ce7193e 100644 --- a/lib/livestatus/commandstable.hpp +++ b/lib/livestatus/commandstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value LineAccessor(const Value& row); diff --git a/lib/livestatus/commentstable.hpp b/lib/livestatus/commentstable.hpp index 7d03685a4..3bf744988 100644 --- a/lib/livestatus/commentstable.hpp +++ b/lib/livestatus/commentstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; private: static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/contactgroupstable.hpp b/lib/livestatus/contactgroupstable.hpp index e0824f846..a424eac23 100644 --- a/lib/livestatus/contactgroupstable.hpp +++ b/lib/livestatus/contactgroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp index aa9d894b5..7bcaa88d5 100644 --- a/lib/livestatus/contactstable.hpp +++ b/lib/livestatus/contactstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp index 1666c4fad..3158eaf9d 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -36,8 +36,8 @@ public: CountAggregator(void); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: int m_Count; diff --git a/lib/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp index a26180802..a7f7888a9 100644 --- a/lib/livestatus/downtimestable.hpp +++ b/lib/livestatus/downtimestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; private: static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/endpointstable.hpp b/lib/livestatus/endpointstable.hpp index 90bcf8e41..edbed0b61 100644 --- a/lib/livestatus/endpointstable.hpp +++ b/lib/livestatus/endpointstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value IdentityAccessor(const Value& row); diff --git a/lib/livestatus/hostgroupstable.hpp b/lib/livestatus/hostgroupstable.hpp index c4f7fd87c..8617a7bb9 100644 --- a/lib/livestatus/hostgroupstable.hpp +++ b/lib/livestatus/hostgroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp index 89e2afc02..ff376e145 100644 --- a/lib/livestatus/hoststable.hpp +++ b/lib/livestatus/hoststable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject); diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index 03b25b7dd..00094be7f 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -36,8 +36,8 @@ public: InvAvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_InvAvg; diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 8e962ee5b..876fc8baf 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -36,8 +36,8 @@ public: InvSumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_InvSum; diff --git a/lib/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp index d341dfca6..c102a7549 100644 --- a/lib/livestatus/logtable.hpp +++ b/lib/livestatus/logtable.hpp @@ -41,13 +41,13 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; - void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn); + void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index eb3b405a2..301ef627e 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -36,8 +36,8 @@ public: MaxAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_Max; diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index 895fce60f..4c7db851a 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -36,8 +36,8 @@ public: MinAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_Min; diff --git a/lib/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp index 88efd4da0..09e49d7b5 100644 --- a/lib/livestatus/negatefilter.hpp +++ b/lib/livestatus/negatefilter.hpp @@ -37,7 +37,7 @@ public: NegateFilter(const Filter::Ptr& inner); - virtual bool Apply(const Table::Ptr& table, const Value& row); + virtual bool Apply(const Table::Ptr& table, const Value& row) override; private: Filter::Ptr m_Inner; diff --git a/lib/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp index 0dc536ebc..f3f31dd89 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -37,7 +37,7 @@ public: OrFilter(void); - virtual bool Apply(const Table::Ptr& table, const Value& row); + virtual bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp index da025bb3b..99881fd00 100644 --- a/lib/livestatus/servicegroupstable.hpp +++ b/lib/livestatus/servicegroupstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp index 8e17613a2..307698dc1 100644 --- a/lib/livestatus/servicestable.hpp +++ b/lib/livestatus/servicestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject); diff --git a/lib/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp index 5e91ca208..33db84705 100644 --- a/lib/livestatus/statehisttable.hpp +++ b/lib/livestatus/statehisttable.hpp @@ -42,13 +42,13 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; - void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn); + void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); diff --git a/lib/livestatus/statustable.hpp b/lib/livestatus/statustable.hpp index 5f6b7a637..075f61749 100644 --- a/lib/livestatus/statustable.hpp +++ b/lib/livestatus/statustable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value ConnectionsAccessor(const Value& row); static Value ConnectionsRateAccessor(const Value& row); diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index ae76c96f5..37abf4c63 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -36,8 +36,8 @@ public: StdAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_StdSum; diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 8dd0adb4d..64d4b58bc 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -36,8 +36,8 @@ public: SumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row); - virtual double GetResult(void) const; + virtual void Apply(const Table::Ptr& table, const Value& row) override; + virtual double GetResult(void) const override; private: double m_Sum; diff --git a/lib/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp index 0220e26d9..637d73d65 100644 --- a/lib/livestatus/timeperiodstable.hpp +++ b/lib/livestatus/timeperiodstable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value AliasAccessor(const Value& row); diff --git a/lib/livestatus/zonestable.hpp b/lib/livestatus/zonestable.hpp index ab9b81a8d..40528b71f 100644 --- a/lib/livestatus/zonestable.hpp +++ b/lib/livestatus/zonestable.hpp @@ -40,11 +40,11 @@ public: static void AddColumns(Table *table, const String& prefix = String(), const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); - virtual String GetName(void) const; - virtual String GetPrefix(void) const; + virtual String GetName(void) const override; + virtual String GetPrefix(void) const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn); + virtual void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value ParentAccessor(const Value& row); diff --git a/lib/remote/actionshandler.hpp b/lib/remote/actionshandler.hpp index e9445bb13..37a666a61 100644 --- a/lib/remote/actionshandler.hpp +++ b/lib/remote/actionshandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API ActionsHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ActionsHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; } diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp index 9471bbb0d..6c36a20b5 100644 --- a/lib/remote/configfileshandler.hpp +++ b/lib/remote/configfileshandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigFilesHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigFilesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; private: void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); diff --git a/lib/remote/configmoduleshandler.hpp b/lib/remote/configmoduleshandler.hpp index 048305490..9195eaf5f 100644 --- a/lib/remote/configmoduleshandler.hpp +++ b/lib/remote/configmoduleshandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigModulesHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigModulesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; private: void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); diff --git a/lib/remote/configstageshandler.hpp b/lib/remote/configstageshandler.hpp index 044bd0785..09ec9ef70 100644 --- a/lib/remote/configstageshandler.hpp +++ b/lib/remote/configstageshandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigStagesHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigStagesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; private: void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp index 9510b6777..2c2cbe93c 100644 --- a/lib/remote/createobjecthandler.hpp +++ b/lib/remote/createobjecthandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API CreateObjectHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(CreateObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; } diff --git a/lib/remote/deleteobjecthandler.hpp b/lib/remote/deleteobjecthandler.hpp index ec35e9d64..ca0d63e00 100644 --- a/lib/remote/deleteobjecthandler.hpp +++ b/lib/remote/deleteobjecthandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API DeleteObjectHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(DeleteObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; } diff --git a/lib/remote/modifyobjecthandler.hpp b/lib/remote/modifyobjecthandler.hpp index da424b9ad..f17d4d861 100644 --- a/lib/remote/modifyobjecthandler.hpp +++ b/lib/remote/modifyobjecthandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API ModifyObjectHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ModifyObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; } diff --git a/lib/remote/statusqueryhandler.hpp b/lib/remote/statusqueryhandler.hpp index 64cf2bd0c..375efef47 100644 --- a/lib/remote/statusqueryhandler.hpp +++ b/lib/remote/statusqueryhandler.hpp @@ -30,7 +30,7 @@ class I2_REMOTE_API StatusQueryHandler : public HttpHandler public: DECLARE_PTR_TYPEDEFS(StatusQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); + virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; }; }