Apply clang-tidy fix 'modernize-use-override'

diff --git a/icinga-studio/forms.h b/icinga-studio/forms.h
index 77f6f3f3da9db0c5682b5bf7120437423d8f7457..f01f5b90456d6dbdd2608873baada41c805680fe 100644 (file)
--- 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 e15ebbd260b5d581edb15ddd216f297dcf1427d0..1d3e657a3cfeb4a81f684bdce2c3bda1dec82847 100644 (file)
--- 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 28c8bc99d578504b6faf5db1ea756c044217df65..0e8363206b8d0379b52db755290ec604e5ee975c 100644 (file)
--- 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 1f6874c46aac6ac4f6a065279919879c9a50172a..6811c8936a5ca1c481adba75bb7cd1ffd3b234de 100644 (file)
--- a/lib/base/application.hpp
+++ b/lib/base/application.hpp
@@ -41,7 +41,7 @@ public:
 
        static boost::signals2::signal<void ()> 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 3e19c7bfba9516b1728ccafb958716a71d2ea68c..716d096838d90b810b8b71d7974bf1592c548a6f 100644 (file)
--- a/lib/base/array.hpp
+++ b/lib/base/array.hpp
@@ -50,7 +50,7 @@ public:
        Array();
        Array(std::initializer_list<Value> 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<Value> m_Data; /**< The data for the array. */

diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 4a6eb27bc9d770d8e36e8a83e70cf380654e5f2f..3f24c36ca97ff98012a5f44b8ee94a700413e7a6 100644 (file)
--- 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<ConfigType *>(ptype.get());

diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp
index f3f7083dc79fcb216d7427282f3bf3a3582ed51e..abb4e01202c54af1047c47b8514c824c8e917cb9 100644 (file)
--- 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<typename T>
        static intrusive_ptr<T> GetObject(const String& name)

diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp
index 68d91241493cdd52ec1b5f452f20ac76f045adef..7ac84dcfab45b257bd40fba4bc23eec33aaac469 100644 (file)
--- 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 8dbdf99608c6f4c0c68ccd505345ed9dc7686ffa..b2627b4860e2640344c82d2b19037597a17cd0f7 100644 (file)
--- 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<String, Value> m_Data; /**< The data for the dictionary. */

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index 4c34efea708b1f1f9e5e5316625f62b6eb1798ff..98bcd4241f2a525404cc60b51618667e3955478c 100644 (file)
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -34,7 +34,7 @@ static boost::thread_specific_ptr<ContextTrace> 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 28aa9d4a7c9b8226ed018e0b3f17e9db2c5d450c..9c26c746855b1bc59c6ac759bb09765589199943 100644 (file)
--- 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<String>& 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<String> 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 ed707e432f73dbc5fe6232264fe3f1acfe7981c2..6efc87060f65546b353577fd4cde85ec0344b33b 100644 (file)
--- 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 e251b7b5769544a8a1c7379d5b27dbbe200d8ba7..d4a5dc5ec08532e8ef56a90c633f3a126ba7f1d3 100644 (file)
--- 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 270f39b2d1037d1d890b16550621c1018b6aa47d..c9fa4d5d2b41aecf130e2237a73b4f8951dd4415 100644 (file)
--- 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 a084f37c8bcdee118b63f50e0cd0819b92311d41..96dfd8efa022248863d137ccf4169fcdd9b56f1e 100644 (file)
--- 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 86c4edb0e1a00c4c49b724b44131c6fada6f37f5..6b4f25bd646ab9c83be57af848131e06d0e233ac 100644 (file)
--- 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 c750467bedc3ea2b3e4d930298ad1a424a107d31..c1508e0d076ee6aad8ccb93ed25fec9122a5c026 100644 (file)
--- 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 a559e603d4563b9daa9a26551840a97868870eaa..562399dc7286a311f76a7951b8aacb462706d029 100644 (file)
--- 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 e0d7b720101fd4bd12dca70df573db0abcf74f22..6e62f1df705a2fd51287a2640e5bc10928252606 100644 (file)
--- a/lib/base/process.hpp
+++ b/lib/base/process.hpp
@@ -67,7 +67,7 @@ public:
        static const std::deque<Process::Ptr>::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 3cea5e1f5376debeec92e920215e9a1a438aa979..e606f46e54b96108138624f715d58b607c4a7526 100644 (file)
--- 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 0e797f54fb9de74d79fdc32c0c75c066016649ef..1617e611426e60327bb54d7da55dd4260466cef1 100644 (file)
--- 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 6058f14bf9dd7589a4053c3aa6836c62821c21de..027e39f97a890b4d3f2f8970b6963fd0720c5a8b 100644 (file)
--- 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 fe590bcce7ebf1d63836eca7da976132fe790cf2..cf45e14613a29915b760c0abec10fbb3c565b9e3 100644 (file)
--- 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 4101dadfda3d42ebc37193e58bc7142f8c79233a..f61848b410ab0c88a57b13f02dde7282cb6b555b 100644 (file)
--- 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<String, int> 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 5e7555e19bebed0d7b224d6e85650ee4d4dba187..639b5f5a1ee7626e588edbe002d90c102b5bdc99 100644 (file)
--- 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 ce661979a074766d8a31a2b56b44223f574e8025..3528d430b14236c35ea5c9d5fea7d5137843de5a 100644 (file)
--- 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<SSL_CTX>& 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 54eeb802b55566d7db8d2e49e483469147f5e69a..56563adc65b76a988e2346910b671ebb6bf1237d 100644 (file)
--- 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<Type::Ptr> 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<String> 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<typename T>

diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
index 02cfef1cc63a5ca43bc9ef61dab3ff307f6fdff9..f89e534521ea9b839d9af27793259984317e6ece 100644 (file)
--- 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 63787a5d135b3303b3f2a346cda852c6fc0709ec..f54da068589ce03e393ba54476fdb12ee5a53f0a 100644 (file)
--- 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<std::string>& 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<std::string>& ap) const override;
+       ImpersonationLevel GetImpersonationLevel() const override;
 };
 
 }

