tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add 'override' keyword to methods

Browse Source 
refs #9929
This commit is contained in:
Gunnar Beutner 2015-08-18 09:12:49 +02:00
parent 60a30d50f6
commit d8cab2f0e8
80 changed files with 325 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/exception.hpp
View File

@ -55,7 +55,7 @@ public:
ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false);
~ScriptError(void) throw(); ~ScriptError(void) throw();
virtual const char *what(void) const throw(); virtual const char *what(void) const throw() override;
DebugInfo GetDebugInfo(void) const; DebugInfo GetDebugInfo(void) const;
bool IsIncompleteExpression(void) const; bool IsIncompleteExpression(void) const;
@ -75,7 +75,7 @@ public:
ValidationError(const ConfigObject::Ptr& object, const std::vector<String>& attributePath, const String& message); ValidationError(const ConfigObject::Ptr& object, const std::vector<String>& attributePath, const String& message);
~ValidationError(void) throw(); ~ValidationError(void) throw();
virtual const char *what(void) const throw(); virtual const char *what(void) const throw() override;
ConfigObject::Ptr GetObject(void) const; ConfigObject::Ptr GetObject(void) const;
std::vector<String> GetAttributePath(void) const; std::vector<String> GetAttributePath(void) const;
@ -124,7 +124,7 @@ public:
posix_error(void); posix_error(void);
virtual ~posix_error(void) throw(); virtual ~posix_error(void) throw();
virtual const char *what(void) const throw(); virtual const char *what(void) const throw() override;
private: private:
mutable char *m_Message; mutable char *m_Message;

14
lib/base/fifo.hpp
View File

@ -41,13 +41,13 @@ public:
FIFO(void); FIFO(void);
~FIFO(void); ~FIFO(void);
virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false); 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); virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
virtual void Write(const void *buffer, size_t count); 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;
virtual bool SupportsWaiting(void) const; virtual bool SupportsWaiting(void) const override;
virtual bool IsDataAvailable(void) const; virtual bool IsDataAvailable(void) const override;
size_t GetAvailableBytes(void) const; size_t GetAvailableBytes(void) const;

8
lib/base/networkstream.hpp
View File

@ -39,12 +39,12 @@ public:
NetworkStream(const Socket::Ptr& socket); NetworkStream(const Socket::Ptr& socket);
virtual size_t Read(void *buffer, size_t count, bool allow_partial = false); virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
virtual void Write(const void *buffer, size_t count); 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: private:
Socket::Ptr m_Socket; Socket::Ptr m_Socket;

14
lib/base/primitivetype.hpp
View File

@ -32,15 +32,15 @@ class I2_BASE_API PrimitiveType : public Type
public: public:
PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual Type::Ptr GetBaseType(void) const; virtual Type::Ptr GetBaseType(void) const override;
virtual int GetAttributes(void) const; virtual int GetAttributes(void) const override;
virtual int GetFieldId(const String& name) const; virtual int GetFieldId(const String& name) const override;
virtual Field GetFieldInfo(int id) const; virtual Field GetFieldInfo(int id) const override;
virtual int GetFieldCount(void) const; virtual int GetFieldCount(void) const override;
protected: protected:
virtual ObjectFactory GetFactory(void) const; virtual ObjectFactory GetFactory(void) const override;
private: private:
String m_Name; String m_Name;

10
lib/base/stdiostream.hpp
View File

@ -34,13 +34,13 @@ public:
StdioStream(std::iostream *innerStream, bool ownsStream); StdioStream(std::iostream *innerStream, bool ownsStream);
~StdioStream(void); ~StdioStream(void);
virtual size_t Read(void *buffer, size_t size, bool allow_partial = false); virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override;
virtual void Write(const void *buffer, size_t size); 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 IsDataAvailable(void) const override;
virtual bool IsEof(void) const; virtual bool IsEof(void) const override;
private: private:
std::iostream *m_InnerStream; std::iostream *m_InnerStream;

18
lib/base/tlsstream.hpp
View File

