From: Gunnar Beutner Date: Thu, 4 Jan 2018 04:12:56 +0000 (+0100) Subject: Apply clang-tidy fix 'modernize-use-override' X-Git-Tag: v2.9.0~248^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca682496c50c59e68e52477a1fc3c2c695b8a48;p=icinga2 Apply clang-tidy fix 'modernize-use-override' --- diff --git a/icinga-studio/forms.h b/icinga-studio/forms.h index 77f6f3f3d..f01f5b904 100644 --- a/icinga-studio/forms.h +++ b/icinga-studio/forms.h @@ -61,7 +61,7 @@ class MainFormBase : public wxFrame MainFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Icinga Studio"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,569 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); - ~MainFormBase(); + ~MainFormBase() override; }; @@ -84,7 +84,7 @@ class ConnectFormBase : public wxDialog public: ConnectFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Icinga Studio - Connect"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~ConnectFormBase(); + ~ConnectFormBase() override; }; @@ -101,7 +101,7 @@ class AboutFormBase : public wxDialog public: AboutFormBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Icinga Studio"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~AboutFormBase(); + ~AboutFormBase() override; }; diff --git a/icinga-studio/icinga-studio.cpp b/icinga-studio/icinga-studio.cpp index e15ebbd26..1d3e657a3 100644 --- a/icinga-studio/icinga-studio.cpp +++ b/icinga-studio/icinga-studio.cpp @@ -29,7 +29,7 @@ using namespace icinga; class IcingaStudio final : public wxApp { public: - virtual bool OnInit() override + bool OnInit() override { Application::InitializeBase(); diff --git a/icinga-studio/mainform.hpp b/icinga-studio/mainform.hpp index 28c8bc99d..0e8363206 100644 --- a/icinga-studio/mainform.hpp +++ b/icinga-studio/mainform.hpp @@ -33,10 +33,10 @@ class MainForm final : public MainFormBase public: MainForm(wxWindow *parent, const Url::Ptr& url); - virtual void OnQuitClicked(wxCommandEvent& event) override; - virtual void OnAboutClicked(wxCommandEvent& event) override; - virtual void OnTypeSelected(wxTreeEvent& event) override; - virtual void OnObjectSelected(wxListEvent& event) override; + void OnQuitClicked(wxCommandEvent& event) override; + void OnAboutClicked(wxCommandEvent& event) override; + void OnTypeSelected(wxTreeEvent& event) override; + void OnObjectSelected(wxListEvent& event) override; private: ApiClient::Ptr m_ApiClient; diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 1f6874c46..6811c8936 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -41,7 +41,7 @@ public: static boost::signals2::signal OnReopenLogs; - ~Application(); + ~Application() override; static void InitializeBase(); static void UninitializeBase(); @@ -165,8 +165,8 @@ public: static void DisplayInfoMessage(std::ostream& os, bool skipVersion = false); protected: - virtual void OnConfigLoaded() override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Stop(bool runtimeRemoved) override; void RunEventLoop(); @@ -174,7 +174,7 @@ protected: virtual void OnShutdown(); - virtual void ValidateName(const String& value, const ValidationUtils& utils) override final; + void ValidateName(const String& value, const ValidationUtils& utils) final; private: static Application::Ptr m_Instance; /**< The application instance. */ diff --git a/lib/base/array.hpp b/lib/base/array.hpp index 3e19c7bfb..716d09683 100644 --- a/lib/base/array.hpp +++ b/lib/base/array.hpp @@ -50,7 +50,7 @@ public: Array(); Array(std::initializer_list init); - ~Array(); + ~Array() override; Value Get(SizeType index) const; void Set(SizeType index, const Value& value); @@ -103,16 +103,16 @@ public: return result; } - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; Array::Ptr Reverse() const; void Sort(); - virtual String ToString() const override; + String ToString() const override; - virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; - virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; + Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; + void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; private: std::vector m_Data; /**< The data for the array. */ diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 4a6eb27bc..3f24c36ca 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -94,7 +94,7 @@ void ConfigObject::ClearExtension(const String& key) class ModAttrValidationUtils final : public ValidationUtils { public: - virtual bool ValidateName(const String& type, const String& name) const override + bool ValidateName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(type); ConfigType *dtype = dynamic_cast(ptype.get()); diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp index f3f7083dc..abb4e0120 100644 --- a/lib/base/configobject.hpp +++ b/lib/base/configobject.hpp @@ -65,8 +65,8 @@ public: void Deactivate(bool runtimeRemoved = false); void SetAuthority(bool authority); - virtual void Start(bool runtimeCreated = false) override; - virtual void Stop(bool runtimeRemoved = false) override; + void Start(bool runtimeCreated = false) override; + void Stop(bool runtimeRemoved = false) override; virtual void Pause(); virtual void Resume(); @@ -76,7 +76,7 @@ public: virtual void OnAllConfigLoaded(); virtual void OnStateLoaded(); - virtual Dictionary::Ptr GetSourceLocation() const override; + Dictionary::Ptr GetSourceLocation() const override; template static intrusive_ptr GetObject(const String& name) diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp index 68d912414..7ac84dcfa 100644 --- a/lib/base/datetime.hpp +++ b/lib/base/datetime.hpp @@ -43,8 +43,8 @@ public: String Format(const String& format) const; - virtual double GetValue() const override; - virtual String ToString() const override; + double GetValue() const override; + String ToString() const override; static Object::Ptr GetPrototype(); diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index 8dbdf9960..b2627b486 100644 --- a/lib/base/dictionary.hpp +++ b/lib/base/dictionary.hpp @@ -51,7 +51,7 @@ public: Dictionary(); - ~Dictionary(); + ~Dictionary() override; Value Get(const String& key) const; bool Get(const String& key, Value *result) const; @@ -77,14 +77,14 @@ public: static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; - virtual String ToString() const override; + String ToString() const override; - virtual Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; - virtual void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; - virtual bool HasOwnField(const String& field) const override; - virtual bool GetOwnField(const String& field, Value *result) const override; + Value GetFieldByName(const String& field, bool sandboxed, const DebugInfo& debugInfo) const override; + void SetFieldByName(const String& field, const Value& value, const DebugInfo& debugInfo) override; + bool HasOwnField(const String& field) const override; + bool GetOwnField(const String& field, Value *result) const override; private: std::map m_Data; /**< The data for the dictionary. */ diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index 4c34efea7..98bcd4241 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -34,7 +34,7 @@ static boost::thread_specific_ptr l_LastExceptionContext; class libcxx_type_info : public std::type_info { public: - virtual ~libcxx_type_info(); + ~libcxx_type_info() override; virtual void noop1() const; virtual void noop2() const; diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp index 28aa9d4a7..9c26c7468 100644 --- a/lib/base/exception.hpp +++ b/lib/base/exception.hpp @@ -53,9 +53,9 @@ class ScriptError : virtual public user_error public: ScriptError(const String& message); ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false); - ~ScriptError() throw(); + ~ScriptError() throw() override; - virtual const char *what(void) const throw() override final; + const char *what(void) const throw() final; DebugInfo GetDebugInfo() const; bool IsIncompleteExpression() const; @@ -77,9 +77,9 @@ class ValidationError : virtual public user_error { public: ValidationError(const ConfigObject::Ptr& object, const std::vector& attributePath, const String& message); - ~ValidationError() throw(); + ~ValidationError() throw() override; - virtual const char *what(void) const throw() override final; + const char *what() const throw() override; ConfigObject::Ptr GetObject() const; std::vector GetAttributePath() const; @@ -126,9 +126,9 @@ String DiagnosticInformation(boost::exception_ptr eptr, bool verbose = true); class posix_error : virtual public std::exception, virtual public boost::exception { public: posix_error(); - virtual ~posix_error() throw(); + ~posix_error() throw() override; - virtual const char *what(void) const throw() override final; + const char *what(void) const throw() final; private: mutable char *m_Message; diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index ed707e432..6efc87060 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -39,15 +39,15 @@ public: static const size_t BlockSize = 512; FIFO(); - ~FIFO(); + ~FIFO() override; - 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() override; - virtual bool IsEof() const override; - virtual bool SupportsWaiting() const override; - virtual bool IsDataAvailable() const override; + size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; + void Close() override; + bool IsEof() const override; + bool SupportsWaiting() const override; + bool IsDataAvailable() const override; size_t GetAvailableBytes() const; diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp index e251b7b57..d4a5dc5ec 100644 --- a/lib/base/filelogger.hpp +++ b/lib/base/filelogger.hpp @@ -39,7 +39,7 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; private: void ReopenLogFile(); diff --git a/lib/base/function.hpp b/lib/base/function.hpp index 270f39b2d..c9fa4d5d2 100644 --- a/lib/base/function.hpp +++ b/lib/base/function.hpp @@ -63,7 +63,7 @@ public: static Object::Ptr GetPrototype(); - virtual Object::Ptr Clone() const override; + Object::Ptr Clone() const override; private: Callback m_Callback; diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index a084f37c8..96dfd8efa 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -90,11 +90,11 @@ public: static void SetConsoleLogSeverity(LogSeverity logSeverity); static LogSeverity GetConsoleLogSeverity(); - virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override final; + void ValidateSeverity(const String& value, const ValidationUtils& utils) final; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: static boost::mutex m_Mutex; diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index 86c4edb0e..6b4f25bd6 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) override; - virtual void Write(const void *buffer, size_t count) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; - virtual void Close() override; + void Close() override; - virtual bool IsEof() const override; + bool IsEof() const override; private: Socket::Ptr m_Socket; diff --git a/lib/base/objecttype.hpp b/lib/base/objecttype.hpp index c750467be..c1508e0d0 100644 --- a/lib/base/objecttype.hpp +++ b/lib/base/objecttype.hpp @@ -32,15 +32,15 @@ class ObjectType final : public Type public: ObjectType(); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; }; } diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp index a559e603d..562399dc7 100644 --- a/lib/base/primitivetype.hpp +++ b/lib/base/primitivetype.hpp @@ -32,15 +32,15 @@ class PrimitiveType final : public Type public: PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory()); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; private: String m_Name; diff --git a/lib/base/process.hpp b/lib/base/process.hpp index e0d7b7201..6e62f1df7 100644 --- a/lib/base/process.hpp +++ b/lib/base/process.hpp @@ -67,7 +67,7 @@ public: static const std::deque::size_type MaxTasksPerThread = 512; Process(const Arguments& arguments, const Dictionary::Ptr& extraEnvironment = nullptr); - ~Process(); + ~Process() override; void SetTimeout(double timeout); double GetTimeout() const; diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp index 3cea5e1f5..e606f46e5 100644 --- a/lib/base/socket.hpp +++ b/lib/base/socket.hpp @@ -38,7 +38,7 @@ public: Socket(); Socket(SOCKET fd); - ~Socket(); + ~Socket() override; SOCKET GetFD() const; diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp index 0e797f54f..1617e6114 100644 --- a/lib/base/socketevents.hpp +++ b/lib/base/socketevents.hpp @@ -122,13 +122,13 @@ protected: class SocketEventEnginePoll final : public SocketEventEngine { public: - virtual void Register(SocketEvents *se, Object *lifesupportObject); - virtual void Unregister(SocketEvents *se); - virtual void ChangeEvents(SocketEvents *se, int events); + void Register(SocketEvents *se, Object *lifesupportObject) override; + void Unregister(SocketEvents *se) override; + void ChangeEvents(SocketEvents *se, int events) override; protected: - virtual void InitializeThread(int tid); - virtual void ThreadProc(int tid); + void InitializeThread(int tid) override; + void ThreadProc(int tid) override; }; #ifdef __linux__ diff --git a/lib/base/stdiostream.hpp b/lib/base/stdiostream.hpp index 6058f14bf..027e39f97 100644 --- a/lib/base/stdiostream.hpp +++ b/lib/base/stdiostream.hpp @@ -32,15 +32,15 @@ public: DECLARE_PTR_TYPEDEFS(StdioStream); StdioStream(std::iostream *innerStream, bool ownsStream); - ~StdioStream(); + ~StdioStream() override; - virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override; - virtual void Write(const void *buffer, size_t size) override; + size_t Read(void *buffer, size_t size, bool allow_partial = false) override; + void Write(const void *buffer, size_t size) override; - virtual void Close() override; + void Close() override; - virtual bool IsDataAvailable() const override; - virtual bool IsEof() const override; + bool IsDataAvailable() const override; + bool IsEof() const override; private: std::iostream *m_InnerStream; diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index fe590bcce..cf45e1461 100644 --- a/lib/base/streamlogger.hpp +++ b/lib/base/streamlogger.hpp @@ -40,8 +40,8 @@ public: StreamLogger(); - virtual void Stop(bool runtimeRemoved) override; - ~StreamLogger(); + void Stop(bool runtimeRemoved) override; + ~StreamLogger() override; void BindStream(std::ostream *stream, bool ownsStream); @@ -49,7 +49,7 @@ public: protected: void ProcessLogEntry(const LogEntry& entry) final; - void Flush(void) final; + void Flush() final; private: static boost::mutex m_Mutex; diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp index 4101dadfd..f61848b41 100644 --- a/lib/base/sysloglogger.hpp +++ b/lib/base/sysloglogger.hpp @@ -41,15 +41,15 @@ public: static void StaticInitialize(); static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void OnConfigLoaded() override; - virtual void ValidateFacility(const String& value, const ValidationUtils& utils) override; + void OnConfigLoaded() override; + void ValidateFacility(const String& value, const ValidationUtils& utils) override; protected: static std::map m_FacilityMap; int m_Facility; - virtual void ProcessLogEntry(const LogEntry& entry) override; - virtual void Flush() override; + void ProcessLogEntry(const LogEntry& entry) override; + void Flush() override; }; } diff --git a/lib/base/timer.hpp b/lib/base/timer.hpp index 5e7555e19..639b5f5a1 100644 --- a/lib/base/timer.hpp +++ b/lib/base/timer.hpp @@ -39,7 +39,7 @@ public: DECLARE_PTR_TYPEDEFS(Timer); Timer(); - ~Timer(); + ~Timer() override; static void Uninitialize(); diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp index ce661979a..3528d430b 100644 --- a/lib/base/tlsstream.hpp +++ b/lib/base/tlsstream.hpp @@ -49,7 +49,7 @@ public: DECLARE_PTR_TYPEDEFS(TlsStream); TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const std::shared_ptr& sslContext = MakeSSLContext()); - ~TlsStream(); + ~TlsStream() override; Socket::Ptr GetSocket() const; @@ -58,17 +58,17 @@ public: void Handshake(); - virtual void Close() override; - virtual void Shutdown() override; + void Close() override; + void Shutdown() override; - 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; + size_t Peek(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + void Write(const void *buffer, size_t count) override; - virtual bool IsEof() const override; + bool IsEof() const override; - virtual bool SupportsWaiting() const override; - virtual bool IsDataAvailable() const override; + bool SupportsWaiting() const override; + bool IsDataAvailable() const override; bool IsVerifyOK() const; String GetVerifyError() const; @@ -97,7 +97,7 @@ private: static int m_SSLIndex; static bool m_SSLIndexInitialized; - virtual void OnEvent(int revents) override; + void OnEvent(int revents) override; void HandleError() const; diff --git a/lib/base/type.hpp b/lib/base/type.hpp index 54eeb802b..56563adc6 100644 --- a/lib/base/type.hpp +++ b/lib/base/type.hpp @@ -76,9 +76,9 @@ public: DECLARE_OBJECT(Type); Type(); - ~Type(); + ~Type() override; - virtual String ToString() const override; + String ToString() const override; virtual String GetName() const = 0; virtual Type::Ptr GetBaseType() const = 0; @@ -102,8 +102,8 @@ public: static Type::Ptr GetByName(const String& name); static std::vector GetAllTypes(); - virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override; - virtual Value GetField(int id) const override; + void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override; + Value GetField(int id) const override; virtual std::vector GetLoadDependencies() const; @@ -122,17 +122,17 @@ class TypeType final : public Type public: DECLARE_PTR_TYPEDEFS(Type); - virtual String GetName() const override; - virtual Type::Ptr GetBaseType() const override; - virtual int GetAttributes() const override; - virtual int GetFieldId(const String& name) const override; - virtual Field GetFieldInfo(int id) const override; - virtual int GetFieldCount() const override; + String GetName() const override; + Type::Ptr GetBaseType() const override; + int GetAttributes() const override; + int GetFieldId(const String& name) const override; + Field GetFieldInfo(int id) const override; + int GetFieldCount() const override; static Object::Ptr GetPrototype(); protected: - virtual ObjectFactory GetFactory() const override; + ObjectFactory GetFactory() const override; }; template diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index 02cfef1cc..f89e53452 100644 --- a/lib/checker/checkercomponent.hpp +++ b/lib/checker/checkercomponent.hpp @@ -79,9 +79,9 @@ public: CheckerComponent(); - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); unsigned long GetIdleCheckables(); diff --git a/lib/cli/apisetupcommand.hpp b/lib/cli/apisetupcommand.hpp index 63787a5d1..f54da0685 100644 --- a/lib/cli/apisetupcommand.hpp +++ b/lib/cli/apisetupcommand.hpp @@ -35,11 +35,11 @@ class ApiSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ApiSetupCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMaxArguments() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMaxArguments() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + ImpersonationLevel GetImpersonationLevel() const override; }; } diff --git a/lib/cli/calistcommand.hpp b/lib/cli/calistcommand.hpp index 517133819..e71ffd872 100644 --- a/lib/cli/calistcommand.hpp +++ b/lib/cli/calistcommand.hpp @@ -35,11 +35,11 @@ class CAListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CAListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; private: static void PrintRequest(const String& requestFile); diff --git a/lib/cli/casigncommand.hpp b/lib/cli/casigncommand.hpp index a45fc0b9d..28ae8b82a 100644 --- a/lib/cli/casigncommand.hpp +++ b/lib/cli/casigncommand.hpp @@ -35,11 +35,11 @@ class CASignCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(CASignCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + ImpersonationLevel GetImpersonationLevel() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; } diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp index 8a49e5b8b..6180c58a9 100644 --- a/lib/cli/consolecommand.hpp +++ b/lib/cli/consolecommand.hpp @@ -39,12 +39,12 @@ public: static void StaticInitialize(); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + ImpersonationLevel GetImpersonationLevel() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; static int RunScriptConsole(ScriptFrame& scriptFrame, const String& addr = String(), const String& session = String(), const String& commandOnce = String(), const String& commandOnceFileName = String(), diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp index ab257f68f..7fafe6d10 100644 --- a/lib/cli/daemoncommand.hpp +++ b/lib/cli/daemoncommand.hpp @@ -35,12 +35,12 @@ class DaemonCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(DaemonCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, 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; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + 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 8bcf49929..7dc5465d2 100644 --- a/lib/cli/featuredisablecommand.hpp +++ b/lib/cli/featuredisablecommand.hpp @@ -35,13 +35,13 @@ class FeatureDisableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureDisableCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual int GetMaxArguments() const override; - virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + int GetMaxArguments() const override; + std::vector GetPositionalSuggestions(const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + 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 24417ac47..a81ecc2c9 100644 --- a/lib/cli/featureenablecommand.hpp +++ b/lib/cli/featureenablecommand.hpp @@ -35,13 +35,13 @@ class FeatureEnableCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureEnableCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; - virtual int GetMaxArguments() const override; - virtual std::vector GetPositionalSuggestions(const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; + int GetMaxArguments() const override; + std::vector GetPositionalSuggestions(const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + 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 75882fcf1..46f357c75 100644 --- a/lib/cli/featurelistcommand.hpp +++ b/lib/cli/featurelistcommand.hpp @@ -35,9 +35,9 @@ class FeatureListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(FeatureListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + 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 4f0e6c890..1e3560a3b 100644 --- a/lib/cli/nodesetupcommand.hpp +++ b/lib/cli/nodesetupcommand.hpp @@ -35,13 +35,13 @@ class NodeSetupCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeSetupCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + ImpersonationLevel GetImpersonationLevel() const override; + 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/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp index 7377fe32d..5cc6033c0 100644 --- a/lib/cli/nodewizardcommand.hpp +++ b/lib/cli/nodewizardcommand.hpp @@ -35,12 +35,12 @@ class NodeWizardCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(NodeWizardCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMaxArguments() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; - virtual ImpersonationLevel GetImpersonationLevel() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + int GetMaxArguments() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + ImpersonationLevel GetImpersonationLevel() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; private: diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp index 36a41f2f3..2220e40c8 100644 --- a/lib/cli/objectlistcommand.hpp +++ b/lib/cli/objectlistcommand.hpp @@ -38,11 +38,11 @@ class ObjectListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(ObjectListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + 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 515ac98e2..b9d362a9a 100644 --- a/lib/cli/pkinewcacommand.hpp +++ b/lib/cli/pkinewcacommand.hpp @@ -35,9 +35,9 @@ class PKINewCACommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCACommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + 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 eb64a0ebd..c3b639c23 100644 --- a/lib/cli/pkinewcertcommand.hpp +++ b/lib/cli/pkinewcertcommand.hpp @@ -35,12 +35,12 @@ class PKINewCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKINewCertCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, 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; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + 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 2788cb1b7..71b9ca3a9 100644 --- a/lib/cli/pkirequestcommand.hpp +++ b/lib/cli/pkirequestcommand.hpp @@ -35,12 +35,12 @@ class PKIRequestCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKIRequestCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, 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; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + 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 ceed29201..0fb0c4847 100644 --- a/lib/cli/pkisavecertcommand.hpp +++ b/lib/cli/pkisavecertcommand.hpp @@ -35,12 +35,12 @@ class PKISaveCertCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISaveCertCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, 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; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + 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 535e16ca7..da9e1c8e7 100644 --- a/lib/cli/pkisigncsrcommand.hpp +++ b/lib/cli/pkisigncsrcommand.hpp @@ -35,12 +35,12 @@ class PKISignCSRCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKISignCSRCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, 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; + std::vector GetArgumentSuggestions(const String& argument, const String& word) const override; + 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 f94230ce5..0ada10ea5 100644 --- a/lib/cli/pkiticketcommand.hpp +++ b/lib/cli/pkiticketcommand.hpp @@ -35,11 +35,11 @@ class PKITicketCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(PKITicketCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual void InitParameters(boost::program_options::options_description& visibleDesc, + String GetDescription() const override; + String GetShortDescription() const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; }; diff --git a/lib/cli/troubleshootcommand.hpp b/lib/cli/troubleshootcommand.hpp index 85ce0c243..dbe5fba5e 100644 --- a/lib/cli/troubleshootcommand.hpp +++ b/lib/cli/troubleshootcommand.hpp @@ -37,10 +37,10 @@ class TroubleshootCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(TroubleshootCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() 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, + String GetDescription() const override; + String GetShortDescription() const override; + int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; private: diff --git a/lib/cli/variablegetcommand.hpp b/lib/cli/variablegetcommand.hpp index 8f01dc89a..84f63df5b 100644 --- a/lib/cli/variablegetcommand.hpp +++ b/lib/cli/variablegetcommand.hpp @@ -38,12 +38,12 @@ class VariableGetCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableGetCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int GetMinArguments() const override; + String GetDescription() const override; + String GetShortDescription() const override; + int GetMinArguments() const override; void InitParameters(boost::program_options::options_description& visibleDesc, boost::program_options::options_description& hiddenDesc) const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + 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 1e964ff2c..d5502dca1 100644 --- a/lib/cli/variablelistcommand.hpp +++ b/lib/cli/variablelistcommand.hpp @@ -38,9 +38,9 @@ class VariableListCommand final : public CLICommand public: DECLARE_PTR_TYPEDEFS(VariableListCommand); - virtual String GetDescription() const override; - virtual String GetShortDescription() const override; - virtual int Run(const boost::program_options::variables_map& vm, const std::vector& ap) const override; + String GetDescription() const override; + String GetShortDescription() const override; + 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/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp index 691efd235..2885e3fc4 100644 --- a/lib/compat/checkresultreader.hpp +++ b/lib/compat/checkresultreader.hpp @@ -41,8 +41,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_ReadTimer; diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp index 14052f810..1cfb2a28e 100644 --- a/lib/compat/compatlogger.hpp +++ b/lib/compat/compatlogger.hpp @@ -41,11 +41,11 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateRotationMethod(const String& value, const ValidationUtils& utils) override; + void ValidateRotationMethod(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void WriteLine(const String& line); diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp index 93c47ae33..3510cd995 100644 --- a/lib/compat/externalcommandlistener.hpp +++ b/lib/compat/externalcommandlistener.hpp @@ -42,8 +42,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: #ifndef _WIN32 diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp index 0b04bcefd..c19377408 100644 --- a/lib/compat/statusdatawriter.hpp +++ b/lib/compat/statusdatawriter.hpp @@ -45,8 +45,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_StatusTimer; diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index 8e10ef12c..20508c94c 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -155,7 +155,7 @@ std::shared_ptr ConfigItem::GetFilter() const class DefaultValidationUtils final : public ValidationUtils { public: - virtual bool ValidateName(const String& type, const String& name) const override + bool ValidateName(const String& type, const String& name) const override { ConfigItem::Ptr item = ConfigItem::GetByTypeAndName(Type::GetByName(type), name); diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp index 3faa8f1b4..7dc0876a3 100644 --- a/lib/config/expression.hpp +++ b/lib/config/expression.hpp @@ -225,12 +225,12 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override { return m_Expression->DoEvaluate(frame, dhint); } - virtual const DebugInfo& GetDebugInfo() const override + const DebugInfo& GetDebugInfo() const override { return m_Expression->GetDebugInfo(); } @@ -250,7 +250,7 @@ public: } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: Value m_Value; @@ -274,7 +274,7 @@ public: { } protected: - const DebugInfo& GetDebugInfo(void) const final; + const DebugInfo& GetDebugInfo() const final; DebugInfo m_DebugInfo; }; @@ -315,8 +315,8 @@ public: } protected: - 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; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; private: String m_Variable; @@ -332,7 +332,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalNegateExpression final : public UnaryExpression @@ -343,7 +343,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class AddExpression final : public BinaryExpression @@ -354,7 +354,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class SubtractExpression final : public BinaryExpression @@ -365,7 +365,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class MultiplyExpression final : public BinaryExpression @@ -376,7 +376,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class DivideExpression final : public BinaryExpression @@ -387,7 +387,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ModuloExpression final : public BinaryExpression @@ -398,7 +398,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class XorExpression final : public BinaryExpression @@ -409,7 +409,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BinaryAndExpression final : public BinaryExpression @@ -420,7 +420,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BinaryOrExpression final : public BinaryExpression @@ -431,7 +431,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ShiftLeftExpression final : public BinaryExpression @@ -442,7 +442,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ShiftRightExpression final : public BinaryExpression @@ -453,7 +453,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class EqualExpression final : public BinaryExpression @@ -464,7 +464,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class NotEqualExpression final : public BinaryExpression @@ -475,7 +475,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LessThanExpression final : public BinaryExpression @@ -486,7 +486,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GreaterThanExpression final : public BinaryExpression @@ -497,7 +497,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LessThanOrEqualExpression final : public BinaryExpression @@ -508,7 +508,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GreaterThanOrEqualExpression final : public BinaryExpression @@ -519,7 +519,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class InExpression final : public BinaryExpression @@ -530,7 +530,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class NotInExpression final : public BinaryExpression @@ -541,7 +541,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalAndExpression final : public BinaryExpression @@ -552,7 +552,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class LogicalOrExpression final : public BinaryExpression @@ -563,7 +563,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class FunctionCallExpression final : public DebuggableExpression @@ -574,7 +574,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; public: std::unique_ptr m_FName; @@ -589,7 +589,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector > m_Expressions; @@ -605,7 +605,7 @@ public: void MakeInline(); protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::vector > m_Expressions; @@ -622,7 +622,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: CombinedSetOp m_Op; @@ -638,7 +638,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Condition; @@ -654,7 +654,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Condition; @@ -670,7 +670,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class BreakExpression final : public DebuggableExpression @@ -681,7 +681,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class ContinueExpression final : public DebuggableExpression @@ -692,7 +692,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class GetScopeExpression final : public Expression @@ -703,7 +703,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: ScopeSpecifier m_ScopeSpec; @@ -717,8 +717,8 @@ public: { } protected: - 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; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override; friend void BindToScope(std::unique_ptr& expr, ScopeSpecifier scopeSpec); }; @@ -733,7 +733,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Message; @@ -748,7 +748,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Name; @@ -762,7 +762,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class FunctionExpression final : public DebuggableExpression @@ -774,7 +774,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_Name; @@ -797,7 +797,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_Type; @@ -825,7 +825,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: bool m_Abstract; @@ -848,7 +848,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_FKVar; @@ -865,7 +865,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; enum IncludeType @@ -885,7 +885,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: String m_RelativeBase; @@ -906,7 +906,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; }; class UsingExpression final : public DebuggableExpression @@ -917,7 +917,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_Name; @@ -931,7 +931,7 @@ public: { } protected: - virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; + ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override; private: std::unique_ptr m_TryBody; diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp index 58d742688..18534e423 100644 --- a/lib/db_ido/commanddbobject.hpp +++ b/lib/db_ido/commanddbobject.hpp @@ -38,8 +38,8 @@ public: CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp index 0175f29e8..ea8cd7ac8 100644 --- a/lib/db_ido/dbconnection.hpp +++ b/lib/db_ido/dbconnection.hpp @@ -76,15 +76,15 @@ public: int GetQueryCount(RingBuffer::SizeType span); virtual int GetPendingQueryCount() const = 0; - virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override final; - virtual void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) override final; + void ValidateFailoverTimeout(double value, const ValidationUtils& utils) final; + void ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils) final; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; - virtual void Resume() override; - virtual void Pause() override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; + void Resume() override; + void Pause() override; virtual void ExecuteQuery(const DbQuery& query) = 0; virtual void ExecuteMultipleQueries(const std::vector&) = 0; diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp index a10de9ccd..e2edb4b6f 100644 --- a/lib/db_ido/endpointdbobject.hpp +++ b/lib/db_ido/endpointdbobject.hpp @@ -41,8 +41,8 @@ public: static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() 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 31e799d47..6d5afc7ac 100644 --- a/lib/db_ido/hostdbobject.hpp +++ b/lib/db_ido/hostdbobject.hpp @@ -38,13 +38,13 @@ public: HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; - virtual void OnConfigUpdateLight() override; + void OnConfigUpdateHeavy() override; + void OnConfigUpdateLight() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: void DoCommonConfigUpdate(); diff --git a/lib/db_ido/hostgroupdbobject.hpp b/lib/db_ido/hostgroupdbobject.hpp index 7b948b62e..dc7016959 100644 --- a/lib/db_ido/hostgroupdbobject.hpp +++ b/lib/db_ido/hostgroupdbobject.hpp @@ -39,8 +39,8 @@ public: HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; private: static void MembersChangedHandler(const HostGroup::Ptr& hgfilter); diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp index 98990fd24..b88bbbd86 100644 --- a/lib/db_ido/servicedbobject.hpp +++ b/lib/db_ido/servicedbobject.hpp @@ -41,13 +41,13 @@ public: static void StaticInitialize(); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; - virtual void OnConfigUpdateLight() override; + void OnConfigUpdateHeavy() override; + void OnConfigUpdateLight() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; private: void DoCommonConfigUpdate(); diff --git a/lib/db_ido/servicegroupdbobject.hpp b/lib/db_ido/servicegroupdbobject.hpp index da08968c3..c62516352 100644 --- a/lib/db_ido/servicegroupdbobject.hpp +++ b/lib/db_ido/servicegroupdbobject.hpp @@ -39,8 +39,8 @@ public: ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/timeperioddbobject.hpp b/lib/db_ido/timeperioddbobject.hpp index 171c2d70b..f40a024f3 100644 --- a/lib/db_ido/timeperioddbobject.hpp +++ b/lib/db_ido/timeperioddbobject.hpp @@ -39,10 +39,10 @@ public: TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; + void OnConfigUpdateHeavy() override; }; } diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp index 0ce3480a2..fa2be5198 100644 --- a/lib/db_ido/userdbobject.hpp +++ b/lib/db_ido/userdbobject.hpp @@ -39,12 +39,12 @@ public: UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); protected: - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; - virtual void OnConfigUpdateHeavy() override; + void OnConfigUpdateHeavy() override; - virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; + String CalculateConfigHash(const Dictionary::Ptr& configFields) const override; }; } diff --git a/lib/db_ido/usergroupdbobject.hpp b/lib/db_ido/usergroupdbobject.hpp index 7a04cb41a..ec2330627 100644 --- a/lib/db_ido/usergroupdbobject.hpp +++ b/lib/db_ido/usergroupdbobject.hpp @@ -39,8 +39,8 @@ public: UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); - virtual Dictionary::Ptr GetConfigFields() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido/zonedbobject.hpp b/lib/db_ido/zonedbobject.hpp index 815d00542..ac051ab6c 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() const override; - virtual Dictionary::Ptr GetStatusFields() const override; + Dictionary::Ptr GetConfigFields() const override; + Dictionary::Ptr GetStatusFields() const override; }; } diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp index 85d89a10d..67fba0101 100644 --- a/lib/db_ido_mysql/idomysqlconnection.hpp +++ b/lib/db_ido_mysql/idomysqlconnection.hpp @@ -55,20 +55,20 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount() const override; + int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded() override; - virtual void Resume() override; - virtual void Pause() override; - - virtual void ActivateObject(const DbObject::Ptr& dbobj) override; - virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; - virtual void ExecuteQuery(const DbQuery& query) override; - virtual void ExecuteMultipleQueries(const std::vector& queries) override; - virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; - virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction() override; + void OnConfigLoaded() override; + void Resume() override; + void Pause() override; + + void ActivateObject(const DbObject::Ptr& dbobj) override; + void DeactivateObject(const DbObject::Ptr& dbobj) override; + void ExecuteQuery(const DbQuery& query) override; + void ExecuteMultipleQueries(const std::vector& queries) override; + void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; + void FillIDCache(const DbType::Ptr& type) override; + void NewTransaction() override; private: DbReference m_InstanceID; diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp index 9a3d20907..1d0e2f710 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.hpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp @@ -47,20 +47,20 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual int GetPendingQueryCount() const override; + int GetPendingQueryCount() const override; protected: - virtual void OnConfigLoaded() override; - virtual void Resume() override; - virtual void Pause() override; - - virtual void ActivateObject(const DbObject::Ptr& dbobj) override; - virtual void DeactivateObject(const DbObject::Ptr& dbobj) override; - virtual void ExecuteQuery(const DbQuery& query) override; - virtual void ExecuteMultipleQueries(const std::vector& queries) override; - virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; - virtual void FillIDCache(const DbType::Ptr& type) override; - virtual void NewTransaction() override; + void OnConfigLoaded() override; + void Resume() override; + void Pause() override; + + void ActivateObject(const DbObject::Ptr& dbobj) override; + void DeactivateObject(const DbObject::Ptr& dbobj) override; + void ExecuteQuery(const DbQuery& query) override; + void ExecuteMultipleQueries(const std::vector& queries) override; + void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override; + void FillIDCache(const DbType::Ptr& type) override; + void NewTransaction() override; private: DbReference m_InstanceID; diff --git a/lib/demo/demo.hpp b/lib/demo/demo.hpp index adba73026..a51c35959 100644 --- a/lib/demo/demo.hpp +++ b/lib/demo/demo.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(Demo); DECLARE_OBJECTNAME(Demo); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; static Value DemoMessageHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); diff --git a/lib/hello/helloapplication.hpp b/lib/hello/helloapplication.hpp index a4f6bd111..9d9bfa806 100644 --- a/lib/hello/helloapplication.hpp +++ b/lib/hello/helloapplication.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(HelloApplication); DECLARE_OBJECTNAME(HelloApplication); - virtual int Main() override; + int Main() override; }; } diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 76dfa8f85..202a7eca6 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -101,7 +101,7 @@ public: void AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify = true, bool persistent = false, double expiry = 0, const MessageOrigin::Ptr& origin = nullptr); void ClearAcknowledgement(const MessageOrigin::Ptr& origin = nullptr); - virtual int GetSeverity() const override; + int GetSeverity() const override; /* Checks */ intrusive_ptr GetCheckCommand() const; @@ -115,7 +115,7 @@ public: bool HasBeenChecked() const; virtual bool IsStateOK(ServiceState state) = 0; - double GetLastCheck(void) const final; + double GetLastCheck() const final; virtual void SaveLastState(ServiceState state, double timestamp) = 0; @@ -145,7 +145,7 @@ public: static boost::signals2::signal OnEventCommandExecuted; /* Downtimes */ - int GetDowntimeDepth(void) const final; + int GetDowntimeDepth() const final; void RemoveAllDowntimes(); void TriggerDowntimes(); @@ -191,8 +191,8 @@ public: void RemoveReverseDependency(const intrusive_ptr& dep); std::vector > GetReverseDependencies() const; - virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override final; - virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override final; + void ValidateCheckInterval(double value, const ValidationUtils& utils) final; + void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) final; static void IncreasePendingChecks(); static void DecreasePendingChecks(); @@ -201,8 +201,8 @@ public: static Object::Ptr GetPrototype(); protected: - virtual void Start(bool runtimeCreated) override; - virtual void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_CheckableMutex; diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp index a64606d26..82d6aceaf 100644 --- a/lib/icinga/command.hpp +++ b/lib/icinga/command.hpp @@ -39,7 +39,7 @@ public: //virtual Dictionary::Ptr Execute(const Object::Ptr& context) = 0; - virtual void Validate(int types, const ValidationUtils& utils) override; + void Validate(int types, const ValidationUtils& utils) override; }; } diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp index 9a1bc97e7..d8cb2a91e 100644 --- a/lib/icinga/comment.hpp +++ b/lib/icinga/comment.hpp @@ -57,9 +57,9 @@ public: static String GetCommentIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp index aa88c64e5..4cf16f66a 100644 --- a/lib/icinga/customvarobject.hpp +++ b/lib/icinga/customvarobject.hpp @@ -38,7 +38,7 @@ class CustomVarObject : public ObjectImpl public: DECLARE_OBJECT(CustomVarObject); - virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override final; + void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) final; }; int FilterArrayToInt(const Array::Ptr& typeFilters, const std::map& filterMap, int defaultValue); diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp index 8f9c364a2..3f5775f34 100644 --- a/lib/icinga/dependency.hpp +++ b/lib/icinga/dependency.hpp @@ -49,15 +49,15 @@ public: bool IsAvailable(DependencyType dt) const; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Stop(bool runtimeRemoved) override; private: Checkable::Ptr m_Parent; diff --git a/lib/icinga/downtime.hpp b/lib/icinga/downtime.hpp index a07496f78..1c120c019 100644 --- a/lib/icinga/downtime.hpp +++ b/lib/icinga/downtime.hpp @@ -66,12 +66,12 @@ public: static String GetDowntimeIDFromLegacyID(int id); protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; - virtual void ValidateStartTime(const Timestamp& value, const ValidationUtils& utils) override; - virtual void ValidateEndTime(const Timestamp& value, const ValidationUtils& utils) override; + void ValidateStartTime(const Timestamp& value, const ValidationUtils& utils) override; + void ValidateEndTime(const Timestamp& value, const ValidationUtils& utils) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp index e3a5ac7af..a4969e866 100644 --- a/lib/icinga/host.hpp +++ b/lib/icinga/host.hpp @@ -51,13 +51,13 @@ public: static HostState CalculateState(ServiceState state); - virtual HostState GetState() const override; - virtual HostState GetLastState() const override; - virtual HostState GetLastHardState() const override; - virtual int GetSeverity() const override; + HostState GetState() const override; + HostState GetLastState() const override; + HostState GetLastHardState() const override; + int GetSeverity() const override; - virtual bool IsStateOK(ServiceState state) override; - virtual void SaveLastState(ServiceState state, double timestamp) override; + bool IsStateOK(ServiceState state) override; + void SaveLastState(ServiceState state, double timestamp) override; static HostState StateFromString(const String& state); static String StateToString(HostState state); @@ -65,13 +65,13 @@ public: static StateType StateTypeFromString(const String& state); static String StateTypeToString(StateType state); - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; protected: - virtual void Stop(bool runtimeRemoved) override; + void Stop(bool runtimeRemoved) override; - virtual void OnAllConfigLoaded() override; - virtual void CreateChildObjects(const Type::Ptr& childType) override; + void OnAllConfigLoaded() override; + void CreateChildObjects(const Type::Ptr& childType) override; private: mutable boost::mutex m_ServicesMutex; diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp index fc8e0c624..9329a202a 100644 --- a/lib/icinga/icingaapplication.hpp +++ b/lib/icinga/icingaapplication.hpp @@ -40,7 +40,7 @@ public: static void StaticInitialize(); - virtual int Main() override; + int Main() override; static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); @@ -48,17 +48,17 @@ public: String GetPidPath() const; - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; String GetNodeName() const; - virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override; private: void DumpProgramState(); void DumpModifiedAttributes(); - virtual void OnShutdown() override; + void OnShutdown() override; }; } diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp index 3e4668f26..b87bb702c 100644 --- a/lib/icinga/notification.hpp +++ b/lib/icinga/notification.hpp @@ -104,10 +104,10 @@ public: static boost::signals2::signal OnNextNotificationChanged; - virtual void Validate(int types, const ValidationUtils& utils) override; + void Validate(int types, const ValidationUtils& utils) override; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); @@ -116,10 +116,10 @@ public: static const std::map& GetTypeFilterMap(); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: ObjectImpl::Ptr m_Checkable; diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp index 125c8da9f..5b8b322f5 100644 --- a/lib/icinga/scheduleddowntime.hpp +++ b/lib/icinga/scheduleddowntime.hpp @@ -49,11 +49,11 @@ public: static void EvaluateApplyRules(const intrusive_ptr& host); static void EvaluateApplyRules(const intrusive_ptr& service); - virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; private: static void TimerProc(); diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp index 0044e48cf..dd7c54e1f 100644 --- a/lib/icinga/service.hpp +++ b/lib/icinga/service.hpp @@ -45,13 +45,13 @@ public: static Service::Ptr GetByNamePair(const String& hostName, const String& serviceName); - virtual Host::Ptr GetHost() const override; - virtual int GetSeverity() const override; + Host::Ptr GetHost() const override; + int GetSeverity() const override; - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; + bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; - virtual bool IsStateOK(ServiceState state) override; - virtual void SaveLastState(ServiceState state, double timestamp) override; + bool IsStateOK(ServiceState state) override; + void SaveLastState(ServiceState state, double timestamp) override; static ServiceState StateFromString(const String& state); static String StateToString(ServiceState state); @@ -62,8 +62,8 @@ public: static void EvaluateApplyRules(const Host::Ptr& host); protected: - virtual void OnAllConfigLoaded() override; - virtual void CreateChildObjects(const Type::Ptr& childType) override; + void OnAllConfigLoaded() override; + void CreateChildObjects(const Type::Ptr& childType) override; private: Host::Ptr m_Host; diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp index c8a7bbe42..9fc01850a 100644 --- a/lib/icinga/timeperiod.hpp +++ b/lib/icinga/timeperiod.hpp @@ -37,16 +37,16 @@ public: DECLARE_OBJECT(TimePeriod); DECLARE_OBJECTNAME(TimePeriod); - virtual void Start(bool runtimeCreated) override; + void Start(bool runtimeCreated) override; void UpdateRegion(double begin, double end, bool clearExisting); - virtual bool GetIsInside() const override; + bool GetIsInside() const override; bool IsInside(double ts) const; double FindNextTransition(double begin); - virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override; private: void AddSegment(double s, double end); diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp index 699f66a57..527777cec 100644 --- a/lib/icinga/user.hpp +++ b/lib/icinga/user.hpp @@ -44,14 +44,14 @@ public: /* Notifications */ TimePeriod::Ptr GetPeriod() const; - virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void Stop(bool runtimeRemoved) override; + void Stop(bool runtimeRemoved) override; - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_UserMutex; }; diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index abf1bc51f..9d7303038 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -37,7 +37,7 @@ public: AndFilter(); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp index a3fb1c161..c3a607192 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) override; + 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 eec57e392..592ac50d4 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -49,8 +49,8 @@ public: AvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_AvgAttr; diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp index b06033dc1..3589f969f 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 4de5e2c8a..f6dbf7dc8 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 e0eed78e0..f8e46390d 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 e42c9c023..4c4816c0c 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 3b2bac401..22e110cd6 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -46,8 +46,8 @@ class CountAggregator final : public Aggregator public: DECLARE_PTR_TYPEDEFS(CountAggregator); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: static CountAggregatorState *EnsureState(AggregatorState **state); diff --git a/lib/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp index b9e4d3d4d..9b3ca2a96 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 c42634207..ced85cfe5 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 1b0e7182b..91d2847a1 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 8653c9b96..c6e34bb3b 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 c471de5cd..3bfb389d1 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -49,8 +49,8 @@ public: InvAvgAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_InvAvgAttr; diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index 1ddc1fc8d..43804ac28 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -48,8 +48,8 @@ public: InvSumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_InvSumAttr; diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp index a5a1abae2..b917bb3e4 100644 --- a/lib/livestatus/livestatuslistener.hpp +++ b/lib/livestatus/livestatuslistener.hpp @@ -45,11 +45,11 @@ public: static int GetClientsConnected(); static int GetConnections(); - virtual void ValidateSocketType(const String& value, const ValidationUtils& utils) override; + void ValidateSocketType(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void ServerThreadProc(); diff --git a/lib/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp index 1864660f7..aab3e1f0e 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 8dcf861bc..9515c3d71 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -48,8 +48,8 @@ public: MaxAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_MaxAttr; diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index 93767c798..a703474f1 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -49,8 +49,8 @@ public: MinAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_MinAttr; diff --git a/lib/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp index 6bc50e3b0..f0744a11d 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) override; + 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 a1a375eeb..be308ecf6 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -37,7 +37,7 @@ public: OrFilter(); - virtual bool Apply(const Table::Ptr& table, const Value& row) override; + bool Apply(const Table::Ptr& table, const Value& row) override; }; } diff --git a/lib/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp index a882f1292..4f97f8a4e 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 d5de376b4..665557236 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 d8fbd4217..5ef4027e7 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 ceb485c12..9edc9e3b8 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 148551915..baadf3165 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -50,8 +50,8 @@ public: StdAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_StdAttr; diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 4630aad10..9215899ea 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -48,8 +48,8 @@ public: SumAggregator(const String& attr); - virtual void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; - virtual double GetResultAndFreeState(AggregatorState *state) const override; + void Apply(const Table::Ptr& table, const Value& row, AggregatorState **state) override; + double GetResultAndFreeState(AggregatorState *state) const override; private: String m_SumAttr; diff --git a/lib/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp index eae3b3c80..ee05cc4e3 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + 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 e81ba2b93..7c223da48 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() const override; - virtual String GetPrefix() const override; + String GetName() const override; + String GetPrefix() const override; protected: - virtual void FetchRows(const AddRowFunction& addRowFn) override; + void FetchRows(const AddRowFunction& addRowFn) override; static Value NameAccessor(const Value& row); static Value ParentAccessor(const Value& row); diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp index 0278916cd..ed7d270d3 100644 --- a/lib/notification/notificationcomponent.hpp +++ b/lib/notification/notificationcomponent.hpp @@ -39,8 +39,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Timer::Ptr m_NotificationTimer; diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp index fe484da07..604ae757c 100644 --- a/lib/perfdata/elasticsearchwriter.hpp +++ b/lib/perfdata/elasticsearchwriter.hpp @@ -42,9 +42,9 @@ public: static String FormatTimestamp(double ts); protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: String m_EventPrefix; diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp index 7b75e88f3..261046e4e 100644 --- a/lib/perfdata/gelfwriter.hpp +++ b/lib/perfdata/gelfwriter.hpp @@ -47,9 +47,9 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp index 9fed91629..7c0606580 100644 --- a/lib/perfdata/graphitewriter.hpp +++ b/lib/perfdata/graphitewriter.hpp @@ -46,13 +46,13 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostNameTemplate(const String& value, const ValidationUtils& utils) override; - virtual void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateHostNameTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp index 2576a4b84..cf7be26ff 100644 --- a/lib/perfdata/influxdbwriter.hpp +++ b/lib/perfdata/influxdbwriter.hpp @@ -46,13 +46,13 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; - virtual void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateHostTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; + void ValidateServiceTemplate(const Dictionary::Ptr& value, const ValidationUtils& utils) override; protected: - virtual void OnConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void OnConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: WorkQueue m_WorkQueue; diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp index 069588e8d..5862a479a 100644 --- a/lib/perfdata/opentsdbwriter.hpp +++ b/lib/perfdata/opentsdbwriter.hpp @@ -44,8 +44,8 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: Stream::Ptr m_Stream; diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp index 8c6726fdd..64bd36fb5 100644 --- a/lib/perfdata/perfdatawriter.hpp +++ b/lib/perfdata/perfdatawriter.hpp @@ -42,12 +42,12 @@ public: static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); - virtual void ValidateHostFormatTemplate(const String& value, const ValidationUtils& utils) override; - virtual void ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateHostFormatTemplate(const String& value, const ValidationUtils& utils) override; + void ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils) override; protected: - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeRemoved) override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeRemoved) override; private: void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); diff --git a/lib/remote/actionshandler.hpp b/lib/remote/actionshandler.hpp index 2e6d4e099..dd5ab9032 100644 --- a/lib/remote/actionshandler.hpp +++ b/lib/remote/actionshandler.hpp @@ -30,7 +30,7 @@ class ActionsHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ActionsHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index 8224bb6d0..81b1310d3 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -109,12 +109,12 @@ public: static String GetDefaultCaPath(); protected: - virtual void OnConfigLoaded() override; - virtual void OnAllConfigLoaded() override; - virtual void Start(bool runtimeCreated) override; - virtual void Stop(bool runtimeDeleted) override; + void OnConfigLoaded() override; + void OnAllConfigLoaded() override; + void Start(bool runtimeCreated) override; + void Stop(bool runtimeDeleted) override; - virtual void ValidateTlsProtocolmin(const String& value, const ValidationUtils& utils) override; + void ValidateTlsProtocolmin(const String& value, const ValidationUtils& utils) override; private: std::shared_ptr m_SSLContext; diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp index 452abbc33..8551aeb9d 100644 --- a/lib/remote/configfileshandler.hpp +++ b/lib/remote/configfileshandler.hpp @@ -30,7 +30,7 @@ class ConfigFilesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigFilesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/configpackageshandler.hpp b/lib/remote/configpackageshandler.hpp index f7898943d..c57a33ee9 100644 --- a/lib/remote/configpackageshandler.hpp +++ b/lib/remote/configpackageshandler.hpp @@ -30,7 +30,7 @@ class ConfigPackagesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigPackagesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/configstageshandler.hpp b/lib/remote/configstageshandler.hpp index 4366c58c1..159856e51 100644 --- a/lib/remote/configstageshandler.hpp +++ b/lib/remote/configstageshandler.hpp @@ -30,7 +30,7 @@ class ConfigStagesHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConfigStagesHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp index 726543faa..ce7ae8f33 100644 --- a/lib/remote/consolehandler.hpp +++ b/lib/remote/consolehandler.hpp @@ -43,7 +43,7 @@ class ConsoleHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ConsoleHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; static std::vector GetAutocompletionSuggestions(const String& word, ScriptFrame& frame); diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp index 6cda7a289..12dc12377 100644 --- a/lib/remote/createobjecthandler.hpp +++ b/lib/remote/createobjecthandler.hpp @@ -30,7 +30,7 @@ class CreateObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(CreateObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/deleteobjecthandler.hpp b/lib/remote/deleteobjecthandler.hpp index ecf4e8e5d..77e68ea5b 100644 --- a/lib/remote/deleteobjecthandler.hpp +++ b/lib/remote/deleteobjecthandler.hpp @@ -30,7 +30,7 @@ class DeleteObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(DeleteObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp index 37420a511..fa43310c0 100644 --- a/lib/remote/endpoint.hpp +++ b/lib/remote/endpoint.hpp @@ -53,7 +53,7 @@ public: intrusive_ptr GetZone() const; - virtual bool GetConnected() const override; + bool GetConnected() const override; static Endpoint::Ptr GetLocalEndpoint(); @@ -69,7 +69,7 @@ public: double GetBytesReceivedPerSecond() const override; protected: - virtual void OnAllConfigLoaded() override; + void OnAllConfigLoaded() override; private: mutable boost::mutex m_ClientsLock; diff --git a/lib/remote/eventshandler.hpp b/lib/remote/eventshandler.hpp index 69ce7cb97..0e89972e9 100644 --- a/lib/remote/eventshandler.hpp +++ b/lib/remote/eventshandler.hpp @@ -31,7 +31,7 @@ class EventsHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(EventsHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/filterutility.hpp b/lib/remote/filterutility.hpp index 0e6a4ace8..e2c69dfc3 100644 --- a/lib/remote/filterutility.hpp +++ b/lib/remote/filterutility.hpp @@ -46,10 +46,10 @@ class ConfigObjectTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(ConfigObjectTargetProvider); - virtual void FindTargets(const String& type, const std::function& addTarget) const override; - virtual Value GetTargetByName(const String& type, const String& name) const override; - virtual bool IsValidType(const String& type) const override; - virtual String GetPluralName(const String& type) const override; + void FindTargets(const String& type, const std::function& addTarget) const override; + Value GetTargetByName(const String& type, const String& name) const override; + bool IsValidType(const String& type) const override; + String GetPluralName(const String& type) const override; }; struct QueryDescription diff --git a/lib/remote/infohandler.hpp b/lib/remote/infohandler.hpp index 52bb8ba8e..f99eab5c8 100644 --- a/lib/remote/infohandler.hpp +++ b/lib/remote/infohandler.hpp @@ -30,7 +30,7 @@ class InfoHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(InfoHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/modifyobjecthandler.hpp b/lib/remote/modifyobjecthandler.hpp index 0ed717975..c5583ac44 100644 --- a/lib/remote/modifyobjecthandler.hpp +++ b/lib/remote/modifyobjecthandler.hpp @@ -30,7 +30,7 @@ class ModifyObjectHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ModifyObjectHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/objectqueryhandler.hpp b/lib/remote/objectqueryhandler.hpp index 6e0b020ce..acefdb63b 100644 --- a/lib/remote/objectqueryhandler.hpp +++ b/lib/remote/objectqueryhandler.hpp @@ -30,7 +30,7 @@ class ObjectQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(ObjectQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; private: diff --git a/lib/remote/statushandler.cpp b/lib/remote/statushandler.cpp index 96f044b64..03627f513 100644 --- a/lib/remote/statushandler.cpp +++ b/lib/remote/statushandler.cpp @@ -32,7 +32,7 @@ class StatusTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(StatusTargetProvider); - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { Dictionary::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty); @@ -45,7 +45,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Dictionary::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty); @@ -70,12 +70,12 @@ public: return result; } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Status"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "statuses"; } diff --git a/lib/remote/statushandler.hpp b/lib/remote/statushandler.hpp index 70f72b586..7dfa8380e 100644 --- a/lib/remote/statushandler.hpp +++ b/lib/remote/statushandler.hpp @@ -30,7 +30,7 @@ class StatusHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(StatusHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/templatequeryhandler.cpp b/lib/remote/templatequeryhandler.cpp index 9406e3645..6dd5b2d89 100644 --- a/lib/remote/templatequeryhandler.cpp +++ b/lib/remote/templatequeryhandler.cpp @@ -54,7 +54,7 @@ public: return target; } - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { Type::Ptr ptype = Type::GetByName(type); @@ -65,7 +65,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(type); @@ -77,7 +77,7 @@ public: return GetTargetForTemplate(item); } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { Type::Ptr ptype = Type::GetByName(type); @@ -87,7 +87,7 @@ public: return ConfigObject::TypeInstance->IsAssignableFrom(ptype); } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return Type::GetByName(type)->GetPluralName(); } diff --git a/lib/remote/templatequeryhandler.hpp b/lib/remote/templatequeryhandler.hpp index 4c3e7c1ae..a70188b2a 100644 --- a/lib/remote/templatequeryhandler.hpp +++ b/lib/remote/templatequeryhandler.hpp @@ -30,7 +30,7 @@ class TemplateQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(TemplateQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/typequeryhandler.cpp b/lib/remote/typequeryhandler.cpp index 991d5e156..2a26e3be2 100644 --- a/lib/remote/typequeryhandler.cpp +++ b/lib/remote/typequeryhandler.cpp @@ -35,7 +35,7 @@ class TypeTargetProvider final : public TargetProvider public: DECLARE_PTR_TYPEDEFS(TypeTargetProvider); - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { for (const Type::Ptr& target : Type::GetAllTypes()) { @@ -43,7 +43,7 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { Type::Ptr ptype = Type::GetByName(name); @@ -53,12 +53,12 @@ public: return ptype; } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Type"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "types"; } diff --git a/lib/remote/typequeryhandler.hpp b/lib/remote/typequeryhandler.hpp index 177cf7419..11e533efd 100644 --- a/lib/remote/typequeryhandler.hpp +++ b/lib/remote/typequeryhandler.hpp @@ -30,7 +30,7 @@ class TypeQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(TypeQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/variablequeryhandler.cpp b/lib/remote/variablequeryhandler.cpp index 9fbfa5893..416170962 100644 --- a/lib/remote/variablequeryhandler.cpp +++ b/lib/remote/variablequeryhandler.cpp @@ -45,7 +45,7 @@ public: return target; } - virtual void FindTargets(const String& type, + void FindTargets(const String& type, const std::function& addTarget) const override { { @@ -57,17 +57,17 @@ public: } } - virtual Value GetTargetByName(const String& type, const String& name) const override + Value GetTargetByName(const String& type, const String& name) const override { return GetTargetForVar(name, ScriptGlobal::Get(name)); } - virtual bool IsValidType(const String& type) const override + bool IsValidType(const String& type) const override { return type == "Variable"; } - virtual String GetPluralName(const String& type) const override + String GetPluralName(const String& type) const override { return "variables"; } diff --git a/lib/remote/variablequeryhandler.hpp b/lib/remote/variablequeryhandler.hpp index 884ed53a3..6ce4dacc1 100644 --- a/lib/remote/variablequeryhandler.hpp +++ b/lib/remote/variablequeryhandler.hpp @@ -30,7 +30,7 @@ class VariableQueryHandler final : public HttpHandler public: DECLARE_PTR_TYPEDEFS(VariableQueryHandler); - virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, + bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) override; }; diff --git a/lib/remote/zone.hpp b/lib/remote/zone.hpp index 83022a30f..dd5918641 100644 --- a/lib/remote/zone.hpp +++ b/lib/remote/zone.hpp @@ -36,7 +36,7 @@ public: DECLARE_OBJECT(Zone); DECLARE_OBJECTNAME(Zone); - virtual void OnAllConfigLoaded() override; + void OnAllConfigLoaded() override; Zone::Ptr GetParent() const; std::set GetEndpoints() const; @@ -50,7 +50,7 @@ public: static Zone::Ptr GetLocalZone(); protected: - virtual void ValidateEndpointsRaw(const Array::Ptr& value, const ValidationUtils& utils) override; + void ValidateEndpointsRaw(const Array::Ptr& value, const ValidationUtils& utils) override; private: Zone::Ptr m_Parent; diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp index 62eb02e0f..047d4670b 100644 --- a/tools/mkclass/classcompiler.cpp +++ b/tools/mkclass/classcompiler.cpp @@ -221,7 +221,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "public:" << std::endl << "\t" << "DECLARE_PTR_TYPEDEFS(TypeImpl<" << klass.Name << ">);" << std::endl << std::endl << "\t" << "TypeImpl();" << std::endl - << "\t" << "~TypeImpl();" << std::endl << std::endl; + << "\t" << "~TypeImpl() override;" << std::endl << std::endl; m_Impl << "TypeImpl<" << klass.Name << ">::TypeImpl()" << std::endl << "{ }" << std::endl << std::endl @@ -229,7 +229,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "{ }" << std::endl << std::endl; /* GetName */ - m_Header << "\t" << "virtual String GetName() const;" << std::endl; + m_Header << "\t" << "String GetName() const override;" << std::endl; m_Impl << "String TypeImpl<" << klass.Name << ">::GetName() const" << std::endl << "{" << std::endl @@ -237,7 +237,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetAttributes */ - m_Header << "\t" << "virtual int GetAttributes() const;" << std::endl; + m_Header << "\t" << "int GetAttributes() const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetAttributes() const" << std::endl << "{" << std::endl @@ -245,7 +245,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetBaseType */ - m_Header << "\t" << "virtual Type::Ptr GetBaseType() const;" << std::endl; + m_Header << "\t" << "Type::Ptr GetBaseType() const override;" << std::endl; m_Impl << "Type::Ptr TypeImpl<" << klass.Name << ">::GetBaseType() const" << std::endl << "{" << std::endl @@ -260,7 +260,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFieldId */ - m_Header << "\t" << "virtual int GetFieldId(const String& name) const;" << std::endl; + m_Header << "\t" << "int GetFieldId(const String& name) const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldId(const String& name) const" << std::endl << "{" << std::endl; @@ -327,7 +327,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFieldInfo */ - m_Header << "\t" << "virtual Field GetFieldInfo(int id) const;" << std::endl; + m_Header << "\t" << "Field GetFieldInfo(int id) const override;" << std::endl; m_Impl << "Field TypeImpl<" << klass.Name << ">::GetFieldInfo(int id) const" << std::endl << "{" << std::endl; @@ -374,7 +374,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) m_Impl << "}" << std::endl << std::endl; /* GetFieldCount */ - m_Header << "\t" << "virtual int GetFieldCount() const;" << std::endl; + m_Header << "\t" << "int GetFieldCount() const override;" << std::endl; m_Impl << "int TypeImpl<" << klass.Name << ">::GetFieldCount() const" << std::endl << "{" << std::endl @@ -387,7 +387,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetFactory */ - m_Header << "\t" << "virtual ObjectFactory GetFactory() const;" << std::endl; + m_Header << "\t" << "ObjectFactory GetFactory() const override;" << std::endl; m_Impl << "ObjectFactory TypeImpl<" << klass.Name << ">::GetFactory() const" << std::endl << "{" << std::endl @@ -395,7 +395,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "}" << std::endl << std::endl; /* GetLoadDependencies */ - m_Header << "\t" << "virtual std::vector GetLoadDependencies() const;" << std::endl; + m_Header << "\t" << "std::vector GetLoadDependencies() const override;" << std::endl; m_Impl << "std::vector TypeImpl<" << klass.Name << ">::GetLoadDependencies() const" << std::endl << "{" << std::endl @@ -409,7 +409,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* RegisterAttributeHandler */ m_Header << "public:" << std::endl - << "\t" << "virtual void RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback);" << std::endl; + << "\t" << "void RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback) override;" << std::endl; m_Impl << "void TypeImpl<" << klass.Name << ">::RegisterAttributeHandler(int fieldId, const Type::AttributeHandler& callback)" << std::endl << "{" << std::endl; @@ -459,7 +459,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) << "\t" << "DECLARE_PTR_TYPEDEFS(ObjectImpl<" << klass.Name << ">);" << std::endl << std::endl; /* Validate */ - m_Header << "\t" << "virtual void Validate(int types, const ValidationUtils& utils) override;" << std::endl; + m_Header << "\t" << "void Validate(int types, const ValidationUtils& utils) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::Validate(int types, const ValidationUtils& utils)" << std::endl << "{" << std::endl; @@ -563,7 +563,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* destructor */ m_Header << "public:" << std::endl - << "\t" << "~ObjectImpl<" << klass.Name << ">();" << std::endl; + << "\t" << "~ObjectImpl<" << klass.Name << ">() override;" << std::endl; m_Impl << "ObjectImpl<" << klass.Name << ">::~ObjectImpl()" << std::endl << "{ }" << std::endl << std::endl; @@ -571,7 +571,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) if (!klass.Fields.empty()) { /* SetField */ m_Header << "public:" << std::endl - << "\t" << "virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override;" << std::endl; + << "\t" << "void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::SetField(int id, const Value& value, bool suppress_events, const Value& cookie)" << std::endl << "{" << std::endl; @@ -615,7 +615,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* GetField */ m_Header << "public:" << std::endl - << "\t" << "virtual Value GetField(int id) const override;" << std::endl; + << "\t" << "Value GetField(int id) const override;" << std::endl; m_Impl << "Value ObjectImpl<" << klass.Name << ">::GetField(int id) const" << std::endl << "{" << std::endl; @@ -648,7 +648,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* ValidateField */ m_Header << "public:" << std::endl - << "\t" << "virtual void ValidateField(int id, const Value& value, const ValidationUtils& utils) override;" << std::endl; + << "\t" << "void ValidateField(int id, const Value& value, const ValidationUtils& utils) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::ValidateField(int id, const Value& value, const ValidationUtils& utils)" << std::endl << "{" << std::endl; @@ -726,7 +726,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* NavigateField */ m_Header << "public:" << std::endl - << "\t" << "virtual Object::Ptr NavigateField(int id) const override;" << std::endl; + << "\t" << "Object::Ptr NavigateField(int id) const override;" << std::endl; m_Impl << "Object::Ptr ObjectImpl<" << klass.Name << ">::NavigateField(int id) const" << std::endl << "{" << std::endl; @@ -963,8 +963,8 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&) /* start/stop */ if (needs_tracking) { m_Header << "protected:" << std::endl - << "\tvirtual void Start(bool runtimeCreated = false) override;" << std::endl - << "\tvirtual void Stop(bool runtimeRemoved = false) override;" << std::endl; + << "\tvoid Start(bool runtimeCreated = false) override;" << std::endl + << "\tvoid Stop(bool runtimeRemoved = false) override;" << std::endl; m_Impl << "void ObjectImpl<" << klass.Name << ">::Start(bool runtimeCreated)" << std::endl << "{" << std::endl