diff --git a/lib/cli/calistcommand.hpp b/lib/cli/calistcommand.hpp
index 517133819834eb71efb4df9a758fddfbc925c73c..e71ffd8723c065544618e5bd4eec95cca58c912d 100644 (file)
--- 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<std::string>& ap) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
        static void PrintRequest(const String& requestFile);

diff --git a/lib/cli/casigncommand.hpp b/lib/cli/casigncommand.hpp
index a45fc0b9d61dd6e36bbd05cf0b695b443a6ca1fe..28ae8b82a8e73cb2d87faf270e86975e574b312a 100644 (file)
--- 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<std::string>& 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<std::string>& ap) const override;
 };
 
 }

diff --git a/lib/cli/consolecommand.hpp b/lib/cli/consolecommand.hpp
index 8a49e5b8b76fe73f8e82d71409365ae39f3b4c3c..6180c58a92b2bdce2b68be96d828a5590c54ce95 100644 (file)
--- 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<std::string>& ap) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& 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 ab257f68f873cb9bebf06f91e9f831110bcaac8c..7fafe6d10671c376c4e3cb201b7b7b1205c7f87e 100644 (file)
--- 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<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp
index 8bcf499297fc4ade469c59b682d0daaf8823c976..7dc5465d24487bc7cd58ce54f9ad31865a2cfeec 100644 (file)
--- 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<String> GetPositionalSuggestions(const String& word) const override;
-       virtual ImpersonationLevel GetImpersonationLevel() const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       String GetDescription() const override;
+       String GetShortDescription() const override;
+       int GetMinArguments() const override;
+       int GetMaxArguments() const override;
+       std::vector<String> GetPositionalSuggestions(const String& word) const override;
+       ImpersonationLevel GetImpersonationLevel() const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp
index 24417ac478212a23744c5100c57a646aa139e9fe..a81ecc2c9c8792b74e5e089f80396f8d15d434b0 100644 (file)
--- 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<String> GetPositionalSuggestions(const String& word) const override;
-       virtual ImpersonationLevel GetImpersonationLevel() const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       String GetDescription() const override;
+       String GetShortDescription() const override;
+       int GetMinArguments() const override;
+       int GetMaxArguments() const override;
+       std::vector<String> GetPositionalSuggestions(const String& word) const override;
+       ImpersonationLevel GetImpersonationLevel() const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp
index 75882fcf1028a63d85704cd0629d3193a02d163e..46f357c7577d31f92599d7019d165c22ae11b6ce 100644 (file)
--- 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<std::string>& ap) const override;
+       String GetDescription() const override;
+       String GetShortDescription() const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