@ -56,17 +56,17 @@ public:
void Handshake(void); void Handshake(void);
virtual void Close(void); virtual void Close(void) override;
virtual void Shutdown(void); virtual void Shutdown(void) override;
virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false); 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); virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
virtual void Write(const void *buffer, size_t count); 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 SupportsWaiting(void) const override;
virtual bool IsDataAvailable(void) const; virtual bool IsDataAvailable(void) const override;
bool IsVerifyOK(void) const; bool IsVerifyOK(void) const;
@ -93,7 +93,7 @@ private:
static int m_SSLIndex; static int m_SSLIndex;
static bool m_SSLIndexInitialized; static bool m_SSLIndexInitialized;
virtual void OnEvent(int revents); virtual void OnEvent(int revents) override;
void HandleError(void) const; void HandleError(void) const;

14
lib/base/type.hpp
View File

@ -114,17 +114,17 @@ class I2_BASE_API TypeType : public Type
public: public:
DECLARE_PTR_TYPEDEFS(Type); DECLARE_PTR_TYPEDEFS(Type);
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual Type::Ptr GetBaseType(void) const; virtual Type::Ptr GetBaseType(void) const override;
virtual int GetAttributes(void) const; virtual int GetAttributes(void) const override;
virtual int GetFieldId(const String& name) const; virtual int GetFieldId(const String& name) const override;
virtual Field GetFieldInfo(int id) const; virtual Field GetFieldInfo(int id) const override;
virtual int GetFieldCount(void) const; virtual int GetFieldCount(void) const override;
static Object::Ptr GetPrototype(void); static Object::Ptr GetPrototype(void);
protected: protected:
virtual ObjectFactory GetFactory(void) const; virtual ObjectFactory GetFactory(void) const override;
}; };
template<typename T> template<typename T>

10
lib/cli/apisetupcommand.hpp
View File

@ -35,11 +35,11 @@ class ApiSetupCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(ApiSetupCommand); DECLARE_PTR_TYPEDEFS(ApiSetupCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
}; };
} }

10
lib/cli/consolecommand.hpp
View File

@ -35,12 +35,12 @@ class ConsoleCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(ConsoleCommand); DECLARE_PTR_TYPEDEFS(ConsoleCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

10
lib/cli/daemoncommand.hpp
View File

@ -35,12 +35,12 @@ class DaemonCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(DaemonCommand); DECLARE_PTR_TYPEDEFS(DaemonCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

14
lib/cli/featuredisablecommand.hpp
View File

@ -35,13 +35,13 @@ class FeatureDisableCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(FeatureDisableCommand); DECLARE_PTR_TYPEDEFS(FeatureDisableCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual std::vector<String> GetPositionalSuggestions(const String& word) const; virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

14
lib/cli/featureenablecommand.hpp
View File

@ -35,13 +35,13 @@ class FeatureEnableCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(FeatureEnableCommand); DECLARE_PTR_TYPEDEFS(FeatureEnableCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual std::vector<String> GetPositionalSuggestions(const String& word) const; virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

6
lib/cli/featurelistcommand.hpp
View File

@ -35,9 +35,9 @@ class FeatureListCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(FeatureListCommand); DECLARE_PTR_TYPEDEFS(FeatureListCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

8
lib/cli/nodeaddcommand.hpp
View File

@ -35,10 +35,10 @@ class NodeAddCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeAddCommand); DECLARE_PTR_TYPEDEFS(NodeAddCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

8
lib/cli/nodeblackandwhitelistcommand.hpp
View File

@ -45,11 +45,11 @@ public:
BlackAndWhitelistCommand(const String& type, BlackAndWhitelistCommandType command); BlackAndWhitelistCommand(const String& type, BlackAndWhitelistCommandType command);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
private: private:
String m_Type; String m_Type;

8
lib/cli/nodelistcommand.hpp
View File

@ -35,11 +35,11 @@ class NodeListCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeListCommand); DECLARE_PTR_TYPEDEFS(NodeListCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

12
lib/cli/noderemovecommand.hpp
View File

@ -35,12 +35,12 @@ class NodeRemoveCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeRemoveCommand); DECLARE_PTR_TYPEDEFS(NodeRemoveCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual std::vector<String> GetPositionalSuggestions(const String& word) const; virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

10
lib/cli/nodesetcommand.hpp
View File

@ -35,12 +35,12 @@ class NodeSetCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeSetCommand); DECLARE_PTR_TYPEDEFS(NodeSetCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

12
lib/cli/nodesetupcommand.hpp
View File

@ -35,13 +35,13 @@ class NodeSetupCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeSetupCommand); DECLARE_PTR_TYPEDEFS(NodeSetupCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
private: private:
static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap); static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap);

8
lib/cli/nodeupdateconfigcommand.hpp
View File

@ -35,10 +35,10 @@ class NodeUpdateConfigCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeUpdateConfigCommand); DECLARE_PTR_TYPEDEFS(NodeUpdateConfigCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
}; };
} }

