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

2018-01-04 05:12:56 +01:00 · 2018-01-04 05:12:56 +01:00 · 9ca682496c
parent ac155d1dda
commit 9ca682496c
141 changed files with 544 additions and 544 deletions
--- 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;

 };

--- 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();

--- 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;
--- 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. */
--- 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. */
--- 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());
--- 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)
--- 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();

--- 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. */
--- 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;
--- 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;
--- 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;

--- 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();
--- 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;
--- 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;
--- 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;
--- 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;
 };

 }
--- 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;
--- 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;
--- 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;

--- 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__
--- 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;
--- 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;
--- 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;
 };

 }
--- 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();

--- 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;

--- 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>
--- 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();
--- 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;
 };

 }
--- 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);
--- 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;
 };

 }
--- 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(),
--- 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;
 };

 }
--- 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;

 };

--- 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;
 };

 }
--- 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;
 };

 }
--- 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);
--- 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:
--- 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);
--- 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;

 };

--- 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;

 };

--- 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;

 };

--- 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;

 };

--- 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;

 };

--- 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;

 };

--- 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:
--- 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;
 };

 }
--- 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);
--- 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;
--- 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);
--- 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
--- 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;
--- 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);

--- 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;
--- 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;
 };

 }
--- 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;
--- 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);
--- 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();
--- 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);
--- 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();
--- 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;
 };

 }
--- 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;
 };

 }
--- 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;
 };

 }
--- 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;
 };

 }
--- 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;
 };

 }
--- 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;
+	void OnConfigLoaded() override;
+	void Resume() override;
+	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 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;
--- 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;
+	void OnConfigLoaded() override;
+	void Resume() override;
+	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 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;
--- 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);

--- 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;
 };

 }
--- 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;
--- 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;
 };

 }
--- 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;
--- 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);
--- 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;
--- 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;
--- 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;
--- 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;
 };

 }
--- 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;
--- 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();
--- 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;
--- 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);
--- 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;
 };
--- 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;
 };

 }
--- 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;
--- 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;
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);

--- 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;
--- 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;
--- 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();
--- 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);
--- 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;
--- 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;
--- a/Show More
+++ b/Show More