diff --git a/lib/cli/nodesetupcommand.hpp b/lib/cli/nodesetupcommand.hpp
index 4f0e6c890e5a49b6256077022a049ef1ab894f23..1e3560a3ba32c39d2a4d208e7b1bc6d8cf8f5324 100644 (file)
--- 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<String> 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<std::string>& ap) const override;
+       std::vector<String> 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<std::string>& ap) const override;
 
 private:
        static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap);

diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp
index 7377fe32d938f51de5cdc161f89a523c636f7c2d..5cc6033c0c87d3fefb9e66e79aca81ec1726d9ea 100644 (file)
--- 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<std::string>& 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<std::string>& 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 36a41f2f388dd4cf97c0edabd1d717fd4e83385e..2220e40c8f33533795bbaf503ee4e11eb50dacbe 100644 (file)
--- 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<std::string>& ap) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
        static void PrintTypeCounts(std::ostream& fp, const std::map<String, int>& type_count);

diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp
index 515ac98e2869c20a887b5dbbc0b89460020a9b08..b9d362a9a3bbc2e754048beeabd44384ace2a6e4 100644 (file)
--- 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<std::string>& ap) const override;
+       String GetDescription() const override;
+       String GetShortDescription() const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp
index eb64a0ebd8ef96b1f9920eb0164e281145f4d1b1..c3b639c233bd7e2723e9381b3a3dc0a0c78bdf72 100644 (file)
--- 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<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp
index 2788cb1b7ed1f738ec7c608a8ccb827b63269e31..71b9ca3a9a7a287686f7ee0511518082fc5e37af 100644 (file)
--- 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<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/pkisavecertcommand.hpp b/lib/cli/pkisavecertcommand.hpp
index ceed29201bb7195d2684a74ac86c5e237f78f6f6..0fb0c48470a74556562b8366d08c8d7c0d98a376 100644 (file)
--- 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<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp
index 535e16ca79a473e4fdf450f39cbbbf19473f4824..da9e1c8e74c1017e0e00ada701149feaf7706acb 100644 (file)
--- 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<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
-       virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+       std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp
index f94230ce59e6e81ae7bd950342391e9ff71e22cc..0ada10ea5a820c63a62fb2e9afa4774c8bc394f6 100644 (file)
--- 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<std::string>& ap) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

diff --git a/lib/cli/troubleshootcommand.hpp b/lib/cli/troubleshootcommand.hpp
index 85ce0c243cc12b74f6e389e05a1befd104a2fde1..dbe5fba5eeb526fad13f4e405ba54be2f30b81ff 100644 (file)
--- 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<std::string>& 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<std::string>& 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 8f01dc89acd0bf18ba872779ebde16e5595262d9..84f63df5b26fb4547d9471fd20717ef3ece076b0 100644 (file)
--- 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<std::string>& ap) const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

diff --git a/lib/cli/variablelistcommand.hpp b/lib/cli/variablelistcommand.hpp
index 1e964ff2c73256ee54b903a6f1cb0b91ea8d6b5f..d5502dca1755b94e63f1ce71cb4cfd5e85f9898d 100644 (file)
--- 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<std::string>& ap) const override;
+       String GetDescription() const override;
+       String GetShortDescription() const override;
+       int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& 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 691efd235ac34f05d615d93528e1e697e746b7c5..2885e3fc4068d6e0218480c751d51d70b5520916 100644 (file)
--- 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 14052f81054925770befdda78b4901d923fff9e2..1cfb2a28e4a6167980c3345541038e99cfbf38a7 100644 (file)
--- 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 93c47ae337a0b0b453196bdfa3a9eaf5590b4acb..3510cd995b8409da3511bcd3425f8aa6aa24e2de 100644 (file)
--- 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 0b04bcefd2f1417c999b596c19f926eb9a17d058..c19377408000ab3474644b8d1142ab7fd79d2950 100644 (file)
--- 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 8e10ef12c114104b53b75ea094d081ea5b7c2ca0..20508c94ca33fa5c264334c3480d7ab83dfe1479 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -155,7 +155,7 @@ std::shared_ptr<Expression> 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 3faa8f1b47024d1b04f336e22a46c1da65c42b84..7dc0876a33f969798f23f172bc59ad66c307e0ff 100644 (file)
--- 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<Expression> 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<std::unique_ptr<Expression> > 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<std::unique_ptr<Expression> > 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<Expression> 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<Expression> 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<Expression>& 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<Expression> 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<Expression> 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<Expression> 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<Expression> m_TryBody;

diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp
index 58d74268846fc26d39d5a2d2f39f6f274f95ba3a..18534e423ff97a87fe9a11f527c63052802f83cc 100644 (file)
--- 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 0175f29e869a34fb1fe22c6ac6836f85759c0dc0..ea8cd7ac8fc2c592edefba789e24ac24450b7afa 100644 (file)
--- 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<DbQuery>&) = 0;

diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp
index a10de9ccd33a2fe0ed0d11477dc3ca1e018f01ea..e2edb4b6f8f4e9e12eacdbd19692fc9691cd1859 100644 (file)
--- 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 31e799d4776fe623b0e055ba4188d26bcfc54d5b..6d5afc7ac3b723501c78d576c2a130e1cdf9a66e 100644 (file)
--- 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 7b948b62e200bd681e737e572d6702c6d2cfd193..dc70169593a3378b4a9e180fc60c7f3d0ae4f4af 100644 (file)
--- 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 98990fd24df1b74769b240580a001c59e62f3029..b88bbbd8641dbf6ba5b35c403f8c2ed538b9078c 100644 (file)
--- 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 da08968c3f8eaaf420fedc792482990b10e8e3f1..c62516352d868632a693a8936dce27d0cfa9a445 100644 (file)
--- 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 171c2d70b13a35516244948132b836024ef7e878..f40a024f3599563d208b028f0bd32fa3c8b26015 100644 (file)
--- 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 0ce3480a2819b09e553180c4af3432dc575917b9..fa2be519893872a907a588ac81f79dd2f084f4ff 100644 (file)
--- 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 7a04cb41a31a71efad7c9ece165d4e8c708d1839..ec233062769d700d8917b209d611e3bb3ad386ce 100644 (file)
--- 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 815d0054281d08167fd7c4ec461b90c1c2cc98fa..ac051ab6cb2c10c9a26e00beba57e105ddea5033 100644 (file)
--- a/lib/db_ido/zonedbobject.hpp
+++ b/lib/db_ido/zonedbobject.hpp
@@ -39,8 +39,8 @@ public:
 
        ZoneDbObject(const intrusive_ptr<DbType>& 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 85d89a10d37ca13445adb37863acd556693aa6b6..67fba0101360b4d44d321ea86dd6845e9c554405 100644 (file)
--- 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<DbQuery>& 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<DbQuery>& 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 9a3d20907b4111da5720e27892bc1e79f9e0447e..1d0e2f7106d2fbda536d266139047c89a1c29416 100644 (file)
--- 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<DbQuery>& 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<DbQuery>& 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 adba7302680e7613485d6f2feffb4055f73dc3e9..a51c359596ea9b28000b4a0f5b627513e4d8ee2e 100644 (file)
--- 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 a4f6bd11154bddaca946d45247f45b0a385cca39..9d9bfa80603060527ae5229e5f0e84d895041178 100644 (file)
--- 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 76dfa8f8551ac297686cc6278c4a927c84025582..202a7eca6332e9de319eb84d14753f06620dcbc0 100644 (file)
--- 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<CheckCommand> 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<void (const Checkable::Ptr&)> 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<Dependency>& dep);
        std::vector<intrusive_ptr<Dependency> > 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 a64606d26e180fc74a3b1e2c7c948b94c32860ec..82d6aceaf568ba52d1a0fb5f229ee6db6de889eb 100644 (file)
--- 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 9a1bc97e7d5e2802120bc5951d5bb29c737a1e0e..d8cb2a91e5f1c909034d79b9550b6752c175cb12 100644 (file)
--- 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<Checkable>::Ptr m_Checkable;

diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp
index aa88c64e545e02864050bf7a5cf2638397f81c35..4cf16f66a33622de42a5e80e4b8707cedc539890 100644 (file)
--- a/lib/icinga/customvarobject.hpp
+++ b/lib/icinga/customvarobject.hpp
@@ -38,7 +38,7 @@ class CustomVarObject : public ObjectImpl<CustomVarObject>
 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<String, int>& filterMap, int defaultValue);

diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index 8f9c364a2cf2cb6a1c13e40a35bd7fa159dc011f..3f5775f345f497f5b7b8a5e0b8949e239bd201ef 100644 (file)
--- 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>& host);
        static void EvaluateApplyRules(const intrusive_ptr<Service>& 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 a07496f78de1ed5f211e00461e7acb53e8dc15ea..1c120c0199ce7bfe68ab7483298c527b7464644b 100644 (file)
--- 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<Checkable>::Ptr m_Checkable;

diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp
index e3a5ac7af0900e44afae2b3e356af94f22cdd4ce..a4969e866a382f6c14a19e18d270e147db775281 100644 (file)
--- 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 fc8e0c624881750790ce328e225a6bdd24ab1765..9329a202a4410c0082a6989ae261acf3b281fa39 100644 (file)
--- 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 3e4668f260272205f270823c736d7cfdff58c82d..b87bb702ce0e319f11ed0fb5f491c83b9454cfc3 100644 (file)
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -104,10 +104,10 @@ public:
 
        static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> 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>& host);
        static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
@@ -116,10 +116,10 @@ public:
        static const std::map<String, int>& 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<Checkable>::Ptr m_Checkable;

diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp
index 125c8da9f7b397c012ffbddd7a8d3fca7b9b4478..5b8b322f559630fedf0e6556c3be75a37863e734 100644 (file)
--- a/lib/icinga/scheduleddowntime.hpp
+++ b/lib/icinga/scheduleddowntime.hpp
@@ -49,11 +49,11 @@ public:
        static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
        static void EvaluateApplyRules(const intrusive_ptr<Service>& 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 0044e48cf16c3930ba7acf2d7ab89e43342cb67b..dd7c54e1fc753d441a5d752e26ed77a0a44fd03f 100644 (file)
--- 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 c8a7bbe4276b12163261ffbaf821049b21a4e6c3..9fc01850ad998de46fd6afd60d16fd379099a13e 100644 (file)
--- 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 699f66a5731d394ffa98ef987bd5c19bd1ce6f42..527777cec8b825c7c3575cce3451e0d38a1eb6d3 100644 (file)
--- 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 abf1bc51f276236c5c8eae8f439b905589ce77f0..9d730303812fb4770ac8585ec366ab1475e7067d 100644 (file)
--- 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 a3fb1c1615d2046b71adb1ad90c48b44284332bd..c3a607192f098749259f6df14e34ccb01589bed5 100644 (file)
--- 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 eec57e392484ebfc16281b9b84d332761f2aa0b8..592ac50d44860632f22e53b52ad56105f73b7a16 100644 (file)
--- 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 b06033dc1d90a00a2110229d583865fd9c2fd618..3589f969f176245a914daaee884e28cb56eadf34 100644 (file)
--- 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 4de5e2c8abac729cfc606bc18cc9676adf4588a0..f6dbf7dc8bf32a044e2d629b5d745684d7c08bea 100644 (file)
--- 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 e0eed78e08dfe642b4f4c648b7192b8cf5fa0a10..f8e46390d505c57fcf6bcb52d2717cb1c9abc841 100644 (file)
--- 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 e42c9c0232814ddfd0eaf9f9434e1c6a11373b92..4c4816c0cdbaa27707ae7b7741ee794a33c1422b 100644 (file)
--- 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 3b2bac401ce1dd95a5fa7548259f9e672e371d9b..22e110cd66379737872236a9aae4118b773fc59e 100644 (file)
--- 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 b9e4d3d4d481544e9f5cf06bccba7aca32a3e346..9b3ca2a96aa202417fd1085e26e35bfdf207b076 100644 (file)
--- 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 c426342071df828a6736ee2263a00c943fd1fba9..ced85cfe576314d176723d7ecb1653542b00132b 100644 (file)
--- 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 1b0e7182bbd40f82c5250c2a867da7cc9472e26d..91d2847a10bbb40ab43a2a0044da6b42bb66afff 100644 (file)
--- 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 8653c9b965d658ded0e7013ad09475f2c788067e..c6e34bb3b6756a964795280ebe734cbe5c138134 100644 (file)
--- 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 c471de5cd51689680054b165551be2010ee1b7e0..3bfb389d1e3de4afc8af6663d23d8f142c377ee7 100644 (file)
--- 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 1ddc1fc8d51a0f262b12960aef93d118ce7b3ee8..43804ac28be4c6fc1003ccd803be69d703f2f0f5 100644 (file)
--- 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 a5a1abae22aa7f45083746d29ed53a63f4e1137e..b917bb3e46986aa9104cf818e38dd7c1cbe93982 100644 (file)
--- 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 1864660f70ae82329fb542c27d609b4356c8cf09..aab3e1f0ee2ab10038a18c2aac684177a9355a92 100644 (file)
--- 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 8dcf861bc4a502507eff96224e037b1454872355..9515c3d7147671a845047c2602734627e65d3f58 100644 (file)
--- 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 93767c79867aa7ac94ccdf5ff58ccd2b1b2258ae..a703474f16e8360b6fad2153b7e2f10f0408258a 100644 (file)
--- 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 6bc50e3b0a72931eec9036923ea58d94970ff1df..f0744a11dc66fcfddd8164f007da84093e8b086a 100644 (file)
--- 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 a1a375eebba7e4ac14affb5779540e937e8c9ffa..be308ecf6479298d858f0f2edbed77886b9d648d 100644 (file)
--- 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 a882f1292b41eb43a2a2b6bdf8cc7ca4b3917be3..4f97f8a4edeb269d490b88f89885214afaaf713f 100644 (file)
--- 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 d5de376b414ceedb96e7277c743c339c80263981..6655572367bdd6788cfbd048f5f92d5a34a248df 100644 (file)
--- 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 d8fbd4217e951678323ff2de604f64bb2ef2aaaf..5ef4027e7c97042aec0839ef29c68b7db3c59b66 100644 (file)
--- 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 ceb485c124ccecc7ebad3d2dda10989bba969e1b..9edc9e3b815d2c562d04f7277d3df5ebf2d93eb6 100644 (file)
--- 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 148551915ddd9a9925b5c7bc1d83dff8a524a2de..baadf3165b90e1d07e689d40846374b1d8c5b689 100644 (file)
--- 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 4630aad10ef967fb29a1161e363f886146ed4f70..9215899eaf762ed621de484296f634f287afcb19 100644 (file)
--- 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 eae3b3c80db56119acdeac1a5a221490573d1f3a..ee05cc4e370393ba0db364f31a86aabab0504f93 100644 (file)
--- 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 e81ba2b93db15663ba330016f2f4d8569e62746b..7c223da48097e26dae0533ee05e5ddafa6db634d 100644 (file)
--- 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 0278916cdff36755dea263496fe26ca7cfac0b33..ed7d270d305aff1efc81a5a218a77799c088e4a6 100644 (file)
--- 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 fe484da07e26ced9b9f819afb6f63adbec31991c..604ae757c728675f128340cf98954c5b10d91a1e 100644 (file)
--- 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 7b75e88f3e48942f03cfd3357ca293c7caf144f8..261046e4e0ad9c672c29ed02fd2d5cc062107f45 100644 (file)
--- 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 9fed9162945716ae7be5b6abb12ef3d5ca8c437a..7c0606580680533b7d8a6f6208a8ebb55fd00426 100644 (file)
--- 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 2576a4b844c04b46ca07717bbd4bfb5136889e84..cf7be26ffdee7299a8486a1816311ab3769cce9e 100644 (file)
--- 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 069588e8dc2cdcb34888e052aab47510b833a691..5862a479af4e7017d433bdd688d94bb556efb0d0 100644 (file)
--- 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 8c6726fdd95ceb67bc45875ca7fea9a52b5b5574..64bd36fb593fa66e028b6dc5c761a1428f36728e 100644 (file)
--- 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 2e6d4e0998056a5d381028e0b36f8049fa930cac..dd5ab9032e00eccbc3a7a33c7730ff4850d16a9c 100644 (file)
--- 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 8224bb6d088f7eb22bed058414340b70d9a993fc..81b1310d3be80732fff650ca6f6285c64622fc72 100644 (file)
--- 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<SSL_CTX> m_SSLContext;

diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp
index 452abbc332acede0959c4e81b23a761865ed857d..8551aeb9d47daf41e0ea8a3c934d1851dcbc94d7 100644 (file)
--- 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 f7898943dfed534f074b01edef749c1e9c141aac..c57a33ee936b7e2767740e700aec002873a01798 100644 (file)
--- 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 4366c58c177444dfe830010d0d6ae12f15ee9dd6..159856e51b81f0f2e9773c348f2b384b91c07714 100644 (file)
--- 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 726543faa438dd7c64582e3e33e8864f82ec9a09..ce7ae8f332cce61e17e19c52c7ec733b0dadecf6 100644 (file)
--- 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<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);

diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp
index 6cda7a289e1eb4b4b0d459c24adf7b60239d8ccd..12dc123772144db5fc1e2ba9ace96b77aaee9309 100644 (file)
--- 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 ecf4e8e5d944eeb589e5b531444cfb8f783d1f04..77e68ea5b9d842af3d5f1f75736499193fecd578 100644 (file)
--- 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 37420a511e5bd812f3cf82aff6e47c4d6b37d832..fa43310c05324ef4eb7202327c04aeebc7d216f9 100644 (file)
--- a/lib/remote/endpoint.hpp
+++ b/lib/remote/endpoint.hpp
@@ -53,7 +53,7 @@ public:
 
        intrusive_ptr<Zone> 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 69ce7cb97c28e0db7551a0f424a056290a09c314..0e89972e948b1a6bdeb690dd56f1f34d8e6e4d6c 100644 (file)
--- 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 0e6a4ace8c7a32978716e41cefe94b0b82757a58..e2c69dfc3e411dd6cdc139d0875b8db81fc57e3d 100644 (file)
--- 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<void (const Value&)>& 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<void (const Value&)>& 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 52bb8ba8e704b5f930c40e1aa288850c4f4a22db..f99eab5c8724e419c2af2f9f1bca3dbd987d823b 100644 (file)
--- 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 0ed7179753ed1d9cdef1364413a81c53ead6eba5..c5583ac44000ffd3f389c4ab96790a1dee56caab 100644 (file)
--- 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 6e0b020ce70cb36e0d02c6cb70e2664f8f85e6bd..acefdb63b200a6f54854ff4ff4a5545de68122d5 100644 (file)
--- 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 96f044b642982728a7b5b1715e35dc6bcf3022ca..03627f51390e110f29f45827c3f7980c5b85b8ee 100644 (file)
--- 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<void (const Value&)>& 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 70f72b586dfd2b2723daecee34696fd46701d887..7dfa8380e7bf65977a878972555b3cefdb3ba51c 100644 (file)
--- 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 9406e3645a1de9de9c40049d2effad825752177b..6dd5b2d89d8a8069c9cdc63446bcee54defb555e 100644 (file)
--- 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<void (const Value&)>& 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 4c3e7c1ae8cb8addb1b4080be0c5fa62faac7c51..a70188b2a796fb4bda95fc401c57172caf47d99f 100644 (file)
--- 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 991d5e1565707ca52a038e8335bda1a0c1fb433c..2a26e3be2c7b5a1b531c0fc4dc4257dfff8790bc 100644 (file)
--- 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<void (const Value&)>& 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 177cf7419de24729c613e413a425d3423fee98d7..11e533efd076176228328f1b611c9ad440080501 100644 (file)
--- 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 9fbfa58930a4f5760a17278716629edcc32e3206..416170962ae3905c8f9d3b8814dc31dd41623a2a 100644 (file)
--- 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<void (const Value&)>& 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 884ed53a32f0888d771572b98ec4648c511956e1..6ce4dacc1977e02035f7f754193004269ead0c6b 100644 (file)
--- 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 83022a30fb309449eafccea05cea2776a72779cf..dd5918641c07c334b78c9f2141ea4bf807e5dbd9 100644 (file)
--- 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<Endpoint::Ptr> 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 62eb02e0fc1d0513043e44fb76ea5b233e54b445..047d4670b197a4155d31ec5d0ab63f0bf16f6cfe 100644 (file)
--- 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<String> GetLoadDependencies() const;" << std::endl;
+       m_Header << "\t" << "std::vector<String> GetLoadDependencies() const override;" << std::endl;
 
        m_Impl << "std::vector<String> 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