10
lib/cli/nodewizardcommand.hpp
View File

@ -35,11 +35,11 @@ class NodeWizardCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(NodeWizardCommand); DECLARE_PTR_TYPEDEFS(NodeWizardCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
}; };
} }

8
lib/cli/objectlistcommand.hpp
View File

@ -38,11 +38,11 @@ class ObjectListCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(ObjectListCommand); DECLARE_PTR_TYPEDEFS(ObjectListCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
private: private:
static void PrintTypeCounts(std::ostream& fp, const std::map<String, int>& type_count); static void PrintTypeCounts(std::ostream& fp, const std::map<String, int>& type_count);

6
lib/cli/pkinewcacommand.hpp
View File

@ -35,9 +35,9 @@ class PKINewCACommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKINewCACommand); DECLARE_PTR_TYPEDEFS(PKINewCACommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

10
lib/cli/pkinewcertcommand.hpp
View File

@ -35,12 +35,12 @@ class PKINewCertCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKINewCertCommand); DECLARE_PTR_TYPEDEFS(PKINewCertCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

10
lib/cli/pkirequestcommand.hpp
View File

@ -35,12 +35,12 @@ class PKIRequestCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKIRequestCommand); DECLARE_PTR_TYPEDEFS(PKIRequestCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

10
lib/cli/pkisavecertcommand.hpp
View File

@ -35,12 +35,12 @@ class PKISaveCertCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKISaveCertCommand); DECLARE_PTR_TYPEDEFS(PKISaveCertCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

10
lib/cli/pkisigncsrcommand.hpp
View File

@ -35,12 +35,12 @@ class PKISignCSRCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKISignCSRCommand); DECLARE_PTR_TYPEDEFS(PKISignCSRCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const; virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

8
lib/cli/pkiticketcommand.hpp
View File

@ -35,11 +35,11 @@ class PKITicketCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(PKITicketCommand); DECLARE_PTR_TYPEDEFS(PKITicketCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };

8
lib/cli/repositoryclearchangescommand.hpp
View File

@ -38,10 +38,10 @@ class RepositoryClearChangesCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(RepositoryClearChangesCommand); DECLARE_PTR_TYPEDEFS(RepositoryClearChangesCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

10
lib/cli/repositorycommitcommand.hpp
View File

@ -38,12 +38,12 @@ class RepositoryCommitCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(RepositoryCommitCommand); DECLARE_PTR_TYPEDEFS(RepositoryCommitCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

14
lib/cli/repositoryobjectcommand.hpp
View File

@ -46,14 +46,14 @@ public:
RepositoryObjectCommand(const String& type, RepositoryCommandType command); RepositoryObjectCommand(const String& type, RepositoryCommandType command);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMaxArguments(void) const; virtual int GetMaxArguments(void) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, virtual void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual ImpersonationLevel GetImpersonationLevel(void) const; virtual ImpersonationLevel GetImpersonationLevel(void) const override;
virtual std::vector<String> GetPositionalSuggestions(const String& word) const; virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
private: private:
String m_Type; String m_Type;

8
lib/cli/troubleshootcommand.hpp
View File

@ -37,11 +37,11 @@ class TroubleshootCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(TroubleshootCommand); DECLARE_PTR_TYPEDEFS(TroubleshootCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
virtual void InitParameters(boost::program_options::options_description& visibleDesc, 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: private:
class InfoLog; class InfoLog;

10
lib/cli/variablegetcommand.hpp
View File

@ -38,12 +38,12 @@ class VariableGetCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(VariableGetCommand); DECLARE_PTR_TYPEDEFS(VariableGetCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int GetMinArguments(void) const; virtual int GetMinArguments(void) const override;
void InitParameters(boost::program_options::options_description& visibleDesc, void InitParameters(boost::program_options::options_description& visibleDesc,
boost::program_options::options_description& hiddenDesc) const; boost::program_options::options_description& hiddenDesc) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
}; };
} }

6
lib/cli/variablelistcommand.hpp
View File

@ -38,9 +38,9 @@ class VariableListCommand : public CLICommand
public: public:
DECLARE_PTR_TYPEDEFS(VariableListCommand); DECLARE_PTR_TYPEDEFS(VariableListCommand);
virtual String GetDescription(void) const; virtual String GetDescription(void) const override;
virtual String GetShortDescription(void) const; virtual String GetShortDescription(void) const override;
virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const; virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
private: private:
static void PrintVariable(std::ostream& fp, const String& message); static void PrintVariable(std::ostream& fp, const String& message);

94
lib/config/expression.hpp
View File

@ -210,12 +210,12 @@ public:
{ } { }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override
{ {
return m_Expression->DoEvaluate(frame, dhint); return m_Expression->DoEvaluate(frame, dhint);
} }
virtual const DebugInfo& GetDebugInfo(void) const virtual const DebugInfo& GetDebugInfo(void) const override
{ {
return m_Expression->GetDebugInfo(); return m_Expression->GetDebugInfo();
} }
@ -232,12 +232,12 @@ public:
{ } { }
protected: 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); 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(); return m_Future.get()->GetDebugInfo();
} }
@ -252,7 +252,7 @@ public:
LiteralExpression(const Value& value = Value()); LiteralExpression(const Value& value = Value());
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
Value m_Value; Value m_Value;
@ -271,7 +271,7 @@ public:
{ } { }
protected: protected:
virtual const DebugInfo& GetDebugInfo(void) const; virtual const DebugInfo& GetDebugInfo(void) const override;
DebugInfo m_DebugInfo; DebugInfo m_DebugInfo;
}; };
@ -324,8 +324,8 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, 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; virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override;
private: private:
String m_Variable; String m_Variable;
@ -341,7 +341,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API LogicalNegateExpression : public UnaryExpression
@ -352,7 +352,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API AddExpression : public BinaryExpression
@ -363,7 +363,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API SubtractExpression : public BinaryExpression
@ -374,7 +374,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API MultiplyExpression : public BinaryExpression
@ -385,7 +385,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API DivideExpression : public BinaryExpression
@ -396,7 +396,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API ModuloExpression : public BinaryExpression
@ -407,7 +407,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API XorExpression : public BinaryExpression
@ -418,7 +418,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API BinaryAndExpression : public BinaryExpression
@ -429,7 +429,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API BinaryOrExpression : public BinaryExpression
@ -440,7 +440,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API ShiftLeftExpression : public BinaryExpression
@ -451,7 +451,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API ShiftRightExpression : public BinaryExpression
@ -462,7 +462,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API EqualExpression : public BinaryExpression
@ -473,7 +473,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API NotEqualExpression : public BinaryExpression
@ -484,7 +484,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API LessThanExpression : public BinaryExpression
@ -495,7 +495,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API GreaterThanExpression : public BinaryExpression
@ -506,7 +506,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API LessThanOrEqualExpression : public BinaryExpression
@ -517,7 +517,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API GreaterThanOrEqualExpression : public BinaryExpression
@ -528,7 +528,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API InExpression : public BinaryExpression
@ -539,7 +539,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API NotInExpression : public BinaryExpression
@ -550,7 +550,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API LogicalAndExpression : public BinaryExpression
@ -561,7 +561,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API LogicalOrExpression : public BinaryExpression
@ -572,7 +572,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API FunctionCallExpression : public DebuggableExpression
@ -591,7 +591,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
public: public:
Expression *m_FName; Expression *m_FName;
@ -612,7 +612,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
std::vector<Expression *> m_Expressions; std::vector<Expression *> m_Expressions;
@ -634,7 +634,7 @@ public:
void MakeInline(void); void MakeInline(void);
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
std::vector<Expression *> m_Expressions; std::vector<Expression *> m_Expressions;
@ -651,7 +651,7 @@ public:
{ } { }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
CombinedSetOp m_Op; CombinedSetOp m_Op;
@ -674,7 +674,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
Expression *m_Condition; Expression *m_Condition;
@ -696,7 +696,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
Expression *m_Condition; Expression *m_Condition;
@ -712,7 +712,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API BreakExpression : public DebuggableExpression
@ -723,7 +723,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API ContinueExpression : public DebuggableExpression
@ -734,7 +734,7 @@ public:
{ } { }
protected: 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 class I2_CONFIG_API GetScopeExpression : public Expression
@ -745,7 +745,7 @@ public:
{ } { }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
ScopeSpecifier m_ScopeSpec; ScopeSpecifier m_ScopeSpec;
@ -759,8 +759,8 @@ public:
{ } { }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, 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; 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); friend I2_CONFIG_API void BindToScope(Expression *& expr, ScopeSpecifier scopeSpec);
}; };
@ -780,7 +780,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
Expression *m_Name; Expression *m_Name;
@ -795,7 +795,7 @@ public:
{ } { }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
std::vector<String> m_Args; std::vector<String> m_Args;
@ -821,7 +821,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
String m_Type; String m_Type;
@ -852,7 +852,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
bool m_Abstract; bool m_Abstract;
@ -879,7 +879,7 @@ public:
} }
protected: protected:
virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const; virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
private: private:
String m_FKVar; String m_FKVar;

6
lib/db_ido/commanddbobject.hpp
View File

@ -38,11 +38,11 @@ public:
CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2); CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
protected: protected:
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
}; };
} }

4
lib/db_ido/endpointdbobject.hpp
View File

@ -41,8 +41,8 @@ public:
static void StaticInitialize(void); static void StaticInitialize(void);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
private: private:
static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint); static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint);

8
lib/db_ido/hostdbobject.hpp
View File

@ -38,12 +38,12 @@ public:
HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
private: private:
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
virtual void OnStatusUpdate(void); virtual void OnStatusUpdate(void) override;
}; };
} }

6
lib/db_ido/hostgroupdbobject.hpp
View File

@ -39,11 +39,11 @@ public:
HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
protected: protected:
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
private: private:
static void MembersChangedHandler(const HostGroup::Ptr& hgfilter); static void MembersChangedHandler(const HostGroup::Ptr& hgfilter);

10
lib/db_ido/servicedbobject.hpp
View File

@ -41,14 +41,14 @@ public:
static void StaticInitialize(void); static void StaticInitialize(void);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
protected: protected:
virtual bool IsStatusAttribute(const String& attribute) const; virtual bool IsStatusAttribute(const String& attribute) const override;
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
virtual void OnStatusUpdate(void); virtual void OnStatusUpdate(void) override;
}; };
} }

6
lib/db_ido/servicegroupdbobject.hpp
View File

@ -39,11 +39,11 @@ public:
ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
protected: protected:
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
}; };
} }

6
lib/db_ido/timeperioddbobject.hpp
View File

@ -38,9 +38,9 @@ public:
TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
}; };
} }

8
lib/db_ido/userdbobject.hpp
View File

@ -38,12 +38,12 @@ public:
UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; 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;
}; };
} }

6
lib/db_ido/usergroupdbobject.hpp
View File

@ -39,11 +39,11 @@ public:
UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
protected: protected:
virtual void OnConfigUpdate(void); virtual void OnConfigUpdate(void) override;
}; };
} }

4
lib/db_ido/zonedbobject.hpp
View File

@ -39,8 +39,8 @@ public:
ZoneDbObject(const intrusive_ptr<DbType>& type, const String& name1, const String& name2); ZoneDbObject(const intrusive_ptr<DbType>& type, const String& name1, const String& name2);
virtual Dictionary::Ptr GetConfigFields(void) const; virtual Dictionary::Ptr GetConfigFields(void) const override;
virtual Dictionary::Ptr GetStatusFields(void) const; virtual Dictionary::Ptr GetStatusFields(void) const override;
}; };
} }

2
lib/livestatus/andfilter.hpp
View File

@ -37,7 +37,7 @@ public:
AndFilter(void); AndFilter(void);
virtual bool Apply(const Table::Ptr& table, const Value& row); virtual bool Apply(const Table::Ptr& table, const Value& row) override;
}; };
} }

2
lib/livestatus/attributefilter.hpp
View File

@ -37,7 +37,7 @@ public:
AttributeFilter(const String& column, const String& op, const String& operand); 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: protected:
String m_Column; String m_Column;

4
lib/livestatus/avgaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
AvgAggregator(const String& attr); AvgAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_Avg; double m_Avg;

6
lib/livestatus/commandstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value LineAccessor(const Value& row); static Value LineAccessor(const Value& row);

6
lib/livestatus/commentstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
private: private:
static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

6
lib/livestatus/contactgroupstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value AliasAccessor(const Value& row); static Value AliasAccessor(const Value& row);

6
lib/livestatus/contactstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value AliasAccessor(const Value& row); static Value AliasAccessor(const Value& row);

4
lib/livestatus/countaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
CountAggregator(void); CountAggregator(void);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
int m_Count; int m_Count;

6
lib/livestatus/downtimestable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
private: private:
static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

6
lib/livestatus/endpointstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value IdentityAccessor(const Value& row); static Value IdentityAccessor(const Value& row);

6
lib/livestatus/hostgroupstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value AliasAccessor(const Value& row); static Value AliasAccessor(const Value& row);

6
lib/livestatus/hoststable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: 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); static Object::Ptr HostGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);

4
lib/livestatus/invavgaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
InvAvgAggregator(const String& attr); InvAvgAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_InvAvg; double m_InvAvg;

4
lib/livestatus/invsumaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
InvSumAggregator(const String& attr); InvSumAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_InvSum; double m_InvSum;

8
lib/livestatus/logtable.hpp
View File

@ -41,13 +41,13 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; 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: 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 HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

4
lib/livestatus/maxaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
MaxAggregator(const String& attr); MaxAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_Max; double m_Max;

4
lib/livestatus/minaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
MinAggregator(const String& attr); MinAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_Min; double m_Min;

2
lib/livestatus/negatefilter.hpp
View File

@ -37,7 +37,7 @@ public:
NegateFilter(const Filter::Ptr& inner); 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: private:
Filter::Ptr m_Inner; Filter::Ptr m_Inner;

2
lib/livestatus/orfilter.hpp
View File

@ -37,7 +37,7 @@ public:
OrFilter(void); OrFilter(void);
virtual bool Apply(const Table::Ptr& table, const Value& row); virtual bool Apply(const Table::Ptr& table, const Value& row) override;
}; };
} }

6
lib/livestatus/servicegroupstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value AliasAccessor(const Value& row); static Value AliasAccessor(const Value& row);

6
lib/livestatus/servicestable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: 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 HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject); static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);

8
lib/livestatus/statehisttable.hpp
View File

@ -42,13 +42,13 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; 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: 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 HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor); static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

6
lib/livestatus/statustable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value ConnectionsAccessor(const Value& row); static Value ConnectionsAccessor(const Value& row);
static Value ConnectionsRateAccessor(const Value& row); static Value ConnectionsRateAccessor(const Value& row);

4
lib/livestatus/stdaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
StdAggregator(const String& attr); StdAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_StdSum; double m_StdSum;

4
lib/livestatus/sumaggregator.hpp
View File

@ -36,8 +36,8 @@ public:
SumAggregator(const String& attr); SumAggregator(const String& attr);
virtual void Apply(const Table::Ptr& table, const Value& row); virtual void Apply(const Table::Ptr& table, const Value& row) override;
virtual double GetResult(void) const; virtual double GetResult(void) const override;
private: private:
double m_Sum; double m_Sum;

6
lib/livestatus/timeperiodstable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value AliasAccessor(const Value& row); static Value AliasAccessor(const Value& row);

6
lib/livestatus/zonestable.hpp
View File

@ -40,11 +40,11 @@ public:
static void AddColumns(Table *table, const String& prefix = String(), static void AddColumns(Table *table, const String& prefix = String(),
const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor()); const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
virtual String GetName(void) const; virtual String GetName(void) const override;
virtual String GetPrefix(void) const; virtual String GetPrefix(void) const override;
protected: protected:
virtual void FetchRows(const AddRowFunction& addRowFn); virtual void FetchRows(const AddRowFunction& addRowFn) override;
static Value NameAccessor(const Value& row); static Value NameAccessor(const Value& row);
static Value ParentAccessor(const Value& row); static Value ParentAccessor(const Value& row);

2
lib/remote/actionshandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API ActionsHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ActionsHandler); 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;
}; };
} }

2
lib/remote/configfileshandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigFilesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigFilesHandler); 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: private:
void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

2
lib/remote/configmoduleshandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigModulesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigModulesHandler); 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: private:
void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

2
lib/remote/configstageshandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigStagesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigStagesHandler); 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: private:
void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

2
lib/remote/createobjecthandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API CreateObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(CreateObjectHandler); 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;
}; };
} }

2
lib/remote/deleteobjecthandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API DeleteObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(DeleteObjectHandler); 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;
}; };
} }

2
lib/remote/modifyobjecthandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API ModifyObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ModifyObjectHandler); 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;
}; };
} }

2
lib/remote/statusqueryhandler.hpp
View File

@ -30,7 +30,7 @@ class I2_REMOTE_API StatusQueryHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(StatusQueryHandler); 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;
}; };
} }